From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E9843B0587 for ; Wed, 9 Sep 2026 19:11:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981102; cv=none; b=SbO/cXNcnnMvg+AjlzrMpI5O3DZsYng1U5mPaW6x7oVsyH4YZxWERpNHWRpicVyoC+fndXsffBwamRp50nxF4Zc+9ky/FUkTBg7cT9yIlzCrs5ffvjdNuYPKRxsTQeC0Bvf9OGXNJgrnpBEgivSfN29/n/cvKjgav72i12V7rUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981102; c=relaxed/simple; bh=Y0xfwq0+QmVRjBaTNLve8YUVJ7FiTI/GS6f/qAti/AQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=otazT/d4rUbI0+p7gW5f5HkucnlXfiqK7tHfSP/e49SeDZNQhUvhsDboguqIEvVB9cuvWn/TbOXWQxmZgYymkOVzGCV9nZkL7fQ7sBajER+PM1jpQ0LSaT/jN2duBgHq/ykdcgFUzz3/ob4wFislTq6ROfwZn4GxOJLjlzVwXaI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XnAO08z9; arc=none smtp.client-ip=209.85.214.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XnAO08z9" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2ce7dfd33ffso84145385ad.0 for ; Wed, 09 Sep 2026 12:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981098; x=1789585898; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TYV5pOTzVWl8Ff3l8BN21LdcJkI8zQjps8Vv83kyTuk=; b=XnAO08z9ztygyYZtYoBm7TQ0PEbbgbp8IRoyZGZWirbykPxgzq2LTUXldE8ggRn3yG 7VYJj92+agBy4/5AJyBIbZ4aWXq3QYMxfMk1AkKYvcspVyTepLiGFImIHJSFpwFAIzfr 6sJPIADpEg97oxg4smfw3bx0oeGbeOo69Wtk7LMI4SU9/yTtqg2F3u7XjYatfDVV/PHG NwaHTlVSlw9g48kSCgsSX5vp7ZbouylNQvnCndUHj3WSrH1adBkCio6MrKMVA0QAEUje ohKif/n+4ZvUXGjU7/vAeSloEK4ADv88LxYGp4pN0NC2NbjJGDT6jSRXHLs1Wno4NnAe 5TZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981098; x=1789585898; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=TYV5pOTzVWl8Ff3l8BN21LdcJkI8zQjps8Vv83kyTuk=; b=WDY3XMwQhwI+Ys073UvZSiCNwHz8ufAApZAFw4R5QG1DLVcKEPpng9v1tkHrdEK0Ts aGmlBQ5dD3Kq4kFqSSZ6b93siYeuJttxM75/q0BJ1lAVZm7RneZfxkRuQxdaxh53XI7l qerRRcIb5TQ1n4uaWfaabx8xa/gspQqQSxW0cjE18VlZKdz3L6+6mR4Xyfxup3Qd12y+ uBhCi8ErDcixZ5Sh5afyT/ggtNeufIxmCLMBY5vQZgNzzi7dk+Q49lm/Ue/ck1vyyXrA /EApYBp5qZAFrPxIqXDeOLMnmmensUS/Bao+sUruk7T7XB0u7KPB0QieCN9tlsa7f5Ym JH4Q== X-Forwarded-Encrypted: i=1; AKwUvBzA3cc3uJroi8s3fGUVySh/UD9/WjaVphfNt1ywZJUwaOokTGhxIanZxWmHZ7DPddjjIzW39xzc9LM+ico=@vger.kernel.org X-Gm-Message-State: AFuF++kmNZImEvw3HM3ktN/K2+jWeMmHxaZxG6OZ3COgfz6PSKt1t+B0 PLZs5lAt+4SMLXmbMXrG+QUXkAhk4CMo1ubxoKZuQioA5+LnHEr1Vl+cW62BA1QcQ/1dvbFhOcQ XrpkMJ5fM2UMpEu7sVM6UfteEkg== X-Received: from plov13.prod.google.com ([2002:a17:902:8d8d:b0:2d8:fd05:fdda]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3c2f:b0:2d8:d4cc:be64 with SMTP id d9443c01a7336-2db8dec4264mr101698875ad.17.1788981098224; Wed, 09 Sep 2026 12:11:38 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:24 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-2-hramamurthy@google.com> Subject: [PATCH net-next v6 01/12] gve: add struct gve_device_info to hold device properties From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the current AdminQ mode, device properties are written into struct gve_device_descriptor that is allocated in shared memory between the driver and device. In the upcoming MailboxQ mode, these properties will be returned in the response of a mailbox message. Hence, add struct gve_device_info as the structure that holds all the properties that are negotiated with the device in either mode. Change the AdminQ mode method gve_adminq_describe_device() and its children to fill up device information into this newly introduced struct gve_device_info. Move a few helper functions and code that set device properties in the priv structure into gve_init_priv(). So now gve_init_priv() calls/does the following: - gve_set_mtu() - gve_set_mac() - gve_set_queue_properties() - gve_set_buf_sizes() - set flow steering and RSS properties - set other priv properties When MailboxQ support is added, device information will be filled into the same structure and the same gve_init_priv() path would be used to set device properties to ensure common code reusage. Most of these changes are refactors only, except for one: with the introduction of the central struct gve_device_info, in AdminQ mode, gve_set_mtu() now also validates the device provided mtu value from jumbo frames device option. This sets up the driver nicely for the MailboxQ mode where both the default and the maximum mtu are provided at once and they are validated in gve_set_mtu(). Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Harshitha Ramamurthy --- v6: - update commit message to call out change in devive provided MTU validation (Sashiko) v5: - ensure using default_tx/rx_queues (Sashiko) - honor device provided rx buffer size correctly (Sashiko) v4: - reuse mtu variable v3: - Read default_min_ring_size from device info instead of priv drivers/net/ethernet/google/gve/gve.h | 29 +++++ drivers/net/ethernet/google/gve/gve_adminq.c | 128 +++++++++++-------- drivers/net/ethernet/google/gve/gve_adminq.h | 6 - drivers/net/ethernet/google/gve/gve_main.c | 86 +++++++++---- 4 files changed, 169 insertions(+), 80 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index c280ff35ee77..021adb9108df 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -797,6 +797,34 @@ struct gve_ptp { struct gve_priv *priv; }; =20 +struct gve_device_info { + enum gve_queue_format queue_format; + u16 default_tx_queues; + u16 default_rx_queues; + u16 max_tx_queues; + u16 max_rx_queues; + u16 default_tx_ring_size; + u16 default_rx_ring_size; + u16 max_tx_ring_size; + u16 max_rx_ring_size; + u16 min_tx_ring_size; + u16 min_rx_ring_size; + u16 max_mtu; + u8 mac[ETH_ALEN]; + u16 max_rx_buffer_size; + u16 header_buf_size; + u32 max_flow_rules; + u16 rss_key_size; + u16 rss_lut_size; + u16 tx_pages_per_qpl; + u16 num_event_counters; + u64 max_registered_pages; + bool default_min_ring_size; + bool nic_timestamp_supported; + bool modify_ring_size_enabled; + bool cache_rss_config; +}; + struct gve_priv { struct net_device *dev; struct gve_tx_ring *tx; /* array of tx_cfg.num_queues */ @@ -929,6 +957,7 @@ struct gve_priv { struct gve_nic_ts_report *nic_ts_report; dma_addr_t nic_ts_report_bus; u64 last_sync_nic_counter; /* Clock counter from last NIC TS report */ + struct gve_device_info device_info; }; =20 enum gve_service_task_flags_bit { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index f05f4895f4c7..512349c5517f 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -70,7 +70,7 @@ void gve_parse_device_option(struct gve_priv *priv, =20 dev_info(&priv->pdev->dev, "Gqi raw addressing device option enabled.\n"); - priv->queue_format =3D GVE_GQI_RDA_FORMAT; + priv->device_info.queue_format =3D GVE_GQI_RDA_FORMAT; break; case GVE_DEV_OPT_ID_GQI_RDA: if (option_length < sizeof(**dev_op_gqi_rda) || @@ -190,7 +190,7 @@ void gve_parse_device_option(struct gve_priv *priv, =20 /* device has not provided min ring size */ if (option_length =3D=3D GVE_DEVICE_OPTION_NO_MIN_RING_SIZE) - priv->default_min_ring_size =3D true; + priv->device_info.default_min_ring_size =3D true; break; case GVE_DEV_OPT_ID_FLOW_STEERING: if (option_length < sizeof(**dev_op_flow_steering) || @@ -922,10 +922,13 @@ int gve_adminq_destroy_rx_queues(struct gve_priv *pri= v, u32 num_queues) =20 static void gve_set_default_rss_sizes(struct gve_priv *priv) { - if (!gve_is_gqi(priv)) { - priv->rss_key_size =3D GVE_RSS_KEY_SIZE; - priv->rss_lut_size =3D GVE_RSS_INDIR_SIZE; - priv->cache_rss_config =3D true; + struct gve_device_info *device_info =3D &priv->device_info; + + if (device_info->queue_format =3D=3D GVE_DQO_RDA_FORMAT || + device_info->queue_format =3D=3D GVE_DQO_QPL_FORMAT) { + device_info->rss_key_size =3D GVE_RSS_KEY_SIZE; + device_info->rss_lut_size =3D GVE_RSS_INDIR_SIZE; + device_info->cache_rss_config =3D true; } } =20 @@ -946,77 +949,105 @@ static void gve_enable_supported_features(struct gve= _priv *priv, const struct gve_device_option_modify_ring *dev_op_modify_ring) { + struct gve_device_info *info =3D &priv->device_info; + /* Before control reaches this point, the page-size-capped max MTU from * the gve_device_descriptor field has already been stored in - * priv->dev->max_mtu. We overwrite it with the true max MTU below. + * device_info->max_mtu. We overwrite it with the true max MTU below. */ if (dev_op_jumbo_frames && (supported_features_mask & GVE_SUP_JUMBO_FRAMES_MASK)) { dev_info(&priv->pdev->dev, "JUMBO FRAMES device option enabled.\n"); - priv->dev->max_mtu =3D be16_to_cpu(dev_op_jumbo_frames->max_mtu); + info->max_mtu =3D be16_to_cpu(dev_op_jumbo_frames->max_mtu); } =20 if (dev_op_buffer_sizes && (supported_features_mask & GVE_SUP_BUFFER_SIZES_MASK)) { - priv->max_rx_buffer_size =3D + info->max_rx_buffer_size =3D be16_to_cpu(dev_op_buffer_sizes->packet_buffer_size); - priv->header_buf_size =3D + info->header_buf_size =3D be16_to_cpu(dev_op_buffer_sizes->header_buffer_size); dev_info(&priv->pdev->dev, "BUFFER SIZES device option enabled with max_rx_buffer_size of %u, hea= der_buf_size of %u.\n", - priv->max_rx_buffer_size, priv->header_buf_size); - if (gve_is_dqo(priv) && - priv->max_rx_buffer_size > GVE_DEFAULT_RX_BUFFER_SIZE) - priv->rx_cfg.packet_buffer_size =3D - priv->max_rx_buffer_size; + info->max_rx_buffer_size, info->header_buf_size); } =20 /* Read and store ring size ranges given by device */ if (dev_op_modify_ring && (supported_features_mask & GVE_SUP_MODIFY_RING_MASK)) { - priv->modify_ring_size_enabled =3D true; - priv->max_rx_desc_cnt =3D + info->modify_ring_size_enabled =3D true; + info->max_rx_ring_size =3D be16_to_cpu(dev_op_modify_ring->max_rx_ring_size); - priv->max_tx_desc_cnt =3D + info->max_tx_ring_size =3D be16_to_cpu(dev_op_modify_ring->max_tx_ring_size); - if (priv->default_min_ring_size) { + if (info->default_min_ring_size) { /* If device hasn't provided minimums, use default minimums */ - priv->min_tx_desc_cnt =3D GVE_DEFAULT_MIN_TX_RING_SIZE; - priv->min_rx_desc_cnt =3D GVE_DEFAULT_MIN_RX_RING_SIZE; + info->min_tx_ring_size =3D GVE_DEFAULT_MIN_TX_RING_SIZE; + info->min_rx_ring_size =3D GVE_DEFAULT_MIN_RX_RING_SIZE; } else { - priv->min_rx_desc_cnt =3D be16_to_cpu(dev_op_modify_ring->min_rx_ring_s= ize); - priv->min_tx_desc_cnt =3D be16_to_cpu(dev_op_modify_ring->min_tx_ring_s= ize); + info->min_rx_ring_size =3D + be16_to_cpu(dev_op_modify_ring->min_rx_ring_size); + info->min_tx_ring_size =3D + be16_to_cpu(dev_op_modify_ring->min_tx_ring_size); } } =20 if (dev_op_flow_steering && (supported_features_mask & GVE_SUP_FLOW_STEERING_MASK)) { if (dev_op_flow_steering->max_flow_rules) { - priv->max_flow_rules =3D + info->max_flow_rules =3D be32_to_cpu(dev_op_flow_steering->max_flow_rules); - priv->dev->hw_features |=3D NETIF_F_NTUPLE; dev_info(&priv->pdev->dev, "FLOW STEERING device option enabled with max rule limit of %u.\n", - priv->max_flow_rules); + info->max_flow_rules); } } =20 if (dev_op_rss_config && (supported_features_mask & GVE_SUP_RSS_CONFIG_MASK)) { - priv->rss_key_size =3D + info->rss_key_size =3D be16_to_cpu(dev_op_rss_config->hash_key_size); - priv->rss_lut_size =3D + info->rss_lut_size =3D be16_to_cpu(dev_op_rss_config->hash_lut_size); - priv->cache_rss_config =3D false; + info->cache_rss_config =3D false; dev_dbg(&priv->pdev->dev, "RSS device option enabled with key size of %u, lut size of %u.\n", - priv->rss_key_size, priv->rss_lut_size); + info->rss_key_size, info->rss_lut_size); } =20 if (dev_op_nic_timestamp && (supported_features_mask & GVE_SUP_NIC_TIMESTAMP_MASK)) - priv->nic_timestamp_supported =3D true; + info->nic_timestamp_supported =3D true; +} + +static void gve_fill_device_info(struct gve_priv *priv, + struct gve_device_descriptor *descriptor) +{ + struct gve_device_info *device_info =3D &priv->device_info; + u16 default_num_queues; + + device_info->tx_pages_per_qpl =3D + be16_to_cpu(descriptor->tx_pages_per_qpl); + device_info->max_registered_pages =3D + be64_to_cpu(descriptor->max_registered_pages); + device_info->num_event_counters =3D be16_to_cpu(descriptor->counters); + ether_addr_copy(device_info->mac, descriptor->mac); + device_info->max_mtu =3D be16_to_cpu(descriptor->mtu); + + default_num_queues =3D be16_to_cpu(descriptor->default_num_queues); + device_info->default_tx_queues =3D default_num_queues; + device_info->default_rx_queues =3D default_num_queues; + device_info->default_tx_ring_size =3D + be16_to_cpu(descriptor->tx_queue_entries); + device_info->default_rx_ring_size =3D + be16_to_cpu(descriptor->rx_queue_entries); + + /* set default ranges */ + device_info->max_tx_ring_size =3D device_info->default_tx_ring_size; + device_info->max_rx_ring_size =3D device_info->default_rx_ring_size; + device_info->min_tx_ring_size =3D device_info->default_tx_ring_size; + device_info->min_rx_ring_size =3D device_info->default_rx_ring_size; } =20 int gve_adminq_describe_device(struct gve_priv *priv) @@ -1027,6 +1058,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) struct gve_device_option_jumbo_frames *dev_op_jumbo_frames =3D NULL; struct gve_device_option_modify_ring *dev_op_modify_ring =3D NULL; struct gve_device_option_rss_config *dev_op_rss_config =3D NULL; + struct gve_device_info *device_info =3D &priv->device_info; struct gve_device_option_gqi_rda *dev_op_gqi_rda =3D NULL; struct gve_device_option_gqi_qpl *dev_op_gqi_qpl =3D NULL; struct gve_device_option_dqo_rda *dev_op_dqo_rda =3D NULL; @@ -1070,26 +1102,26 @@ int gve_adminq_describe_device(struct gve_priv *pri= v) * DqoRda, DqoQpl, GqiRda, GqiQpl. Use GqiQpl as default. */ if (dev_op_dqo_rda) { - priv->queue_format =3D GVE_DQO_RDA_FORMAT; + device_info->queue_format =3D GVE_DQO_RDA_FORMAT; dev_info(&priv->pdev->dev, "Driver is running with DQO RDA queue format.\n"); supported_features_mask =3D be32_to_cpu(dev_op_dqo_rda->supported_features_mask); } else if (dev_op_dqo_qpl) { - priv->queue_format =3D GVE_DQO_QPL_FORMAT; + device_info->queue_format =3D GVE_DQO_QPL_FORMAT; supported_features_mask =3D be32_to_cpu(dev_op_dqo_qpl->supported_features_mask); } else if (dev_op_gqi_rda) { - priv->queue_format =3D GVE_GQI_RDA_FORMAT; + device_info->queue_format =3D GVE_GQI_RDA_FORMAT; dev_info(&priv->pdev->dev, "Driver is running with GQI RDA queue format.\n"); supported_features_mask =3D be32_to_cpu(dev_op_gqi_rda->supported_features_mask); - } else if (priv->queue_format =3D=3D GVE_GQI_RDA_FORMAT) { + } else if (device_info->queue_format =3D=3D GVE_GQI_RDA_FORMAT) { dev_info(&priv->pdev->dev, "Driver is running with GQI RDA queue format.\n"); } else { - priv->queue_format =3D GVE_GQI_QPL_FORMAT; + device_info->queue_format =3D GVE_GQI_QPL_FORMAT; if (dev_op_gqi_qpl) supported_features_mask =3D be32_to_cpu(dev_op_gqi_qpl->supported_features_mask); @@ -1097,18 +1129,9 @@ int gve_adminq_describe_device(struct gve_priv *priv) "Driver is running with GQI QPL queue format.\n"); } =20 + gve_fill_device_info(priv, descriptor); gve_set_default_rss_sizes(priv); =20 - err =3D gve_set_mtu(priv, descriptor); - if (err) - goto free_device_descriptor; - - priv->num_event_counters =3D be16_to_cpu(descriptor->counters); - - gve_set_mac(priv, descriptor); - - gve_set_queue_properties(priv, descriptor); - gve_enable_supported_features(priv, supported_features_mask, dev_op_jumbo_frames, dev_op_dqo_qpl, dev_op_buffer_sizes, dev_op_flow_steering, @@ -1595,6 +1618,8 @@ int gve_set_num_ntfy_blks(struct gve_priv *priv) =20 void gve_set_num_queues(struct gve_priv *priv) { + struct gve_device_info *device_info =3D &priv->device_info; + priv->tx_cfg.max_queues =3D min_t(int, priv->tx_cfg.max_queues, priv->num_ntfy_blks / 2); priv->rx_cfg.max_queues =3D @@ -1602,10 +1627,13 @@ void gve_set_num_queues(struct gve_priv *priv) =20 priv->tx_cfg.num_queues =3D priv->tx_cfg.max_queues; priv->rx_cfg.num_queues =3D priv->rx_cfg.max_queues; - if (priv->default_num_queues > 0) { - priv->tx_cfg.num_queues =3D min_t(int, priv->default_num_queues, + if (device_info->default_tx_queues > 0) + priv->tx_cfg.num_queues =3D min_t(int, + device_info->default_tx_queues, priv->tx_cfg.num_queues); - priv->rx_cfg.num_queues =3D min_t(int, priv->default_num_queues, + + if (device_info->default_rx_queues > 0) + priv->rx_cfg.num_queues =3D min_t(int, + device_info->default_rx_queues, priv->rx_cfg.num_queues); - } } diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 68c63ce75505..a17af755b454 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -658,10 +658,4 @@ int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, struct gve_ptype_lut *ptype_lut); int gve_set_num_ntfy_blks(struct gve_priv *priv); void gve_set_num_queues(struct gve_priv *priv); -void gve_set_queue_properties(struct gve_priv *priv, - struct gve_device_descriptor *descriptor); -int gve_set_mtu(struct gve_priv *priv, - struct gve_device_descriptor *descriptor); -void gve_set_mac(struct gve_priv *priv, - struct gve_device_descriptor *descriptor); #endif /* _GVE_ADMINQ_H */ diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 9cc343a16271..d3882de584e3 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2398,57 +2398,71 @@ static const struct xdp_metadata_ops gve_xdp_metada= ta_ops =3D { .xmo_rx_timestamp =3D gve_xdp_rx_timestamp, }; =20 -static void gve_set_default_desc_cnt(struct gve_priv *priv, - const struct gve_device_descriptor *descriptor) +static void gve_set_desc_cnt(struct gve_priv *priv) { - priv->tx_desc_cnt =3D be16_to_cpu(descriptor->tx_queue_entries); - priv->rx_desc_cnt =3D be16_to_cpu(descriptor->rx_queue_entries); + struct gve_device_info *device_info =3D &priv->device_info; =20 - /* set default ranges */ - priv->max_tx_desc_cnt =3D priv->tx_desc_cnt; - priv->max_rx_desc_cnt =3D priv->rx_desc_cnt; - priv->min_tx_desc_cnt =3D priv->tx_desc_cnt; - priv->min_rx_desc_cnt =3D priv->rx_desc_cnt; + priv->tx_desc_cnt =3D device_info->default_tx_ring_size; + priv->rx_desc_cnt =3D device_info->default_rx_ring_size; + priv->max_tx_desc_cnt =3D device_info->max_tx_ring_size; + priv->max_rx_desc_cnt =3D device_info->max_rx_ring_size; + priv->min_tx_desc_cnt =3D device_info->min_tx_ring_size; + priv->min_rx_desc_cnt =3D device_info->min_rx_ring_size; } =20 -void gve_set_queue_properties(struct gve_priv *priv, - struct gve_device_descriptor *descriptor) +static void gve_set_queue_properties(struct gve_priv *priv) { - /* set default descriptor counts */ - gve_set_default_desc_cnt(priv, descriptor); + struct gve_device_info *device_info =3D &priv->device_info; =20 - priv->max_registered_pages =3D be64_to_cpu(descriptor->max_registered_pag= es); - priv->tx_pages_per_qpl =3D be16_to_cpu(descriptor->tx_pages_per_qpl); - priv->default_num_queues =3D be16_to_cpu(descriptor->default_num_queues); + gve_set_desc_cnt(priv); + priv->max_registered_pages =3D device_info->max_registered_pages; + priv->tx_pages_per_qpl =3D device_info->tx_pages_per_qpl; } =20 -int gve_set_mtu(struct gve_priv *priv, - struct gve_device_descriptor *descriptor) +static int gve_set_mtu(struct gve_priv *priv) { + struct gve_device_info *device_info =3D &priv->device_info; u16 mtu; =20 - mtu =3D be16_to_cpu(descriptor->mtu); + mtu =3D device_info->max_mtu; if (mtu < ETH_MIN_MTU) { dev_err(&priv->pdev->dev, "MTU %d below minimum MTU\n", mtu); return -EINVAL; } priv->dev->max_mtu =3D mtu; + priv->dev->mtu =3D mtu; =20 return 0; } =20 -void gve_set_mac(struct gve_priv *priv, - struct gve_device_descriptor *descriptor) +static void gve_set_mac(struct gve_priv *priv) { + struct gve_device_info *device_info =3D &priv->device_info; u8 *mac; =20 - mac =3D descriptor->mac; + mac =3D device_info->mac; eth_hw_addr_set(priv->dev, mac); dev_info(&priv->pdev->dev, "MAC addr: %pM\n", mac); } =20 +static void gve_set_buf_sizes(struct gve_priv *priv) +{ + struct gve_device_info *device_info =3D &priv->device_info; + + if (device_info->max_rx_buffer_size) + priv->max_rx_buffer_size =3D device_info->max_rx_buffer_size; + + if (gve_is_dqo(priv) && + priv->max_rx_buffer_size > GVE_DEFAULT_RX_BUFFER_SIZE) + priv->rx_cfg.packet_buffer_size =3D priv->max_rx_buffer_size; + + if (device_info->header_buf_size) + priv->header_buf_size =3D device_info->header_buf_size; +} + static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) { + struct gve_device_info *device_info =3D &priv->device_info; int err; =20 /* Set up the adminq */ @@ -2471,7 +2485,7 @@ static int gve_init_priv(struct gve_priv *priv, bool = skip_describe_device) if (skip_describe_device) goto setup_device; =20 - priv->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; + device_info->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; /* Get the initial information we need from the device */ err =3D gve_adminq_describe_device(priv); if (err) { @@ -2480,6 +2494,8 @@ static int gve_init_priv(struct gve_priv *priv, bool = skip_describe_device) goto err; } =20 + priv->queue_format =3D priv->device_info.queue_format; + err =3D gve_set_num_ntfy_blks(priv); if (err) { dev_err(&priv->pdev->dev, @@ -2507,12 +2523,34 @@ static int gve_init_priv(struct gve_priv *priv, boo= l skip_describe_device) netif_set_tso_max_size(priv->dev, GVE_DQO_TX_MAX); } =20 - priv->dev->mtu =3D priv->dev->max_mtu; + if (gve_set_mtu(priv)) { + err =3D -EINVAL; + goto err; + } + + priv->num_event_counters =3D device_info->num_event_counters; + + gve_set_mac(priv); + + gve_set_queue_properties(priv); + priv->modify_ring_size_enabled =3D device_info->modify_ring_size_enabled; + + gve_set_buf_sizes(priv); + + priv->max_flow_rules =3D device_info->max_flow_rules; + if (priv->max_flow_rules) + priv->dev->hw_features |=3D NETIF_F_NTUPLE; + + priv->rss_key_size =3D device_info->rss_key_size; + priv->rss_lut_size =3D device_info->rss_lut_size; + priv->cache_rss_config =3D device_info->cache_rss_config; + priv->numa_node =3D dev_to_node(&priv->pdev->dev); priv->tx_cfg.num_xdp_queues =3D 0; priv->rx_copybreak =3D GVE_DEFAULT_RX_COPYBREAK; priv->ts_config.tx_type =3D HWTSTAMP_TX_OFF; priv->ts_config.rx_filter =3D HWTSTAMP_FILTER_NONE; + priv->nic_timestamp_supported =3D device_info->nic_timestamp_supported; =20 setup_device: priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 848563AEF51 for ; Wed, 9 Sep 2026 19:11:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981104; cv=none; b=oHY2uHtwZG+xI/mAoZokE1RARkBEYbhUWyvxFK7ZX8X9fn17jUy/dxBQN+j5voPvYGzBOhg1/Ir86mXv1OvRr2u1BMZBph+EssS0KybUasI2L+um87w4x8hRZZUhHJItNGiCJppmQq8Z8KRhRodD4R/zI9PvmXq6cOzKuIDG97s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981104; c=relaxed/simple; bh=o6PEpf9iueRpeImtmoU20oIzP3f9GoKFTCn0cL8DKgk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=dVoqcrEnV9cCMxnu5ESRQOnMHJNMpomSVs1AcchwXG1Df0uayt9rJzfOCn+ps/QkYFjXjxzypxphPsKrXI4+lLe8cr11HUUUZMpUEP4YNslSETHRXnPzucbyZo/NTD5/exASVd82nKHqAvM1nlRDzhbHyHgM0ecmVJfW+NcypnQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=KEelK4K8; arc=none smtp.client-ip=209.85.215.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="KEelK4K8" Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cc1eb205d31so4540515a12.2 for ; Wed, 09 Sep 2026 12:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981099; x=1789585899; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=gOdWomF6r1HDhUcNAETqEcDHfk68Z04Jfg74hH3MYtE=; b=KEelK4K8EQ68TQFeXInaDnClbVFeYtVXVSD3zmN+u6qCKHuJWZ8fP8iMU8PRNnZxkY aUX4N6J6RVTwwgyI2cc8gAHsLnbUFB3SmWLPZLbeysSZR+RVIZhN8P+LumtFGI9N1+gA 89VThQmaPs2ceSbDSKi84KvG+R1iEIWR+LFRAsuQiXOWdOBNeBE4dxDAD5/WvssvAiWK FtYwHizRxImzUBPdLyVy+ehLtvzGB4fpx2sVH0z9Xy8SS/6EeM661rsggeC5QpyjqJEF oxJ3JHkXBsSseU44CC7EbwaGYQQ8GXfOnqm9xPGCdujmqLNpy9ESxjerAA5Q4yBYm7KK L+Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981099; x=1789585899; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=gOdWomF6r1HDhUcNAETqEcDHfk68Z04Jfg74hH3MYtE=; b=erw8/cAuFMIKaeT7ifNdRhNrRo0th3PxlKWbr5BGdHKG/DpkbDH8dgbZS0mHv00urR HP7WbwM/JEEUwilKZCPMVjP7b0ZQngVkWj/7Mq2q94G45QJ0EgfxkWeOyHZOWeKdsm4F ehk+FOTcRP3/fB8ccenQ0XE7FqLikY4s/Bdr50VRaUV4BDvCJGy/yLCO8YsP27Pi4u6K svSMfARGdn8cPqK7EBy6XCzna2KBlMCR+PFZlFucsrnBeRVQ9GYn4UF01D8XJA8yDd0K HhwFjazfF1BYaibvgkz6FSyyC1Pdlkfqtf710G0lMzKrPHJjghNY6atvxgdEG9GnYPLr YqUA== X-Forwarded-Encrypted: i=1; AKwUvBzWRdXWqtG+uW4GFQOz4ATMnRumzgBPnBl+qsYs0mjm8EDn/mVvss5X71PixeaXfrZwpbW3TD+ObE50f30=@vger.kernel.org X-Gm-Message-State: AFuF++kY5GpDXJqv+t8UvHTYtMWNUo9Nw1uOeGCzwKvFe9o0B3wzwNh3 GpU24UIp6KV/qU6+BD35nw0N1Sn35hLesG+qFI47O/OdrpoBfcBrPQaAaeIkRjol5g2HXFLUEyn CCKSynvQZD8jVLN076TO3dKYjmA== X-Received: from pgbj10-n2.prod.google.com ([2002:a05:6a02:61ca:20b0:cc4:32ab:3366]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:6f8c:b0:3d3:ae0f:5269 with SMTP id adf61e73a8af0-3da3a15c001mr57860380637.21.1788981099108; Wed, 09 Sep 2026 12:11:39 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:25 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-3-hramamurthy@google.com> Subject: [PATCH net-next v6 02/12] gve: introduce control plane operations structure From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" To abstract out the difference in implementation of control plane operations between the existing Adminq ABI and the upcoming Mailbox ABI, introduce a new gve_ctrl_ops structure which will contain the basic operations. At probe, these ops will be set based on the ABI and the corresponding ops will be called in relevant places. As of this patch, only Adminq ops are set. In future patches, corresponding ops will be set for the new mailbox mode. Implement a ctrl op to map/unmap the doorbell bar. Since this functionality has moved to a control op, call this op after control ops are set for AdminQ mode. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Harshitha Ramamurthy --- v6: - plumb through map_db_bar error instead of overwriting it drivers/net/ethernet/google/gve/gve.h | 11 +++++++ drivers/net/ethernet/google/gve/gve_adminq.c | 21 ++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 ++ drivers/net/ethernet/google/gve/gve_main.c | 34 +++++++++++--------- 4 files changed, 52 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 021adb9108df..56148ea3cfbf 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -825,6 +825,16 @@ struct gve_device_info { bool cache_rss_config; }; =20 +/** + * struct gve_ctrl_ops - Control plane operations structure + * @map_db_bar: Maps the doorbell BAR for the device and store in @priv. + * @unmap_db_bar: Unmaps the doorbell BAR previously mapped by @map_db_bar. + */ +struct gve_ctrl_ops { + int (*map_db_bar)(struct gve_priv *priv); + void (*unmap_db_bar)(struct gve_priv *priv); +}; + struct gve_priv { struct net_device *dev; struct gve_tx_ring *tx; /* array of tx_cfg.num_queues */ @@ -958,6 +968,7 @@ struct gve_priv { dma_addr_t nic_ts_report_bus; u64 last_sync_nic_counter; /* Clock counter from last NIC TS report */ struct gve_device_info device_info; + const struct gve_ctrl_ops *ctrl_ops; }; =20 enum gve_service_task_flags_bit { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 512349c5517f..08d8e49d563e 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1637,3 +1637,24 @@ void gve_set_num_queues(struct gve_priv *priv) device_info->default_rx_queues, priv->rx_cfg.num_queues); } + +int gve_adminq_map_db_bar(struct gve_priv *priv) +{ + struct pci_dev *pdev =3D priv->pdev; + void __iomem *db_bar; + + db_bar =3D pci_iomap(pdev, GVE_DOORBELL_BAR, 0); + if (!db_bar) { + dev_err(&pdev->dev, "Failed to map doorbell bar!\n"); + return -ENOMEM; + } + priv->db_bar2 =3D db_bar; + return 0; +} + +void gve_adminq_unmap_db_bar(struct gve_priv *priv) +{ + struct pci_dev *pdev =3D priv->pdev; + + pci_iounmap(pdev, priv->db_bar2); +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index a17af755b454..93d3cabb67f1 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -658,4 +658,6 @@ int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, struct gve_ptype_lut *ptype_lut); int gve_set_num_ntfy_blks(struct gve_priv *priv); void gve_set_num_queues(struct gve_priv *priv); +int gve_adminq_map_db_bar(struct gve_priv *priv); +void gve_adminq_unmap_db_bar(struct gve_priv *priv); #endif /* _GVE_ADMINQ_H */ diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index d3882de584e3..d721347e54b4 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2460,6 +2460,11 @@ static void gve_set_buf_sizes(struct gve_priv *priv) priv->header_buf_size =3D device_info->header_buf_size; } =20 +static const struct gve_ctrl_ops gve_adminq_ops =3D { + .map_db_bar =3D gve_adminq_map_db_bar, + .unmap_db_bar =3D gve_adminq_unmap_db_bar, +}; + static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) { struct gve_device_info *device_info =3D &priv->device_info; @@ -2861,7 +2866,6 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) { int max_tx_queues, max_rx_queues; struct net_device *dev; - __be32 __iomem *db_bar; struct gve_registers __iomem *reg_bar; struct gve_priv *priv; int err; @@ -2889,13 +2893,6 @@ static int gve_probe(struct pci_dev *pdev, const str= uct pci_device_id *ent) goto abort_with_pci_region; } =20 - db_bar =3D pci_iomap(pdev, GVE_DOORBELL_BAR, 0); - if (!db_bar) { - dev_err(&pdev->dev, "Failed to map doorbell bar!\n"); - err =3D -ENOMEM; - goto abort_with_reg_bar; - } - gve_write_version(®_bar->driver_version); /* Get max queues to alloc etherdev */ max_tx_queues =3D ioread32be(®_bar->max_tx_queues); @@ -2905,7 +2902,7 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) if (!dev) { dev_err(&pdev->dev, "could not allocate netdev\n"); err =3D -ENOMEM; - goto abort_with_db_bar; + goto abort_with_reg_bar; } SET_NETDEV_DEV(dev, &pdev->dev); pci_set_drvdata(pdev, dev); @@ -2937,19 +2934,25 @@ static int gve_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) priv->pdev =3D pdev; priv->msg_enable =3D DEFAULT_MSG_LEVEL; priv->reg_bar0 =3D reg_bar; - priv->db_bar2 =3D db_bar; priv->service_task_flags =3D 0x0; priv->state_flags =3D 0x0; priv->ethtool_flags =3D 0x0; priv->rx_cfg.packet_buffer_size =3D GVE_DEFAULT_RX_BUFFER_SIZE; priv->max_rx_buffer_size =3D GVE_DEFAULT_RX_BUFFER_SIZE; =20 + /* Set adminq ctrl ops */ + priv->ctrl_ops =3D &gve_adminq_ops; + + err =3D priv->ctrl_ops->map_db_bar(priv); + if (err) + goto abort_with_netdev; + gve_set_probe_in_progress(priv); priv->gve_wq =3D alloc_ordered_workqueue("gve", 0); if (!priv->gve_wq) { dev_err(&pdev->dev, "Could not allocate workqueue"); err =3D -ENOMEM; - goto abort_with_netdev; + goto abort_with_unmap_db_bar; } INIT_WORK(&priv->service_task, gve_service_task); INIT_WORK(&priv->stats_report_task, gve_stats_report_task); @@ -2979,12 +2982,12 @@ static int gve_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) abort_with_wq: destroy_workqueue(priv->gve_wq); =20 +abort_with_unmap_db_bar: + priv->ctrl_ops->unmap_db_bar(priv); + abort_with_netdev: free_netdev(dev); =20 -abort_with_db_bar: - pci_iounmap(pdev, db_bar); - abort_with_reg_bar: pci_iounmap(pdev, reg_bar); =20 @@ -3000,14 +3003,13 @@ static void gve_remove(struct pci_dev *pdev) { struct net_device *netdev =3D pci_get_drvdata(pdev); struct gve_priv *priv =3D netdev_priv(netdev); - __be32 __iomem *db_bar =3D priv->db_bar2; void __iomem *reg_bar =3D priv->reg_bar0; =20 unregister_netdev(netdev); gve_teardown_priv_resources(priv); destroy_workqueue(priv->gve_wq); + priv->ctrl_ops->unmap_db_bar(priv); free_netdev(netdev); - pci_iounmap(pdev, db_bar); pci_iounmap(pdev, reg_bar); pci_release_regions(pdev); pci_disable_device(pdev); --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E60883AFCFA for ; Wed, 9 Sep 2026 19:11:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981105; cv=none; b=WWO++e3XyrGjtOYyukFhpZmz2d+TLBU6HkF3XHxEpCuVKs+4CRDyIzjKs7pbvnKIoWSQnocVr3TDslk4RcEEZjQIA/TEYOCB6sHKwUy1TWrZc4I0Jd7FZzG550rnziibL7F293LvI5LyOR6PMkCq0Pm5hLVLOcP3etCuOLADTuE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981105; c=relaxed/simple; bh=4cl2VM1Gb0PxKI+BhSYZQE8isU6lbP+m/ciD5MPCRZ0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Rfal4Th85wS0sEW60I/+U6z974/aMYiWJ77kq4ywMrqgNwwqqlN0gJDTNCZZ0SITA+SB37dGNWcBplaMPxwSKK88byC428tTWE1DF2kD40W7sII+D0uXoWlmW86YGd2Z2K8k31k12x+z6GG78IpE9x3P0qjiXW4r13AxDl6kDQA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PHZWMMmU; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PHZWMMmU" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-39b90cc0d5cso3714033a91.0 for ; Wed, 09 Sep 2026 12:11:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981100; x=1789585900; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=AcO81dRZAl8vXBv9U9RzYMgfWn1QTLYhmyLktJ0Iemk=; b=PHZWMMmUyRS039XjVGaovBW+n31qMM5K3zirsus3Gc+40MAnYPaL2w4NyKUOCWHkyr 3ULwBlOpWj+2TQv7q9vPbjAqlj3DPDyteqIid4voUWW/Wh1AJdSV+eI2V6usDn3UKQ4/ DrbQFkORtKBmSkwRhDIQox8D2ioiWvpIxgPDFLb7dFqMFqRM7vAHRWY1/KiMOfwPFGu1 xP84DzxuADclnWWNUblf0905/dI1oqm2HyfPLxO2GjloPEUMFsde6r5lfMN3N+rPo+ws lpOugcsYcfmtZGASGX2XpcDSlowJC5tHw4X9w4FYKciMPs27+1f3QX8ndU7bk07vGc/a 9dRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981100; x=1789585900; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=AcO81dRZAl8vXBv9U9RzYMgfWn1QTLYhmyLktJ0Iemk=; b=Q7hW4fbRa5iCBrl8skBJgAq/4RFplkZRESYiRMe+9BS577MvXWDS9tIPaek2s+r0Ap J4fpGsHemELoEP+9C6Ey4pUdrA5YQdz3VWELB+yRdSZSQkD1ZffjlMy8AbF4EsFHT/F/ WeQmdiFZyWUbTGxOVQGoUfxgXfe/EgBGWkyDwHinRYZgcLFqXdc6boDJsiS9pne0GGDu lwa0ckHjWfxOE0bjnvoVWNvk3ky5qgTR34lznZdG1fTIYJ/xXBdymPblq5Bw+4u0CIL2 4Cc5uo8ArvHiV+T4XndZIEJ2HPFxzqdVggGplY9McE/RL6mgIZQrUsa72+GgARxwJhJS l1Pg== X-Forwarded-Encrypted: i=1; AKwUvBxNCRppQ4uzs7ByLL0xJyVo1FWSade6imcZXo8CujaAnpcOX8f/Ndzbz90Kfy+aHrBKcXQZoZjBCFJZIiY=@vger.kernel.org X-Gm-Message-State: AFuF++m1g969YcjPL+lMCfS060J4O3TvHIgpZD7eLINUhmBbH19fy+0/ mKLg9l18bzjRTWm31hL0dIHCy0Iau8VgJVHHNs2p+2s2w1rYKf4pvCaiqtO1j5xgefHJxurxr4e upCYVkP9NhaCvFY61kgfE+Y6yLw== X-Received: from pjyo21.prod.google.com ([2002:a17:90a:eb95:b0:39b:a02e:b51f]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2b4e:b0:398:9be9:ab8f with SMTP id 98e67ed59e1d1-39b2622b9ecmr54951568a91.20.1788981099875; Wed, 09 Sep 2026 12:11:39 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:26 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-4-hramamurthy@google.com> Subject: [PATCH net-next v6 03/12] gve: introduce ctrl ops to set vectors and Qs From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce following ctrl ops for Adminq mode. - set_num_queues to set maximum and default TX/RX queues in the alloc structures used in the initialization flow. - set_num_ntfy_blks op to set number of vectors(ntfy_blks) in the initialization flow. This is done by attaching the adminq_ prefix to the existing functions placed in the gve_adminq.c file. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Harshitha Ramamurthy --- v4: Attach 'adminq_' prefix in the function names for gve_set_num_queues and gve_set_num_ntfy_blks and set them as ops (Przemek Kitszel) drivers/net/ethernet/google/gve/gve.h | 6 ++++++ drivers/net/ethernet/google/gve/gve_adminq.c | 4 ++-- drivers/net/ethernet/google/gve/gve_adminq.h | 4 ++-- drivers/net/ethernet/google/gve/gve_main.c | 6 ++++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 56148ea3cfbf..1bc5e32b6618 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -829,10 +829,16 @@ struct gve_device_info { * struct gve_ctrl_ops - Control plane operations structure * @map_db_bar: Maps the doorbell BAR for the device and store in @priv. * @unmap_db_bar: Unmaps the doorbell BAR previously mapped by @map_db_bar. + * @set_num_queues: Sets default and max TX/RX queues into allocation + * structures stored in @priv to be used during initializ= ation. + * @set_num_ntfy_blks: Sets no. of vectors into @priv to be used during + * initialization. */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); void (*unmap_db_bar)(struct gve_priv *priv); + void (*set_num_queues)(struct gve_priv *priv); + int (*set_num_ntfy_blks)(struct gve_priv *priv); }; =20 struct gve_priv { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 08d8e49d563e..046155ae7d66 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1592,7 +1592,7 @@ int gve_adminq_query_rss_config(struct gve_priv *priv= , struct ethtool_rxfh_param return err; } =20 -int gve_set_num_ntfy_blks(struct gve_priv *priv) +int gve_adminq_set_num_ntfy_blks(struct gve_priv *priv) { int num_ntfy; =20 @@ -1616,7 +1616,7 @@ int gve_set_num_ntfy_blks(struct gve_priv *priv) return 0; } =20 -void gve_set_num_queues(struct gve_priv *priv) +void gve_adminq_set_num_queues(struct gve_priv *priv) { struct gve_device_info *device_info =3D &priv->device_info; =20 diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 93d3cabb67f1..ed3504853908 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -656,8 +656,8 @@ int gve_adminq_report_nic_ts(struct gve_priv *priv, struct gve_ptype_lut; int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, struct gve_ptype_lut *ptype_lut); -int gve_set_num_ntfy_blks(struct gve_priv *priv); -void gve_set_num_queues(struct gve_priv *priv); +int gve_adminq_set_num_ntfy_blks(struct gve_priv *priv); +void gve_adminq_set_num_queues(struct gve_priv *priv); int gve_adminq_map_db_bar(struct gve_priv *priv); void gve_adminq_unmap_db_bar(struct gve_priv *priv); #endif /* _GVE_ADMINQ_H */ diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index d721347e54b4..da53c1fb6afb 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2463,6 +2463,8 @@ static void gve_set_buf_sizes(struct gve_priv *priv) static const struct gve_ctrl_ops gve_adminq_ops =3D { .map_db_bar =3D gve_adminq_map_db_bar, .unmap_db_bar =3D gve_adminq_unmap_db_bar, + .set_num_queues =3D gve_adminq_set_num_queues, + .set_num_ntfy_blks =3D gve_adminq_set_num_ntfy_blks, }; =20 static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) @@ -2501,14 +2503,14 @@ static int gve_init_priv(struct gve_priv *priv, boo= l skip_describe_device) =20 priv->queue_format =3D priv->device_info.queue_format; =20 - err =3D gve_set_num_ntfy_blks(priv); + err =3D priv->ctrl_ops->set_num_ntfy_blks(priv); if (err) { dev_err(&priv->pdev->dev, "Could not setup notify blocks: err=3D%d\n", err); goto err; } =20 - gve_set_num_queues(priv); + priv->ctrl_ops->set_num_queues(priv); dev_info(&priv->pdev->dev, "TX queues %d, RX queues %d\n", priv->tx_cfg.num_queues, priv->rx_cfg.num_queues); dev_info(&priv->pdev->dev, "Max TX queues %d, Max RX queues %d\n", --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B9253B1EC6 for ; Wed, 9 Sep 2026 19:11:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981106; cv=none; b=ucd8t0f4IGR2grLdf2PIWU8noNtWL/NCN+bOVca5REmqkFRxVss8zNmqLRSZlkZ9SNq1aCtC3+ihN6DXZjYNOOqL0wQLbvhrPeOU6FKtx1DLvMWUo75xGR5PBfmGBOmNWUk9hZoY1p93knm50tdkq6ZnNiyJs2cpSEfy6Qzqe1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981106; c=relaxed/simple; bh=OLqZ4XpsDKfL+rYQCWWILVLCJUhEXvHE/LDQG4VAFDY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RaUal+xmTkiiEqSEKYplvWhh3ihE+3tMMfCjb+A9jm5tjAj4Ovbzs4WAte0aZJQ53gaLzBUR5+orLnPq4+a+IrBpoz5E2NA5WFasDn/Q6weMfubUyjXArt9lgOAtcJULpG/PLNKbMzGfacqAOe4drQCoxdt/6eZ01kE7F9oUlWE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uZAOa8jH; arc=none smtp.client-ip=209.85.215.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uZAOa8jH" Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-ca8aee88725so9795106a12.3 for ; Wed, 09 Sep 2026 12:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981101; x=1789585901; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=C8GvnE9AyTB5PxOdeDn+W37MXQjUGp/yhAttw8TGSh0=; b=uZAOa8jHCvc1tse49hTInJfbTDEn66XYHHrQYmqO02Yy30Jb+aSjjR5VHJlRh7d7gv nESdMxXTtYljKeNFJy9AwGNgwOsJidoE76v5lf7rzPL8wTtvYIWZlxo+vUfF6ZKHHz74 nzCYRUTgQ3K/ipafRGBypm9UVJj0xFEzo5MYs47eCkDmxu1H3v2kZtZyZV3kEz9rJt25 8HHp3C1P4AJIFJKYell10922v91IegAYZiFVNxpIOqtwtXIT1qOdVjuBJE5+D7KP88Mb zkZHbaBXx6ZIIp8pw9uqRhrLLIfsR3Fi4hyVRhf1ImUIR4r7vdv4eiKE9NZv4VWrDSmA U7+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981101; x=1789585901; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C8GvnE9AyTB5PxOdeDn+W37MXQjUGp/yhAttw8TGSh0=; b=E23a8/WWC5WkiRmLDECta09iS5y8mba06NgPVJbFd7hhHyhTviGGUxHkHVRnKwFzYk KBnl7373xCKHIYdRNawkrjesrkYbj/blLo3t08mV74Tb0Kb7wyASYC565RjmjbUIZvTN EqolerOpq5lwUXg6JEmwHdFDUYusEoZ9d2e+1hEIGf50hteBdevgI3H4GPYBqLLF7uCA EyBP0vw5K2R9TOjwOzNLm0yeIdqU5VpMWwyqAnQmbgaKJT2CwOwHxPCYjJhGSLRmf9bs VxbQ1PM/l30VNRQakre7JwHXWAkCGj1Z59qHqkIcbQiBkfg7mQMcErbYiFeL4G+mkfZU RoQw== X-Forwarded-Encrypted: i=1; AKwUvBzuveBVBlWFzf9tcj+lv1INvy4jKKkd4peSgEnfHlIqKb9YhFltlwLi4ZsK3pF41IWDP+xog7a8LUc3I1I=@vger.kernel.org X-Gm-Message-State: AFuF++ktLzdL+81GfyvBn2fh4azb6mqG7icwig426BuscftKICHPLPbY vX9HmGyDl8l29mg0psXrEVWVsE8lBynZvHdP67Vk4A+2nKsHI1aSS5HElapSHKbaz7VIZetuMfd ProtkbcRKpk2+qdc/Jqn9e8SPeA== X-Received: from pghf4.prod.google.com ([2002:a63:e304:0:b0:cc4:56ea:7ae7]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:339a:b0:3d3:adad:f171 with SMTP id adf61e73a8af0-3dabb2435bbmr13084975637.19.1788981100707; Wed, 09 Sep 2026 12:11:40 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:27 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-5-hramamurthy@google.com> Subject: [PATCH net-next v6 04/12] gve: introduce gve_adminq_get_device_properties() From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce gve_adminq_get_device_properties() which executes the first two Adminq commands: VERIFY_DRIVER_COMPATIBILITY and DESCRIBE_DEVICE so that this can be called during initialization. Move these to Adminq specific files. This is just code movement, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Harshitha Ramamurthy --- v5: - Place the utsname.h and version.h header files only where needed - drop uneccessary __maybe_unused (Sashiko) v3: - move patch down so that the function is introduced just before usage - mark function as maybe_unused - update commit message drivers/net/ethernet/google/gve/gve_adminq.c | 68 ++++++++++++++++++-- drivers/net/ethernet/google/gve/gve_adminq.h | 5 +- drivers/net/ethernet/google/gve/gve_main.c | 47 +------------- 3 files changed, 65 insertions(+), 55 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 046155ae7d66..f420a8e1dd3d 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -6,6 +6,8 @@ =20 #include #include +#include +#include #include "gve.h" #include "gve_adminq.h" #include "gve_register.h" @@ -1143,6 +1145,27 @@ int gve_adminq_describe_device(struct gve_priv *priv) return err; } =20 +int gve_adminq_get_device_properties(struct gve_priv *priv) +{ + int err; + + err =3D gve_adminq_verify_driver_compatibility(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not verify driver compatibility: err=3D%d\n", err); + return err; + } + + /* Get the initial information we need from the device */ + err =3D gve_adminq_describe_device(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not get device information: err=3D%d\n", err); + return err; + } + return 0; +} + int gve_adminq_register_page_list(struct gve_priv *priv, struct gve_queue_page_list *qpl) { @@ -1205,20 +1228,53 @@ int gve_adminq_report_stats(struct gve_priv *priv, = u64 stats_report_len, return gve_adminq_execute_cmd(priv, &cmd); } =20 -int gve_adminq_verify_driver_compatibility(struct gve_priv *priv, - u64 driver_info_len, - dma_addr_t driver_info_addr) +int gve_adminq_verify_driver_compatibility(struct gve_priv *priv) { + struct gve_driver_info *driver_info; union gve_adminq_command cmd; + dma_addr_t driver_info_bus; + int err; + + driver_info =3D dma_alloc_coherent(&priv->pdev->dev, + sizeof(struct gve_driver_info), + &driver_info_bus, GFP_KERNEL); + if (!driver_info) + return -ENOMEM; + + *driver_info =3D (struct gve_driver_info) { + .os_type =3D 1, /* Linux */ + .os_version_major =3D cpu_to_be32(LINUX_VERSION_MAJOR), + .os_version_minor =3D cpu_to_be32(LINUX_VERSION_SUBLEVEL), + .os_version_sub =3D cpu_to_be32(LINUX_VERSION_PATCHLEVEL), + .driver_capability_flags =3D { + cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1), + cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2), + cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3), + cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4), + }, + }; + strscpy(driver_info->os_version_str1, utsname()->release, + sizeof(driver_info->os_version_str1)); + strscpy(driver_info->os_version_str2, utsname()->version, + sizeof(driver_info->os_version_str2)); =20 memset(&cmd, 0, sizeof(cmd)); cmd.opcode =3D cpu_to_be32(GVE_ADMINQ_VERIFY_DRIVER_COMPATIBILITY); cmd.verify_driver_compatibility =3D (struct gve_adminq_verify_driver_comp= atibility) { - .driver_info_len =3D cpu_to_be64(driver_info_len), - .driver_info_addr =3D cpu_to_be64(driver_info_addr), + .driver_info_len =3D cpu_to_be64(sizeof(struct gve_driver_info)), + .driver_info_addr =3D cpu_to_be64(driver_info_bus), }; =20 - return gve_adminq_execute_cmd(priv, &cmd); + err =3D gve_adminq_execute_cmd(priv, &cmd); + + /* It's ok if the device doesn't support this */ + if (err =3D=3D -EOPNOTSUPP) + err =3D 0; + + dma_free_coherent(&priv->pdev->dev, + sizeof(struct gve_driver_info), + driver_info, driver_info_bus); + return err; } =20 int gve_adminq_report_link_speed(struct gve_priv *priv) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index ed3504853908..2ab68c822e22 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -640,9 +640,8 @@ int gve_adminq_register_page_list(struct gve_priv *priv, int gve_adminq_unregister_page_list(struct gve_priv *priv, u32 page_list_i= d); int gve_adminq_report_stats(struct gve_priv *priv, u64 stats_report_len, dma_addr_t stats_report_addr, u64 interval); -int gve_adminq_verify_driver_compatibility(struct gve_priv *priv, - u64 driver_info_len, - dma_addr_t driver_info_addr); +int gve_adminq_verify_driver_compatibility(struct gve_priv *priv); +int gve_adminq_get_device_properties(struct gve_priv *priv); int gve_adminq_report_link_speed(struct gve_priv *priv); int gve_adminq_add_flow_rule(struct gve_priv *priv, struct gve_adminq_flow= _rule *rule, u32 loc); int gve_adminq_del_flow_rule(struct gve_priv *priv, u32 loc); diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index da53c1fb6afb..addfd8dc1a1a 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -17,8 +17,6 @@ #include #include #include -#include -#include #include #include #include @@ -41,49 +39,6 @@ char gve_driver_name[] =3D "gve"; const char gve_version_str[] =3D GVE_VERSION; static const char gve_version_prefix[] =3D GVE_VERSION_PREFIX; =20 -static int gve_verify_driver_compatibility(struct gve_priv *priv) -{ - int err; - struct gve_driver_info *driver_info; - dma_addr_t driver_info_bus; - - driver_info =3D dma_alloc_coherent(&priv->pdev->dev, - sizeof(struct gve_driver_info), - &driver_info_bus, GFP_KERNEL); - if (!driver_info) - return -ENOMEM; - - *driver_info =3D (struct gve_driver_info) { - .os_type =3D 1, /* Linux */ - .os_version_major =3D cpu_to_be32(LINUX_VERSION_MAJOR), - .os_version_minor =3D cpu_to_be32(LINUX_VERSION_SUBLEVEL), - .os_version_sub =3D cpu_to_be32(LINUX_VERSION_PATCHLEVEL), - .driver_capability_flags =3D { - cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS1), - cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS2), - cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS3), - cpu_to_be64(GVE_DRIVER_CAPABILITY_FLAGS4), - }, - }; - strscpy(driver_info->os_version_str1, utsname()->release, - sizeof(driver_info->os_version_str1)); - strscpy(driver_info->os_version_str2, utsname()->version, - sizeof(driver_info->os_version_str2)); - - err =3D gve_adminq_verify_driver_compatibility(priv, - sizeof(struct gve_driver_info), - driver_info_bus); - - /* It's ok if the device doesn't support this */ - if (err =3D=3D -EOPNOTSUPP) - err =3D 0; - - dma_free_coherent(&priv->pdev->dev, - sizeof(struct gve_driver_info), - driver_info, driver_info_bus); - return err; -} - static netdev_features_t gve_features_check(struct sk_buff *skb, struct net_device *dev, netdev_features_t features) @@ -2480,7 +2435,7 @@ static int gve_init_priv(struct gve_priv *priv, bool = skip_describe_device) return err; } =20 - err =3D gve_verify_driver_compatibility(priv); + err =3D gve_adminq_verify_driver_compatibility(priv); if (err) { dev_err(&priv->pdev->dev, "Could not verify driver compatibility: err=3D%d\n", err); --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 975033AFCF2 for ; Wed, 9 Sep 2026 19:11:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981107; cv=none; b=pKaCGd9UNvIqHLVLKpdvCAnTTt8F1hbX8Ezplk9+cyivMMcan9KmjVXlf6qc3qDSCvu5FpAe1IjRlSeeTW5bcPZ8pYwv62hNLaOqdwG17a65SWLY2gixaJHaxSZNuOF/HIqMLm+Zkjz4IFkrlNg1Bj4AA/iF7vxn79+i6yATsJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981107; c=relaxed/simple; bh=ws3NyFt2Eq5oSMM9qxW059P3+fp4MKS5wCL8ItzZXgY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=RBuqvT3Jl51l+FnhjFvpywlXA5XBJDxll21jYC6Bm2NbERrbZHlAZpNGeWvuKfcj5MMSa1MbbMSZ1UusfLnLvxAWFswr/NpMqK28X0A4xO/iv1xi1Y2DZ/iukOaHcZwL2XHHMPPxttPutMp8cHi4qc7nM4LWjbGJTfg72jNyeZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Abrb6NAq; arc=none smtp.client-ip=209.85.216.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Abrb6NAq" Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3823dcc1647so7746995a91.3 for ; Wed, 09 Sep 2026 12:11:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981102; x=1789585902; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=GLJDQncqzNVoIGFBadBP0k4UcM75NHkYZkUObPvmAS4=; b=Abrb6NAquP8I2E8OSVUep9ThlR4/WF5L9BAYFMq2g+X0weUb6nFD6IX+qLYJjyD+Sr T3AKfZmSTFZSqrOWC6p3NCqVl4O8vzDotdQTYL+2drzmXLJoDbTHayP/musP0HSs6TES iLmT2wjmximEAHK08ocDo8sKCdGxUi+dLMn9b8c9+Tbyyei+iNUP80iWkRp2k33XK/GL bpESy6xG3oFUzgJWu7eKJgk6nzI5FOXk04EzACekhTUibxD6VF3WQzP8DRqwk8ALRqnt tBSm5x1kpAa6yTgY85y/zwj+/GmS8hX0ISZga+ihomh1DsxTzvNqwcO+u7d3yBTNLi9O pRmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981102; x=1789585902; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=GLJDQncqzNVoIGFBadBP0k4UcM75NHkYZkUObPvmAS4=; b=fWyywRJ2TCE9s41aZmq4Uojp9VOqagQKOWVLcxP4A4xaUFqyz+n2aQBtyqxm3uikqU 36sOysPAtpc9oAzK5E59iqxEBdT+Visvu9JBc14wcaQJfiaE6Dncl/Mp2tgumZ1yKLCi YVVthGhj+d2aD02JWHQhm5UIARLtZU0hSKsEqG/1XpYaV6IRQ0mNEDmsopcU1Y/ekmuD HNCyXtH01stPtLwfwVs7oMwb2+OZu+R/hzWY/DqODqQe+90n7pEMQLhuUjN4rZn6THqL oLJt+urvzbcjzeFLHVw0/izKIONBJSGa2NMI53jF+U1W17OOM/Wk/Fn8mOZVuvvLh65H XPqg== X-Forwarded-Encrypted: i=1; AKwUvBxzKOuxIgYFvsDU45Y7PVXuZ9R0pIQ2wwEWO4ATQs0sFMTYyhdbdfKUA2B6m2LLsxJANDObAsxuUr1e0/Q=@vger.kernel.org X-Gm-Message-State: AFuF++n3YxjWgcXmt3kqE2tiGoPb8/6K5EcBeCjhedX6Vg8j5h6awCYT cd6g7ffJYceoiJTOtHb0AdW3Eyw03/R2URSi76WIrxlkC96jr/zPGtkb4Dn5PQ4i2VvqCf3zNjl 9iFOrlw9Zy2GQvmu8l+qmgruabg== X-Received: from pjbct20.prod.google.com ([2002:a17:90a:f594:b0:39b:96da:4409]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:d44b:b0:398:bee5:61d6 with SMTP id 98e67ed59e1d1-39b26252edamr59121853a91.24.1788981101472; Wed, 09 Sep 2026 12:11:41 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:28 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-6-hramamurthy@google.com> Subject: [PATCH net-next v6 05/12] gve: refactor gve_init_priv for reset path From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The driver does not need to renegotiate all properties with the device on a reset since those should stay constant through a reset. Hence change gve_init_priv() into a method that only sets these properties into the priv structure and hence needs to be only called once during gve_probe(). To achieve this end state of gve_init_priv(), do the following: - introduce gve_adminq_init() which writes the driver version register and allocates the AdminQ and call it in gve_probe() - call gve_adminq_get_device_properties() into gve_probe() to learn device properties - introduce gve_setup_device() which deals with device setup logic and call it in gve_probe() - resetting no. of registered pages is moved into gve_setup_device() since that needs to be reset every time queues are re-created. With these changes, gve_adminq_get_device_properties() and gve_init_priv() are only called once during gve_probe. gve_reset_recovery() now calls targeted setup functions directly. This prepares the driver to add mailbox mode's control plane initialization and device properties negotiation in the same place as is done in AdminQ mode in the upcoming patches when adding the mailbox ABI. These changes are only code movement, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Harshitha Ramamurthy --- v6: - drop double logging on err of gve_adminq_get_device_properties() v3: - gve_reset_recovery also calls verify driver compatibility - don't free device resources if gve_open() fails in the reset path - move resetting no. of registered pages to gve_setup_device() drivers/net/ethernet/google/gve/gve.h | 2 + drivers/net/ethernet/google/gve/gve_adminq.c | 12 +- drivers/net/ethernet/google/gve/gve_adminq.h | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 143 ++++++++++--------- 4 files changed, 92 insertions(+), 67 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 1bc5e32b6618..48cc8a6be186 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1253,6 +1253,8 @@ static inline bool gve_is_clock_enabled(struct gve_pr= iv *priv) return priv->nic_ts_report; } =20 +void gve_adminq_write_version(u8 __iomem *driver_version_register); + /* gqi napi handler defined in gve_main.c */ int gve_napi_poll(struct napi_struct *napi, int budget); =20 diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index f420a8e1dd3d..a62cb7a921d0 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -298,8 +298,10 @@ gve_process_device_options(struct gve_priv *priv, return 0; } =20 -int gve_adminq_alloc(struct device *dev, struct gve_priv *priv) +static int gve_adminq_alloc(struct gve_priv *priv) { + struct device *dev =3D &priv->pdev->dev; + priv->adminq_pool =3D dma_pool_create("adminq_pool", dev, GVE_ADMINQ_BUFFER_SIZE, 0, 0); if (unlikely(!priv->adminq_pool)) @@ -355,6 +357,14 @@ int gve_adminq_alloc(struct device *dev, struct gve_pr= iv *priv) return 0; } =20 +int gve_adminq_init(struct gve_priv *priv) +{ + struct gve_registers __iomem *reg_bar =3D priv->reg_bar0; + + gve_adminq_write_version(®_bar->driver_version); + return gve_adminq_alloc(priv); +} + void gve_adminq_release(struct gve_priv *priv) { int i =3D 0; diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 2ab68c822e22..78eee3b5cb7f 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -619,7 +619,7 @@ union gve_adminq_command { =20 static_assert(sizeof(union gve_adminq_command) =3D=3D 64); =20 -int gve_adminq_alloc(struct device *dev, struct gve_priv *priv); +int gve_adminq_init(struct gve_priv *priv); void gve_adminq_free(struct gve_priv *priv); void gve_adminq_release(struct gve_priv *priv); int gve_adminq_describe_device(struct gve_priv *priv); diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index addfd8dc1a1a..2fe280cf7e68 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2415,6 +2415,35 @@ static void gve_set_buf_sizes(struct gve_priv *priv) priv->header_buf_size =3D device_info->header_buf_size; } =20 +static int gve_setup_device(struct gve_priv *priv) +{ + int err; + + priv->num_registered_pages =3D 0; + + priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); + if (!priv->xsk_pools) { + err =3D -ENOMEM; + goto err; + } + + gve_set_netdev_xdp_features(priv); + if (!gve_is_gqi(priv)) + priv->dev->xdp_metadata_ops =3D &gve_xdp_metadata_ops; + + err =3D gve_setup_device_resources(priv); + if (err) + goto err_free_xsk_bitmap; + + return 0; + +err_free_xsk_bitmap: + bitmap_free(priv->xsk_pools); + priv->xsk_pools =3D NULL; +err: + return err; +} + static const struct gve_ctrl_ops gve_adminq_ops =3D { .map_db_bar =3D gve_adminq_map_db_bar, .unmap_db_bar =3D gve_adminq_unmap_db_bar, @@ -2422,47 +2451,18 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D= { .set_num_ntfy_blks =3D gve_adminq_set_num_ntfy_blks, }; =20 -static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) +static int gve_init_priv(struct gve_priv *priv) { struct gve_device_info *device_info =3D &priv->device_info; int err; =20 - /* Set up the adminq */ - err =3D gve_adminq_alloc(&priv->pdev->dev, priv); - if (err) { - dev_err(&priv->pdev->dev, - "Failed to alloc admin queue: err=3D%d\n", err); - return err; - } - - err =3D gve_adminq_verify_driver_compatibility(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not verify driver compatibility: err=3D%d\n", err); - goto err; - } - - priv->num_registered_pages =3D 0; - - if (skip_describe_device) - goto setup_device; - - device_info->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; - /* Get the initial information we need from the device */ - err =3D gve_adminq_describe_device(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not get device information: err=3D%d\n", err); - goto err; - } - priv->queue_format =3D priv->device_info.queue_format; =20 err =3D priv->ctrl_ops->set_num_ntfy_blks(priv); if (err) { dev_err(&priv->pdev->dev, "Could not setup notify blocks: err=3D%d\n", err); - goto err; + return err; } =20 priv->ctrl_ops->set_num_queues(priv); @@ -2485,10 +2485,8 @@ static int gve_init_priv(struct gve_priv *priv, bool= skip_describe_device) netif_set_tso_max_size(priv->dev, GVE_DQO_TX_MAX); } =20 - if (gve_set_mtu(priv)) { - err =3D -EINVAL; - goto err; - } + if (gve_set_mtu(priv)) + return -EINVAL; =20 priv->num_event_counters =3D device_info->num_event_counters; =20 @@ -2513,30 +2511,7 @@ static int gve_init_priv(struct gve_priv *priv, bool= skip_describe_device) priv->ts_config.tx_type =3D HWTSTAMP_TX_OFF; priv->ts_config.rx_filter =3D HWTSTAMP_FILTER_NONE; priv->nic_timestamp_supported =3D device_info->nic_timestamp_supported; - -setup_device: - priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); - if (!priv->xsk_pools) { - err =3D -ENOMEM; - goto err; - } - - gve_set_netdev_xdp_features(priv); - if (!gve_is_gqi(priv)) - priv->dev->xdp_metadata_ops =3D &gve_xdp_metadata_ops; - - err =3D gve_setup_device_resources(priv); - if (err) - goto err_free_xsk_bitmap; - return 0; - -err_free_xsk_bitmap: - bitmap_free(priv->xsk_pools); - priv->xsk_pools =3D NULL; -err: - gve_adminq_free(priv); - return err; } =20 static void gve_teardown_priv_resources(struct gve_priv *priv) @@ -2566,15 +2541,32 @@ static int gve_reset_recovery(struct gve_priv *priv= , bool was_up) { int err; =20 - err =3D gve_init_priv(priv, true); - if (err) + err =3D gve_adminq_init(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Failed to alloc admin queue: err=3D%d\n", err); goto err; + } + + err =3D gve_adminq_verify_driver_compatibility(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not verify driver compatibility: err=3D%d\n", err); + goto err_free_adminq; + } + + err =3D gve_setup_device(priv); + if (err) + goto err_free_adminq; if (was_up) { err =3D gve_open(priv->dev); if (err) - goto err; + return err; } return 0; + +err_free_adminq: + gve_adminq_free(priv); err: dev_err(&priv->pdev->dev, "Reset failed! !!! DISABLING ALL QUEUES !!!\n"); gve_turndown(priv); @@ -2617,7 +2609,7 @@ int gve_reset(struct gve_priv *priv, bool attempt_tea= rdown) return err; } =20 -static void gve_write_version(u8 __iomem *driver_version_register) +void gve_adminq_write_version(u8 __iomem *driver_version_register) { const char *c =3D gve_version_prefix; =20 @@ -2850,7 +2842,6 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) goto abort_with_pci_region; } =20 - gve_write_version(®_bar->driver_version); /* Get max queues to alloc etherdev */ max_tx_queues =3D ioread32be(®_bar->max_tx_queues); max_rx_queues =3D ioread32be(®_bar->max_rx_queues); @@ -2897,12 +2888,24 @@ static int gve_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) priv->rx_cfg.packet_buffer_size =3D GVE_DEFAULT_RX_BUFFER_SIZE; priv->max_rx_buffer_size =3D GVE_DEFAULT_RX_BUFFER_SIZE; =20 + err =3D gve_adminq_init(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Failed to alloc admin queue: err=3D%d\n", err); + goto abort_with_netdev; + } + + priv->device_info.queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; + err =3D gve_adminq_get_device_properties(priv); + if (err) + goto abort_with_adminq; + /* Set adminq ctrl ops */ priv->ctrl_ops =3D &gve_adminq_ops; =20 err =3D priv->ctrl_ops->map_db_bar(priv); if (err) - goto abort_with_netdev; + goto abort_with_adminq; =20 gve_set_probe_in_progress(priv); priv->gve_wq =3D alloc_ordered_workqueue("gve", 0); @@ -2916,10 +2919,17 @@ static int gve_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) priv->tx_cfg.max_queues =3D max_tx_queues; priv->rx_cfg.max_queues =3D max_rx_queues; =20 - err =3D gve_init_priv(priv, false); + err =3D gve_init_priv(priv); if (err) goto abort_with_wq; =20 + err =3D gve_setup_device(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not setup device: err=3D%d\n", err); + goto abort_with_wq; + } + if (!gve_is_gqi(priv) && !gve_is_qpl(priv)) dev->netmem_tx =3D NETMEM_TX_DMA; =20 @@ -2942,6 +2952,9 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) abort_with_unmap_db_bar: priv->ctrl_ops->unmap_db_bar(priv); =20 +abort_with_adminq: + gve_adminq_free(priv); + abort_with_netdev: free_netdev(dev); =20 --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F00D93B71DB for ; Wed, 9 Sep 2026 19:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981111; cv=none; b=B7xJU2pCdof/NSjeDV8MpDFUr6cSWd/+yNuvhfYoBAVAUkoNh91XBSM1QLaSz9wmm6j4x2c2BSIirMkZDATdOmAAQoJgK+PCQmRZDFexpX1hyGbIoNIgPihjzvicnX3UnGBVrnIx1czgG/Oc48YI2PAE9J4yUvcDVmFMc6S2MfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981111; c=relaxed/simple; bh=RWk2XXNxarryDRHntoxdadLEqqAYW3XQX7UD7KAqgJQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=t0BUhDdtSBIm5pnVxmz/hoT+BeUFLMLfOXdbA2fqEcLQzsLIR6SxW7vgWDgCHmHXVGC1GMKToqFTSvx9jm1pM5PEHPbKaGXssGs+vXXeo5DtUfkqRUhiZVSnesz1drADyhOghO4G6u+Cfnd99lpssL7T45A9/CMwHLZ0efHjByM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=cLh/mSoV; arc=none smtp.client-ip=209.85.216.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cLh/mSoV" Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3968bb86fb7so7701269a91.2 for ; Wed, 09 Sep 2026 12:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981104; x=1789585904; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=lKApnSEw/tM3Cqvf9CcY4USJIWwI0r3ya7+QVn//fe0=; b=cLh/mSoVzDyEJp+PZuiz8JxpEh9+/vvexfo2QstLk6X4SBn/3PjAEv7fDH+6PzUYMm c5CYbQPb6QVXjbJULN/e7k959sVWBYA3LWmXGVQPKwkYiiwbLYalLqg2y0HrkGVolCRs KueNlPtMs5Xgf/jD630Dpk/GAuSNBdDPQY5CTxcwJbpAl1xlXGP4Nhi072Kk4IAFjREN RFUBvOBp/BeFdF1p5cKCfO6hu2Tsj04r7W4s0MIZiN+ob5flz3AMVAjM4fvRwf906mlJ 3FbQEs3MUO7dA8c5+bAeHVq1nFYuDL/100jHBrULCozUBQBfEzp2uIMXiPAAhX8AifDv +bPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981104; x=1789585904; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=lKApnSEw/tM3Cqvf9CcY4USJIWwI0r3ya7+QVn//fe0=; b=lmL9vHQPfPuKVhMSZfz5jZjlt2M0nAhCKJ0sHwDiEjTeUzGbEcfarsRu8+sN0nfygo bOtaCbC1vVSWTlVY6DPfLRhJVB077cVVAL6GYCl80QQ3k4tODtf/PsUGnGsO5RyHXFq8 SnsO25ncOmsfPF6zF1JTha3Fj0QQwXvO7KEL38x1HSe954oU4/QRkYenWc9AtMwlKgGx lzSwef54HaSqqSaF898V65fk80ZAl2Lt6wipXfmrZPD/1OyKYGlLVVRLigGN9lpqf0nd nyYhTgtjzE6vLu9l2slMPf7j3i6ITCNJTeLRBLLOarK9XhxfJJHYPoD0/M/Q0OY4OyfC +q1A== X-Forwarded-Encrypted: i=1; AKwUvBxRY7Fsq14SKmD2aNMnIQxeL90VYVNn41cmHYY/uqdY2NO0kXvn+vHyoMV642DCBcPuY1KCdPMYnTDOXqY=@vger.kernel.org X-Gm-Message-State: AFuF++mgEmZFYOktrjXDo8yhkFMFxk1dHmOBCNt938C1DU9sG76Vfe7O QeY/EzSJc0RUZ+pZs26xTREaE4wdlCXR2zZir3YXEsJhD3f2VzrD5xWYsOUuqIGdBleKIxzcNJo 2B2sxoR1nDYt3Ur3QD5cOZzxrEw== X-Received: from pjbgb23.prod.google.com ([2002:a17:90b:617:b0:39d:6985:8798]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:314e:b0:38f:efed:5445 with SMTP id 98e67ed59e1d1-39b261500fdmr50401192a91.4.1788981102619; Wed, 09 Sep 2026 12:11:42 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:29 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-7-hramamurthy@google.com> Subject: [PATCH net-next v6 06/12] gve: simplify reset logic From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington Current GVE reset logic is quite complex, with a number of methods with similar names and functionalities. This complexity has allowed a number of bugs to enter the reset/recovery path, including the potential for reset loops if an operation fails during teardown. Simplify the reset path by doing the following: 1) Removing recursive resets. Recursive resets have two major issues. First, there is the potential for stack overflows if resets are invoked too many times in a row. Second, long recursive calls mean that GVE never gives up the RTNL lock, or at the very least holds it for too long. If a reset must occur anywhere during the reset/recovery path, it should be scheduled as a separate task. 2) Removing resets during teardown. This is partly covered by removing recursive resets, but the primary goal in this case is to ensure that the driver is capable of actually executing a hardware reset if something goes wrong with a control plane operation. As it stands, if `deconfigure_device_resources` fails, for example, GVE will preempt its reset with another reset without actually invoking a hardware reset, which could actually help with recovery. 3) Decompose allocation/de-allocation and setup/teardown. Performing allocation and setup for each control plane system (RSS, ptype map, etc) leaves many more error conditions to handle, causing teardown in the case of failures to be much more complex than they need to be. This will also be useful to better align a major behavioral change in mailbox mode, which will use separate response buffers instead to get data from the device instead of a pre-allocated shared memory region. With the new reset functionality, shared resources between the device and driver are not freed until after the hardware reset has completed in the event that `deconfigure_device_resources` fails, meaning that the device could potentially still be holding on to shared memory. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- v5: - fix workqueue disable count imbalance in reset and suspend path (Sashiko) - destroy rings before stopping queues (Sashiko) - ensure to call gve_queues_stop in error path in gve_close() - pull out gve_turndown out of gve_queues_stop so the ordering of gve_turndown(stop NAPIs) -> gve_destroy_rings -> gve_queues_stop(free rin= gs) can be preserved v4: - fix kdoc formatting for gve_teardown_control_plane_resources - ignore management interrupt if device is not okay v3: - only reset when failing to program flow rules as ethtool op - don't attempt to teardown rings in reset path if AQ is not allocated - fix work queue semantics related to management IRQ handler v2: - Fixed typos in commit message (recursive, preempt) - Fixed a kdoc warning drivers/net/ethernet/google/gve/gve.h | 2 +- drivers/net/ethernet/google/gve/gve_adminq.c | 9 +- drivers/net/ethernet/google/gve/gve_adminq.h | 1 - drivers/net/ethernet/google/gve/gve_ethtool.c | 2 +- .../net/ethernet/google/gve/gve_flow_rule.c | 15 +- drivers/net/ethernet/google/gve/gve_main.c | 351 +++++++++--------- 6 files changed, 197 insertions(+), 183 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 48cc8a6be186..026d685ecaee 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1348,7 +1348,7 @@ struct page_pool *gve_rx_create_page_pool(struct gve_= priv *priv, =20 /* Reset */ void gve_schedule_reset(struct gve_priv *priv); -int gve_reset(struct gve_priv *priv, bool attempt_teardown); +int gve_reset(struct gve_priv *priv, bool skip_queue_setup); void gve_get_curr_alloc_cfgs(struct gve_priv *priv, struct gve_tx_alloc_rings_cfg *tx_alloc_cfg, struct gve_rx_alloc_rings_cfg *rx_alloc_cfg); diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index a62cb7a921d0..901673d2e264 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -365,7 +365,7 @@ int gve_adminq_init(struct gve_priv *priv) return gve_adminq_alloc(priv); } =20 -void gve_adminq_release(struct gve_priv *priv) +static void gve_adminq_release(struct gve_priv *priv) { int i =3D 0; =20 @@ -394,7 +394,6 @@ void gve_adminq_release(struct gve_priv *priv) } gve_clear_device_rings_ok(priv); gve_clear_device_resources_ok(priv); - gve_clear_admin_queue_ok(priv); } =20 void gve_adminq_free(struct gve_priv *priv) @@ -1377,12 +1376,8 @@ gve_adminq_configure_flow_rule(struct gve_priv *priv, sizeof(struct gve_adminq_configure_flow_rule), flow_rule_cmd); =20 - if (err =3D=3D -ETIME) { - dev_err(&priv->pdev->dev, "Timeout to configure the flow rule, trigger r= eset"); - gve_reset(priv, true); - } else if (!err) { + if (!err) priv->flow_rules_cache.rules_cache_synced =3D false; - } =20 return err; } diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 78eee3b5cb7f..fe1e8868cdfe 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -621,7 +621,6 @@ static_assert(sizeof(union gve_adminq_command) =3D=3D 6= 4); =20 int gve_adminq_init(struct gve_priv *priv); void gve_adminq_free(struct gve_priv *priv); -void gve_adminq_release(struct gve_priv *priv); int gve_adminq_describe_device(struct gve_priv *priv); int gve_adminq_configure_device_resources(struct gve_priv *priv, dma_addr_t counter_array_bus_addr, diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/et= hernet/google/gve/gve_ethtool.c index 8199738ba979..dd1c44fedc77 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -651,7 +651,7 @@ static int gve_user_reset(struct net_device *netdev, u3= 2 *flags) =20 if (*flags =3D=3D ETH_RESET_ALL) { *flags =3D 0; - return gve_reset(priv, true); + return gve_reset(priv, false); } =20 return -EOPNOTSUPP; diff --git a/drivers/net/ethernet/google/gve/gve_flow_rule.c b/drivers/net/= ethernet/google/gve/gve_flow_rule.c index 2c80cda28ef3..fae552f4ad6f 100644 --- a/drivers/net/ethernet/google/gve/gve_flow_rule.c +++ b/drivers/net/ethernet/google/gve/gve_flow_rule.c @@ -278,6 +278,11 @@ int gve_add_flow_rule(struct gve_priv *priv, struct et= htool_rxnfc *cmd) goto out; =20 err =3D gve_adminq_add_flow_rule(priv, rule, fsp->location); + if (err =3D=3D -ETIME) { + dev_err(&priv->pdev->dev, + "Timeout to add flow rule, trigger reset."); + gve_reset(priv, false); + } =20 out: kvfree(rule); @@ -290,9 +295,17 @@ int gve_add_flow_rule(struct gve_priv *priv, struct et= htool_rxnfc *cmd) int gve_del_flow_rule(struct gve_priv *priv, struct ethtool_rxnfc *cmd) { struct ethtool_rx_flow_spec *fsp =3D (struct ethtool_rx_flow_spec *)&cmd-= >fs; + int err; =20 if (!priv->max_flow_rules) return -EOPNOTSUPP; =20 - return gve_adminq_del_flow_rule(priv, fsp->location); + err =3D gve_adminq_del_flow_rule(priv, fsp->location); + if (err =3D=3D -ETIME) { + dev_err(&priv->pdev->dev, + "Timeout to delete flow rule, trigger reset."); + gve_reset(priv, false); + } + + return err; } diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 2fe280cf7e68..87388856ff6c 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -270,6 +270,10 @@ static irqreturn_t gve_mgmnt_intr(int irq, void *arg) { struct gve_priv *priv =3D arg; =20 + /* Device resources are not okay; consider the interrupt spurious. */ + if (!gve_get_device_resources_ok(priv)) + return IRQ_NONE; + queue_work(priv->gve_wq, &priv->service_task); return IRQ_HANDLED; } @@ -590,7 +594,22 @@ static void gve_free_notify_blocks(struct gve_priv *pr= iv) priv->msix_vectors =3D NULL; } =20 -static int gve_setup_device_resources(struct gve_priv *priv) +static void gve_free_control_plane_resources(struct gve_priv *priv) +{ + bitmap_free(priv->xsk_pools); + priv->xsk_pools =3D NULL; + + kvfree(priv->ptype_lut_dqo); + priv->ptype_lut_dqo =3D NULL; + + gve_free_stats_report(priv); + gve_free_notify_blocks(priv); + gve_free_counter_array(priv); + gve_free_rss_config_cache(priv); + gve_free_flow_rule_caches(priv); +} + +static int gve_alloc_control_plane_resources(struct gve_priv *priv) { int err; =20 @@ -599,16 +618,42 @@ static int gve_setup_device_resources(struct gve_priv= *priv) return err; err =3D gve_alloc_rss_config_cache(priv); if (err) - goto abort_with_flow_rule_caches; + goto abort; err =3D gve_alloc_counter_array(priv); if (err) - goto abort_with_rss_config_cache; + goto abort; err =3D gve_alloc_notify_blocks(priv); if (err) - goto abort_with_counter; + goto abort; err =3D gve_alloc_stats_report(priv); if (err) - goto abort_with_ntfy_blocks; + goto abort; + + if (!gve_is_gqi(priv)) { + priv->ptype_lut_dqo =3D kvzalloc_obj(*priv->ptype_lut_dqo, + GFP_KERNEL); + if (!priv->ptype_lut_dqo) { + err =3D -ENOMEM; + goto abort; + } + } + + priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); + if (!priv->xsk_pools) { + err =3D -ENOMEM; + goto abort; + } + + return 0; +abort: + gve_free_control_plane_resources(priv); + return err; +} + +static int gve_setup_control_plane_resources(struct gve_priv *priv) +{ + int err =3D 0; + err =3D gve_adminq_configure_device_resources(priv, priv->counter_array_bus, priv->num_event_counters, @@ -618,20 +663,15 @@ static int gve_setup_device_resources(struct gve_priv= *priv) dev_err(&priv->pdev->dev, "could not setup device_resources: err=3D%d\n", err); err =3D -ENXIO; - goto abort_with_stats_report; + return err; } =20 if (!gve_is_gqi(priv)) { - priv->ptype_lut_dqo =3D kvzalloc_obj(*priv->ptype_lut_dqo); - if (!priv->ptype_lut_dqo) { - err =3D -ENOMEM; - goto abort_with_stats_report; - } err =3D gve_adminq_get_ptype_map_dqo(priv, priv->ptype_lut_dqo); if (err) { dev_err(&priv->pdev->dev, "Failed to get ptype map: err=3D%d\n", err); - goto abort_with_ptype_lut; + goto deconfigure_device; } } =20 @@ -646,7 +686,7 @@ static int gve_setup_device_resources(struct gve_priv *= priv) err =3D gve_init_rss_config(priv, priv->rx_cfg.num_queues); if (err) { dev_err(&priv->pdev->dev, "Failed to init RSS config"); - goto abort_with_clock; + goto teardown_clock; } =20 err =3D gve_adminq_report_stats(priv, priv->stats_report_len, @@ -658,67 +698,64 @@ static int gve_setup_device_resources(struct gve_priv= *priv) gve_set_device_resources_ok(priv); return 0; =20 -abort_with_clock: +teardown_clock: gve_teardown_clock(priv); -abort_with_ptype_lut: - kvfree(priv->ptype_lut_dqo); - priv->ptype_lut_dqo =3D NULL; -abort_with_stats_report: - gve_free_stats_report(priv); -abort_with_ntfy_blocks: - gve_free_notify_blocks(priv); -abort_with_counter: - gve_free_counter_array(priv); -abort_with_rss_config_cache: - gve_free_rss_config_cache(priv); -abort_with_flow_rule_caches: - gve_free_flow_rule_caches(priv); - +deconfigure_device: + gve_adminq_deconfigure_device_resources(priv); return err; } =20 -static void gve_trigger_reset(struct gve_priv *priv); - -static void gve_teardown_device_resources(struct gve_priv *priv) +/** + * gve_teardown_control_plane_resources() - Request the device to release = any + * shared allocated resources. + * + * @priv: Pointer to the GVE private device data structure. + * + * If any part of the teardown step fails, the failure is documented, but = is + * otherwise ignored. It is expected that a device reset is triggered + * immediately after tearing down device resources, which would clear any + * lingering state on the device. + */ +static void gve_teardown_control_plane_resources(struct gve_priv *priv) { int err; =20 /* Tell device its resources are being freed */ if (gve_get_device_resources_ok(priv)) { err =3D gve_flow_rules_reset(priv); - if (err) { + if (err) dev_err(&priv->pdev->dev, "Failed to reset flow rules: err=3D%d\n", err); - gve_trigger_reset(priv); - } /* detach the stats report */ err =3D gve_adminq_report_stats(priv, 0, 0x0, GVE_STATS_REPORT_TIMER_PER= IOD); - if (err) { + if (err) dev_err(&priv->pdev->dev, "Failed to detach stats report: err=3D%d\n", err); - gve_trigger_reset(priv); - } + gve_teardown_clock(priv); err =3D gve_adminq_deconfigure_device_resources(priv); - if (err) { + if (err) dev_err(&priv->pdev->dev, "Could not deconfigure device resources: err=3D%d\n", err); - gve_trigger_reset(priv); - } } =20 - kvfree(priv->ptype_lut_dqo); - priv->ptype_lut_dqo =3D NULL; - - gve_free_flow_rule_caches(priv); - gve_free_rss_config_cache(priv); - gve_free_counter_array(priv); - gve_free_notify_blocks(priv); - gve_free_stats_report(priv); - gve_teardown_clock(priv); gve_clear_device_resources_ok(priv); } =20 +static void gve_teardown_device(struct gve_priv *priv) +{ + gve_teardown_control_plane_resources(priv); + gve_adminq_free(priv); + /* + * Free any resources shared with the device only after we have a + * guarantee that the device will not try to access such resources. + * Device commands in gve_teardown_control_plane_resources can fail, in + * which case, device resources won't be relinquished until + * gve_adminq_free is called to trigger a device reset. + */ + gve_free_control_plane_resources(priv); +} + static int gve_unregister_qpl(struct gve_priv *priv, struct gve_queue_page_list *qpl) { @@ -1157,8 +1194,6 @@ void gve_schedule_reset(struct gve_priv *priv) queue_work(priv->gve_wq, &priv->service_task); } =20 -static void gve_reset_and_teardown(struct gve_priv *priv, bool was_up); -static int gve_reset_recovery(struct gve_priv *priv, bool was_up); static void gve_turndown(struct gve_priv *priv); static void gve_turnup(struct gve_priv *priv); =20 @@ -1269,11 +1304,12 @@ static int gve_reg_xdp_info(struct gve_priv *priv, = struct net_device *dev) return err; } =20 - static void gve_drain_page_cache(struct gve_priv *priv) { int i; =20 + if (!priv->rx) + return; for (i =3D 0; i < priv->rx_cfg.num_queues; i++) page_frag_cache_drain(&priv->rx[i].page_cache); } @@ -1416,10 +1452,11 @@ static int gve_queues_start(struct gve_priv *priv, reset: if (gve_get_reset_in_progress(priv)) goto stop_and_free_rings; - gve_reset_and_teardown(priv, true); - /* if this fails there is nothing we can do so just ignore the return */ - gve_reset_recovery(priv, false); - /* return the original error */ + + /* Attempt to reset. If reset is successful, gve_queues_start was + * successful. + */ + err =3D gve_reset(priv, false); return err; stop_and_free_rings: gve_tx_stop_rings(priv, gve_num_tx_queues(priv)); @@ -1435,6 +1472,12 @@ static int gve_open(struct net_device *dev) struct gve_priv *priv =3D netdev_priv(dev); int err; =20 + if (!gve_get_device_resources_ok(priv)) { + dev_err(&priv->pdev->dev, + "Attempting to open netdev without resources. Device must be reset."); + return -ENODEV; + } + gve_get_curr_alloc_cfgs(priv, &tx_alloc_cfg, &rx_alloc_cfg); =20 err =3D gve_queues_mem_alloc(priv, &tx_alloc_cfg, &rx_alloc_cfg); @@ -1451,41 +1494,16 @@ static int gve_open(struct net_device *dev) return 0; } =20 -static int gve_queues_stop(struct gve_priv *priv) +static void gve_queues_stop(struct gve_priv *priv) { - int err; + gve_unreg_xdp_info(priv); + gve_drain_page_cache(priv); =20 - netif_carrier_off(priv->dev); - if (gve_get_device_rings_ok(priv)) { - gve_turndown(priv); - gve_drain_page_cache(priv); - err =3D gve_destroy_rings(priv); - if (err) - goto err; - err =3D gve_unregister_qpls(priv); - if (err) - goto err; - gve_clear_device_rings_ok(priv); - } timer_delete_sync(&priv->stats_report_timer); - - gve_unreg_xdp_info(priv); + cancel_work_sync(&priv->stats_report_task); =20 gve_tx_stop_rings(priv, gve_num_tx_queues(priv)); gve_rx_stop_rings(priv, priv->rx_cfg.num_queues); - - priv->interface_down_cnt++; - return 0; - -err: - /* This must have been called from a reset due to the rtnl lock - * so just return at this point. - */ - if (gve_get_reset_in_progress(priv)) - return err; - /* Otherwise reset before returning */ - gve_reset_and_teardown(priv, true); - return gve_reset_recovery(priv, false); } =20 static int gve_close(struct net_device *dev) @@ -1493,12 +1511,30 @@ static int gve_close(struct net_device *dev) struct gve_priv *priv =3D netdev_priv(dev); int err; =20 - err =3D gve_queues_stop(priv); - if (err) - return err; + gve_turndown(priv); + + /* Surrender to reset if the queue destroying adminq cmds fail. Reset + * will not re-enable the interface. + */ + if (gve_get_device_rings_ok(priv)) { + gve_clear_device_rings_ok(priv); + err =3D gve_destroy_rings(priv); + if (err) + goto reset; + err =3D gve_unregister_qpls(priv); + if (err) + goto reset; + } =20 + gve_queues_stop(priv); gve_queues_mem_remove(priv); + priv->interface_down_cnt++; return 0; + +reset: + gve_queues_stop(priv); + err =3D gve_reset(priv, true); + return err; } =20 static void gve_handle_link_status(struct gve_priv *priv, bool link_status) @@ -2421,25 +2457,17 @@ static int gve_setup_device(struct gve_priv *priv) =20 priv->num_registered_pages =3D 0; =20 - priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); - if (!priv->xsk_pools) { - err =3D -ENOMEM; - goto err; - } - gve_set_netdev_xdp_features(priv); if (!gve_is_gqi(priv)) priv->dev->xdp_metadata_ops =3D &gve_xdp_metadata_ops; =20 - err =3D gve_setup_device_resources(priv); + err =3D gve_alloc_control_plane_resources(priv); if (err) - goto err_free_xsk_bitmap; - + goto err; + err =3D gve_setup_control_plane_resources(priv); + if (err) + goto err; return 0; - -err_free_xsk_bitmap: - bitmap_free(priv->xsk_pools); - priv->xsk_pools =3D NULL; err: return err; } @@ -2514,30 +2542,7 @@ static int gve_init_priv(struct gve_priv *priv) return 0; } =20 -static void gve_teardown_priv_resources(struct gve_priv *priv) -{ - gve_teardown_device_resources(priv); - gve_adminq_free(priv); - bitmap_free(priv->xsk_pools); - priv->xsk_pools =3D NULL; -} - -static void gve_trigger_reset(struct gve_priv *priv) -{ - /* Reset the device by releasing the AQ */ - gve_adminq_release(priv); -} - -static void gve_reset_and_teardown(struct gve_priv *priv, bool was_up) -{ - gve_trigger_reset(priv); - /* With the reset having already happened, close cannot fail */ - if (was_up) - gve_close(priv->dev); - gve_teardown_priv_resources(priv); -} - -static int gve_reset_recovery(struct gve_priv *priv, bool was_up) +static int gve_recover(struct gve_priv *priv, bool setup_queues) { int err; =20 @@ -2545,62 +2550,66 @@ static int gve_reset_recovery(struct gve_priv *priv= , bool was_up) if (err) { dev_err(&priv->pdev->dev, "Failed to alloc admin queue: err=3D%d\n", err); - goto err; + goto teardown_device; } =20 err =3D gve_adminq_verify_driver_compatibility(priv); if (err) { dev_err(&priv->pdev->dev, "Could not verify driver compatibility: err=3D%d\n", err); - goto err_free_adminq; + goto teardown_device; } =20 err =3D gve_setup_device(priv); if (err) - goto err_free_adminq; - if (was_up) { + goto teardown_device; + + if (setup_queues) { err =3D gve_open(priv->dev); if (err) - return err; + goto teardown_device; } + return 0; =20 -err_free_adminq: - gve_adminq_free(priv); -err: - dev_err(&priv->pdev->dev, "Reset failed! !!! DISABLING ALL QUEUES !!!\n"); - gve_turndown(priv); +teardown_device: + dev_err(&priv->pdev->dev, "Recover failed! !!! DISABLING ALL QUEUES !!!\n= "); + gve_teardown_device(priv); return err; } =20 -int gve_reset(struct gve_priv *priv, bool attempt_teardown) +int gve_reset(struct gve_priv *priv, bool skip_queue_setup) { bool was_up =3D netif_running(priv->dev); int err; =20 + if (gve_get_reset_in_progress(priv)) + return 0; + dev_info(&priv->pdev->dev, "Performing reset\n"); gve_clear_do_reset(priv); gve_set_reset_in_progress(priv); - /* If we aren't attempting to teardown normally, just go turndown and - * reset right away. - */ - if (!attempt_teardown) { + + if (was_up) { gve_turndown(priv); - gve_reset_and_teardown(priv, was_up); - } else { - /* Otherwise attempt to close normally */ - if (was_up) { - err =3D gve_close(priv->dev); - /* If that fails reset as we did above */ - if (err) - gve_reset_and_teardown(priv, was_up); + if (gve_get_device_rings_ok(priv)) { + gve_clear_device_rings_ok(priv); + gve_destroy_rings(priv); + gve_unregister_qpls(priv); } - /* Clean up any remaining resources */ - gve_teardown_priv_resources(priv); + gve_queues_stop(priv); } =20 - /* Set it all back up */ - err =3D gve_reset_recovery(priv, was_up); + disable_work(&priv->service_task); + gve_teardown_device(priv); + gve_queues_mem_remove(priv); + + enable_work(&priv->service_task); + err =3D gve_recover(priv, was_up && !skip_queue_setup); + if (err) + dev_info(&priv->pdev->dev, + "Failed to recover in reset: %d\n", err); + gve_clear_reset_in_progress(priv); priv->reset_cnt++; priv->interface_up_cnt =3D 0; @@ -2927,7 +2936,7 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) if (err) { dev_err(&priv->pdev->dev, "Could not setup device: err=3D%d\n", err); - goto abort_with_wq; + goto abort_teardown_device; } =20 if (!gve_is_gqi(priv) && !gve_is_qpl(priv)) @@ -2935,7 +2944,7 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) =20 err =3D register_netdev(dev); if (err) - goto abort_with_gve_init; + goto abort_teardown_device; =20 dev_info(&pdev->dev, "GVE version %s\n", gve_version_str); dev_info(&pdev->dev, "GVE queue format %d\n", (int)priv->queue_format); @@ -2943,8 +2952,9 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) queue_work(priv->gve_wq, &priv->service_task); return 0; =20 -abort_with_gve_init: - gve_teardown_priv_resources(priv); +abort_teardown_device: + disable_work(&priv->stats_report_task); + gve_teardown_device(priv); =20 abort_with_wq: destroy_workqueue(priv->gve_wq); @@ -2976,7 +2986,8 @@ static void gve_remove(struct pci_dev *pdev) void __iomem *reg_bar =3D priv->reg_bar0; =20 unregister_netdev(netdev); - gve_teardown_priv_resources(priv); + disable_work_sync(&priv->service_task); + gve_teardown_device(priv); destroy_workqueue(priv->gve_wq); priv->ctrl_ops->unmap_db_bar(priv); free_netdev(netdev); @@ -2992,16 +3003,13 @@ static void gve_shutdown(struct pci_dev *pdev) bool was_up =3D netif_running(priv->dev); =20 netif_device_detach(netdev); + disable_work_sync(&priv->service_task); =20 rtnl_lock(); netdev_lock(netdev); - if (was_up && gve_close(priv->dev)) { - /* If the dev was up, attempt to close, if close fails, reset */ - gve_reset_and_teardown(priv, was_up); - } else { - /* If the dev wasn't up or close worked, finish tearing down */ - gve_teardown_priv_resources(priv); - } + if (was_up) + gve_close(priv->dev); + gve_teardown_device(priv); netdev_unlock(netdev); rtnl_unlock(); } @@ -3013,16 +3021,14 @@ static int gve_suspend(struct device *dev) struct gve_priv *priv =3D netdev_priv(netdev); bool was_up =3D netif_running(priv->dev); =20 + disable_work_sync(&priv->service_task); + priv->suspend_cnt++; rtnl_lock(); netdev_lock(netdev); - if (was_up && gve_close(priv->dev)) { - /* If the dev was up, attempt to close, if close fails, reset */ - gve_reset_and_teardown(priv, was_up); - } else { - /* If the dev wasn't up or close worked, finish tearing down */ - gve_teardown_priv_resources(priv); - } + if (was_up) + gve_close(priv->dev); + gve_teardown_device(priv); priv->up_before_suspend =3D was_up; netdev_unlock(netdev); rtnl_unlock(); @@ -3039,7 +3045,8 @@ static int gve_resume(struct device *dev) priv->resume_cnt++; rtnl_lock(); netdev_lock(netdev); - err =3D gve_reset_recovery(priv, priv->up_before_suspend); + enable_work(&priv->service_task); + err =3D gve_recover(priv, priv->up_before_suspend); netdev_unlock(netdev); rtnl_unlock(); return err; --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F06E83B71DD for ; Wed, 9 Sep 2026 19:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981111; cv=none; b=ljRG7rCYFdf2OqKm91sg4kRcOVN93469H2kE49Np4S6vbNNbLhdohZkhRlDkemmiI+IfxrgsQI7V8uHBMtxWMAz8QH7nmKoeekBccMaz/txA33BOqmvHib5DQBXOLsRbKtOIP2tbzXiW/CiWl+NGxaI/EAiuWKt04sOcDz6fUEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981111; c=relaxed/simple; bh=rfZrJqVINpHQmqsp7P3umBsI70x9tN+ZuXbATN+Xjfc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=t3jZ4GDEDq4wjxDE/0G5gNHQup7jhj728ut5OS9UW2zUH8Al+imdG9/QB2w4lwLJcxFmL7X1AmAmKbgg42zedMi4UNkUaolTGpRMy/SJkFJ1rooaAUATjC+yNBqjQNXG6PffITVHId/aH8/4gzA/ZsyEEo9/OeWAeb6vVJtAq6c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=TC+3OtWn; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TC+3OtWn" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-398e1f7d1a5so3746721a91.0 for ; Wed, 09 Sep 2026 12:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981104; x=1789585904; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=037pVR4gd8pnF+LHI/sesMBd73j2Xaeo+CEi7uhiPAE=; b=TC+3OtWnAL6f2jJyrt906msxZQj5Ns3zXeywOXSGD8M3gG2IljSssbJxEWYPZrpqwp P5vfWqMcQqhfz75O9qVGP6RZyB2g2PSasoQ4y4+yBNOYWew3GxgIAKTb0S2IDS5XodL5 2aztXTWSaGNiry/DaB1as+EDbAFC3LWKFGsdNGpztktru5cp4gb5JP6TXBBLeBmqdmNK mRWfFciCFz1HCkHq1uNZdFhD+5sAUAoswK67lqdMYqsqsFa8HbWlWb3N7Ygb4bm6O7fF 1gUVNnERsTQAcT6f3092m9ZOS7jC53curlAueizra+98JlEUeWa638QW0JItLQZHZUb7 ZCwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981104; x=1789585904; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=037pVR4gd8pnF+LHI/sesMBd73j2Xaeo+CEi7uhiPAE=; b=LCj4emznKDKUy9qPUx5JFZxPd78/8aQfOcx8K52Yjchm1HdckUzSb6nnufHZQ9lxqR WfHeo2eI8zb2BZh5p+mupedxXUnq5T01mtQHb4vnTUTFnDrausMIxZyrWDVVuM6sqHaz OTUViOt4DIMnf5nD2G+y/mWaqfpneGqK7ca4tS+2neszv5508leW0y6Y8FoHneL9J6In 8/ofCDjwP3TY0BjQgCko0FhFs0Z/yA3jpekp2CtGPL74BjfosyM4s+HM4pJrvjh0da+E fFUe58Tf1VFH3St+38hoCZ2Stg0h1RBN0yVTzAI03ozZrgOrRMMmMrrCIyABQx8XbN5V xJqg== X-Forwarded-Encrypted: i=1; AKwUvBw4e+CtFv4QLFFT74EThUsb4Z2B/Z6wOLQjqhcUPmAUBD1ub+cNVaarWZ732LnuxGY4XjVXkQReyzlV0cs=@vger.kernel.org X-Gm-Message-State: AFuF++mHF39YqLEOztbw+odLcVlUf6sCKJ1wXnYml5mLK206GHfa7U1w 7azU6+fBrzLCWrqYUT1gqKULfYcvzczCvwWAlBTc3gvNcxdpISITPQiY+4bpFKm5ObKiSeAo+hZ qv0LoNoYDeC/o3Krf73cA6qPpPw== X-Received: from pjbcn5.prod.google.com ([2002:a17:90a:f085:b0:38e:8fe4:4ac2]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:6081:b0:39b:51cc:4586 with SMTP id 98e67ed59e1d1-39b51cc65admr22414180a91.19.1788981104187; Wed, 09 Sep 2026 12:11:44 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:30 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-8-hramamurthy@google.com> Subject: [PATCH net-next v6 07/12] gve: add gve_ctrl_ops for gve initialization/teardown sequences From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington Driver initialization and teardown involve a number of control plane operations that need to be defined for gve_probe to operate in both mailbox and adminq modes. This list includes: - get_ptype_map: a mapping of packet types (L3+L4) held in RX completion descriptors - configure_rss: set up default RSS configuration if the device is not queryable - setup_stats_report: set up DMA region for stats report (AQ-only) - reset_flow_rules: needed in teardown; flushes all flow rules from device Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 12 ++++++++++ drivers/net/ethernet/google/gve/gve_adminq.c | 7 +++--- drivers/net/ethernet/google/gve/gve_adminq.h | 3 +-- drivers/net/ethernet/google/gve/gve_main.c | 24 +++++++++++++++----- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 026d685ecaee..e0583e8cd2cd 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -833,12 +833,24 @@ struct gve_device_info { * structures stored in @priv to be used during initializ= ation. * @set_num_ntfy_blks: Sets no. of vectors into @priv to be used during * initialization. + * @get_ptype_map: Learn packet type map from device and store it in @priv + * @configure_rss: Set up default RSS configuration + * @setup_stats_report: Set up DMA region for stats report (AdminQ only) + * @reset_flow_rules: Flush all flow rules from device */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); void (*unmap_db_bar)(struct gve_priv *priv); void (*set_num_queues)(struct gve_priv *priv); int (*set_num_ntfy_blks)(struct gve_priv *priv); + int (*get_ptype_map)(struct gve_priv *priv); + int (*configure_rss)(struct gve_priv *priv, + struct ethtool_rxfh_param *param); + int (*setup_stats_report)(struct gve_priv *priv, + u64 stats_report_len, + dma_addr_t stats_report_addr, + u64 interval_ms); /* AQ-specific */ + int (*reset_flow_rules)(struct gve_priv *priv); }; =20 struct gve_priv { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 901673d2e264..1176e13fafc0 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1329,8 +1329,7 @@ int gve_adminq_report_nic_ts(struct gve_priv *priv, return gve_adminq_execute_cmd(priv, &cmd); } =20 -int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, - struct gve_ptype_lut *ptype_lut) +int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv) { struct gve_ptype_map *ptype_map; union gve_adminq_command cmd; @@ -1356,9 +1355,9 @@ int gve_adminq_get_ptype_map_dqo(struct gve_priv *pri= v, =20 /* Populate ptype_lut. */ for (i =3D 0; i < GVE_NUM_PTYPES; i++) { - ptype_lut->ptypes[i].l3_type =3D + priv->ptype_lut_dqo->ptypes[i].l3_type =3D ptype_map->ptypes[i].l3_type; - ptype_lut->ptypes[i].l4_type =3D + priv->ptype_lut_dqo->ptypes[i].l4_type =3D ptype_map->ptypes[i].l4_type; } err: diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index fe1e8868cdfe..5e51c060e237 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -652,8 +652,7 @@ int gve_adminq_report_nic_ts(struct gve_priv *priv, dma_addr_t nic_ts_report_addr); =20 struct gve_ptype_lut; -int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, - struct gve_ptype_lut *ptype_lut); +int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv); int gve_adminq_set_num_ntfy_blks(struct gve_priv *priv); void gve_adminq_set_num_queues(struct gve_priv *priv); int gve_adminq_map_db_bar(struct gve_priv *priv); diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 87388856ff6c..cc27141240fd 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -652,7 +652,8 @@ static int gve_alloc_control_plane_resources(struct gve= _priv *priv) =20 static int gve_setup_control_plane_resources(struct gve_priv *priv) { - int err =3D 0; + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; + int err; =20 err =3D gve_adminq_configure_device_resources(priv, priv->counter_array_bus, @@ -667,7 +668,7 @@ static int gve_setup_control_plane_resources(struct gve= _priv *priv) } =20 if (!gve_is_gqi(priv)) { - err =3D gve_adminq_get_ptype_map_dqo(priv, priv->ptype_lut_dqo); + err =3D ops->get_ptype_map(priv); if (err) { dev_err(&priv->pdev->dev, "Failed to get ptype map: err=3D%d\n", err); @@ -689,12 +690,13 @@ static int gve_setup_control_plane_resources(struct g= ve_priv *priv) goto teardown_clock; } =20 - err =3D gve_adminq_report_stats(priv, priv->stats_report_len, + err =3D ops->setup_stats_report(priv, priv->stats_report_len, priv->stats_report_bus, GVE_STATS_REPORT_TIMER_PERIOD); if (err) dev_err(&priv->pdev->dev, "Failed to report stats: err=3D%d\n", err); + gve_set_device_resources_ok(priv); return 0; =20 @@ -718,6 +720,7 @@ static int gve_setup_control_plane_resources(struct gve= _priv *priv) */ static void gve_teardown_control_plane_resources(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; int err; =20 /* Tell device its resources are being freed */ @@ -727,11 +730,13 @@ static void gve_teardown_control_plane_resources(stru= ct gve_priv *priv) dev_err(&priv->pdev->dev, "Failed to reset flow rules: err=3D%d\n", err); /* detach the stats report */ - err =3D gve_adminq_report_stats(priv, 0, 0x0, GVE_STATS_REPORT_TIMER_PER= IOD); + err =3D ops->setup_stats_report(priv, 0, 0x0, + GVE_STATS_REPORT_TIMER_PERIOD); if (err) dev_err(&priv->pdev->dev, "Failed to detach stats report: err=3D%d\n", err); gve_teardown_clock(priv); + err =3D gve_adminq_deconfigure_device_resources(priv); if (err) dev_err(&priv->pdev->dev, @@ -1815,6 +1820,7 @@ static int gve_xdp(struct net_device *dev, struct net= dev_bpf *xdp) =20 int gve_init_rss_config(struct gve_priv *priv, u16 num_queues) { + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; struct gve_rss_config *rss_config =3D &priv->rss_config; struct ethtool_rxfh_param rxfh =3D {0}; u16 i; @@ -1830,15 +1836,17 @@ int gve_init_rss_config(struct gve_priv *priv, u16 = num_queues) =20 rxfh.hfunc =3D ETH_RSS_HASH_TOP; =20 - return gve_adminq_configure_rss(priv, &rxfh); + return ops->configure_rss(priv, &rxfh); } =20 int gve_flow_rules_reset(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; + if (!priv->max_flow_rules) return 0; =20 - return gve_adminq_reset_flow_rules(priv); + return ops->reset_flow_rules(priv); } =20 int gve_adjust_config(struct gve_priv *priv, @@ -2477,6 +2485,10 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D { .unmap_db_bar =3D gve_adminq_unmap_db_bar, .set_num_queues =3D gve_adminq_set_num_queues, .set_num_ntfy_blks =3D gve_adminq_set_num_ntfy_blks, + .get_ptype_map =3D gve_adminq_get_ptype_map_dqo, + .reset_flow_rules =3D gve_adminq_reset_flow_rules, + .setup_stats_report =3D gve_adminq_report_stats, + .configure_rss =3D gve_adminq_configure_rss, }; =20 static int gve_init_priv(struct gve_priv *priv) --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BBAF63B3C05 for ; Wed, 9 Sep 2026 19:11:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981110; cv=none; b=MtdlMU/E/E8SRd8JSGPjiiSM5haG9Xz2x55GLyqV8vkLdc0a5QA29KEUexxXrzsxC1KNYgDfDDzNcddLINOtPR5G0WiFM9JhWCdQol8QeZvTuB5tqVb2wuLDlwIASByGtkTIfz8tVh/ITr75LDp5FBlMZPLVhYkb1m/u6E9khlE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981110; c=relaxed/simple; bh=C3Ksr/Ys+AJCkXFSC/mlrZvpwinbE6uMNSWRGYQVdE4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=k4Q0G3zQa/IoEkQc7VvT9nNhSHNghDAj3b6NvijWkV7MMci85QfYk8o1aGclI/IiZhvHF9qwR09rqKp4tornXykKXJu4dDOgZZd3PvYZ0SDxS2YtU2cMALGtiWrbDJePhbXWWYv7upYfEm55gAPuuw2O6bspFu5RfsunJ/zLvyY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=jLz34bcs; arc=none smtp.client-ip=209.85.215.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jLz34bcs" Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-cc1eb205d31so4540699a12.2 for ; Wed, 09 Sep 2026 12:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981105; x=1789585905; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Oe8I1pwhrEJpQdRTioweQKfQSZy9DRot7kKfh6Zuylk=; b=jLz34bcsrPOh+ny7As5q1PhMxNhiuQgkTJc30xaWWD/p0J0zmlZ9FazUwb4+itTHV9 PQWCvwULyWzREXHWJXWhp7HYKxnsrt0vIvsc5/MATf2Z6+XXxyq13T01SaSdtvv5E0yf MgPeGjX8zqnAiUlVqXtyhxg7q5DnNt8VrujGdDg8DRe/6FTmdxaT/xUZsw2vscFxZyaR 4oEscz49dYdqFngWUPxZX6K7gC+wADRQK+H8LRp1c8PI1zUpkKaomJBVFmYB/2EeReFC W71L2hiUVLnec771CIRxEf7fz1tVT4fP963EadHwMFqAEDbdxsu9udIGnoLDYd7Kxk7N F5CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981105; x=1789585905; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Oe8I1pwhrEJpQdRTioweQKfQSZy9DRot7kKfh6Zuylk=; b=QRgl4XTDgTVZXIrwLR3LI1UxxJYNkIPsYdGTs371fwBKJ+zvdtOsqXZmhA2iySgT8C kl1AY345bucqI79SAyanj0uRGx7+vK29+Xv6y6j0HLO8P5a39P9iWIjTaBPB2dRh82ZF AEdWQpRp+9MBL+Oxa1V02qmij36m+FRqmCl27j2yFrdZXThAP0BunCqgXxSSzCQ/mmAm qJSchL9oC1u9k0GKqsoV432JS9eafhaiMbBKP84PLQ1P6YUdvAkj8pphF/bmKk6DOOfE VPF4jV012WVWFFpMCqBvNJYHeHTPMUNY6b3j7qM1mzILZZTkuzqimfmsWb45zMKFV6Ze YZXQ== X-Forwarded-Encrypted: i=1; AKwUvByOujfHwc4s2eUg1XYZnEXnkoi7m8xV/TmCgaQ60HX0wp7o+ewuP1nYGoR260X/waTHXjBQXT9x3lsuaA8=@vger.kernel.org X-Gm-Message-State: AFuF++nhU9PyvkbSc7HiR9ao03IzrmIqUqVPpRMNlH2YPNj1KIe4Lp/w tn6xl0iA1s6vJi2SoII7u+W3ET61g6fhGv6VUXegxjvXyuODsCcBC4FepiC4I2VPaQNroxPTkWo OrSBui1i8xOE/zHXxbbV0g5gqjA== X-Received: from pfblh9.prod.google.com ([2002:a05:6a00:7109:b0:868:fe3c:88e6]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:9f17:b0:3d3:ae0f:526d with SMTP id adf61e73a8af0-3da3a1f0463mr53446381637.25.1788981105078; Wed, 09 Sep 2026 12:11:45 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:31 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-9-hramamurthy@google.com> Subject: [PATCH net-next v6 08/12] gve: split up notify block allocation and setup paths From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington Before this patch, notify block allocation and setup occurred in the same method. This all occurred before gve_adminq_configure_device_resources, which populates the irq_db_indicies array, a DMA region with BAR offsets for MSI-X vectors. The coming mailbox mode will require notify blocks to be set up only after receiving the IRQ doorbell offsets, as the request does not work with a supplied DMA buffer in the way that admin queue mode does. The intended flow in that case would be: 1) allocate notify blocks 2) request doorbell information 3) set up MSI-X vectors based on doorbell info This ordering also works for admin queue mode, so it will be updated to match. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- v3: - remove redundant call to gve_teardown_clock() drivers/net/ethernet/google/gve/gve.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 155 +++++++++++---------- 2 files changed, 86 insertions(+), 71 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index e0583e8cd2cd..f624a3e385e4 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -674,6 +674,7 @@ struct gve_notify_block { struct gve_tx_ring *tx; /* tx rings on this block */ struct gve_rx_ring *rx; /* rx rings on this block */ u32 irq; + bool irq_requested; }; =20 /* Tracks allowed and current rx queue settings */ @@ -954,6 +955,7 @@ struct gve_priv { u64 link_speed; bool up_before_suspend; /* True if dev was up before suspend */ =20 + bool mgmt_irq_requested; struct gve_ptype_lut *ptype_lut_dqo; =20 /* Must be a power of two. */ diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index cc27141240fd..d2f974a0cc87 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -428,6 +428,24 @@ int gve_napi_poll_dqo(struct napi_struct *napi, int bu= dget) return work_done; } =20 +static void gve_free_notify_blocks(struct gve_priv *priv) +{ + pci_disable_msix(priv->pdev); + if (priv->irq_db_indices) { + dma_free_coherent(&priv->pdev->dev, + priv->num_ntfy_blks * + sizeof(*priv->irq_db_indices), + priv->irq_db_indices, + priv->irq_db_indices_bus); + priv->irq_db_indices =3D NULL; + } + + kvfree(priv->ntfy_blocks); + priv->ntfy_blocks =3D NULL; + kvfree(priv->msix_vectors); + priv->msix_vectors =3D NULL; +} + static const struct cpumask *gve_get_node_mask(struct gve_priv *priv) { if (priv->numa_node =3D=3D NUMA_NO_NODE) @@ -439,11 +457,9 @@ static const struct cpumask *gve_get_node_mask(struct = gve_priv *priv) static int gve_alloc_notify_blocks(struct gve_priv *priv) { int num_vecs_requested =3D priv->num_ntfy_blks + 1; - const struct cpumask *node_mask; - unsigned int cur_cpu; int vecs_enabled; - int i, j; int err; + int i; =20 priv->msix_vectors =3D kvzalloc_objs(*priv->msix_vectors, num_vecs_requested); @@ -457,7 +473,7 @@ static int gve_alloc_notify_blocks(struct gve_priv *pri= v) dev_err(&priv->pdev->dev, "Could not enable min msix %d/%d\n", GVE_MIN_MSIX, vecs_enabled); err =3D vecs_enabled; - goto abort_with_msix_vectors; + goto abort; } if (vecs_enabled !=3D num_vecs_requested) { int new_num_ntfy_blks =3D (vecs_enabled - 1) & ~0x1; @@ -480,15 +496,6 @@ static int gve_alloc_notify_blocks(struct gve_priv *pr= iv) priv->rx_cfg.num_queues =3D priv->rx_cfg.max_queues; } =20 - /* Setup Management Vector - the last vector */ - snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), "gve-mgmnt@p= ci:%s", - pci_name(priv->pdev)); - err =3D request_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, - gve_mgmnt_intr, 0, priv->mgmt_msix_name, priv); - if (err) { - dev_err(&priv->pdev->dev, "Did not receive management vector.\n"); - goto abort_with_msix_enabled; - } priv->irq_db_indices =3D dma_alloc_coherent(&priv->pdev->dev, priv->num_ntfy_blks * @@ -496,15 +503,65 @@ static int gve_alloc_notify_blocks(struct gve_priv *p= riv) &priv->irq_db_indices_bus, GFP_KERNEL); if (!priv->irq_db_indices) { err =3D -ENOMEM; - goto abort_with_mgmt_vector; + goto abort; } =20 priv->ntfy_blocks =3D kvzalloc(priv->num_ntfy_blks * sizeof(*priv->ntfy_blocks), GFP_KERNEL); if (!priv->ntfy_blocks) { err =3D -ENOMEM; - goto abort_with_irq_db_indices; + goto abort; + } + return 0; + +abort: + gve_free_notify_blocks(priv); + return err; +} + +static void gve_teardown_notify_blocks(struct gve_priv *priv) +{ + int i; + + if (!priv->ntfy_blocks) + return; + + for (i =3D 0; i < priv->num_ntfy_blks; i++) { + struct gve_notify_block *block =3D &priv->ntfy_blocks[i]; + + if (!block->irq_requested) + continue; + + irq_set_affinity_hint(priv->msix_vectors[i].vector, + NULL); + free_irq(priv->msix_vectors[i].vector, block); + block->irq =3D 0; + block->irq_requested =3D false; + } + + if (priv->mgmt_irq_requested) { + free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv); + priv->mgmt_irq_requested =3D false; + } +} + +static int gve_setup_notify_blocks(struct gve_priv *priv) +{ + const struct cpumask *node_mask; + unsigned int cur_cpu; + int i; + int err; + + /* Setup Management Vector - the last vector */ + snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), + "gve-mgmnt@pci:%s", pci_name(priv->pdev)); + err =3D request_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, + gve_mgmnt_intr, 0, priv->mgmt_msix_name, priv); + if (err) { + dev_err(&priv->pdev->dev, "Did not receive management vector.\n"); + return err; } + priv->mgmt_irq_requested =3D true; =20 /* Setup the other blocks - the first n-1 vectors */ node_mask =3D gve_get_node_mask(priv); @@ -522,9 +579,10 @@ static int gve_alloc_notify_blocks(struct gve_priv *pr= iv) if (err) { dev_err(&priv->pdev->dev, "Failed to receive msix vector %d\n", i); - goto abort_with_some_ntfy_blocks; + goto abort; } block->irq =3D priv->msix_vectors[msix_idx].vector; + block->irq_requested =3D true; irq_set_affinity_and_hint(block->irq, cpumask_of(cur_cpu)); block->irq_db_index =3D &priv->irq_db_indices[i].index; @@ -538,61 +596,12 @@ static int gve_alloc_notify_blocks(struct gve_priv *p= riv) cur_cpu =3D cpumask_first(node_mask); } return 0; -abort_with_some_ntfy_blocks: - for (j =3D 0; j < i; j++) { - struct gve_notify_block *block =3D &priv->ntfy_blocks[j]; - int msix_idx =3D j; =20 - irq_set_affinity_hint(priv->msix_vectors[msix_idx].vector, - NULL); - free_irq(priv->msix_vectors[msix_idx].vector, block); - block->irq =3D 0; - } - kvfree(priv->ntfy_blocks); - priv->ntfy_blocks =3D NULL; -abort_with_irq_db_indices: - dma_free_coherent(&priv->pdev->dev, priv->num_ntfy_blks * - sizeof(*priv->irq_db_indices), - priv->irq_db_indices, priv->irq_db_indices_bus); - priv->irq_db_indices =3D NULL; -abort_with_mgmt_vector: - free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv); -abort_with_msix_enabled: - pci_disable_msix(priv->pdev); -abort_with_msix_vectors: - kvfree(priv->msix_vectors); - priv->msix_vectors =3D NULL; +abort: + gve_teardown_notify_blocks(priv); return err; } =20 -static void gve_free_notify_blocks(struct gve_priv *priv) -{ - int i; - - if (!priv->msix_vectors) - return; - - /* Free the irqs */ - for (i =3D 0; i < priv->num_ntfy_blks; i++) { - struct gve_notify_block *block =3D &priv->ntfy_blocks[i]; - int msix_idx =3D i; - - irq_set_affinity_hint(priv->msix_vectors[msix_idx].vector, - NULL); - free_irq(priv->msix_vectors[msix_idx].vector, block); - block->irq =3D 0; - } - free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv); - kvfree(priv->ntfy_blocks); - priv->ntfy_blocks =3D NULL; - dma_free_coherent(&priv->pdev->dev, priv->num_ntfy_blks * - sizeof(*priv->irq_db_indices), - priv->irq_db_indices, priv->irq_db_indices_bus); - priv->irq_db_indices =3D NULL; - pci_disable_msix(priv->pdev); - kvfree(priv->msix_vectors); - priv->msix_vectors =3D NULL; -} =20 static void gve_free_control_plane_resources(struct gve_priv *priv) { @@ -749,6 +758,7 @@ static void gve_teardown_control_plane_resources(struct= gve_priv *priv) =20 static void gve_teardown_device(struct gve_priv *priv) { + gve_teardown_notify_blocks(priv); gve_teardown_control_plane_resources(priv); gve_adminq_free(priv); /* @@ -2471,13 +2481,16 @@ static int gve_setup_device(struct gve_priv *priv) =20 err =3D gve_alloc_control_plane_resources(priv); if (err) - goto err; + return err; + err =3D gve_setup_control_plane_resources(priv); if (err) - goto err; + return err; + + err =3D gve_setup_notify_blocks(priv); + if (err) + return err; return 0; -err: - return err; } =20 static const struct gve_ctrl_ops gve_adminq_ops =3D { --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB96E3B1013 for ; Wed, 9 Sep 2026 19:11:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981112; cv=none; b=VU6a2remKf9yORRnOCzC+H4LomiLFj0aFDQhwuP/AA0DsBQlMKuUaUw9QiFfcMbkopFGlv2LSMuDrHgQeotI/HGqO1lZLAByYdLFznsXS8WpKC9PKEGQaeobesjQ37oexp6MZjrECB9QXGDBGroHPFYxiDw2BB6fswQUXot60zg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981112; c=relaxed/simple; bh=e7GpH1YQ7T60trIYxLHKuGpgbc951WHmwNbGb0a8WsU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FNGvoGgf38lBPPR1PFZLTpqRIzOVR7GFQjioCEstrHaVIhWnuhPKxfAuRtp9UJ8CD5ob0/W4t5EsZncq0MEl8J8zGBw6jdyts6H1FWNr3ZG5N5Fk9z7POSzOVubU2X58H0n5loKVFsiBxbUHKE2/Exy/p+uQuprPnq/fLeyQsu0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=mEF8uNV3; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mEF8uNV3" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-39512608fb1so13035305a91.1 for ; Wed, 09 Sep 2026 12:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981106; x=1789585906; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=8qH9idYVCwUoNv+cPGKmmtnB56fEoOaqA8sVMiM+SIo=; b=mEF8uNV3EicQKEdlYaDdIqdFdoXVcPd8GRsBkXjXQUGKQIA46GmWNz6H2H2HP9lv75 M1wfLa+3P9+uki+IsSc2FsuyXmuR8Yz761Xe/3MXEDlE2SEyGHvtRLvIRhlm0Ye+HL6c 5ACb0PLCWb8183ZYMypU/M0XqPDlkTr9Q2+HWRnN/Db5jSvYK7kGYj1cfZd7kBjPIHNz 3/Cwu6yycuJPrJirZg8wf3YRFu1fBxVwuyF7+CDdRLB5yzznj5FIPtnWmY1YBi45DKaa gzjjwtx1Ufj4AdALqixN7BO0m8KncY1B5RHXG+C8vGKF2QQSzw1egUEpVoTgGwTXdVw9 FjHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981106; x=1789585906; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8qH9idYVCwUoNv+cPGKmmtnB56fEoOaqA8sVMiM+SIo=; b=UaxVfl8KVHh4xkKWE6Jqvr5H7TIq7oqOAyuKxZBXUyJLxc618foTe637VG2OL6D3XO rRKO4KhI5LV75MpBMpa2d+/fymfvF7aSV+rRUE07JXrG598KKtOt7OkQpLamfSmN2bPE YzDjAl2E2QsFc9hmK5tn5UMqLvvGWPBKQX9xlJDU1x3wRHFeij0KTX8xyj3VmaOmK3HQ 28l/iBDqJbuL9TDPjIpSs/oo1k27rE5KJRfJ4PYi5YQbLtKzFqIcTjJ+xvkm9DiiSDRh FDuJ0tpANkdsBa/9aoRgUKimP9w3Y9u8rva9lJy7mv8JUkEsQKCkfHmGbELoVuSbNDJo DBdA== X-Forwarded-Encrypted: i=1; AKwUvBy3VBqbTnymruNEk7/53dFjMgomBL9LYUPEOs+0jNR7C1S3p++kezMvaEE58Sa5Icx9QlBEW3Sfvog/YeE=@vger.kernel.org X-Gm-Message-State: AFuF++kHWVQFmJFHe/GXGTy3pASpl1abntioei3PpwJM/YhaNc5Xqi20 JKx3q2D048uaortZzdJ29QM4YV7Bl4IT9fnnQ1cSdj/Y4/hIm3CnOUW03iAQBnfSPCdtucC9NvP O+w9fn2wF+S7AELOuU+yYUCwIPw== X-Received: from pjni21.prod.google.com ([2002:a17:90a:8395:b0:398:ff5d:7e24]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2f46:b0:396:6344:3b63 with SMTP id 98e67ed59e1d1-39b260de5c6mr58998268a91.2.1788981105883; Wed, 09 Sep 2026 12:11:45 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:32 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-10-hramamurthy@google.com> Subject: [PATCH net-next v6 09/12] gve: introduce new methods to handle IRQ doorbells From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington Introduce `request_db_info` and `release_db_resources` to `struct gve_ctrl_ops`. These encapsulate the configuration of device resources (counter arrays and IRQ doorbell indices) which vary between Admin Queue and Mailbox modes. Establish the relationship between IRQ doorbell indices and notify blocks in these new methods instead of directly in notify_block setup/teardown methods. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- v6: - update commit message v4: - propagate code changes as specified by v3. v3: - move allocation of IRQ DB indices and counter array back into gve_alloc_control_plane_resources() from gve_adminq_request_db_info(). - Similar to above, move free logic out of gve_adminq_free_db_resources() and rename all introduced methods from *free_db_resources to *release_db_resources to reflect the behavioral change. drivers/net/ethernet/google/gve/gve.h | 10 ++ drivers/net/ethernet/google/gve/gve_adminq.c | 37 ++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 98 ++++++++++---------- 4 files changed, 97 insertions(+), 50 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index f624a3e385e4..6c46c842070b 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -834,6 +834,9 @@ struct gve_device_info { * structures stored in @priv to be used during initializ= ation. * @set_num_ntfy_blks: Sets no. of vectors into @priv to be used during * initialization. + * @request_db_info: Request and store doorbell information into @priv + * @release_db_resources: Release device hold on DMA memory holding doorbe= ll + * info (AdminQ only) * @get_ptype_map: Learn packet type map from device and store it in @priv * @configure_rss: Set up default RSS configuration * @setup_stats_report: Set up DMA region for stats report (AdminQ only) @@ -844,6 +847,8 @@ struct gve_ctrl_ops { void (*unmap_db_bar)(struct gve_priv *priv); void (*set_num_queues)(struct gve_priv *priv); int (*set_num_ntfy_blks)(struct gve_priv *priv); + int (*request_db_info)(struct gve_priv *priv); + void (*release_db_resources)(struct gve_priv *priv); int (*get_ptype_map)(struct gve_priv *priv); int (*configure_rss)(struct gve_priv *priv, struct ethtool_rxfh_param *param); @@ -1164,6 +1169,11 @@ static inline u32 gve_rx_idx_to_ntfy(struct gve_priv= *priv, u32 queue_idx) return (priv->num_ntfy_blks / 2) + queue_idx; } =20 +static inline u32 gve_ntfy_to_msix_idx(struct gve_priv *priv, u32 ntfy_blk= _idx) +{ + return ntfy_blk_idx; +} + static inline bool gve_is_qpl(struct gve_priv *priv) { return priv->queue_format =3D=3D GVE_GQI_QPL_FORMAT || diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 1176e13fafc0..b89825a85db8 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1718,3 +1718,40 @@ void gve_adminq_unmap_db_bar(struct gve_priv *priv) =20 pci_iounmap(pdev, priv->db_bar2); } + +int gve_adminq_request_db_info(struct gve_priv *priv) +{ + int err; + int i; + + err =3D gve_adminq_configure_device_resources(priv, + priv->counter_array_bus, + priv->num_event_counters, + priv->irq_db_indices_bus, + priv->num_ntfy_blks); + if (unlikely(err)) { + dev_err(&priv->pdev->dev, + "could not setup device_resources: err=3D%d\n", err); + return -ENXIO; + } + + for (i =3D 0; i < priv->num_ntfy_blks; i++) + priv->ntfy_blocks[i].irq_db_index =3D + &priv->irq_db_indices[i].index; + return 0; +} + +void gve_adminq_release_db_resources(struct gve_priv *priv) +{ + int err; + + /* Log error in deconfigure device, but don't fail. This is only ever + * called as a reset is about to be triggered, so it would be redundant + * to trigger a reset. + */ + err =3D gve_adminq_deconfigure_device_resources(priv); + if (err) + dev_err(&priv->pdev->dev, + "Could not deconfigure device resources: err=3D%d\n", + err); +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 5e51c060e237..52172bf228eb 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -657,4 +657,6 @@ int gve_adminq_set_num_ntfy_blks(struct gve_priv *priv); void gve_adminq_set_num_queues(struct gve_priv *priv); int gve_adminq_map_db_bar(struct gve_priv *priv); void gve_adminq_unmap_db_bar(struct gve_priv *priv); +int gve_adminq_request_db_info(struct gve_priv *priv); +void gve_adminq_release_db_resources(struct gve_priv *priv); #endif /* _GVE_ADMINQ_H */ diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index d2f974a0cc87..84efcdea6be9 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -203,6 +203,30 @@ static void gve_free_counter_array(struct gve_priv *pr= iv) priv->counter_array =3D NULL; } =20 +static int gve_alloc_irq_db_indices(struct gve_priv *priv) +{ + priv->irq_db_indices =3D + dma_alloc_coherent(&priv->pdev->dev, + priv->num_ntfy_blks * + sizeof(*priv->irq_db_indices), + &priv->irq_db_indices_bus, GFP_KERNEL); + if (!priv->irq_db_indices) + return -ENOMEM; + + return 0; +} + +static void gve_free_irq_db_indices(struct gve_priv *priv) +{ + if (!priv->irq_db_indices) + return; + + dma_free_coherent(&priv->pdev->dev, priv->num_ntfy_blks * + sizeof(*priv->irq_db_indices), + priv->irq_db_indices, priv->irq_db_indices_bus); + priv->irq_db_indices =3D NULL; +} + /* NIC requests to report stats */ static void gve_stats_report_task(struct work_struct *work) { @@ -431,15 +455,6 @@ int gve_napi_poll_dqo(struct napi_struct *napi, int bu= dget) static void gve_free_notify_blocks(struct gve_priv *priv) { pci_disable_msix(priv->pdev); - if (priv->irq_db_indices) { - dma_free_coherent(&priv->pdev->dev, - priv->num_ntfy_blks * - sizeof(*priv->irq_db_indices), - priv->irq_db_indices, - priv->irq_db_indices_bus); - priv->irq_db_indices =3D NULL; - } - kvfree(priv->ntfy_blocks); priv->ntfy_blocks =3D NULL; kvfree(priv->msix_vectors); @@ -496,24 +511,14 @@ static int gve_alloc_notify_blocks(struct gve_priv *p= riv) priv->rx_cfg.num_queues =3D priv->rx_cfg.max_queues; } =20 - priv->irq_db_indices =3D - dma_alloc_coherent(&priv->pdev->dev, - priv->num_ntfy_blks * - sizeof(*priv->irq_db_indices), - &priv->irq_db_indices_bus, GFP_KERNEL); - if (!priv->irq_db_indices) { - err =3D -ENOMEM; - goto abort; - } - priv->ntfy_blocks =3D kvzalloc(priv->num_ntfy_blks * sizeof(*priv->ntfy_blocks), GFP_KERNEL); if (!priv->ntfy_blocks) { err =3D -ENOMEM; goto abort; } - return 0; =20 + return 0; abort: gve_free_notify_blocks(priv); return err; @@ -528,13 +533,14 @@ static void gve_teardown_notify_blocks(struct gve_pri= v *priv) =20 for (i =3D 0; i < priv->num_ntfy_blks; i++) { struct gve_notify_block *block =3D &priv->ntfy_blocks[i]; + int msix_idx =3D gve_ntfy_to_msix_idx(priv, i); =20 if (!block->irq_requested) continue; =20 - irq_set_affinity_hint(priv->msix_vectors[i].vector, + irq_set_affinity_hint(priv->msix_vectors[msix_idx].vector, NULL); - free_irq(priv->msix_vectors[i].vector, block); + free_irq(priv->msix_vectors[msix_idx].vector, block); block->irq =3D 0; block->irq_requested =3D false; } @@ -563,12 +569,11 @@ static int gve_setup_notify_blocks(struct gve_priv *p= riv) } priv->mgmt_irq_requested =3D true; =20 - /* Setup the other blocks - the first n-1 vectors */ node_mask =3D gve_get_node_mask(priv); cur_cpu =3D cpumask_first(node_mask); for (i =3D 0; i < priv->num_ntfy_blks; i++) { struct gve_notify_block *block =3D &priv->ntfy_blocks[i]; - int msix_idx =3D i; + int msix_idx =3D gve_ntfy_to_msix_idx(priv, i); =20 snprintf(block->name, sizeof(block->name), "gve-ntfy-blk%d@pci:%s", i, pci_name(priv->pdev)); @@ -578,14 +583,13 @@ static int gve_setup_notify_blocks(struct gve_priv *p= riv) IRQF_NO_AUTOEN, block->name, block); if (err) { dev_err(&priv->pdev->dev, - "Failed to receive msix vector %d\n", i); + "Failed to receive msix vector %d\n", msix_idx); goto abort; } block->irq =3D priv->msix_vectors[msix_idx].vector; block->irq_requested =3D true; irq_set_affinity_and_hint(block->irq, cpumask_of(cur_cpu)); - block->irq_db_index =3D &priv->irq_db_indices[i].index; =20 cur_cpu =3D cpumask_next(cur_cpu, node_mask); /* Wrap once CPUs in the node have been exhausted, or when @@ -602,7 +606,6 @@ static int gve_setup_notify_blocks(struct gve_priv *pri= v) return err; } =20 - static void gve_free_control_plane_resources(struct gve_priv *priv) { bitmap_free(priv->xsk_pools); @@ -611,9 +614,10 @@ static void gve_free_control_plane_resources(struct gv= e_priv *priv) kvfree(priv->ptype_lut_dqo); priv->ptype_lut_dqo =3D NULL; =20 - gve_free_stats_report(priv); - gve_free_notify_blocks(priv); + gve_free_irq_db_indices(priv); gve_free_counter_array(priv); + gve_free_notify_blocks(priv); + gve_free_stats_report(priv); gve_free_rss_config_cache(priv); gve_free_flow_rule_caches(priv); } @@ -626,15 +630,18 @@ static int gve_alloc_control_plane_resources(struct g= ve_priv *priv) if (err) return err; err =3D gve_alloc_rss_config_cache(priv); - if (err) - goto abort; - err =3D gve_alloc_counter_array(priv); if (err) goto abort; err =3D gve_alloc_notify_blocks(priv); if (err) goto abort; err =3D gve_alloc_stats_report(priv); + if (err) + goto abort; + err =3D gve_alloc_counter_array(priv); + if (err) + goto abort; + err =3D gve_alloc_irq_db_indices(priv); if (err) goto abort; =20 @@ -664,15 +671,9 @@ static int gve_setup_control_plane_resources(struct gv= e_priv *priv) const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; int err; =20 - err =3D gve_adminq_configure_device_resources(priv, - priv->counter_array_bus, - priv->num_event_counters, - priv->irq_db_indices_bus, - priv->num_ntfy_blks); - if (unlikely(err)) { - dev_err(&priv->pdev->dev, - "could not setup device_resources: err=3D%d\n", err); - err =3D -ENXIO; + err =3D ops->request_db_info(priv); + if (err) { + dev_err(&priv->pdev->dev, "Failed to get db info"); return err; } =20 @@ -681,7 +682,7 @@ static int gve_setup_control_plane_resources(struct gve= _priv *priv) if (err) { dev_err(&priv->pdev->dev, "Failed to get ptype map: err=3D%d\n", err); - goto deconfigure_device; + goto release_db_resources; } } =20 @@ -711,8 +712,8 @@ static int gve_setup_control_plane_resources(struct gve= _priv *priv) =20 teardown_clock: gve_teardown_clock(priv); -deconfigure_device: - gve_adminq_deconfigure_device_resources(priv); +release_db_resources: + ops->release_db_resources(priv); return err; } =20 @@ -745,12 +746,7 @@ static void gve_teardown_control_plane_resources(struc= t gve_priv *priv) dev_err(&priv->pdev->dev, "Failed to detach stats report: err=3D%d\n", err); gve_teardown_clock(priv); - - err =3D gve_adminq_deconfigure_device_resources(priv); - if (err) - dev_err(&priv->pdev->dev, - "Could not deconfigure device resources: err=3D%d\n", - err); + ops->release_db_resources(priv); } =20 gve_clear_device_resources_ok(priv); @@ -2502,6 +2498,8 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D { .reset_flow_rules =3D gve_adminq_reset_flow_rules, .setup_stats_report =3D gve_adminq_report_stats, .configure_rss =3D gve_adminq_configure_rss, + .request_db_info =3D gve_adminq_request_db_info, + .release_db_resources =3D gve_adminq_release_db_resources, }; =20 static int gve_init_priv(struct gve_priv *priv) --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2C965540A1 for ; Wed, 9 Sep 2026 19:11:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981113; cv=none; b=VvFcX0sohR55JnsxfMP+1cvqK0WLm4J7h+VzX2aCpRgwYE+0YCQ1kB3UGrWKh8DSTRVA+hdZt0NvSIBELcRy55LDUAd1laGzYeWD8b/zb+SH+Zpsj9IqhVvyFN77kpmvLmuZ4lOOMDwd2hxyGmNz9KpSvUzZxC/5lDM8f3wBtfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981113; c=relaxed/simple; bh=AcENafcDiTZP0n259Q8//HEAgEabE68i/MJGsM6Vyks=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Gmnlaii0Fa8jok4xa95PmyNJeGHeptHToIsf7NqDN0iNVakAUTHvkiuLzZAwnQEjshzosAxVGOpXdoOstHq++YRYZ2aOk1Ha6SCW8Aa6IL/Dt8a43G4R8BlC1SAywy010Fx1i3xALk8k9DjgkM+f//mNO1ivg0J8UErMs6K2oks= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LDvBOJuY; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LDvBOJuY" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-38e8e864ef0so10883832a91.0 for ; Wed, 09 Sep 2026 12:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981107; x=1789585907; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=RRTWKGMES+1AC/FpM+C1+0inOvt7Elo1ZARglMXx7Dc=; b=LDvBOJuYCE6TE8ooXKr3naD+Q7JCDvQrFMYaPZAV/wRlTXxQO8wgAreDbhhKPlP0SK EV/k1hQL1a6+7RWUsAmmOXSXiFXvgmLHHv+I9q/68H9ov3qWhtgso6wOQcSLR/VZEiB4 Wx8zqsRfHtVI8ozCjF6dGteBlOZGNhCYeR/mE5tli71jR6OgiQ9Ry3fjlrF+rPyE/jYJ dFoS8M4ooEY6JIGu/9pbvj7qdlA7fPk9GgpwIG1F1MFzvlizF+E9v5s6s4LX2qJwcGkn 6T+NEz9B4QNliRmdVR8FMRfgVX3Gf2mt2DR1s60i9ioWRAivSQUXDoZl12764KwM1vgH /ktQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981107; x=1789585907; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RRTWKGMES+1AC/FpM+C1+0inOvt7Elo1ZARglMXx7Dc=; b=X62lq0b2oz2dQ/07pjksAtAFyqNNsAgTuBsRRpBo0UcPaah/L0QsCWKVilVDavZwWX DDMrhC4Ey9MaotxE0BiowaaPeCW6zXpDAoP0a9FnItS/Zi8FvWxHDHYl3ofWkurFwQU2 HX8Pdxm+DG3PX5NI7CiZ0n8QzYlFJqKTupRlTsAIjEDLXvdGiDX5J+AtPz9+Ql70AKOV 4JTeQfdDTDhQSZyAVNtxZmwY3kdeBIWXXsN72N7Rkx1Buct+v6B2jFOkgk45Fg+s5ZxH SmXf6NyEvaHoVwLmboXZQDsWhhVd1Dktj522nI1hYXiMZ1wJYFUeQPkKvW50K2/eoEnK ePEw== X-Forwarded-Encrypted: i=1; AKwUvBz3K2DU1kXOdbGrPgMoHE+ab2Z4L3ORpqTV8sN1FH3CSnoLCfSe/U3vPjgL6/QrmVBLyZegnCTECG77i40=@vger.kernel.org X-Gm-Message-State: AFuF++l3MIZJuSi8DXJjVqJZ0ogwl/eanIT/EwF2U32NC5O4uvBVMZlG dsEq2ec0rqMlaQSittGQnH6KM++oHrS9SLvWF8E8YAA3OsT3i4T4bIU8Bevs7TL7S9x7/6tu1v4 gGQXQquq1Lf4pdQkcMWBxPWhudQ== X-Received: from pjyo18.prod.google.com ([2002:a17:90a:eb92:b0:39b:6595:d1ac]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3851:b0:396:40e6:f631 with SMTP id 98e67ed59e1d1-39bac1389e1mr10557621a91.3.1788981106645; Wed, 09 Sep 2026 12:11:46 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:33 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-11-hramamurthy@google.com> Subject: [PATCH net-next v6 10/12] gve: setup and teardown management interrupts From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington Introduce control ops to setup/teardown control plane IRQs. Admin queue-specific functionality is moved to admin queue files. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 4 +++ drivers/net/ethernet/google/gve/gve_adminq.c | 36 ++++++++++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 ++ drivers/net/ethernet/google/gve/gve_main.c | 32 +++++------------ 4 files changed, 51 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 6c46c842070b..016e85ed91a5 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -837,6 +837,8 @@ struct gve_device_info { * @request_db_info: Request and store doorbell information into @priv * @release_db_resources: Release device hold on DMA memory holding doorbe= ll * info (AdminQ only) + * @setup_mgmt_irq: Setup control plane IRQ + * @teardown_mgmt_irq: Teardown control plane IRQ * @get_ptype_map: Learn packet type map from device and store it in @priv * @configure_rss: Set up default RSS configuration * @setup_stats_report: Set up DMA region for stats report (AdminQ only) @@ -849,6 +851,8 @@ struct gve_ctrl_ops { int (*set_num_ntfy_blks)(struct gve_priv *priv); int (*request_db_info)(struct gve_priv *priv); void (*release_db_resources)(struct gve_priv *priv); + int (*setup_mgmt_irq)(struct gve_priv *priv); + void (*teardown_mgmt_irq)(struct gve_priv *priv); int (*get_ptype_map)(struct gve_priv *priv); int (*configure_rss)(struct gve_priv *priv, struct ethtool_rxfh_param *param); diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index b89825a85db8..c3c10d5062f5 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1755,3 +1755,39 @@ void gve_adminq_release_db_resources(struct gve_priv= *priv) "Could not deconfigure device resources: err=3D%d\n", err); } + +static irqreturn_t gve_mgmnt_intr(int irq, void *arg) +{ + struct gve_priv *priv =3D arg; + + /* Device resources are not okay; consider the interrupt spurious. */ + if (!gve_get_device_resources_ok(priv)) + return IRQ_NONE; + + queue_work(priv->gve_wq, &priv->service_task); + return IRQ_HANDLED; +} + +int gve_adminq_setup_mgmt_irq(struct gve_priv *priv) +{ + int err; + + snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), + "gve-mgmnt@pci:%s", pci_name(priv->pdev)); + err =3D request_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, + gve_mgmnt_intr, 0, priv->mgmt_msix_name, priv); + if (err) + return err; + + priv->mgmt_irq_requested =3D true; + + return 0; +} + +void gve_adminq_teardown_mgmt_irq(struct gve_priv *priv) +{ + if (priv->mgmt_irq_requested) { + free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv); + priv->mgmt_irq_requested =3D false; + } +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 52172bf228eb..0b48e9f2a82a 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -659,4 +659,6 @@ int gve_adminq_map_db_bar(struct gve_priv *priv); void gve_adminq_unmap_db_bar(struct gve_priv *priv); int gve_adminq_request_db_info(struct gve_priv *priv); void gve_adminq_release_db_resources(struct gve_priv *priv); +int gve_adminq_setup_mgmt_irq(struct gve_priv *priv); +void gve_adminq_teardown_mgmt_irq(struct gve_priv *priv); #endif /* _GVE_ADMINQ_H */ diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 84efcdea6be9..e7ebc4e0f24b 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -290,18 +290,6 @@ static void gve_free_stats_report(struct gve_priv *pri= v) priv->stats_report =3D NULL; } =20 -static irqreturn_t gve_mgmnt_intr(int irq, void *arg) -{ - struct gve_priv *priv =3D arg; - - /* Device resources are not okay; consider the interrupt spurious. */ - if (!gve_get_device_resources_ok(priv)) - return IRQ_NONE; - - queue_work(priv->gve_wq, &priv->service_task); - return IRQ_HANDLED; -} - static irqreturn_t gve_intr(int irq, void *arg) { struct gve_notify_block *block =3D arg; @@ -526,6 +514,7 @@ static int gve_alloc_notify_blocks(struct gve_priv *pri= v) =20 static void gve_teardown_notify_blocks(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; int i; =20 if (!priv->ntfy_blocks) @@ -545,29 +534,24 @@ static void gve_teardown_notify_blocks(struct gve_pri= v *priv) block->irq_requested =3D false; } =20 - if (priv->mgmt_irq_requested) { - free_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, priv); - priv->mgmt_irq_requested =3D false; - } + ops->teardown_mgmt_irq(priv); } =20 static int gve_setup_notify_blocks(struct gve_priv *priv) { + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; const struct cpumask *node_mask; unsigned int cur_cpu; int i; int err; =20 - /* Setup Management Vector - the last vector */ - snprintf(priv->mgmt_msix_name, sizeof(priv->mgmt_msix_name), - "gve-mgmnt@pci:%s", pci_name(priv->pdev)); - err =3D request_irq(priv->msix_vectors[priv->mgmt_msix_idx].vector, - gve_mgmnt_intr, 0, priv->mgmt_msix_name, priv); + /* Setup Management Vector */ + err =3D ops->setup_mgmt_irq(priv); if (err) { - dev_err(&priv->pdev->dev, "Did not receive management vector.\n"); + dev_err(&priv->pdev->dev, + "Did not receive management vector.\n"); return err; } - priv->mgmt_irq_requested =3D true; =20 node_mask =3D gve_get_node_mask(priv); cur_cpu =3D cpumask_first(node_mask); @@ -2500,6 +2484,8 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D { .configure_rss =3D gve_adminq_configure_rss, .request_db_info =3D gve_adminq_request_db_info, .release_db_resources =3D gve_adminq_release_db_resources, + .setup_mgmt_irq =3D gve_adminq_setup_mgmt_irq, + .teardown_mgmt_irq =3D gve_adminq_teardown_mgmt_irq, }; =20 static int gve_init_priv(struct gve_priv *priv) --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1D9455408F for ; Wed, 9 Sep 2026 19:11:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981114; cv=none; b=HraYwb/8ZUxBvz4GoFDhDPbaoO/F1QNruOmLfw9c3bqDciGZsC+NhEGQa8EP0Yp2m5S6tOh8WqwtGyHQIfgks8TljfhZVqHjbjILKpR0a54DYX+vay2yguI+uqPAxuknqMsUJVInmcux2p75bDEtImWaX4tphndh9eDP9RRanJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981114; c=relaxed/simple; bh=6CaPKQc7QmcX96WwtnTad/J7uxd9cHkleOtxz6VENEg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hGmDsHB802NId8tDgkBa0KSGslp1g5bD/YnQlge2O/iWmM5C/OS57Xw5O8eXba2D1Fv6Rpe+XJ4inKe40wha5JtUypAK6dgh1DiMzswrzN//j088Iht/Zg8Ahea2CxPzY07e9h/erNGwCuV1xUfdqSb8zE1qICtm2l3TLlTke4w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uQukNyRH; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uQukNyRH" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-398e1f7d1a5so3746781a91.0 for ; Wed, 09 Sep 2026 12:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981108; x=1789585908; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=C2wRjNyXR6pE/D87MnbzZFeOwFTH0/V5+5+ZnMyd8uc=; b=uQukNyRH9/m9L8mWd5dU3y0EAUUnntBARJy2N+wsP0yZHM5Okpo7XUNm4+EATS1y5n JWknAMukPOv56GU7J+gr07+g55Z2uMS6LYfsEwnZ8T9cfQofyrOwULQFgCa5gx7M9BaB 8zBJcmx5DPJCckf3HL77CRdDLyCYHPaKWOVInifU3EzBA2V2J1UilqTrOrmCHxieN/1S n0mTC0yQOd9n7ijsClgX8FRc7MwE8JC/26bkbsR6Nmsny7zlpFSjhY2txmTIHe5UZvkq LlQ2EWGwAp81RtlFpDo2HcjHd4f3jdnwhjrYsPKmAdgynCdKYGTh5UMuBiAqy0B23oqg SM5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981108; x=1789585908; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C2wRjNyXR6pE/D87MnbzZFeOwFTH0/V5+5+ZnMyd8uc=; b=p7V6oQTkJ0DRr/+UeDPCmF46+K8cOMODiisjhcivLxyL856i+/pBgh3WheM5nZb+I5 rN+5lgz0NADsNRcWVWW4C0wzF+Att1SuQkl5iz1IschWKiIpc7Bx67Yz0C9JdMjRvdks xQ7TclXdZ+1zD8P3gPzDgXGt4XIYY3bmbbbgr6GMmkuvUNzKpCGqr76dFN2PdhyxqrFG aiZXLmWZlFKuHu84HwbxfTKk+MtBggldZ57v2UQ/JAoUuuKZEDFGeHbSys410ToU8Pxw BfdOvFlT70Ztg49uXEtiegq53L7PXhy//8w3wjA2XHhWqnjG5YSGaAJ6b4C9zx6QruwI lXrg== X-Forwarded-Encrypted: i=1; AKwUvByE5w4rwHrfXnZcf2PdCVZl6VDtlHVOegfRVLaFeIcRLte2tkcm7rmue+AUx7L5YDIPz5mLfUuK5d39rws=@vger.kernel.org X-Gm-Message-State: AFuF++l3uut9xnd4YsCdhIXOpqWSAZ5ZRq6WsDIkSgsWLp0beP2h7y+z 3xvBWJ7x0IgT7I2Jz6GNBxEGGQpCblEJ3fGGV1ic9iDzKabKIRZyf+MM/8oAvj7mgzi+tkkgLsq viwoDOi/C7VYTDJ+jGFTCLJJ1aA== X-Received: from pjbfs22.prod.google.com ([2002:a17:90a:f296:b0:39d:627d:6bfc]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:fc47:b0:398:9c0c:7c72 with SMTP id 98e67ed59e1d1-39b2627fe24mr51602245a91.25.1788981107456; Wed, 09 Sep 2026 12:11:47 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:34 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-12-hramamurthy@google.com> Subject: [PATCH net-next v6 11/12] gve: add ctrl ops for queue operations From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the next few control ops to - create queues - destroy queues These changes are just moving existing code into ops, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Harshitha Ramamurthy --- v6: - drop unintentional change of gve_priv from const to non-const v5: - remove double logging during queue creation/destruction on err also (Sash= iko) drivers/net/ethernet/google/gve/gve.h | 4 ++ drivers/net/ethernet/google/gve/gve_adminq.c | 50 ++++++++++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 43 +++-------------- 4 files changed, 63 insertions(+), 36 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 016e85ed91a5..00966b6a730f 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -843,6 +843,8 @@ struct gve_device_info { * @configure_rss: Set up default RSS configuration * @setup_stats_report: Set up DMA region for stats report (AdminQ only) * @reset_flow_rules: Flush all flow rules from device + * @create_queues: Sends commands to the device to create TX/RX queues. + * @destroy_queues: Sends commands to the device to destroy TX/RX queues. */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); @@ -861,6 +863,8 @@ struct gve_ctrl_ops { dma_addr_t stats_report_addr, u64 interval_ms); /* AQ-specific */ int (*reset_flow_rules)(struct gve_priv *priv); + int (*create_queues)(struct gve_priv *priv); + int (*destroy_queues)(struct gve_priv *priv); }; =20 struct gve_priv { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index c3c10d5062f5..9a0a94ebdcd8 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -943,6 +943,30 @@ static void gve_set_default_rss_sizes(struct gve_priv = *priv) } } =20 +int gve_adminq_destroy_queues(struct gve_priv *priv) +{ + int num_tx_queues =3D gve_num_tx_queues(priv); + int err; + + err =3D gve_adminq_destroy_tx_queues(priv, 0, num_tx_queues); + if (err) { + netif_err(priv, drv, priv->dev, + "failed to destroy tx queues\n"); + /* This failure will trigger a reset - no need to clean up */ + return err; + } + netif_dbg(priv, drv, priv->dev, "destroyed tx queues\n"); + err =3D gve_adminq_destroy_rx_queues(priv, priv->rx_cfg.num_queues); + if (err) { + netif_err(priv, drv, priv->dev, + "failed to destroy rx queues\n"); + /* This failure will trigger a reset - no need to clean up */ + return err; + } + netif_dbg(priv, drv, priv->dev, "destroyed rx queues\n"); + return err; +} + static void gve_enable_supported_features(struct gve_priv *priv, u32 supported_features_mask, const struct gve_device_option_jumbo_frames @@ -1791,3 +1815,29 @@ void gve_adminq_teardown_mgmt_irq(struct gve_priv *p= riv) priv->mgmt_irq_requested =3D false; } } + +int gve_adminq_create_queues(struct gve_priv *priv) +{ + int num_tx_queues =3D gve_num_tx_queues(priv); + int err; + + err =3D gve_adminq_create_tx_queues(priv, 0, num_tx_queues); + if (err) { + netif_err(priv, drv, priv->dev, "failed to create %d tx queues\n", + num_tx_queues); + return err; + } + netif_dbg(priv, drv, priv->dev, "created %d tx queues\n", + num_tx_queues); + + err =3D gve_adminq_create_rx_queues(priv, priv->rx_cfg.num_queues); + if (err) { + netif_err(priv, drv, priv->dev, "failed to create %d rx queues\n", + priv->rx_cfg.num_queues); + return err; + } + netif_dbg(priv, drv, priv->dev, "created %d rx queues\n", + priv->rx_cfg.num_queues); + + return err; +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 0b48e9f2a82a..d696e4932a8b 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -628,6 +628,8 @@ int gve_adminq_configure_device_resources(struct gve_pr= iv *priv, dma_addr_t db_array_bus_addr, u32 num_ntfy_blks); int gve_adminq_deconfigure_device_resources(struct gve_priv *priv); +int gve_adminq_create_queues(struct gve_priv *priv); +int gve_adminq_destroy_queues(struct gve_priv *priv); int gve_adminq_create_tx_queues(struct gve_priv *priv, u32 start_id, u32 n= um_queues); int gve_adminq_destroy_tx_queues(struct gve_priv *priv, u32 start_id, u32 = num_queues); int gve_adminq_create_single_rx_queue(struct gve_priv *priv, u32 queue_ind= ex); diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index e7ebc4e0f24b..c9abb9681dca 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -873,33 +873,16 @@ static int gve_unregister_qpls(struct gve_priv *priv) =20 static int gve_create_rings(struct gve_priv *priv) { - int num_tx_queues =3D gve_num_tx_queues(priv); int err; int i; =20 - err =3D gve_adminq_create_tx_queues(priv, 0, num_tx_queues); + err =3D priv->ctrl_ops->create_queues(priv); if (err) { - netif_err(priv, drv, priv->dev, "failed to create %d tx queues\n", - num_tx_queues); /* This failure will trigger a reset - no need to clean * up */ return err; } - netif_dbg(priv, drv, priv->dev, "created %d tx queues\n", - num_tx_queues); - - err =3D gve_adminq_create_rx_queues(priv, priv->rx_cfg.num_queues); - if (err) { - netif_err(priv, drv, priv->dev, "failed to create %d rx queues\n", - priv->rx_cfg.num_queues); - /* This failure will trigger a reset - no need to clean - * up - */ - return err; - } - netif_dbg(priv, drv, priv->dev, "created %d rx queues\n", - priv->rx_cfg.num_queues); =20 if (gve_is_gqi(priv)) { /* Rx data ring has been prefilled with packet buffers at queue @@ -1054,26 +1037,12 @@ static int gve_queues_mem_alloc(struct gve_priv *pr= iv, =20 static int gve_destroy_rings(struct gve_priv *priv) { - int num_tx_queues =3D gve_num_tx_queues(priv); int err; =20 - err =3D gve_adminq_destroy_tx_queues(priv, 0, num_tx_queues); - if (err) { - netif_err(priv, drv, priv->dev, - "failed to destroy tx queues\n"); - /* This failure will trigger a reset - no need to clean up */ - return err; - } - netif_dbg(priv, drv, priv->dev, "destroyed tx queues\n"); - err =3D gve_adminq_destroy_rx_queues(priv, priv->rx_cfg.num_queues); - if (err) { - netif_err(priv, drv, priv->dev, - "failed to destroy rx queues\n"); - /* This failure will trigger a reset - no need to clean up */ - return err; - } - netif_dbg(priv, drv, priv->dev, "destroyed rx queues\n"); - return 0; + err =3D priv->ctrl_ops->destroy_queues(priv); + + /* A failure will trigger a reset - no need to clean up */ + return err; } =20 static void gve_queues_mem_free(struct gve_priv *priv, @@ -2486,6 +2455,8 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D { .release_db_resources =3D gve_adminq_release_db_resources, .setup_mgmt_irq =3D gve_adminq_setup_mgmt_irq, .teardown_mgmt_irq =3D gve_adminq_teardown_mgmt_irq, + .create_queues =3D gve_adminq_create_queues, + .destroy_queues =3D gve_adminq_destroy_queues, }; =20 static int gve_init_priv(struct gve_priv *priv) --=20 2.55.0.979.g7e5102b832-goog From nobody Fri Sep 25 18:21:00 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E98F456B849 for ; Wed, 9 Sep 2026 19:11:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981116; cv=none; b=FaqANy07KJzZYbj1FD5tkIaQSvls+XEhzQReFaNmysEC0ilmBJ4z1+mfnRJS1Mnd5jSn7yLtBfD2fijm3Rw3v3RFcUSRF4z/2AyaAcH1bCdW3jSJt0bz9Is5KqcXHUX/zXCWpYbXEEncXp2EtBMZ13mZ23WGGjQp7keXzyuBBUY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981116; c=relaxed/simple; bh=VAniQhMzaC6SsX9ldWgZlcmfA3M/hOHrNtMTdXsLKEE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hka8DHQpQ/vQgz5iBZaedTnA1+ebWzZMQLt0tjuUo8LCz9cR2hgHI7++DNRWuQWDzr1Mh090fkzXUGzCJpLLYZ4b5KXDIt2HV64gzyVo5c4Vwnz1raZX2002OS8POBfeo8rdVVnu3FgczO/KExJnSMxcg6xMNIg0F6cUZ7f5Fpk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bxoDYH/N; arc=none smtp.client-ip=209.85.214.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bxoDYH/N" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2d94f086fedso86092885ad.1 for ; Wed, 09 Sep 2026 12:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981108; x=1789585908; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=cPFYtU/9RxAjn/jpxF9s2qsv43MfqLKklIHoDpf5Mpk=; b=bxoDYH/Ni/AGl3/X4jQ6g80znww38/GHG0ZfdCPjulRtQbsCm7WLiSPQzhSy0ogg7r ACuEPvdNjUUf0pH2DOvOfL0xCE+BE9Lb2Jmctq6V/12iwBVUZ73RQwAHR0EbSh6nfjVP IhKALaCHJBNvqf8L4AFc0DTQ+51lsKa/Gph7HDtccF3KVuVM+2BEWSbEo7r4dIaKYZhk Ac/+9ZnPG6gwLCH5jNiuPlBgF1qzwYVQIz/dt8tQzgywJhXYzet4Ns8KaWu5tV2K2QPt khDDnaH1Apb2m7J2EgwT5VP869X9CDCRs84Ba/30tOK2RSJ4ganitiuEstOJ2wb3NIh/ LYtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981108; x=1789585908; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cPFYtU/9RxAjn/jpxF9s2qsv43MfqLKklIHoDpf5Mpk=; b=SG/CeyR2gt9C1F4IKQxhE2DtmxYlQAjqFP0B1i224hug61jHq0NoU6C6X01/qxYIu3 AukENTxpVc62gnPRtXKdcQlq3fFtqbQS+ckcwFYOuFqioFnBA8wnnpuicmJl4dPmaQdq 0we0LqgnHNjyA0zS0hMPf+UPsNxd4GK5nZgKr7u6go2V6pFeXTNMg38PClq1pISZPuat xHjXjJsqqSE4996lnf/2fLsTOqywUFvXINtY5s1854+Sv5moOXYZyuNo/jtyK61rrpAk 1vRCjhevPpBFzErX6DIRbGvEhQpdRtZv/YehZ9lbtD3GIXl03xAqO2IBOTvgpa9Tee9i fHQg== X-Forwarded-Encrypted: i=1; AKwUvBw8FMScY8vkVdx1/TXf+y0dP/IqRxZFh+4PgHpA89tmUALvoveXaKPIgmRQJWFWPyWvPb6lR7lqZqvWk2o=@vger.kernel.org X-Gm-Message-State: AFuF++mLVm2d25oZI/aHe8JM1i0JS9VpBpYMn+qPe5hyudjaGU9q8E9D jhYlDcErbCT6YuxOHpEoj3q/5eCENSSisQ2Z1ViGXoHporYWjC6jlZalJEmvsp1/rC08wEyyLhN AJ/jOWuJSKYOzL22f9RnrgDvWhA== X-Received: from plhz2.prod.google.com ([2002:a17:902:d9c2:b0:2dc:ff56:3f4c]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:704:b0:2d8:f965:7e48 with SMTP id d9443c01a7336-2db1235b1fbmr326250635ad.1.1788981108306; Wed, 09 Sep 2026 12:11:48 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:35 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-13-hramamurthy@google.com> Subject: [PATCH net-next v6 12/12] gve: add link status/speed ctrl ops From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington Refactor link status check to use a control plane op. Introduce new op for retrieving the link status in AQ mode. This op reads the link status from the device status register and stores the value in priv. Also add an op for retrieving link speed in AQ mode which calls into gve_adminq_report_link_speed. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- v3: - Fix kdoc typo ("set link status" -> "set link speed") - Copy link status into local variable instead of reading twice to prevent TOCTOU issue drivers/net/ethernet/google/gve/gve.h | 5 ++++ drivers/net/ethernet/google/gve/gve_adminq.c | 10 +++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 1 + drivers/net/ethernet/google/gve/gve_ethtool.c | 3 +-- drivers/net/ethernet/google/gve/gve_main.c | 26 ++++++++++++------- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 00966b6a730f..b7ce6e8632db 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -845,6 +845,8 @@ struct gve_device_info { * @reset_flow_rules: Flush all flow rules from device * @create_queues: Sends commands to the device to create TX/RX queues. * @destroy_queues: Sends commands to the device to destroy TX/RX queues. + * @report_link_status: Set link status into @priv->link_up + * @report_link_speed: Set link speed into @priv->link_speed */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); @@ -865,6 +867,8 @@ struct gve_ctrl_ops { int (*reset_flow_rules)(struct gve_priv *priv); int (*create_queues)(struct gve_priv *priv); int (*destroy_queues)(struct gve_priv *priv); + int (*report_link_status)(struct gve_priv *priv); + int (*report_link_speed)(struct gve_priv *priv); }; =20 struct gve_priv { @@ -966,6 +970,7 @@ struct gve_priv { =20 /* Gvnic device link speed from hypervisor. */ u64 link_speed; + bool link_up; bool up_before_suspend; /* True if dev was up before suspend */ =20 bool mgmt_irq_requested; diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 9a0a94ebdcd8..ed64f298e80d 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1841,3 +1841,13 @@ int gve_adminq_create_queues(struct gve_priv *priv) =20 return err; } + +int gve_adminq_report_link_status(struct gve_priv *priv) +{ + u32 status; + + status =3D ioread32be(&priv->reg_bar0->device_status); + WRITE_ONCE(priv->link_up, + !!(GVE_DEVICE_STATUS_LINK_STATUS_MASK & status)); + return 0; +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index d696e4932a8b..8daac5fd685a 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -643,6 +643,7 @@ int gve_adminq_report_stats(struct gve_priv *priv, u64 = stats_report_len, dma_addr_t stats_report_addr, u64 interval); int gve_adminq_verify_driver_compatibility(struct gve_priv *priv); int gve_adminq_get_device_properties(struct gve_priv *priv); +int gve_adminq_report_link_status(struct gve_priv *priv); int gve_adminq_report_link_speed(struct gve_priv *priv); int gve_adminq_add_flow_rule(struct gve_priv *priv, struct gve_adminq_flow= _rule *rule, u32 loc); int gve_adminq_del_flow_rule(struct gve_priv *priv, u32 loc); diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/et= hernet/google/gve/gve_ethtool.c index dd1c44fedc77..a3220c651438 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -749,12 +749,11 @@ static int gve_get_link_ksettings(struct net_device *= netdev, int err =3D 0; =20 if (priv->link_speed =3D=3D 0) - err =3D gve_adminq_report_link_speed(priv); + err =3D priv->ctrl_ops->report_link_speed(priv); =20 cmd->base.speed =3D priv->link_speed; =20 cmd->base.duplex =3D DUPLEX_FULL; - return err; } =20 diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index c9abb9681dca..cc65986276be 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1501,15 +1501,18 @@ static int gve_close(struct net_device *dev) return err; } =20 -static void gve_handle_link_status(struct gve_priv *priv, bool link_status) +static void gve_handle_link_status(struct gve_priv *priv) { + bool link_up; + if (!gve_get_napi_enabled(priv)) return; =20 - if (link_status =3D=3D netif_carrier_ok(priv->dev)) + link_up =3D READ_ONCE(priv->link_up); + if (link_up =3D=3D netif_carrier_ok(priv->dev)) return; =20 - if (link_status) { + if (link_up) { netdev_info(priv->dev, "Device link is up.\n"); netif_carrier_on(priv->dev); } else { @@ -1536,7 +1539,6 @@ static int gve_set_xdp(struct gve_priv *priv, struct = bpf_prog *prog, { struct bpf_prog *old_prog; int err =3D 0; - u32 status; =20 old_prog =3D READ_ONCE(priv->xdp_prog); if (!netif_running(priv->dev)) { @@ -1563,8 +1565,8 @@ static int gve_set_xdp(struct gve_priv *priv, struct = bpf_prog *prog, bpf_prog_put(old_prog); =20 out: - status =3D ioread32be(&priv->reg_bar0->device_status); - gve_handle_link_status(priv, GVE_DEVICE_STATUS_LINK_STATUS_MASK & status); + priv->ctrl_ops->report_link_status(priv); + gve_handle_link_status(priv); return err; } =20 @@ -1997,11 +1999,11 @@ static void gve_turnup(struct gve_priv *priv) =20 static void gve_turnup_and_check_status(struct gve_priv *priv) { - u32 status; + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; =20 gve_turnup(priv); - status =3D ioread32be(&priv->reg_bar0->device_status); - gve_handle_link_status(priv, GVE_DEVICE_STATUS_LINK_STATUS_MASK & status); + ops->report_link_status(priv); + gve_handle_link_status(priv); } =20 static struct gve_notify_block *gve_get_tx_notify_block(struct gve_priv *p= riv, @@ -2325,12 +2327,14 @@ static void gve_service_task(struct work_struct *wo= rk) { struct gve_priv *priv =3D container_of(work, struct gve_priv, service_task); + const struct gve_ctrl_ops *ops =3D priv->ctrl_ops; u32 status =3D ioread32be(&priv->reg_bar0->device_status); =20 gve_handle_status(priv, status); =20 gve_handle_reset(priv); - gve_handle_link_status(priv, GVE_DEVICE_STATUS_LINK_STATUS_MASK & status); + ops->report_link_status(priv); + gve_handle_link_status(priv); } =20 static void gve_set_netdev_xdp_features(struct gve_priv *priv) @@ -2457,6 +2461,8 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D { .teardown_mgmt_irq =3D gve_adminq_teardown_mgmt_irq, .create_queues =3D gve_adminq_create_queues, .destroy_queues =3D gve_adminq_destroy_queues, + .report_link_status =3D gve_adminq_report_link_status, + .report_link_speed =3D gve_adminq_report_link_speed, }; =20 static int gve_init_priv(struct gve_priv *priv) --=20 2.55.0.979.g7e5102b832-goog