From mboxrd@z Thu Jan 1 00:00:00 1970 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 CC6EA3D7A07 for ; Fri, 14 Aug 2026 02:14:30 +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=1786673674; cv=none; b=kncTw8jrEXLilQ2VoEmJ4/Knr+nEqONIdwA4zooR7+vo/UwXmz69N5C6F47WTrZrfOHXbESfShdtC/zuqKery4RcwdR2Xlu/SeSrkJMqtZmDHibPTkRxt81uBKej8yNor9YDvRU8mNaVd9SZiempJGTOU7y9TSBVXmkQryItUEk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786673674; c=relaxed/simple; bh=EmphvCi+s1UDGXPBbLzBcgWs2hVl9aJcKqiFDG3KuJ4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=P5cK3t6CgRpJW7X+sNuYTSyUXnT4GXsmDYrzhAn/ww0G11dWwT+u7KUYSdiDjlbu7x/8AJeVZgIMWW6MCE7iFxUWuV5Vn929Bxw6Yxu2MTcxgf4M+t4lF/NdQhsDq/QVFFXSF2BC2odWUEaL9OVxAKLtj4yXQvEUUOoFyfpem4U= 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=UJLPuebU; 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="UJLPuebU" Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-c860544c077so862602a12.3 for ; Thu, 13 Aug 2026 19:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786673666; x=1787278466; 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=0HMc/YRCDvbRVhl+aqazRKv1duvJfUeYao3LfxxHRoU=; b=UJLPuebU2MMyvioVLKwaHInqUXXDUsvbqoBD6+nKJRuO8I0f+ywR2u8O7iJwHO8KTz xUt8+Jsq3q3hIfg4B/IV43/wInvkde0sqPESW5miuxCe2C97L/yEgk1A2szcANiw9C4Q CmgwKGYr49eJkCdY6ZJTbcNmaTbSeY9Bow2ySextvTtV2LjL1/BTt5AEAoNwscX9gAhY 12DDRvdHZSNCUv+3phRwYhyW0tuXsz8xxg4toYmqAdq50AQW+e4pOdrlrryWDXl0XQsl tXOEVftcODZnqPUeA/1wS1zViyfONEwlicWD8ZGLlTeyDyz3oDW+TSM8A9I/PDS5SB4k prLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786673666; x=1787278466; 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=0HMc/YRCDvbRVhl+aqazRKv1duvJfUeYao3LfxxHRoU=; b=eFMqKtHwhp8ZacnGkJRy2lMv+Y2kkaFkj4drcQc0iE0/t0RfzCnvDiQJT/7OKK0v4A JMxaJZHEyABPlcUqncdKO4zgeDxgUD5RWLM7zEXzSZ6lxKhG943iPxhK/mIH0mfF53fW tI1p3QESgIx3aPsuLh5/jJP10sDmRZQYyoVvPQGUNn2KN4hD4YDGRlq9sJQFurhSl9RP 1HQ1QkTYVMT7KMl4/5p6kS+a2a5ChJ+hSegjbRKEQC2iiBeywldFsbajl09Hb5sucomV Wb/Ui+SIL6rPgviyiqqcE0D7AuQrjai8btyPU9bID9IM52dwM5nvVRLPMaXkBZJAnBwO t0NQ== X-Forwarded-Encrypted: i=1; AHgh+Roh+SsIg49d+X8dXr4k1MPP6KdRklKA5fuCMcOreTfUZJuF5Ektu8lZpu0d8t3JOSNz9nbAG+xLR520XqM=@vger.kernel.org X-Gm-Message-State: AOJu0YxfYFn9fQ+h4jRphJWFPyK6WYKYxSz3EDBQXqhBQoSd2kcFFZCm M6R/j/2RB9sqTISPtbePXwWjrui+XF61SvTX5drNTprho31gz8gycgmS8buNMsDKBIVWIgIBvLo SopIMRI6NlfnKbGhUk3OQqbC/MA== X-Received: from pgbbg25.prod.google.com ([2002:a05:6a02:119:b0:c8b:2706:11a7]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4322:b0:3c3:a0cd:9d27 with SMTP id adf61e73a8af0-3cc71cd1487mr2382091637.26.1786673665596; Thu, 13 Aug 2026 19:14:25 -0700 (PDT) Date: Fri, 14 Aug 2026 02:13:58 +0000 In-Reply-To: <20260814021406.3044324-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: <20260814021406.3044324-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.691.gc56d675ccc-goog Message-ID: <20260814021406.3044324-9-hramamurthy@google.com> Subject: [PATCH net-next v4 08/15] 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, przemyslaw.kitszel@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 Signed-off-by: Harshitha Ramamurthy --- 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 | 146 ++++++++++--------- 4 files changed, 95 insertions(+), 67 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h index d6e7ab0649ac..143c666fcebd 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1255,6 +1255,8 @@ static inline bool gve_is_clock_enabled(struct gve_priv *priv) return priv->nic_ts_report; } +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); diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c index bdac2dd9b86a..fda752f09a66 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -296,8 +296,10 @@ gve_process_device_options(struct gve_priv *priv, return 0; } -int gve_adminq_alloc(struct device *dev, struct gve_priv *priv) +static int gve_adminq_alloc(struct gve_priv *priv) { + struct device *dev = &priv->pdev->dev; + priv->adminq_pool = dma_pool_create("adminq_pool", dev, GVE_ADMINQ_BUFFER_SIZE, 0, 0); if (unlikely(!priv->adminq_pool)) @@ -353,6 +355,14 @@ int gve_adminq_alloc(struct device *dev, struct gve_priv *priv) return 0; } +int gve_adminq_init(struct gve_priv *priv) +{ + struct gve_registers __iomem *reg_bar = 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 = 0; diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/ethernet/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 { static_assert(sizeof(union gve_adminq_command) == 64); -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/ethernet/google/gve/gve_main.c index 5cb22575fd93..eab5e9cf990a 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2416,6 +2416,35 @@ static void gve_set_buf_sizes(struct gve_priv *priv) priv->header_buf_size = device_info->header_buf_size; } +static int gve_setup_device(struct gve_priv *priv) +{ + int err; + + priv->num_registered_pages = 0; + + priv->xsk_pools = bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); + if (!priv->xsk_pools) { + err = -ENOMEM; + goto err; + } + + gve_set_netdev_xdp_features(priv); + if (!gve_is_gqi(priv)) + priv->dev->xdp_metadata_ops = &gve_xdp_metadata_ops; + + err = 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 = NULL; +err: + return err; +} + static const struct gve_ctrl_ops gve_adminq_ops = { .map_db_bar = gve_adminq_map_db_bar, .unmap_db_bar = gve_adminq_unmap_db_bar, @@ -2423,47 +2452,18 @@ static const struct gve_ctrl_ops gve_adminq_ops = { .set_num_ntfy_blks = gve_adminq_set_num_ntfy_blks, }; -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 = &priv->device_info; int err; - /* Set up the adminq */ - err = gve_adminq_alloc(&priv->pdev->dev, priv); - if (err) { - dev_err(&priv->pdev->dev, - "Failed to alloc admin queue: err=%d\n", err); - return err; - } - - err = gve_adminq_verify_driver_compatibility(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not verify driver compatibility: err=%d\n", err); - goto err; - } - - priv->num_registered_pages = 0; - - if (skip_describe_device) - goto setup_device; - - device_info->queue_format = GVE_QUEUE_FORMAT_UNSPECIFIED; - /* Get the initial information we need from the device */ - err = gve_adminq_describe_device(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not get device information: err=%d\n", err); - goto err; - } - priv->queue_format = priv->device_info.queue_format; err = priv->ctrl_ops->set_num_ntfy_blks(priv); if (err) { dev_err(&priv->pdev->dev, "Could not setup notify blocks: err=%d\n", err); - goto err; + return err; } priv->ctrl_ops->set_num_queues(priv); @@ -2486,10 +2486,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); } - if (gve_set_mtu(priv)) { - err = -EINVAL; - goto err; - } + if (gve_set_mtu(priv)) + return -EINVAL; priv->num_event_counters = device_info->num_event_counters; @@ -2514,30 +2512,7 @@ static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) priv->ts_config.tx_type = HWTSTAMP_TX_OFF; priv->ts_config.rx_filter = HWTSTAMP_FILTER_NONE; priv->nic_timestamp_supported = device_info->nic_timestamp_supported; - -setup_device: - priv->xsk_pools = bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); - if (!priv->xsk_pools) { - err = -ENOMEM; - goto err; - } - - gve_set_netdev_xdp_features(priv); - if (!gve_is_gqi(priv)) - priv->dev->xdp_metadata_ops = &gve_xdp_metadata_ops; - - err = 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 = NULL; -err: - gve_adminq_free(priv); - return err; } static void gve_teardown_priv_resources(struct gve_priv *priv) @@ -2567,15 +2542,32 @@ static int gve_reset_recovery(struct gve_priv *priv, bool was_up) { int err; - err = gve_init_priv(priv, true); - if (err) + err = gve_adminq_init(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Failed to alloc admin queue: err=%d\n", err); goto err; + } + + err = gve_adminq_verify_driver_compatibility(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not verify driver compatibility: err=%d\n", err); + goto err_free_adminq; + } + + err = gve_setup_device(priv); + if (err) + goto err_free_adminq; if (was_up) { err = 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); @@ -2618,7 +2610,7 @@ int gve_reset(struct gve_priv *priv, bool attempt_teardown) return err; } -static void gve_write_version(u8 __iomem *driver_version_register) +void gve_adminq_write_version(u8 __iomem *driver_version_register) { const char *c = gve_version_prefix; @@ -2851,7 +2843,6 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto abort_with_pci_region; } - gve_write_version(®_bar->driver_version); /* Get max queues to alloc etherdev */ max_tx_queues = ioread32be(®_bar->max_tx_queues); max_rx_queues = ioread32be(®_bar->max_rx_queues); @@ -2898,13 +2889,28 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) priv->rx_cfg.packet_buffer_size = GVE_DEFAULT_RX_BUFFER_SIZE; priv->max_rx_buffer_size = GVE_DEFAULT_RX_BUFFER_SIZE; + err = gve_adminq_init(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Failed to alloc admin queue: err=%d\n", err); + goto abort_with_netdev; + } + + priv->device_info.queue_format = GVE_QUEUE_FORMAT_UNSPECIFIED; + err = gve_adminq_get_device_properties(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not get device information: err=%d\n", err); + goto abort_with_adminq; + } + /* Set adminq ctrl ops */ priv->ctrl_ops = &gve_adminq_ops; err = priv->ctrl_ops->map_db_bar(priv); if (err) { err = -ENOMEM; - goto abort_with_netdev; + goto abort_with_adminq; } gve_set_probe_in_progress(priv); @@ -2919,10 +2925,17 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) priv->tx_cfg.max_queues = max_tx_queues; priv->rx_cfg.max_queues = max_rx_queues; - err = gve_init_priv(priv, false); + err = gve_init_priv(priv); if (err) goto abort_with_wq; + err = gve_setup_device(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not setup device: err=%d\n", err); + goto abort_with_wq; + } + if (!gve_is_gqi(priv) && !gve_is_qpl(priv)) dev->netmem_tx = NETMEM_TX_DMA; @@ -2945,6 +2958,9 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) abort_with_unmap_db_bar: priv->ctrl_ops->unmap_db_bar(priv); +abort_with_adminq: + gve_adminq_free(priv); + abort_with_netdev: free_netdev(dev); -- 2.55.0.691.gc56d675ccc-goog