From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 07AA43CFF66 for ; Tue, 2 Jun 2026 23:59:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444746; cv=none; b=E3o9RxQ/yB7iBCkJFUaDo4PzQYf0YyI6bOAhOfou1ceOmQTtKL8Z2UrgpmJx/rPBBKxMHEQTau8FPehgzcgbfzEEc/we7lLak+vwrzTuc7C9qKQVBT9C1hAU84QrIG6UqEriG78LokR1393a97CJqNYETrpiHHZLYTm7W4ncl3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444746; c=relaxed/simple; bh=Z8zc+t9FysG/A3238K7QuL+tz/0ZsCr4c3rTv316V70=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Z+8ZJR2+wLS4dtcbh11ClUPd1wml6uYUZ1ydpxozONq4k2arupj0ci98mc9Ng8mEAH7Wt6Q25pyWgog/RcDcADi40Hlx3IVJye92fnosWjGA+4ByYCdXA1SW/vnoGXnkqpU8/iHhxNx+UY+Locjk1sf9MsWO9VdW2ZSubRGkGQ8= 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=husRwNDD; arc=none smtp.client-ip=209.85.215.201 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="husRwNDD" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c8514f8ed5dso9092478a12.3 for ; Tue, 02 Jun 2026 16:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444743; x=1781049543; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=0hfnKBitry7RLyqz55UndF/vQw9Tta7wZyRyA2fbEyo=; b=husRwNDDwL6ig0MoCxA7CRrosjjFEPir7xzRBrhYaNTxtTwPASLKGr2FmdejP9TcRi fbdQvz1NzhMgVcYi0Nx4Gy2/aRYFM24qTObdN1OMmROqzSeZCEOKczMiy7oWZu1hCEjD WF9xn8sRjI0OO5c+lh39IOdhgzIND/a6lWtswLgThc4JuyAEx/axz1AkspVTVWjHnXiI BJtx0dmOxAbC69hztd+Zpl9MJ5oM7K4ZPvWhcEXV7swJumRaflX0SY2i3knpXo54G2ti KEm30bpWZUNE2ZsUmzWU1JyrX35Z23X4He7KnYm6idIDBddASwbG+CJIxQX4BJ6keMlu ofWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444743; x=1781049543; h=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; bh=0hfnKBitry7RLyqz55UndF/vQw9Tta7wZyRyA2fbEyo=; b=DCfewODdTz++hu9LYJ1l3+3rs1X79znx5CCwStqZQLJzWMW0TDY1EnNWt6RaghW/f3 B+Fga0XaQcb3qno3VRRk3l7ZLrg6CgprBBkWn6jiNPxKDdTeCil0DhQONSlhZDyHP3+W Dr3stoAp5LaDsgGaVg9DWlAROYRpU0ZkkxeTVAeQ0wUtYSqerx3RoosBiSPiVBFRPuhj zcqb7jJbV9A+mZgKCHSOLDQghc6yt3eiioKK1AKDAfjCFZmyI56dxtxSyxLHZuoamQe2 9zA9/e4mB18I4QWwtuJKO2mO5CWE5JKKkFZBcdSWErMBbxA74es1q9C4RkN2H+YhRYp8 mMbg== X-Forwarded-Encrypted: i=1; AFNElJ9sHjYhQA5LWQ1aMD4qd7RblLURSqu9YQnwVVFClk/8rd2m17b1oPWDQ3FAsRjRsV2aAK+vqq7W4xmI1+c=@vger.kernel.org X-Gm-Message-State: AOJu0YwZaUSt0tix5Prfbgz/Q/u9Y7xuw5sLShqYWiXn5e/hY+vu2ES1 2Q2GodbLgoAo5Ce4zglyTOHiZ3yXQEnsj3OhdOgZrsjdJ364X5qYGpw9THF7TIHyAhQAWY9crdS dvGNERE4yfaDqLshY0rxyr1zKWQ== X-Received: from pgcl27.prod.google.com ([2002:a63:701b:0:b0:c85:104d:a751]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c786:b0:3b4:7c33:296b with SMTP id adf61e73a8af0-3b497869594mr938429637.32.1780444742913; Tue, 02 Jun 2026 16:59:02 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:45 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-2-hramamurthy@google.com> Subject: [PATCH net-next v2 01/15] gve: don't pass in unused parameter to gve_adminq_free 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Clean up gve_adminq_free to not take in an unused parameter. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve_adminq.c | 2 +- drivers/net/ethernet/google/gve/gve_adminq.h | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 08587bf40ed4..70ffed8b52c3 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -385,7 +385,7 @@ void gve_adminq_release(struct gve_priv *priv) gve_clear_admin_queue_ok(priv); } =20 -void gve_adminq_free(struct device *dev, struct gve_priv *priv) +void gve_adminq_free(struct gve_priv *priv) { if (!gve_get_admin_queue_ok(priv)) return; diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 22a74b6aa17e..8e80f36116ec 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -620,7 +620,7 @@ union gve_adminq_command { static_assert(sizeof(union gve_adminq_command) =3D=3D 64); =20 int gve_adminq_alloc(struct device *dev, struct gve_priv *priv); -void gve_adminq_free(struct device *dev, 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, diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index e4d78ae52daf..30bf6df4ebc5 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2506,14 +2506,14 @@ static int gve_init_priv(struct gve_priv *priv, boo= l skip_describe_device) bitmap_free(priv->xsk_pools); priv->xsk_pools =3D NULL; err: - gve_adminq_free(&priv->pdev->dev, priv); + gve_adminq_free(priv); return err; } =20 static void gve_teardown_priv_resources(struct gve_priv *priv) { gve_teardown_device_resources(priv); - gve_adminq_free(&priv->pdev->dev, priv); + gve_adminq_free(priv); bitmap_free(priv->xsk_pools); priv->xsk_pools =3D NULL; } --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 EA8D83CBE75 for ; Tue, 2 Jun 2026 23:59:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444747; cv=none; b=J9KXqctnrf0q1g1nCv95Xpti1flHWHOCKoGtknwB/DBwJEsDyd1eblY7yJlU0BYXC1osAzyH2eF+xNllCQTmqD5WMuFcfm/bHuHe6H+YzDhFsquhufrQeC1RG7CzHbiJh+YSkkV9hDNwRCLP3q6A4hAcDeE9RPxu4wAb81VzWzw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444747; c=relaxed/simple; bh=fH1rldMVm/p0+7buqgj8QdnCbb2w0Q4Q4kYREg9P/Mc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=f+dY6oUqSTnnaHsKF+KJKC1ylA2m8ZYGysmzjmVpW7DYDG6Rxw7hPdp1o35fnz9tnJZXQgA/i0/73nJHtcB6dlus9sMySygw1HfpY+UKxbDE2/ti9MoOwl6Irrb8sY33C1a7u+eHaBxcajHU4S4Sgw3tysyFFPjxyuV7TiaJTv4= 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=LtI34trX; arc=none smtp.client-ip=209.85.216.74 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="LtI34trX" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-36d97415004so6298668a91.2 for ; Tue, 02 Jun 2026 16:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444744; x=1781049544; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=JTHN+ncLuFZ47q8BiVAGO1PaS6eMNaA/XSXGliZHi5s=; b=LtI34trXlPV4kiZ0uNYFFTn8/OJD6xfGxcQ3FHUNlzxqTEq3fkl321mBheZSQemp4U 8deV3hwZza7cZ9hfiuXUbOx5fW1obDI/Wb9kR3zfTR38sJD8+P6BZo/B/vdFt/92iGWy R8wkiD9HupaGQRwJW0IPN1f2dZE4sQ57CDBrse2tNmqpriW7Omy2cQKZNAZYEUmC4dAU P8nF2DyPQhz4xV07C/VV37MitHsZW/CK4X8r3vya6OfTbBLscSlxPAOlbKtQwrvc9vAm eiit3wk89r7iDH66Ygx8kZ3eSn4uuOz0Vzns3jQRhnlLXvTmA/da2C717HA4rdHhTR3H mJSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444744; x=1781049544; h=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; bh=JTHN+ncLuFZ47q8BiVAGO1PaS6eMNaA/XSXGliZHi5s=; b=HzbOV0RDI08zQS3wbgs0WMSP06+CibFJcMgdAOh8fPm61GDBh/VGDVC3EQFCzwxQYE kaEb4tjyusO+JLDyi0fQgpaNVSJYcjW1JyqoSgnlGICAY0tVEA6zkx8zXD32RTD/mix/ nlXonH+KfhWbk85GIT+A5/fDwr/aaB1Zanxsf7MqkU0JPhniJPcWbSxi2sDFkDJfPN72 AD8Wr4rrgqWACcIiU8IQNiZ0jVa550/+N397dj/r4YRw04sz3lDCQAEpYNBgWPj/tUST Fb7pPBe8cG/PmPGKE8dQLzZjOKWIQ7qVYzCHJbCgHihHRm1Ruqe805KNkyxJze88/yjo bj3Q== X-Forwarded-Encrypted: i=1; AFNElJ8cfYq96baaaEVdLtsdGjpzrGIy2+02sKcWEuDzNKUAnGbUiQD+D46s8TqKeulm74xn8tzD5oi/Ag/L7DM=@vger.kernel.org X-Gm-Message-State: AOJu0Yzh4qYfbRe4chjUyOF7vjlx4HZokAwUQXqylmWmJRzWpKrH1bBg HnbjKJfYfa0c64kIwNxp5U1wfGhOSqxoqmvnM7B+v/GpK+zreL6YzFmonG6/1cXSvTUb0z6MHLq IqQuCc2VnTYP1j93kumFxAL3OUw== X-Received: from pjtz23.prod.google.com ([2002:a17:90a:cb17:b0:368:bb57:bcb7]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5345:b0:36d:635a:ac1b with SMTP id 98e67ed59e1d1-36e34292d44mr918795a91.22.1780444743712; Tue, 02 Jun 2026 16:59:03 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:46 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-3-hramamurthy@google.com> Subject: [PATCH net-next v2 02/15] gve: refactor initialization with helper functions 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the interest of commonizing code, refactor gve_probe() and gve_init_priv() with a few helper functions that can be expanded and utilized in upcoming patches that add the mailbox ABI to the driver. The helper functions are: - gve_set_num_ntfy_blks() - gve_set_num_queues() Reorder code to combine lines that accomplish a similar objective like setting defaults. Move setting HW-GRO and UDP GSO support out of an Adminq method into gve_init_priv(). These changes are just code movement, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve_adminq.c | 8 -- drivers/net/ethernet/google/gve/gve_main.c | 108 +++++++++++-------- 2 files changed, 65 insertions(+), 51 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 70ffed8b52c3..dfeabddfb396 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1117,14 +1117,6 @@ int gve_adminq_describe_device(struct gve_priv *priv) =20 gve_set_default_rss_sizes(priv); =20 - /* DQO supports HW-GRO and UDP_GSO */ - if (gve_is_dqo(priv)) { - u64 additional_features =3D NETIF_F_GRO_HW | NETIF_F_GSO_UDP_L4; - - priv->dev->hw_features |=3D additional_features; - priv->dev->features |=3D additional_features; - } - priv->max_registered_pages =3D be64_to_cpu(descriptor->max_registered_pages); mtu =3D be16_to_cpu(descriptor->mtu); diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 30bf6df4ebc5..b9542ef36b29 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2398,65 +2398,32 @@ static const struct xdp_metadata_ops gve_xdp_metada= ta_ops =3D { .xmo_rx_timestamp =3D gve_xdp_rx_timestamp, }; =20 -static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) +static int gve_set_num_ntfy_blks(struct gve_priv *priv) { int num_ntfy; - int err; - - /* 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_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; =20 - priv->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->dev->mtu =3D priv->dev->max_mtu; num_ntfy =3D pci_msix_vec_count(priv->pdev); if (num_ntfy <=3D 0) { dev_err(&priv->pdev->dev, "could not count MSI-x vectors: err=3D%d\n", num_ntfy); - err =3D num_ntfy; - goto err; + return num_ntfy; } else if (num_ntfy < GVE_MIN_MSIX) { dev_err(&priv->pdev->dev, "gve needs at least %d MSI-x vectors, but only= has %d\n", GVE_MIN_MSIX, num_ntfy); - err =3D -EINVAL; - goto err; + return -EINVAL; } =20 - /* Big TCP is only supported on DQO */ - if (!gve_is_gqi(priv)) - netif_set_tso_max_size(priv->dev, GVE_DQO_TX_MAX); - - priv->rx_copybreak =3D GVE_DEFAULT_RX_COPYBREAK; /* gvnic has one Notification Block per MSI-x vector, except for the * management vector */ priv->num_ntfy_blks =3D (num_ntfy - 1) & ~0x1; priv->mgmt_msix_idx =3D priv->num_ntfy_blks; - priv->numa_node =3D dev_to_node(&priv->pdev->dev); =20 + return 0; +} + +static void gve_set_num_queues(struct gve_priv *priv) +{ 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 @@ -2470,18 +2437,73 @@ static int gve_init_priv(struct gve_priv *priv, boo= l skip_describe_device) priv->rx_cfg.num_queues =3D min_t(int, priv->default_num_queues, priv->rx_cfg.num_queues); } - priv->tx_cfg.num_xdp_queues =3D 0; =20 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", priv->tx_cfg.max_queues, priv->rx_cfg.max_queues); +} + +static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) +{ + int err; + + /* 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; + } + + priv->num_registered_pages =3D 0; + + if (skip_describe_device) + goto setup_device; + + err =3D gve_verify_driver_compatibility(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not verify driver compatibility: err=3D%d\n", err); + goto err; + } + + /* Get the initial information we need from the device */ + priv->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; + 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; + } + + err =3D gve_set_num_ntfy_blks(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not setup notify blocks: err=3D%d\n", err); + goto err; + } + + gve_set_num_queues(priv); + + if (gve_is_dqo(priv)) { + /* DQO supports HW-GRO and UDP_GSO */ + u64 additional_features =3D NETIF_F_GRO_HW | NETIF_F_GSO_UDP_L4; + + priv->dev->hw_features |=3D additional_features; + priv->dev->features |=3D additional_features; =20 - if (!gve_is_gqi(priv)) { priv->tx_coalesce_usecs =3D GVE_TX_IRQ_RATELIMIT_US_DQO; priv->rx_coalesce_usecs =3D GVE_RX_IRQ_RATELIMIT_US_DQO; + + /* Big TCP is only supported on DQO */ + netif_set_tso_max_size(priv->dev, GVE_DQO_TX_MAX); } =20 + priv->dev->mtu =3D priv->dev->max_mtu; + 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; =20 --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 B0C2D3CC9FF for ; Tue, 2 Jun 2026 23:59:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444748; cv=none; b=VfjRGKRY3qxHl0NZ8bSh9Pa4u2n7ptN5SC2QeeiUlnIuQkriqBpRyBFl0XBTpk3WkfXJvyLY6pJhCcYddz3uqy6qcRzgLqdZUYVm2qzPVF/1453+3ZDvZOmE1nkPi/Vu4hn8jccOeNgghxjdwONll+zIQn5+PTRRfIPZztJn5ak= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444748; c=relaxed/simple; bh=jwyRvZ/+qHHJpwn/eKpo09IX4NL3rKOUxSltYeKc8n0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JiJkfRUdsFoLpgN6bXn8gaSSgd4rBzaa/nZlyFzbGkoGNEVaL16sEnxjrMPAQvEXV1vx71akE6/zA/MyV3iWrcfUdTfA42/r1ECw+gunht9dhXqcjjAkwbxyik4enDBqFhSbqUWGzsRKwZQSEwmgYTcLNZDyFJIjJPx7MS7qHwk= 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=FV/IDnpc; arc=none smtp.client-ip=209.85.214.201 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="FV/IDnpc" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2bf11699875so1057085ad.1 for ; Tue, 02 Jun 2026 16:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444745; x=1781049545; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=O1UNzlhiTlzST26pj+RRE5Kxk1lz3fpGKLNeH2a+Ysk=; b=FV/IDnpcrE6ljFI9irhaDWrlHUQtlr5V/JTM/AVojKKnbG+oQGCTIzBfBiaUyI1GIU Xtz+MjzEmOiTab/gFgSnjIqmHrVNpHCV0vciK3ze9Ac/iUwtMg3VjvUCGwnNeWbs6QU/ X3jqD3ySGHXD8H2DBxEa5I+UC8JC3dhByzUZXXZlimFAh8/H7WPjF9fp+pbY5rFrC2Sk t8jo3TInPDkh5whHxoCScoT2AlEJs1OJ3myEbgkX/7GemzxrGVxycKrKfNgJE2pE5Ego Io65FxF3O+iEIKLUwfCRMBbbOERX3p3Okb3AAlGGPZBwDoD2TUdf1HAh3XHy6FO+wYKs AIaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444745; x=1781049545; h=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; bh=O1UNzlhiTlzST26pj+RRE5Kxk1lz3fpGKLNeH2a+Ysk=; b=AgaAkKUUVBoomFTo8BVVwI/ROJKi9lfIXRu8gv0zNPrwCC5D4bvNl/6mqz2+zV3Es4 e4e9skPuWOSJaxVfmAHWwFNjn1Qy8o923msurWKlNR9l24RLXrriB2yg/sO7l/sVYePm 7Bhby62QDDlZJHxKD64Z2hdqfXlThcgOXF6tAH0aNaWPrKF2K3isGkaMVgBwP5eHJtY3 GkJ6x56h1O0mKXWL0J4CMu7Xct2GOp9mLwicu0rFbg2ucslJBqvISIVFV/n81Un0JQyR mXO8EC8cWBamQp3TiY5YcrA/3pG6gyXCjvJLSRGwPFlGPRw95ehBJm+vK2CBxbdENpFT Kzzw== X-Forwarded-Encrypted: i=1; AFNElJ+EoAq19YD7K8d+ZUJb6KV3gUrPVN2YsDnm7ZzJOxs1/6DwMBGSYfics4jnCkKkGop+CnBrxsSEfGxMo5Y=@vger.kernel.org X-Gm-Message-State: AOJu0YybOewRq3cA8JCjqmzZVbuat5+vKvt32jcfGdZMIF8VYh+do0F1 I3GVG/84/wWyXqCwrsKoOIZevd0jahyNiFNTNUiy0lGjQKhL8cFJpB9RoYXcJLO1beElVI8xIdN ofo8unkvAJRbxrJRDIqtR2Iv9jw== X-Received: from plss9.prod.google.com ([2002:a17:902:c649:b0:2bf:1316:821e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2409:b0:2c0:a858:8128 with SMTP id d9443c01a7336-2c1640b37bemr7670815ad.1.1780444744546; Tue, 02 Jun 2026 16:59:04 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:47 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-4-hramamurthy@google.com> Subject: [PATCH net-next v2 03/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 2 + drivers/net/ethernet/google/gve/gve_adminq.c | 66 ++++++++++++++++++-- drivers/net/ethernet/google/gve/gve_adminq.h | 5 +- drivers/net/ethernet/google/gve/gve_main.c | 59 +---------------- 4 files changed, 66 insertions(+), 66 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 1d66d3834f7e..645175a5dfae 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include =20 diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index dfeabddfb396..860d43650c6a 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1144,6 +1144,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) { @@ -1206,20 +1227,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 8e80f36116ec..831759d30f44 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 b9542ef36b29..eb2d768e5881 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -41,49 +40,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) @@ -2461,21 +2417,10 @@ static int gve_init_priv(struct gve_priv *priv, boo= l skip_describe_device) if (skip_describe_device) goto setup_device; =20 - err =3D gve_verify_driver_compatibility(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not verify driver compatibility: err=3D%d\n", err); - goto err; - } - - /* Get the initial information we need from the device */ priv->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; - err =3D gve_adminq_describe_device(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not get device information: err=3D%d\n", err); + err =3D gve_adminq_get_device_properties(priv); + if (err) goto err; - } =20 err =3D gve_set_num_ntfy_blks(priv); if (err) { --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 A63003CBE7C for ; Tue, 2 Jun 2026 23:59:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444748; cv=none; b=HcvAX+KelLf6yRpVhepcs4GKnRaDPs48cjKXOIKy/qrBO1G9Hia0ON9VLXKh6q2A7WztuY5spRti5TLwanQAMGDeu50xTRg3ycQzIZl1c7D7/POhOVcHW8M2PZ8bnhGha7nrxC1Antk3xH4TyWd/sala2TZ2lRi3bv4qHHFVMHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444748; c=relaxed/simple; bh=HUIQ/G5dsO1Ug/sGdMGDyTDVpr9E2tnSQa4QM7hfAMc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TIad65E9vFaaJU6RW4eAsFbHe0QJRzFuYfolGSQqPasuswOZubjoJahl/SG9eJYr1SvHHq1miXQhLHQjn6hNShOqE5CSK1wISl2/U5hnTVp7nSq3YeUlDFYku8d7FTDvnQzPJ/FvAp34zw+4sJu965hWr2qt8lUrDoZoJufZKRM= 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=Sw/Bb8Qd; arc=none smtp.client-ip=209.85.216.74 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="Sw/Bb8Qd" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-36b7c55406bso4605653a91.2 for ; Tue, 02 Jun 2026 16:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444746; x=1781049546; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4rPviAwWDHQ433P+7RhzOVcrCNAa7ojcKWDdm3tBNVc=; b=Sw/Bb8QdC0HHlbrHHt868NELwh+1YATmiNe6WzBfYPn7SmoDiYz+ihSeWrJiO2XQZM zC8iaEbhUQIeoGD/uBDsSM4XWP1H8RMTDqjgvHu4ytsPBqu2BY56nJPpNkXYzNr+xI52 lRXyeXdq8+QCkw4y3gN9HLHf37rHBKrMCY2pWVGqmOyZotHTY3r4ZDH5JNrGLk6lCEP+ hUNBxeU89fcg9Aa56FLy+MPQoT6LRH6kxiC7OrOoCYHS9jTNVHF+RKkWT1dhfU0mHHan yHNAVFHBUoPtzs/MxctUKzF3oheUU7JnYSV/DBN7Yo/udeITMjF3s2VZlGl8HFCDAgmj PWMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444746; x=1781049546; h=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; bh=4rPviAwWDHQ433P+7RhzOVcrCNAa7ojcKWDdm3tBNVc=; b=MsL7SUT8lO9zW77c9HEWd8o44Uq6SrTqELnvfoMR5z6/g+cx0867oHlsSG3IWe8gjc GbQiPT85OnQxDNoqRtFGe7LXpOxfMjXF7PlspnDMx+vdPP+HmfzJgWFaHQer69JrBMtD WEq2ZT+8FAyeqj3RpvWJcFlhgypN0GUeJhsN54ZYf+qWm8tqQb4v6jn40uH5q/6SEXtZ dAe8y2hacYfVh2seHU8FLSB4i2Hf/ESys9IoKXITFCEJmXTaS6mQ5RTkkNlX8S4xHW4+ B7xRNPZs27TQFF5+4kfLLaSbPL5d9SfV4+MGAaf737OjYni9yrgG466/xssdC4FuNEvk 3lyA== X-Forwarded-Encrypted: i=1; AFNElJ/tbDaf1er7Lzrgl+fBVQUDJetAa+OvIVycpT0d/ToER7kZEC+PpAqp8xJAasbTgS/qOtp+ehvqzJOwuTs=@vger.kernel.org X-Gm-Message-State: AOJu0Yxwu7iqm4DHo+bntQGT6kuyoG1ZTzpd/djDLr21KHNlX7fVS887 7kKWII2au6iUlAVrAjeEMHgZmaJdYR+xhdoXs66xn/TSPV3cZ8BogLtdcfa6LD8TLRjdL0pWfSE CO7Xsvr2HBZ9/Qhi9p7VAOMwkQg== X-Received: from pjez16.prod.google.com ([2002:a17:90a:150:b0:36b:cff1:e69e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1d44:b0:368:6159:980c with SMTP id 98e67ed59e1d1-36e32949e4dmr811053a91.20.1780444745398; Tue, 02 Jun 2026 16:59:05 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:48 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-5-hramamurthy@google.com> Subject: [PATCH net-next v2 04/15] gve: add a few helper functions to set 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" For the mailbox ABI, device properties will come from a different source compared to the AdminQ mode. To accommodate the new source when the mailbox ABI is added, add a few helper functions to set a few device properties. Those functions are: - gve_set_queue_properties() to set no. of pages for QPL mode and number of queues in general - gve_set_mtu() - gve_set_mac() This is just code movement, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve_adminq.c | 38 +++------------- drivers/net/ethernet/google/gve/gve_adminq.h | 6 +++ drivers/net/ethernet/google/gve/gve_main.c | 46 ++++++++++++++++++++ 3 files changed, 59 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 860d43650c6a..77203184efbd 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -920,19 +920,6 @@ int gve_adminq_destroy_rx_queues(struct gve_priv *priv= , u32 num_queues) return err; } =20 -static void gve_set_default_desc_cnt(struct gve_priv *priv, - const struct gve_device_descriptor *descriptor) -{ - priv->tx_desc_cnt =3D be16_to_cpu(descriptor->tx_queue_entries); - priv->rx_desc_cnt =3D be16_to_cpu(descriptor->rx_queue_entries); - - /* 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; -} - static void gve_set_default_rss_sizes(struct gve_priv *priv) { if (!gve_is_gqi(priv)) { @@ -1049,8 +1036,6 @@ int gve_adminq_describe_device(struct gve_priv *priv) union gve_adminq_command cmd; dma_addr_t descriptor_bus; int err =3D 0; - u8 *mac; - u16 mtu; =20 memset(&cmd, 0, sizeof(cmd)); descriptor =3D dma_pool_alloc(priv->adminq_pool, GFP_KERNEL, @@ -1112,26 +1097,17 @@ int gve_adminq_describe_device(struct gve_priv *pri= v) "Driver is running with GQI QPL queue format.\n"); } =20 - /* set default descriptor counts */ - gve_set_default_desc_cnt(priv, descriptor); - gve_set_default_rss_sizes(priv); =20 - priv->max_registered_pages =3D - be64_to_cpu(descriptor->max_registered_pages); - mtu =3D be16_to_cpu(descriptor->mtu); - if (mtu < ETH_MIN_MTU) { - dev_err(&priv->pdev->dev, "MTU %d below minimum MTU\n", mtu); - err =3D -EINVAL; + err =3D gve_set_mtu(priv, descriptor); + if (err) goto free_device_descriptor; - } - priv->dev->max_mtu =3D mtu; + priv->num_event_counters =3D be16_to_cpu(descriptor->counters); - eth_hw_addr_set(priv->dev, descriptor->mac); - mac =3D descriptor->mac; - dev_info(&priv->pdev->dev, "MAC addr: %pM\n", mac); - 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_mac(priv, descriptor); + + gve_set_queue_properties(priv, descriptor); =20 gve_enable_supported_features(priv, supported_features_mask, dev_op_jumbo_frames, dev_op_dqo_qpl, diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 831759d30f44..ed5cb052a52d 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -655,5 +655,11 @@ 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); +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); =20 #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 eb2d768e5881..338dc0b3249a 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2400,6 +2400,52 @@ static void gve_set_num_queues(struct gve_priv *priv) priv->tx_cfg.max_queues, priv->rx_cfg.max_queues); } =20 +static void gve_set_default_desc_cnt(struct gve_priv *priv, + const struct gve_device_descriptor *descriptor) +{ + priv->tx_desc_cnt =3D be16_to_cpu(descriptor->tx_queue_entries); + priv->rx_desc_cnt =3D be16_to_cpu(descriptor->rx_queue_entries); + + /* 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; +} + +void gve_set_queue_properties(struct gve_priv *priv, + struct gve_device_descriptor *descriptor) +{ + /* set default descriptor counts */ + gve_set_default_desc_cnt(priv, descriptor); + + 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); +} + +int gve_set_mtu(struct gve_priv *priv, + struct gve_device_descriptor *descriptor) +{ + u16 mtu; + + mtu =3D be16_to_cpu(descriptor->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; + + return 0; +} + +void gve_set_mac(struct gve_priv *priv, + struct gve_device_descriptor *descriptor) +{ + eth_hw_addr_set(priv->dev, descriptor->mac); + dev_info(&priv->pdev->dev, "MAC addr: %pM\n", descriptor->mac); +} + static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) { int err; --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 6F7F93D1A9A for ; Tue, 2 Jun 2026 23:59:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444750; cv=none; b=VeSS9616+CJ3NprYzeQbjofXpNvcCJGrO0btr8I8G6YVrasrvU9pE8+fidqPD5wtKGIOyYXcsB/KVqKomhg7fjJ4M+8C8aTkks6Fj9+7xxhG+6cbjXJlwJ2JEZVxWlfj6A8c3CgPQBX5SwfmiibdyrjzmRP8CMezD9aTFMpbATc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444750; c=relaxed/simple; bh=oaGu4c6TMG0LBwTuvcuW7siWdRMM5D/zv/v5c5v2dCw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HVAZ5l5H3EPe7EBCM8K5i7qzLhu4/KwssRVacrK/W5lGc3m/8TPTCd4zRTGMQpQ05APChrb9eef+F40C3BZR/6Leocx8a9Qr400ZhUeMa2Mq9zmTcn9+utGZq8oW49aomOM5f5O15OXoC9e3lXwr5G+YiZ9e2F0xRx353N7BclU= 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=o3o/vI9H; arc=none smtp.client-ip=209.85.215.201 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="o3o/vI9H" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-c85a2ed88c8so3620864a12.3 for ; Tue, 02 Jun 2026 16:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444747; x=1781049547; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LXTbt64BHJpwXLJdQFfnxgCMmrTNVSzhhrY3v2EUYnI=; b=o3o/vI9Hu98qHTD5Y8KVqvhVUspXvJA6GtbZ+6083qBopDo37r8h2zAucqLxnDwUvl P//Teys5XNvZJMucaQGsKWTutDoh0ZYxJcAPrGovdx1K6YF+X4eWP94LvSUkn+BZ9INv 32wV1owp3EDTTfXCodkC5ghK4yVuUPN1jLUV7XNcdhA3cRaN4P50BLrRzvJvRz9/UMhB Vtx6E/fkRAdFHxID7Fz9QF/c+l+RZenyI66NY4oWeCVH7n264KOwwu+oBGtdDlBlDG0u 9c/qrzW99lniLC4Z7yj2SUynzt/DOP77YYwpCql41vm/g60/RImvaXWq+/YrXZlAWG2s xt1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444747; x=1781049547; h=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; bh=LXTbt64BHJpwXLJdQFfnxgCMmrTNVSzhhrY3v2EUYnI=; b=HtiQ5WJHi/EedKpoQUNx4lmjzzoLViC7tVBSsd098C0u+Skkc36et26OQwK3ur/jQE hhmpw3fNkPR8mEFWO5sa9RYri3Z2s7aMRL1Z4RO36n42mw5e8Q00Qfw0Zs07knkqStAt W5vGvTevQBvZd+gGPv+y0MalrowFaKeHrJixJnljSlPA4EVWziP1ZywGsOSPZqTJ92J8 RLgAHLnDkoCDNCaiMjbx1nQZ1ZzA6fQ3SoJur8z4G/oeLdT5T5LDaxa9UCLf1LDlat5c xEP9kTJcpWtzXxRSsFabx3GAO1abBx+cMxTEhEk5N1fNT3QmHmNwssmRQM1Fl5ass6He AG7g== X-Forwarded-Encrypted: i=1; AFNElJ8koLharvz1/zoCMvc5W1EHJVFiTua8+Ua08px/kQP7zxVCnJ9bMTgK2mNToQg0UGhdXt4iv5lgXpwFwhA=@vger.kernel.org X-Gm-Message-State: AOJu0YyKB2WrCg2q8V03bXg6+WDPDi3XC7epBuY/ehUBsAQipKIK3uF2 uCypxxlzfJ3KlPtDjFuZKLKB33cs+xmr6XhNiIx0y1iCxo1vFI0rTKjTUUsb3s8J9mo6WsSYG3Q PIpYhy7WxF+lPlbXcxmE2t+Eduw== X-Received: from pga15.prod.google.com ([2002:a05:6a02:4f8f:b0:c85:b584:3b1d]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6e03:b0:3b4:8ec9:514e with SMTP id adf61e73a8af0-3b4975aa628mr1097081637.4.1780444746391; Tue, 02 Jun 2026 16:59:06 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:49 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-6-hramamurthy@google.com> Subject: [PATCH net-next v2 05/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 the functions it calls 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. These changes are refactors only, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 29 +++++ drivers/net/ethernet/google/gve/gve_adminq.c | 113 +++++++++++-------- drivers/net/ethernet/google/gve/gve_adminq.h | 6 - drivers/net/ethernet/google/gve/gve_main.c | 101 ++++++++++++----- 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 645175a5dfae..086a315f42c1 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -796,6 +796,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 */ @@ -928,6 +956,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 77203184efbd..06db2ccd0b89 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 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, diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index ed5cb052a52d..831759d30f44 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -655,11 +655,5 @@ 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); -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); =20 #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 338dc0b3249a..1aeee916471f 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2380,6 +2380,8 @@ static int gve_set_num_ntfy_blks(struct gve_priv *pri= v) =20 static 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 @@ -2387,12 +2389,14 @@ static void gve_set_num_queues(struct gve_priv *pri= v) =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); - } =20 dev_info(&priv->pdev->dev, "TX queues %d, RX queues %d\n", priv->tx_cfg.num_queues, priv->rx_cfg.num_queues); @@ -2400,54 +2404,69 @@ static void gve_set_num_queues(struct gve_priv *pri= v) priv->tx_cfg.max_queues, priv->rx_cfg.max_queues); } =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 priv->dev->max_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) { - eth_hw_addr_set(priv->dev, descriptor->mac); - dev_info(&priv->pdev->dev, "MAC addr: %pM\n", descriptor->mac); + struct gve_device_info *device_info =3D &priv->device_info; + + eth_hw_addr_set(priv->dev, device_info->mac); + dev_info(&priv->pdev->dev, "MAC addr: %pM\n", device_info->mac); +} + +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) + 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; } =20 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 */ @@ -2463,11 +2482,13 @@ static int gve_init_priv(struct gve_priv *priv, boo= l 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; err =3D gve_adminq_get_device_properties(priv); if (err) 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, @@ -2491,12 +2512,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 365C63D333A for ; Tue, 2 Jun 2026 23:59:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444750; cv=none; b=n9gMnB6zek7bTCkLfujIWlw2A0uhlx9vFAXbdzmdi/O2WEd/P+y5Pv8V7J1+hFgF6LJXtVFwYk+U1FidJquCQoSjtXg9Gh+rPcfu8ZgEXaBYaitcQmppClAwKRRl05V9ZqQWARlApPESKgw4KRfOjlWalt32H6i1ZyUGfAH0ABc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444750; c=relaxed/simple; bh=FwGXS8e6HUgTVB3w+vwLfDxMVnGT2dm1xGoUpgeqMYo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KAcVAbSuOnAtz7qqanyJeis/3GbcfDhw1ktNfuP8YD8wRoOSJiZyIJQkbXMbXtqxFE0e656sxETpBCEiFnmAX1yFsb83lMoAH7Fj5GepoOQ639G2ZgN7G6jGJEL5xpzzTAaB8aXoQdIyNaOPtYeffiJOAHNx1zJierBF4sXzUP4= 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=AAV6YedE; arc=none smtp.client-ip=209.85.215.202 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="AAV6YedE" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c85759a8f33so59585a12.0 for ; Tue, 02 Jun 2026 16:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444747; x=1781049547; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=SIbPdnvitqMPA6Y12Vag7sROSmwPcIYAij/Y31wBos8=; b=AAV6YedEMHMluSYNLpb2q5QtADdklMRbp7OEvqYWxA+cYJ0oNJRAPl3uviu2CI2Ks4 ukEPGfEB+OdzcYT2fz59L0MuNIzkQP990Z0YAxQIFCgRtTJlvKAMtvCkibN4HnhHmUBx AF9pS4iF6gJ5NIRwA19JFvMmSm65H64H9y6cjaLixGcgBHllycjjwP3u7VODzVXwbbmC NhYUxjgQe35sO3y01SqgiuhxaaCOz3rQe+VuuJbRhvm4bW6PVU2UO6ilcxyiZnZDVOP8 LInmHGBYO+9wZd67NT14ZwfCXoRKMOoKBCxourhVmR5cG9k7ZMlqQIHW/jbeGfoJrORL KlAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444747; x=1781049547; h=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; bh=SIbPdnvitqMPA6Y12Vag7sROSmwPcIYAij/Y31wBos8=; b=CY8ScFfshoCDikmHC48LOGliCM4XiKMpyDI7h/Dy0DfG4yxSIOudjNmwCpAUK4pu+o dtJ/U8Y7xSMcWduZlkwuPYDfWqF1khtp25rwnbAmU8V9Dhy+VUHPosLX58Z8cGJxrWnb qNIq7PWF5gEA0FIUzrc6s7oQlC+RkIyW6ap02u7gnfD3SmR1iZ77XxrD0VuZoJlpfrxl qKTCrxMEQbVz4s/pTRmBLKVuV17BisSVdNBMxONZV1JVHp14n8QhbNAoSNsAvPdKNBp5 nNrJ1R9BuZn1c5gWi1jJ2gM3P0NuvNtao/zkrF0PhUlZhglQ6qTg1SyBvnMgEvzP0T9b lu1g== X-Forwarded-Encrypted: i=1; AFNElJ+kEn7dSv3fHzSKALu644SRFTyhfEWNk0YpP3lq+EDqZqUYnifmOYhREimCyceHCqDrSam+ljltvk02JN8=@vger.kernel.org X-Gm-Message-State: AOJu0YyUTmqakk+Kelo6VBNyrDTL1V2GtlaCuCPhkpsWvYEAZ+ywtW99 7RddH76lRupzkc0UoBljEOha4oKsIoziMX5tnbx9dMXDfyr6FBzw2KcZPSya6fZSPDIrApwiLxI u+cGwAMpj2wWLqPJGv0QzGNP8eQ== X-Received: from pggu23.prod.google.com ([2002:a63:df17:0:b0:c85:8297:df9b]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:c996:b0:3b3:d656:b470 with SMTP id adf61e73a8af0-3b4989416bamr769252637.27.1780444747266; Tue, 02 Jun 2026 16:59:07 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:50 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-7-hramamurthy@google.com> Subject: [PATCH net-next v2 06/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 Signed-off-by: Harshitha Ramamurthy --- 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 | 36 +++++++++++--------- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 086a315f42c1..c1e118241d2b 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -824,6 +824,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 */ @@ -957,6 +967,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 06db2ccd0b89..4617489d8714 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1645,3 +1645,24 @@ int gve_adminq_query_rss_config(struct gve_priv *pri= v, struct ethtool_rxfh_param dma_pool_free(priv->adminq_pool, descriptor, descriptor_bus); return err; } + +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 831759d30f44..bc76976eb00f 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -655,5 +655,7 @@ 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_adminq_map_db_bar(struct gve_priv *priv); +void gve_adminq_unmap_db_bar(struct gve_priv *priv); =20 #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 1aeee916471f..51dd4f9b3022 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2464,6 +2464,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; @@ -2850,7 +2855,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; @@ -2878,13 +2882,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); @@ -2894,7 +2891,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); @@ -2926,19 +2923,27 @@ 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) { + err =3D -ENOMEM; + 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); @@ -2968,12 +2973,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 @@ -2989,14 +2994,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 523A93D45FE for ; Tue, 2 Jun 2026 23:59:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444751; cv=none; b=Hz+e96u5ukKTasUS91jHYrAbQ7PfMaIH6MvnmG1eluZ2GIlPu0wOummA6N5jraWkKY9tTLv5qe9H7SdCwmcEVieLdV24GRFr16aNAAG/LcsRt76Uoh0ZufDFzxcfUZrfQYmKW3Wqjag+LdrvjqVtjk9/o33hTBQZ4bysiHUwqBs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444751; c=relaxed/simple; bh=Jid2mZV9AdafsjyRc+X2ZCHCA2HF8RZcuwocaQdhGfQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SFi2+Wvb9Laxi8370ipJnhegEGNcpQEM7EjlL0WlP3nuFGa1Fiey9WznMjBIotMWvg7Htl+LtHd3fK5Xe89hUhFYgUTb81T2er+UH34PgyEnWXgRJJWn0MQ8ab4Clc9SitBmOXj5Tghm+bBs3eQQ3E1ZwPY92q+tdbrgCa+LhAA= 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=s6aLygZI; arc=none smtp.client-ip=209.85.214.202 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="s6aLygZI" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2c0c3315d31so32654805ad.3 for ; Tue, 02 Jun 2026 16:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444748; x=1781049548; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=xpIUEsUWU8etm6zUAiNt4A561F4DqethgQmhV6MgVco=; b=s6aLygZIFjEMccoEtfp3pyEET55fQ1GRyvCuwSEWl9r3UqcH8r7o55HGLNIE3lK++W 8YI2N2VIk4qXV5lvnr/+1MjD1WoUZemcgDa1ajnBp/DklgpDS1ilh+IOjARFVKOB2fM1 RJkSF32XWMLPw6FdcCW96FX3HZCRRLHlm6rwYBIJP9USlmB8jDcmw3OTbJTUS2/1n24O 2bh/PeVmxoOIM6NrZsbEb/2WOsDOXmK0VbjsLYUnsGCOEHobWF91OSfB1Lk0HDLjwzKu q+DRGzVVv7ZKFL1KVnkrZiddan61c6Pzgc7iTSbn62r7Bc9ucRGmFL80UDKJ9WKCvGDS GnlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444748; x=1781049548; h=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; bh=xpIUEsUWU8etm6zUAiNt4A561F4DqethgQmhV6MgVco=; b=SVD/fYzbT5KXhhpMNOL+zuuAu8VA7UXUiy8unounXVAlKZSN6BLpVC25HfY9ElIgeN qVAZQAPdKbNQJbNB+4NxtCqrluxCRKCZHytU7M2UfzPOjBlhnH/yf9vraPnhU+X4igIw CLIShonEA0mxNJ93RSG7e8/VritJX2aobq0yqqXuhNLRDGv6nAReNltMb4KtbX+fosyy m4rxghdTlnM3ILUIvzqyerTF4fCvnHCS8+ZpaUr55m2+CQHIg7hS5MvkiRwf0m3cD6yR UzcS0rOoraLof1jycMsiDaA81z/9tQrFFn+ckILAkEhA7CmArdSqXvng/QVcEcYXZ17v 2Yig== X-Forwarded-Encrypted: i=1; AFNElJ9SjnzEKyhOMzlk/h3mWf2Zy9kgmy3Gloh51coyxRchVDk30karo76V2L9WydXpqECrV9l4RngEz7gZSAg=@vger.kernel.org X-Gm-Message-State: AOJu0YxUq4VlEdVA/Kec72HT3rtXEaU2aPZS3pbfGuMfx+5n1dlT0sPX Z2Vub6i40LfkKKU3TlqxIgqzkiXSD8w+SFng9g0XIMA9/Eg/dQGl4CiTftFtI3ML8BCt09d+/YE +F0D5J20txRrTMA5CgndMfAbcWQ== X-Received: from plao13.prod.google.com ([2002:a17:903:300d:b0:2bd:c925:e1dc]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:bd1:b0:2c1:20fe:9d5a with SMTP id d9443c01a7336-2c1644cd036mr6232295ad.35.1780444748116; Tue, 02 Jun 2026 16:59:08 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:51 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-8-hramamurthy@google.com> Subject: [PATCH net-next v2 07/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce following ctrl ops for Adminq mode. This change does not introduce any functional change, just movement of code into ops. - 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. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 6 ++ drivers/net/ethernet/google/gve/gve_adminq.c | 45 ++++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 64 +++----------------- 4 files changed, 63 insertions(+), 54 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index c1e118241d2b..bd48c3d7a2b2 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -828,10 +828,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 4617489d8714..923a5c737258 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1666,3 +1666,48 @@ void gve_adminq_unmap_db_bar(struct gve_priv *priv) =20 pci_iounmap(pdev, priv->db_bar2); } + +int gve_adminq_set_num_ntfy_blks(struct gve_priv *priv) +{ + int num_ntfy; + + num_ntfy =3D pci_msix_vec_count(priv->pdev); + if (num_ntfy <=3D 0) { + dev_err(&priv->pdev->dev, + "could not count MSI-x vectors: err=3D%d\n", num_ntfy); + return num_ntfy; + } else if (num_ntfy < GVE_MIN_MSIX) { + dev_err(&priv->pdev->dev, "gve needs at least %d MSI-x vectors, but only= has %d\n", + GVE_MIN_MSIX, num_ntfy); + return -EINVAL; + } + + /* gvnic has one Notification Block per MSI-x vector, except for the + * management vector + */ + priv->num_ntfy_blks =3D (num_ntfy - 1) & ~0x1; + priv->mgmt_msix_idx =3D priv->num_ntfy_blks; + + return 0; +} + +void gve_adminq_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 + min_t(int, priv->rx_cfg.max_queues, priv->num_ntfy_blks / 2); + + priv->tx_cfg.num_queues =3D priv->tx_cfg.max_queues; + priv->rx_cfg.num_queues =3D priv->rx_cfg.max_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); + 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 bc76976eb00f..ac3ef9fd8d24 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -657,5 +657,7 @@ int gve_adminq_get_ptype_map_dqo(struct gve_priv *priv, struct gve_ptype_lut *ptype_lut); int gve_adminq_map_db_bar(struct gve_priv *priv); void gve_adminq_unmap_db_bar(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); =20 #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 51dd4f9b3022..d693caed7e3d 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2354,56 +2354,6 @@ static const struct xdp_metadata_ops gve_xdp_metadat= a_ops =3D { .xmo_rx_timestamp =3D gve_xdp_rx_timestamp, }; =20 -static int gve_set_num_ntfy_blks(struct gve_priv *priv) -{ - int num_ntfy; - - num_ntfy =3D pci_msix_vec_count(priv->pdev); - if (num_ntfy <=3D 0) { - dev_err(&priv->pdev->dev, - "could not count MSI-x vectors: err=3D%d\n", num_ntfy); - return num_ntfy; - } else if (num_ntfy < GVE_MIN_MSIX) { - dev_err(&priv->pdev->dev, "gve needs at least %d MSI-x vectors, but only= has %d\n", - GVE_MIN_MSIX, num_ntfy); - return -EINVAL; - } - - /* gvnic has one Notification Block per MSI-x vector, except for the - * management vector - */ - priv->num_ntfy_blks =3D (num_ntfy - 1) & ~0x1; - priv->mgmt_msix_idx =3D priv->num_ntfy_blks; - - return 0; -} - -static 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 - min_t(int, priv->rx_cfg.max_queues, priv->num_ntfy_blks / 2); - - priv->tx_cfg.num_queues =3D priv->tx_cfg.max_queues; - priv->rx_cfg.num_queues =3D priv->rx_cfg.max_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); - 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); - - 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", - priv->tx_cfg.max_queues, priv->rx_cfg.max_queues); -} - static void gve_set_desc_cnt(struct gve_priv *priv) { struct gve_device_info *device_info =3D &priv->device_info; @@ -2465,8 +2415,10 @@ static void gve_set_buf_sizes(struct gve_priv *priv) } =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, + .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) @@ -2494,14 +2446,18 @@ 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", + priv->tx_cfg.max_queues, priv->rx_cfg.max_queues); =20 if (gve_is_dqo(priv)) { /* DQO supports HW-GRO and UDP_GSO */ --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 3DA293D524E for ; Tue, 2 Jun 2026 23:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444752; cv=none; b=fPlnkKVdO0+gyGg2ULoSWqSpRLx0qxj1RxfCcM77sZEj3+bjn5Db7GiE9A2h+dj4fYHZ7m2rKESHR8huy3eoHON/XSTDBawqUQwKY+ysz50Fxf1Dfy61kR8rn5nV71N4Uj1B8ricJhDBZ7VIku+5bI56A97pbszT6spQXb+5LeY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444752; c=relaxed/simple; bh=Na0SeIfyOd7yAAbMXxs/OfScfNP6TSwBD6oC5sbAqiE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bAU9CUXLCUNuMeXkK3yjl33DRv+HF4bd8yi62gFga04YBdZSXza7gNc+p9A/qXMYpF5rPe/6OZP0RwF8ockeYEHtDVgB9f1MLoku9Csfup0JvnRjIX+6FWQPs6VgpsJQzzwq/Q1VGNgVSkSmv+6dYEcahRl80xPRkMdNPOIrXbg= 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=bZNMPxZD; arc=none smtp.client-ip=209.85.210.202 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="bZNMPxZD" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-8426ed9f24dso44791b3a.1 for ; Tue, 02 Jun 2026 16:59:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444749; x=1781049549; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ZyKin3epjmHjB+l3vFExCe2kv3656lDfwhSyk8bL+DU=; b=bZNMPxZDX42vvV66Sr7flQLuN3w+h6ImxSmkZOzv8KcCfmLqACGWR81J33/P3jvhiI xa6zglQwzSF/IfhqZezSf71mxoja5KIpUvIPdk/sDbKJ9JDtqy7vzrPJyGiMLjCT2bLo UyXi/M+a5LStvUOEpS9RCVT216qQhxSYvrFxe1YYU8Zb01g+omiG/AljUQQ2HGArncpz qZQQenwbVXQ6r8xhQ/dWtkfv0vLSwbkc5E6vSM9GMX/c3+zJvB6N5qtNYCBgScFlkW5I bnH7NfoIhL0ZY49OvQtJJP1FnZ0iZjaUEsPBOMJ8M4GutScSsFTkr1BN9wM2h+MgBdB9 90hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444749; x=1781049549; h=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; bh=ZyKin3epjmHjB+l3vFExCe2kv3656lDfwhSyk8bL+DU=; b=hwfTYteC7cfhqx4yqwKprf8eFt0WaN1+Ct/AC6fu5ZuN8oH620FsymfoTj4fDgSajo iNWnod+/ucm6QQkX3nrPS+x/Rr2Q2PlXmroiB8inmFWpktjM+9P9pNXACz1L9JcPDw4l arR7dXIIU3mccRIS7OOXupfdjN97O3ZThHQw7n8AaNlOQpxltZMGYgxraEbrNaP3uj9I +amAepGm+12lr21W1tC2P1RI8pIk1alVtN0nBsZE7GZAr9zdhM+xIO4bR/uuSma9eVCm vwzLjpwQv+1HuZ4QmANThMb7kD70Tu+jDMGqp6HeLdWH1iwV1IdRYj6WZ5k2ileJ/NOs uxXg== X-Forwarded-Encrypted: i=1; AFNElJ9f2tplWXI8AivTJ7nUzUBx+uwbB6UruMDZJWy6NMjfDFrFyodJYeVAaLgB3NzyCSwoUvpcg1bGl4N1P40=@vger.kernel.org X-Gm-Message-State: AOJu0YzBXFJKeK0MyNTdBVzwz+prlT+gwmr+B88Rs1cneSTFlh8AFvyD skYVJWh2AYXG1hlpcrUvDrIQHo5YdJX82/+E1RIgfPgD+r6kS80yLmuVpWZ269BC2+7738KqBlq iCcoTQpFm97W5St8avGLfDNemaw== X-Received: from pgc4.prod.google.com ([2002:a05:6a02:2f84:b0:c74:497:507e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:d492:b0:3b4:613f:90b1 with SMTP id adf61e73a8af0-3b498903549mr726413637.16.1780444749011; Tue, 02 Jun 2026 16:59:09 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:52 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-9-hramamurthy@google.com> Subject: [PATCH net-next v2 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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() - move gve_adminq_get_device_properties() into gve_probe() - 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_register_qpls() since that is a QPL specific property. With these changes, gve_adminq_get_device_properties() and gve_init_priv() are only called once during gve_probe. gve_reset_recovery() can now bypass full initialization and call these 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 --- 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 | 132 +++++++++++-------- 4 files changed, 92 insertions(+), 56 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index bd48c3d7a2b2..72588d201e5d 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1252,6 +1252,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 923a5c737258..e7956d2768b6 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; } =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)) @@ -353,6 +355,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 ac3ef9fd8d24..d07e9c6f279d 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 d693caed7e3d..746ff69a28dd 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -797,6 +797,8 @@ static int gve_register_qpls(struct gve_priv *priv) int err; int i; =20 + priv->num_registered_pages =3D 0; + num_tx_qpls =3D gve_num_tx_qpls(&priv->tx_cfg, gve_is_qpl(priv)); num_rx_qpls =3D gve_num_rx_qpls(&priv->rx_cfg, gve_is_qpl(priv)); =20 @@ -2414,6 +2416,33 @@ 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->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, @@ -2421,36 +2450,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; - } - - priv->num_registered_pages =3D 0; - - if (skip_describe_device) - goto setup_device; - - device_info->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; - err =3D gve_adminq_get_device_properties(priv); - if (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); @@ -2473,10 +2484,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 @@ -2501,30 +2510,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) @@ -2554,15 +2540,29 @@ 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_setup_device(priv); + if (err) + goto err_free_adminq; if (was_up) { err =3D gve_open(priv->dev); if (err) - goto err; + goto err_free_device; } return 0; + +err_free_device: + gve_teardown_device_resources(priv); + bitmap_free(priv->xsk_pools); + priv->xsk_pools =3D NULL; +err_free_adminq: + gve_adminq_free(priv); err: dev_err(&priv->pdev->dev, "Reset failed! !!! DISABLING ALL QUEUES !!!\n"); gve_turndown(priv); @@ -2605,7 +2605,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 @@ -2838,7 +2838,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); @@ -2885,13 +2884,28 @@ 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) { + dev_err(&priv->pdev->dev, + "Could not get device information: err=3D%d\n", 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) { err =3D -ENOMEM; - goto abort_with_netdev; + goto abort_with_adminq; } =20 gve_set_probe_in_progress(priv); @@ -2906,10 +2920,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 @@ -2932,6 +2953,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (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 D56E83D647A for ; Tue, 2 Jun 2026 23:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444754; cv=none; b=XYUpme44e9mKDS2CVMV2xnVIxLsdpZjSYKf5BSRhr05Wori/FFoHvDDaZDHltMfnj7UUQbHnwV0OBGlbILEuGW4UZCIFgLqf74S+KyDpsIHip1H7PjF1rH5usiqXimBvpGR4EA/4cIXKKRgpvczCBh2WfonGIBOGugN+7wQDpn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444754; c=relaxed/simple; bh=vlXYIYL9QTWznkvct15QBSB66UjBNT4nj/9EHJkxq4w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=m5Hdyi03IxVRz8lzjVNz5wF8C5cg3TEZ6wx+XKMkWbZxj+4Wpb4EA1+BIw6dvLUsvPatQ5E9FOsNcGMbUGFWw5EcyaAjqHWz9GIJk4jLz0vmRVpnY9URqJDJCzhOzNyh2GhU1fRriDBLG0S6YPQIE+4RrX4Do2DTnbygMPo2HL0= 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=Pk2Hxua2; arc=none smtp.client-ip=209.85.210.202 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="Pk2Hxua2" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-84238e83851so2224969b3a.1 for ; Tue, 02 Jun 2026 16:59:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444750; x=1781049550; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LpDIxHnDF0+XKaA/CcYR60ivGnavty89fftbvhrFuDE=; b=Pk2Hxua2xZghsLsBfP1KrFnK3B+CGQbfMtbxJg08yLDBwZ/bFhWPNasIduP2IIJgs7 7M2gcJfcin/HTbWlivSfc6mT7GYZstGTsiKwpHTc3Uo9hfja2+8SR2DmSpJpcnQ6u23+ z2dUgD1maxXbBDFXu9okUs/ijGXQ0X5YS+q0VyR9uqnhWt7w2SmGvwm/n/wS6fG5HYoJ FE6br/LoxyhN56LqLU2S+LEPTlqLxtu9tetj7X4h5qiP/0bLoUBJll/RpPGZULrLrap0 ZpYkL7RtpLFK2VjbKPE8ptsFCFbzAGWOWEIIDbI41wEoq2G1hyNy0xAyP+nkQFg2dfdT wobQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444750; x=1781049550; h=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; bh=LpDIxHnDF0+XKaA/CcYR60ivGnavty89fftbvhrFuDE=; b=Q/pP9L1GyWlzVq0wxDDHHfqUb34484M4tO0Wi8DhaHEXbPRtz7OvCKzaGUnmqge73g YOb2N5nkafnDZ3sL/1kVBH914FQmoKHAHuvZljlkm6+Gko5AkPHzsDLxtadphOnumlpo T92Px1MS/rd7UMw+NCxZTfUetU1KGozSWCSMaPehsRVgQsOpAzFBLnSSX/bfpM7VSgK8 FODLCB8Ty+XdLCNNYKV5qMJfmI3d2EpN/wLGXvXc8ldKmEJ3altbzpaUmM6kwmsqGIuk UBnQBTqZkS/STP26wnfp0K2+SN+ZzBhZecCbJ0pZPeMUlUdDyPX9lnaNeFgr+OjGf8RK U8xA== X-Forwarded-Encrypted: i=1; AFNElJ8efO4HsSnWOtL+yR11ha3HXLqV0/dKDvt2yUvkoi0c75ejmVrb41sK6Ikte4y0CzaSm6rgzoLy3iLF6xA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxi8c3JDaN9XXu1kXGC9qG0PcdRJcwhEw8snUB3TR/Tgd8nQgGW jIO21+00O4AUlZqhYP0USHQJrAc2Rh9VjCBmZ8WFN0Ztxjkm8MkoxYM3/uqKyfm53o5QrlM6Cgk OuTcM4bxJzbWep0QjCN8z7slG8w== X-Received: from pfbdo14.prod.google.com ([2002:a05:6a00:4a0e:b0:842:48fe:379a]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:3687:b0:837:e9cc:d46e with SMTP id d2e1a72fcca58-84284e5f662mr974597b3a.21.1780444749852; Tue, 02 Jun 2026 16:59:09 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:53 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-10-hramamurthy@google.com> Subject: [PATCH net-next v2 09/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- Changes in 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 | 5 +- drivers/net/ethernet/google/gve/gve_adminq.h | 1 - drivers/net/ethernet/google/gve/gve_ethtool.c | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 338 +++++++++--------- 5 files changed, 167 insertions(+), 181 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 72588d201e5d..c2e68fd97de5 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1347,7 +1347,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 e7956d2768b6..84b548467a0c 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -363,7 +363,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 @@ -392,7 +392,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,7 +1376,7 @@ gve_adminq_configure_flow_rule(struct gve_priv *priv, =20 if (err =3D=3D -ETIME) { dev_err(&priv->pdev->dev, "Timeout to configure the flow rule, trigger r= eset"); - gve_reset(priv, true); + gve_reset(priv, false); } else if (!err) { priv->flow_rules_cache.rules_cache_synced =3D false; } diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index d07e9c6f279d..12d2d1347e21 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 dc2213b5ce24..54b623b678ce 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_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 746ff69a28dd..f8289f478e5b 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -591,7 +591,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 @@ -600,16 +615,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, @@ -619,20 +660,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 @@ -647,7 +683,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, @@ -659,67 +695,61 @@ 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) +/* + * Request the device to release any allocated shared resources. + * + * 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) { @@ -1160,8 +1190,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 @@ -1272,11 +1300,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); } @@ -1419,10 +1448,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)); @@ -1438,6 +1468,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); @@ -1454,41 +1490,18 @@ 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; - - 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_turndown(priv); =20 gve_unreg_xdp_info(priv); + gve_drain_page_cache(priv); + + timer_delete_sync(&priv->stats_report_timer); + 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) @@ -1496,12 +1509,28 @@ 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_queues_stop(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_mem_remove(priv); + priv->interface_down_cnt++; return 0; + +reset: + err =3D gve_reset(priv, true); + return err; } =20 static void gve_handle_link_status(struct gve_priv *priv, bool link_status) @@ -2420,25 +2449,17 @@ static int gve_setup_device(struct gve_priv *priv) { int err; =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; } @@ -2513,30 +2534,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 @@ -2549,54 +2547,52 @@ static int gve_reset_recovery(struct gve_priv *priv= , bool was_up) =20 err =3D gve_setup_device(priv); if (err) - goto err_free_adminq; - if (was_up) { + goto err; + if (setup_queues) { err =3D gve_open(priv->dev); if (err) - goto err_free_device; + goto err; } return 0; =20 -err_free_device: - gve_teardown_device_resources(priv); - bitmap_free(priv->xsk_pools); - priv->xsk_pools =3D NULL; -err_free_adminq: - gve_adminq_free(priv); err: - dev_err(&priv->pdev->dev, "Reset failed! !!! DISABLING ALL QUEUES !!!\n"); - gve_turndown(priv); + 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) { - 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); - } - /* Clean up any remaining resources */ - gve_teardown_priv_resources(priv); + + if (was_up) { + gve_queues_stop(priv); + gve_destroy_rings(priv); + gve_unregister_qpls(priv); } =20 - /* Set it all back up */ - err =3D gve_reset_recovery(priv, was_up); + /* Reset the device by releasing the AQ. Rings and other resources + * within the NIC are implicitly destroyed if commands fail. + */ + gve_adminq_free(priv); + + gve_queues_mem_remove(priv); + gve_teardown_clock(priv); + gve_free_control_plane_resources(priv); + + 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; @@ -2928,7 +2924,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)) @@ -2936,7 +2932,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); @@ -2944,8 +2940,8 @@ 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: + gve_teardown_device(priv); =20 abort_with_wq: destroy_workqueue(priv->gve_wq); @@ -2977,8 +2973,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); destroy_workqueue(priv->gve_wq); + gve_teardown_device(priv); priv->ctrl_ops->unmap_db_bar(priv); free_netdev(netdev); pci_iounmap(pdev, reg_bar); @@ -2996,13 +2992,9 @@ static void gve_shutdown(struct pci_dev *pdev) =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(); } @@ -3017,13 +3009,9 @@ static int gve_suspend(struct device *dev) 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(); @@ -3040,7 +3028,7 @@ 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); + err =3D gve_recover(priv, priv->up_before_suspend); netdev_unlock(netdev); rtnl_unlock(); return err; --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 CE18E3D16F0 for ; Tue, 2 Jun 2026 23:59:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444754; cv=none; b=K3+57HIT7IJevG/O6FZknaVWI+FR6ggAdBXylipFjAT4RKrQS5KtN+YxlP+E1HXhW79uEycWwAHyIzB5rsHjwg6i4QLNQtzoVUFkFMmOY2aAl8ZV7I71Ojf5M4/YI9IPS3DnBGVIJiO0+Gi+DfOFPYpkSC9NBRNlJV4I8qrowP4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444754; c=relaxed/simple; bh=bfkbzcp1Fot1w6bvS24vOCxDosYYMCK/5oG6sXU5oes=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fF1sel6ov7R8kz6kUrU0cqjWUZDLaojDrSrGbuTcBQ5INJBPULHUKf4xcAkDWysbmfB/BQ4vqgZbWwr+ZfPlB/fmpYacb4FyQbGs7JHr3Jo/E7f0Sy5oA49NUcDzaN+ZGIoOePZSwOgfY5n0Nb/PBQdBJzlDb0X01WWH0IhC59c= 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=oyDSsKHp; arc=none smtp.client-ip=209.85.216.73 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="oyDSsKHp" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-36bba9b849dso4812378a91.1 for ; Tue, 02 Jun 2026 16:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444751; x=1781049551; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=W6G34oXGvIyApPhfMqkOGV/NoJJkAaxyWdHlCw0ixgI=; b=oyDSsKHpcLDJmeCKBCEtsELBYZ19G1qK8z8EsLsWbzE1590H4C7dzrgp7hlQwxOqll KKQwm+HT/4kvylYx0VDNNUKmf/QoI1TzeX2YRg8rJu8YQqS0mOiFWjjupz/UIdlySP2D tPdubeYKF9V2qn8+dl9oe+UoDN3foNYxrAGSLXzpnFRsNb0NwMdD0TbkAEOCgoDCYOec 9YCmp8vzkd8+f39nd9e+bGgJYf5xk+WQywGOYaJBSwEZgFMHtttF8c3K6KekoID7IN8O Qum7TrRhF2JJ6hVQsoQI0D1DzPTu3TVQfbGFJ8thkI7FWCBrmWD7x0sdnXrDP4+09bdW /GLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444751; x=1781049551; h=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; bh=W6G34oXGvIyApPhfMqkOGV/NoJJkAaxyWdHlCw0ixgI=; b=elqRfSXF2IlXVwuewkZJc54qGfy7s3yV4nF3aCM64M8UheGJVs6KU6cpeIEAzoUW5I q/PgZyWXsfoAfgIXAgfLOQxUWtwDH5p29roxVB6HJHrkkFSD802BkmnCzIO3+xkB9+JD UoYRPRnIORxzWlr7/o0OLnXAzDT2wcCH6Yoqf0CdAct6hV7nou2no4ELpS2a0qMp+3lt t1f6D3OyzKawLQLuk5OulYqA76mzGIacdvAM4ZNj1zfWOOpmmvsL0qHjln0hmzDsZ/sX gmQoZWZmcCHksVSi6Fhbq/peQwfbB7LIbeycvxEwp7kfA8LLBRPs3kOrUjJhL2RJwbQK C8NQ== X-Forwarded-Encrypted: i=1; AFNElJ/UUGv/dvLwaTd5JcfQz0kx7XDd/6nOA8NkiDyqA+L8G9rt98ZRoqt1Q5IaOA1Jhh4QsL8B6HSs4E+3pvY=@vger.kernel.org X-Gm-Message-State: AOJu0YzCWH/nkeO+iPdUUB2zV6fVD0DSvO7sctF0wK4Sxwux4JUKlFG6 sF2J4HuElYnF4NG8nsysQdH6E4rfIH3kLrdtRzEiv5cqQZ85xv8DLfVe3i+afbycBA7nirvAsMM gQFvaabfXZWVvp4H2YzemmdoObg== X-Received: from pjbx36.prod.google.com ([2002:a17:90a:38a7:b0:36b:8abb:86b5]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:48cf:b0:36d:633a:e8aa with SMTP id 98e67ed59e1d1-36e30a2855amr1052328a91.13.1780444750697; Tue, 02 Jun 2026 16:59:10 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:54 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-11-hramamurthy@google.com> Subject: [PATCH net-next v2 10/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 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 c2e68fd97de5..939b245ed562 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -832,12 +832,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 84b548467a0c..d814108deeef 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1327,8 +1327,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; @@ -1354,9 +1353,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 12d2d1347e21..d5f98a80be46 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_map_db_bar(struct gve_priv *priv); void gve_adminq_unmap_db_bar(struct gve_priv *priv); int gve_adminq_set_num_ntfy_blks(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 f8289f478e5b..06df6d8ad429 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -649,7 +649,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, @@ -664,7 +665,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); @@ -686,12 +687,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 @@ -712,6 +714,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 */ @@ -721,11 +724,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, @@ -1811,6 +1816,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; @@ -1826,15 +1832,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, @@ -2469,6 +2477,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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 BA01A3D7D7B for ; Tue, 2 Jun 2026 23:59:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444755; cv=none; b=Nw1RUj45q5Qukyfm29006Gt1VKRRuzWRUCczHUHwn0wicNaNaT+5OT5cfsTdnPAj6i1QqVcRl85qLJhtmiPmInCtC104Wxr700JA6g9utnLLTMkWQ4guCqwnTolAI0z6H1RgqOaHZQTPG2DxrNzQ7uPIiwqCXlMhwtMvQ+j2wSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444755; c=relaxed/simple; bh=Qkkyon9gqvLq7BdyABeX5Tqb1Z7rXvGkYnNhI7MplIo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=d7YaD2ZumNg3ZThn9c8KcJQFWLvevNgOLBIUlHW5affTFYLzYBc339RPesXZWcTD2GB2DkbhOScOQacbFeiFO1TJrxg5uudaCNzITgUE8uM1p9ml/aHvsCdqb4AD+SpmKvs7oiRawaRS5Vc10h4o6N8bFRqaw7lEam/mrM/GNII= 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=ExtfqPxt; arc=none smtp.client-ip=209.85.214.202 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="ExtfqPxt" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2c0c1e112dfso41763985ad.0 for ; Tue, 02 Jun 2026 16:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444752; x=1781049552; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sv5XvrfKLhmarDTIjRJkZy4vPqS4o33dakzeK+6ZBfc=; b=ExtfqPxt0qsSXKPkyNqN6VbC0wNP3GLYxABbAfHxyB7x+oLHZBRPIV14liNAX2A1bL 6QJ3R8gjJUYsTZuAI5me1ivxdaKcN5OMS/w5jZo29W8d+l4IohktdhycTVWCXHuQv7BL 8PzJxOcp9h9KC/vGOiKqrrcC6rW8vENOOu0Gm7A22YSttToDd5BfQz6dDg/DmncF/W9h FhFbmjS13fRzmxXFgwM7kD++QjA4N8SNe9G/pebNOCW2negecVOw8LsqwZyHfvkPp6GF 96ivSLuVzIzrFxNrQ3SXbZx2WsR47AktuMnGOKhzijZHTsc6pkdlvp09HmtDNmdPFfDU uARw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444752; x=1781049552; h=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; bh=sv5XvrfKLhmarDTIjRJkZy4vPqS4o33dakzeK+6ZBfc=; b=g0gY6ILUaoT+tSdKvd90Bu9WSWmDNVcdlKWrmfDA3dcNpyURZs+lCi5UwvhVJTU94i CIckHYSp8ZmfVXWlhPfjwSpcoZcX9wHjBj98EXID0D6qFr96q9ssIPflTZzD7KO0uJGG Ne0yB+hujmXbPTTMpm0rv45wKm2SvQFBsQkQXcVCGgUxr6p09WNIIk/F5vbJb07t2++n QV5t4oPKwzCJhx51qJQhhIfOfdEl0hV1luD/mx8yu9VeAGt1kswdOp+Y5cTjUnQYUwsx YffbrhYG/7ELiDpHpBSlVRqEQ4vTSWizz7sqCyuTkvPcv11NfcxeCLjsNr28daG1AHPo 38Cg== X-Forwarded-Encrypted: i=1; AFNElJ/zvkc+t0DzXSi/QuDVzS1RShg3YlEPmpQMh6KgFWvA1MgokZBLoRt+e5Zp6KpwVPrhqMC25MwdhIb9Pm4=@vger.kernel.org X-Gm-Message-State: AOJu0YxTDJGp4ku/BwyOI73iqNEZ9ITde15VjEq0ORTj3faM8os1cXzz 2oAcTB6wlm4bAOKKdSekpQ+uJjTJ/ogs2aLfthDC1QiiyuHT6D1lKjeiEN11Miobb5zkqJyiLKT zXsmJp92LCQC5hhc0E0PNjq0Grw== X-Received: from pjji4.prod.google.com ([2002:a17:90a:6504:b0:369:28c8:746f]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:c2c5:b0:35c:cba:3453 with SMTP id 98e67ed59e1d1-36e33105750mr950302a91.22.1780444751550; Tue, 02 Jun 2026 16:59:11 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:55 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-12-hramamurthy@google.com> Subject: [PATCH net-next v2 11/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 158 ++++++++++++--------- 2 files changed, 89 insertions(+), 71 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 939b245ed562..e173c14bdc08 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -673,6 +673,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 */ @@ -953,6 +954,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 06df6d8ad429..98970508ae54 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -425,6 +425,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) @@ -436,11 +454,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); @@ -454,7 +470,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; @@ -477,15 +493,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 * @@ -493,15 +500,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); @@ -519,9 +576,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; @@ -535,61 +593,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) { @@ -743,6 +752,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); /* @@ -2463,13 +2473,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 { @@ -2591,6 +2604,9 @@ int gve_reset(struct gve_priv *priv, bool skip_queue_= setup) gve_unregister_qpls(priv); } =20 + gve_teardown_notify_blocks(priv); + gve_teardown_control_plane_resources(priv); + /* Reset the device by releasing the AQ. Rings and other resources * within the NIC are implicitly destroyed if commands fail. */ --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 73E683D890F for ; Tue, 2 Jun 2026 23:59:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444756; cv=none; b=MfENbnRD6OM1EVA47hxUSu+v9M0lCj2nec7nvjY2SkYEktMLTj3DI24jgxVQugRu4egzPPpPAthC9bYwuqbaVaJeBTvkAHxiQXljgdn1+lzVSA+af2BwN/4rwzCzAny6uzjyug9mRtQcDrBdQfdHqgYWtW6LUq9sGa/TIqngdvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444756; c=relaxed/simple; bh=qdUwWfqH2ScZ7OVPBHIwyGfGzSkBUL7CRJoOZbN0zTE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bJRidz7XiAn29E6VesIEu23GlV2S+m4r5I5mnzM/pbxKE5WeCVc5FtqDAAgH0UNs69XPnD9/suhsbns432uxJjV7JDjIOXvPlmC97vSXgd6h+QHY4kK8O4ay+rqdD4lBiIPrEeKYfXjJ2+O8IjkwBH3uKSHTGP9MYhjvJIxMpj8= 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=Ax4So56q; arc=none smtp.client-ip=209.85.214.201 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="Ax4So56q" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2c0c3315d31so32655565ad.3 for ; Tue, 02 Jun 2026 16:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444753; x=1781049553; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=9FlKji3hm2NB+QDodIndkPfsEAgD6+iyL7xiAelQYGw=; b=Ax4So56q5k61i1vdoLW3n8+og9SmBUt7sisIU3DLWBqMAht0l3yn7usMlfi0IhGrSs 2sQtiWNah56R57810d99CnQ78qMhbRcVrYHS9hPsA50QtIRMF0i6Ea/pNk03VROYPJwV ChnRbT7JpoQL5k74+K36bUlbEP3GGAeuZfZulLNVxLKbFN/+kd1nCFgbHZaENfintGrG OQPYBnGCmWLw8H1evA5h7xdaJ/z/b0PA8Vt3QF3/5ek8E1gilUycAYEGjFOJm2nIOhB/ XxPIpcT/Go9ZJYeA8kNLgG3mZBs7J1zZXHNs2839yc1DO7iNGWvdrbI5dbz2RGHR/UV8 LY9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444753; x=1781049553; h=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; bh=9FlKji3hm2NB+QDodIndkPfsEAgD6+iyL7xiAelQYGw=; b=IJI8Hm8M1O0+dNtEd4q7SzWVFzGv32FVbpiGsKpW4tiyoD6rRyEZKbnAUmRjuh4P9T LMj1aMvPO2jZfBVnYLWtZr5RPGrOKjV/ryC9B8De1JDW+4CQm+THkZPTkevl6aSB6IMu l8zqljVDwpN1rx8JoQBJkfOL76dIdYwo5B9EunmtTEF1l+ugCGp3zExWbht+QTFMguu1 Q3iD+kht3/hywe9ffM4GUxL1Pn1b/Iim7yEzcCFmakg/wKJ2cCrtNNAgMGtzb3zitxDA ZjAc/njgf8A9OA/MG+xc9clhnCdoVPzs1NPKa3jZd8mllwFed0aTUejlCV2SOEUm/mCh HDhA== X-Forwarded-Encrypted: i=1; AFNElJ9EYpkDbxVvYGwP7wbSi6BGzk8NbBlcEmMxiyf+TU2NIMy837LD5WLYzaENMB2VRU+kioqK1rwPzZEy3JI=@vger.kernel.org X-Gm-Message-State: AOJu0YymqSNEkjoG3imp50aqEDwUhFr4IvsgiWJmFo+WkI23kN4bpgnI U0/dBU0QKX75R2bjYHBm4qWJA+x5Sf9Z/r8FjmgkVpbtgx0FwrOg9spifqHgseppuUOQq9sbmYm zWaPwxGsUTO8z9r2yy2hk++dCew== X-Received: from plbke7.prod.google.com ([2002:a17:903:3407:b0:2bf:190f:f93e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e985:b0:2c1:5a24:b4ed with SMTP id d9443c01a7336-2c1644d1a9bmr6069555ad.37.1780444752437; Tue, 02 Jun 2026 16:59:12 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:56 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-13-hramamurthy@google.com> Subject: [PATCH net-next v2 12/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Joshua Washington Introduce `request_db_info` and `free_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. All behaviors related to the IRQ doorbell indices will be managed by these new methods instead of occurring directly in notify_block setup/teardown methods. Similarly, GQ ring counters will be managed in `request_db_info`. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee 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 | 71 ++++++++++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 70 +++++-------------- 4 files changed, 103 insertions(+), 52 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index e173c14bdc08..6db5fbc0b321 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -833,6 +833,8 @@ 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 + * @free_db_resources: Free DMA memory holding doorbell 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) @@ -843,6 +845,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 (*free_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); @@ -1163,6 +1167,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 || @@ -1375,6 +1384,9 @@ int gve_adjust_queues(struct gve_priv *priv, struct gve_rx_queue_config new_rx_config, struct gve_tx_queue_config new_tx_config, bool reset_rss); +/* Initialization sequence */ +int gve_alloc_counter_array(struct gve_priv *priv); +void gve_free_counter_array(struct gve_priv *priv); /* flow steering rule */ int gve_get_flow_rule_entry(struct gve_priv *priv, struct ethtool_rxnfc *c= md); int gve_get_flow_rule_ids(struct gve_priv *priv, struct ethtool_rxnfc *cmd= , u32 *rule_locs); diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index d814108deeef..259dcd617216 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1719,3 +1719,74 @@ void gve_adminq_set_num_queues(struct gve_priv *priv) device_info->default_rx_queues, priv->rx_cfg.num_queues); } + +int gve_adminq_request_db_info(struct gve_priv *priv) +{ + int err; + int i; + + /* Alloc dma addrs needed for shm regions */ + err =3D gve_alloc_counter_array(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Failed to alloc db counter array."); + return err; + } + + 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_with_counter_array; + } + + 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; + goto abort_with_irq_db_indices; + } + + 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; + +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_counter_array: + gve_free_counter_array(priv); + return err; +} + +void gve_adminq_free_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); + + 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; + gve_free_counter_array(priv); +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index d5f98a80be46..985b1aefea6e 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -657,5 +657,7 @@ int gve_adminq_map_db_bar(struct gve_priv *priv); void gve_adminq_unmap_db_bar(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_request_db_info(struct gve_priv *priv); +void gve_adminq_free_db_resources(struct gve_priv *priv); =20 #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 98970508ae54..55f48aee125e 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -179,7 +179,7 @@ static void gve_free_rss_config_cache(struct gve_priv *= priv) memset(rss_config, 0, sizeof(*rss_config)); } =20 -static int gve_alloc_counter_array(struct gve_priv *priv) +int gve_alloc_counter_array(struct gve_priv *priv) { priv->counter_array =3D dma_alloc_coherent(&priv->pdev->dev, @@ -192,7 +192,7 @@ static int gve_alloc_counter_array(struct gve_priv *pri= v) return 0; } =20 -static void gve_free_counter_array(struct gve_priv *priv) +void gve_free_counter_array(struct gve_priv *priv) { if (!priv->counter_array) return; @@ -428,15 +428,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); @@ -493,24 +484,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; @@ -525,13 +506,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; } @@ -560,12 +542,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)); @@ -575,14 +556,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 @@ -599,7 +579,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); @@ -608,9 +587,8 @@ static void gve_free_control_plane_resources(struct gve= _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_counter_array(priv); + gve_free_stats_report(priv); gve_free_rss_config_cache(priv); gve_free_flow_rule_caches(priv); } @@ -623,9 +601,6 @@ static int gve_alloc_control_plane_resources(struct gve= _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); @@ -661,15 +636,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 @@ -678,7 +647,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 free_db_resources; } } =20 @@ -708,8 +677,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); +free_db_resources: + ops->free_db_resources(priv); return err; } =20 @@ -739,12 +708,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->free_db_resources(priv); } =20 gve_clear_device_resources_ok(priv); @@ -2494,6 +2458,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, + .free_db_resources =3D gve_adminq_free_db_resources, }; =20 static int gve_init_priv(struct gve_priv *priv) --=20 2.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 214E93D967A for ; Tue, 2 Jun 2026 23:59:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444758; cv=none; b=WrUeK3rqUE06k5LMVrAFMFlkOtMKQe7TVxHqJngv/GcZ5G40bz4Z36jb1a64Er1DSPZnnW/TDLIU1MD+U2dff0F7S8SvgIsaek41O+9ImTCkMLWrb8KOEFXqx4HO/37XYxCBVVHIzffLNk3l7iRCI4Y4GFGaZxUYlaS65pDOiXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444758; c=relaxed/simple; bh=dY8+lKHhV2rHhovPTI1TDqg9U0WqdNSAPj353183+us=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=SAMeI45oQ077DYOXJP3PstB5JQobcVx1ZAbLIqsaggcxXnjErKisuql7xT0QbJ7AFdFRwVDRh3CMMe1JiEUa7FPTa6636NzvR+alXn1xGHUg+3knpQhHIGkifG8/tFF588Tzwkn9sTsV3tINyKWSmS7nCm1PBUoJSX0HpgZTjN4= 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=e1TU3EIu; arc=none smtp.client-ip=209.85.214.202 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="e1TU3EIu" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2bf32259e0eso49364695ad.0 for ; Tue, 02 Jun 2026 16:59:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444753; x=1781049553; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nINQiEO0FTPKhvz31pc2aYp3CuLYfvtT99Woxa/XmsI=; b=e1TU3EIufFTqZZ4DyzRUBhQQtJDsdlCQHAvXrL3rv637w88Y7BKXzzOvxnsg2FmTYY k7xla1IYLvmcNZRcnfvv66QVSpnxW+qPGVyV38e551m6HIBV5gpDIZ13de7F+bXpzaeu d1JVtEUVLmNMJMF0dFhCw52CmmCsAAfhTpgLCxgUc1z72v4ab9Bnd7B2m1UTWdoLVLAz 4IRipdxqVi20BCXulgs4vRz6xUt3joG1YBRXTeA3PVezcEPcTbgOLBL2LK+2pnacvowF Amg4SkvkruCMjconOsicRHNa1VajyjquNcQYETCWp4bYhC3pPIK7J2IGhm+qHWrlZWNw zCyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444753; x=1781049553; h=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; bh=nINQiEO0FTPKhvz31pc2aYp3CuLYfvtT99Woxa/XmsI=; b=G3nMV0VqRgu6IjGuPpiYTzWcVnElEA92IMT82qFp1ETTxMJjCtMT6caYpwB5VIzFDc gEwbRyOc+06rIZPrFew226Dngyr7rXaEG09oJ3PBdMRTTK4r3vcwMt8FbdbOCXuVh79G +UdDXtgs22Q0cfQ4OLOhCuh1tMHjP/GNOoFitGU1vZOQMWFQY7O7CRK1RC7/ZAPb6lYB g+W8C9HrxU1IIR5yq0NTz7L5L47z1DCHUSnkHh0EmekdqKnDeUmD4i6bnAX0tO4FAAgq YpAHvmZ3VHkQZFlD37gLA0JphTosvtONGHEaOStqS5gmEB3ODTB9d4aePgdoI+UcmZth 8Q+Q== X-Forwarded-Encrypted: i=1; AFNElJ8L/m6dy0w0CtUB/SIX1w4IGrA4TYg543R+V6I/BcxMQlLyi5ncvDg3iEQUoUfpEZ22UhVgfHl08jioxMM=@vger.kernel.org X-Gm-Message-State: AOJu0YxPB1/FfNHCkg4eUAOgRXNol4Q81S3EKg1yako7arfI4QWmMBh3 htdz1EglqbhbGNw2FVTInKy6ol+UmM4O9Wxe6DBh8+QfqR3xNiopE7eI2ZQnmioCvNdKpVCuxMU er+6N6pZ43XoUB0o4KAnc7Z9xpg== X-Received: from plbmi7.prod.google.com ([2002:a17:902:fcc7:b0:2bc:fd14:b4f1]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:28c:b0:2bf:1fbd:b946 with SMTP id d9443c01a7336-2c1636143fbmr8559035ad.0.1780444753308; Tue, 02 Jun 2026 16:59:13 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:57 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-14-hramamurthy@google.com> Subject: [PATCH net-next v2 13/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 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 | 32 ++++++++++++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 ++ drivers/net/ethernet/google/gve/gve_main.c | 28 ++++++----------- 4 files changed, 47 insertions(+), 19 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 6db5fbc0b321..b2e578b3d450 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -835,6 +835,8 @@ struct gve_device_info { * initialization. * @request_db_info: Request and store doorbell information into @priv * @free_db_resources: Free DMA memory holding doorbell 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) @@ -847,6 +849,8 @@ struct gve_ctrl_ops { int (*set_num_ntfy_blks)(struct gve_priv *priv); int (*request_db_info)(struct gve_priv *priv); void (*free_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 259dcd617216..5dc5c63cee32 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1790,3 +1790,35 @@ void gve_adminq_free_db_resources(struct gve_priv *p= riv) priv->irq_db_indices =3D NULL; gve_free_counter_array(priv); } + +static irqreturn_t gve_mgmnt_intr(int irq, void *arg) +{ + struct gve_priv *priv =3D arg; + + 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 985b1aefea6e..ff656fb4f113 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -659,5 +659,7 @@ int gve_adminq_set_num_ntfy_blks(struct gve_priv *priv); void gve_adminq_set_num_queues(struct gve_priv *priv); int gve_adminq_request_db_info(struct gve_priv *priv); void gve_adminq_free_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); =20 #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 55f48aee125e..9d00093826e3 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -267,14 +267,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; - - 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; @@ -499,6 +491,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) @@ -518,29 +511,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); @@ -2460,6 +2448,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, .free_db_resources =3D gve_adminq_free_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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 3173A3D5C3A for ; Tue, 2 Jun 2026 23:59:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444758; cv=none; b=ouY77SvVOnDYUJwHRWqKgKut2BCIaqNF9VZWt0eLMfeJbT5YBm3BcFRpfWxqR2ncu15+uMqaO6aNG0Vkwg7U1Y+3Dwodn8DEwlAoojmwbBZPT7bHqhQKeApYJImL4xy30O8HCCeNYi/9pKMUb6c6oUcKUXwNa2J9GdhMYl8BdFM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444758; c=relaxed/simple; bh=k+vW0mqd6P/RhkJ7A6+QLcND4y/aqaRRAmep9jb9nSI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Q8+bk5oW8p0JEdCLICr+EZzON0Q/K+gY5DccbDEiL0GrAI8oc9K2IIKXRqkzkLU03p15iFtBnNi79yaBrz8Nv35NTvuKR4EriGQXfjPAA+2tL4MvE11oJQWZ5MevIssRp9cy0dg/djJH1qij5MjLtiWKsLCA8d8xsyULQEWDRMs= 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=s7dVpzcH; arc=none smtp.client-ip=209.85.216.73 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="s7dVpzcH" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-36d99629fd6so4858876a91.1 for ; Tue, 02 Jun 2026 16:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444754; x=1781049554; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Rd39dBYhCZtI0L93Tr3ikSirnGLJysTcXvZ5qialSWU=; b=s7dVpzcHGB357EdISEIJraKTW8uivOF+y0PvdvOg1tYioHLsu+ancE4QY6f99MaCLC LyPakCOyd01r/GQ2iule9QePIt2O4CaUr2/MmRSuhGZxlcv3qj/Pt7xQPmB0EghIsyOV JVHF6RG3rH/XOqxZUjZV+TYH0sTPqK66TcpKzipdHRQeTR5YSW6VkLlnGVb6wc/q7n0K Dx/mwUREEK5Lx52WDii8gu0Fa84ZKyzgeg5xczbZt6eG4FftgWPUZh9jhLAisc5UmzZL OvJ8rECqGPO4I+Z32823AexW0opV8+psxNgo9JyVZi1L9I7vBKNufZ+KWWTriPYy0Gfu dZHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444754; x=1781049554; h=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; bh=Rd39dBYhCZtI0L93Tr3ikSirnGLJysTcXvZ5qialSWU=; b=fqTl2AHf74T06SdQen8lZJKHV12go+naAG7wQ8C5H79Ljc2p7sPb84h+/3/Qhah5HI GeBXZurP5hpv56mQUxEMBVNu+ZVSEoyrQuaq1whnHslPSmiTEL897/F+qTRuMyUinMHX 449KlY4O9SgK66oR9jgBh7BGVmAkYEGntSF6T7/2U4qE56adTyhSWDUbBqHBZNiW0/VF BS9g6zwGiDVJOXCUCF6LUPahgp82as2cb4Nc46CPQ75lz5hghPDAVoVYn8zuBI+2qjAe vauifO7VkH4NKBSMSN2n29yxI0P5LNJCVidfCdljT2z85pXBel+BTYRFrbaxK6jel9SK cQ2Q== X-Forwarded-Encrypted: i=1; AFNElJ94tdfvhgIU2zpReXZQu1zznxuaL5C1x/7DT+w4lqJyezFu3ccSjjA1BGgwRnZoAeP95/8HA+TUlm2GRRA=@vger.kernel.org X-Gm-Message-State: AOJu0YxwclhLYbUKDQL/m0btfYSf4YDiElgbrmlfZQ2Cs9+Zc0mGW6aS ZgjUMp2zg8LxdiXiyoGameX85rRn4VA60/QSplLD8zsk+kjz6l+0k9ZTrxYkdINco7NQMP09ckv i1nksf5UNGomy+YuUDGjGpSTUvg== X-Received: from pgly2.prod.google.com ([2002:a63:1802:0:b0:c79:2fa5:7c6e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5345:b0:36d:635a:ac1b with SMTP id 98e67ed59e1d1-36e34292d44mr919317a91.22.1780444754133; Tue, 02 Jun 2026 16:59:14 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:58 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-15-hramamurthy@google.com> Subject: [PATCH net-next v2 14/15] gve: add ctrl ops to 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 Signed-off-by: Harshitha Ramamurthy --- Changes in v2: - Fixed typo in commit message (exisiting -> existing) 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 | 3 +- drivers/net/ethernet/google/gve/gve_main.c | 41 ++++------------ 4 files changed, 65 insertions(+), 33 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index b2e578b3d450..4283cb9b49de 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -841,6 +841,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); @@ -859,6 +861,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 5dc5c63cee32..799381d24c71 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -941,6 +941,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 @@ -1822,3 +1846,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 ff656fb4f113..03e8318f7327 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); @@ -661,5 +663,4 @@ int gve_adminq_request_db_info(struct gve_priv *priv); void gve_adminq_free_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 9d00093826e3..dfc734d8bec9 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -841,33 +841,18 @@ 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); + netif_err(priv, drv, priv->dev, + "failed to create queues\n"); /* 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 @@ -1022,26 +1007,16 @@ 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); + err =3D priv->ctrl_ops->destroy_queues(priv); + 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; + "failed to destroy queues\n"); } - netif_dbg(priv, drv, priv->dev, "destroyed rx queues\n"); - return 0; + return err; } =20 static void gve_queues_mem_free(struct gve_priv *priv, @@ -2450,6 +2425,8 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D { .free_db_resources =3D gve_adminq_free_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.54.0.1013.g208068f2d8-goog From nobody Mon Jun 8 05:25:49 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 0D03F3DC4C2 for ; Tue, 2 Jun 2026 23:59:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444758; cv=none; b=i21LwL0tEcxyl43zMc7hugcax1ea29EmU4a64V8d4psibT+clHVQY5a6Izte+PSGdjHW1iGid7nxb98UDSlFZDKEElkIzKFjnX+HjvVV7K2DPwFFXpnVZESQnrIYBz3xKiUqeI7YnWKg8LOIfsrS86DOm83DT7aQ6z1xWMwrTGI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780444758; c=relaxed/simple; bh=DGCE98+sf3gtOgL0DfJ4/GGRQT0Y2b64WXkjR4uZqZY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JVSYYg2sgucjJsaHmHNhwrmr3MroSFFzXgtOhIYBGS2gmIPpMnwPk/WD9A4gbPO+Vi5TVrdoR3ZvvOmOKEJPDaCO8csydEQUxO0ZDufZr943TNCH8bzqVlNNCu9YAaE6TrE6XFwxaUihl5jXqf5vrTqE6nMPTeo7lPIIKsiURFA= 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=rR0oSDbj; arc=none smtp.client-ip=209.85.214.201 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="rR0oSDbj" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2c0c3315d31so32655865ad.3 for ; Tue, 02 Jun 2026 16:59:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1780444755; x=1781049555; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sds0BjBHqkbHWS41aSKBXAbeImqpSn/zS8nv8MxHFhE=; b=rR0oSDbjypnvxj66iG8dsTiTQPJavprJY2J4qcRCr519VOxzYWmdQq6UTimC1PM426 TlnjjwUZxZsHBwGp2dJKTtP0sXLgwNz7KzUpWTuuXsD7+Gvl5VLUugR1wYQLdx5GBDiz kuqRyXuitPRFd+U4ixP0f9JtDO0RtcT6T4M4NdxzjksqIGBQ4oCykV25QYaR0Lribcgw JEm/CN7zBH5wHhb1oCNkCWRS2u2kD45wIcE7sf/CW9dJoqXNkCyyECOqEkag8MDIzHmO JbkovzBqGvGe3uNLRdbMQ1wz3kNqQE5YCetyZ6ayF5yKApOXieyOccW9OVfkMNjWznwJ Cmlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780444755; x=1781049555; h=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; bh=sds0BjBHqkbHWS41aSKBXAbeImqpSn/zS8nv8MxHFhE=; b=Q9Qn8H9O/uApvGFI18h1MYjc2iGht1J+phJx09uGfgsGGARYK5hI2vkfABOqwL8cju D4w0Mso3sBMUezvT/51etUGTwLBt3USMVfBnvj98+XEGAfQ8Op6FdcmQXA6kAQQD3zWZ CHJAXlVNOTWcPDhbg42xmFxNgKPlhd6KfCyZItC4JsbFeNtZKqXz8dQSAPio8cjysuvY d4gi/bqzjTlXFBdojU8wjcUO8gGN/zV5iMy26ciZqV2DjRmO2hWO4LGbRcCu3jJeV3oJ Dzms8pI6L5jgmtrofwTCXC6nIzqf7gBFt43dKoDN48GQ8fGpBv3dKcKb7YHItmonIwtT EZIg== X-Forwarded-Encrypted: i=1; AFNElJ8BJ1ZPCMKshJNXe6+uTaHM71PvkyhWmRi/urWDaJzQpkew98aT7N1tu8CDFbrNglYm/eJiAsQkN/poE9A=@vger.kernel.org X-Gm-Message-State: AOJu0Yya2gGt3epzKuP5R6p1cTOgXbijkE8MDSIeiAxUr9eGjG8KySwa bUdqTl5clYhE4cCGPG2+SH8wYTxhDwnH5TPzvk4LCtfquca0iD+o8qt2plA3OeFMeGg/hrcpLdN D5/2SrWuuLDpKMSAzlI1yFJHmQA== X-Received: from plpp10.prod.google.com ([2002:a17:902:c70a:b0:2bd:56ce:d8ea]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ea0d:b0:2c0:ee6c:c53c with SMTP id d9443c01a7336-2c163a28b90mr9147755ad.1.1780444754952; Tue, 02 Jun 2026 16:59:14 -0700 (PDT) Date: Tue, 2 Jun 2026 23:58:59 +0000 In-Reply-To: <20260602235900.3050782-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: <20260602235900.3050782-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.1013.g208068f2d8-goog Message-ID: <20260602235900.3050782-16-hramamurthy@google.com> Subject: [PATCH net-next v2 15/15] 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, willemb@google.com, jordanrhee@google.com, jfraker@google.com, nktgrg@google.com, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 5 ++++ 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 | 3 +-- drivers/net/ethernet/google/gve/gve_main.c | 23 +++++++++++-------- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 4283cb9b49de..c8ebbbb93942 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 { * @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 status into @priv->link_speed */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); @@ -863,6 +865,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 { @@ -964,6 +968,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 799381d24c71..b33633555b71 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1872,3 +1872,12 @@ 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); + priv->link_up =3D !!(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 03e8318f7327..82413369dec9 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 54b623b678ce..aaf5b8b1671b 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 dfc734d8bec9..181ec6919051 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1475,15 +1475,15 @@ 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) { if (!gve_get_napi_enabled(priv)) return; =20 - if (link_status =3D=3D netif_carrier_ok(priv->dev)) + if (priv->link_up =3D=3D netif_carrier_ok(priv->dev)) return; =20 - if (link_status) { + if (priv->link_up) { netdev_info(priv->dev, "Device link is up.\n"); netif_carrier_on(priv->dev); } else { @@ -1510,7 +1510,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)) { @@ -1537,8 +1536,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 @@ -1971,11 +1970,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, @@ -2299,12 +2298,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) @@ -2427,6 +2428,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.54.0.1013.g208068f2d8-goog