]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
gve: Enable reading max ring size from the device in DQO-QPL mode
authorMatt Olson <maolson@google.com>
Wed, 25 Feb 2026 18:23:42 +0000 (10:23 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 28 Feb 2026 16:58:29 +0000 (08:58 -0800)
The gVNIC device indicates a device option (MODIFY_RING) to the driver,
which presents a range of ring sizes from which the user is allowed to
select. But in DQO-QPL queue format, the driver ignores the "max" of
this range and instead allows the user to configure the ring size in the
range [min, default]. This was done because increasing the ring size
could result in the number of registered pages being higher than the max
allowed by the device.

In order to support large ring sizes, stop ignoring the "max" of the
range presented in the MODIFY_RING option.

Signed-off-by: Matt Olson <maolson@google.com>
Signed-off-by: Max Yuan <maxyuan@google.com>
Reviewed-by: Jordan Rhee <jordanrhee@google.com>
Reviewed-by: Harshitha Ramamurthy <hramamurthy@google.com>
Reviewed-by: Praveen Kaligineedi <pkaligineedi@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Link: https://patch.msgid.link/20260225182342.1049816-3-joshwash@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/google/gve/gve_adminq.c

index 2c233009621bc42080080f56941def91a6153e50..b5f105709e49b832796fac3c953933f536fb9e24 100644 (file)
@@ -989,12 +989,10 @@ static void gve_enable_supported_features(struct gve_priv *priv,
        if (dev_op_modify_ring &&
            (supported_features_mask & GVE_SUP_MODIFY_RING_MASK)) {
                priv->modify_ring_size_enabled = true;
-
-               /* max ring size for DQO QPL should not be overwritten because of device limit */
-               if (priv->queue_format != GVE_DQO_QPL_FORMAT) {
-                       priv->max_rx_desc_cnt = be16_to_cpu(dev_op_modify_ring->max_rx_ring_size);
-                       priv->max_tx_desc_cnt = be16_to_cpu(dev_op_modify_ring->max_tx_ring_size);
-               }
+               priv->max_rx_desc_cnt =
+                       be16_to_cpu(dev_op_modify_ring->max_rx_ring_size);
+               priv->max_tx_desc_cnt =
+                       be16_to_cpu(dev_op_modify_ring->max_tx_ring_size);
                if (priv->default_min_ring_size) {
                        /* If device hasn't provided minimums, use default minimums */
                        priv->min_tx_desc_cnt = GVE_DEFAULT_MIN_TX_RING_SIZE;