From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (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 8E051432E66 for ; Mon, 3 Aug 2026 18:46:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782796; cv=none; b=fJ4ppHSRMTJduhXJjpyHAWv/GHM75jr6iu79LipG+SFi3Q8qKUw47Ryc8J3Y5slyFVAfP4NsExM6YwF9VngtG/4n8/G3w0SWztAOAmoqQdr8CdXgaZJPEb7oSvoXcNcVjHMkMxPNfy3HKobodpK6GsE8veX1h2IRkEZBciuyOsQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782796; c=relaxed/simple; bh=frH6jsEdOdsfiylCZZU+8mNGyrjO4vDVEUrOEZEaJOY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=V0g+xif0EwQff4Kl1DVSTsFrW9Ftni59TfXcc4lxLKWSsDuOPVGP/xeS/+hk2jqY+hJeYkR3kPRqNgBPYrg4RH7yKbA/n6+7TvnsPUcz8FE4+6wt4ksu8BQxH+fKFyJH7EWt65+9/5pXI0PlHJBz27WHq520kmCBl1MfKAGdPcQ= 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=RPhVQiiV; arc=none smtp.client-ip=209.85.210.200 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="RPhVQiiV" Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8484f26852dso4209973b3a.1 for ; Mon, 03 Aug 2026 11:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782794; x=1786387594; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=w7ASYggieirjDdtwumqn+FDfbcMK1nGnAGwXV10QRd8=; b=RPhVQiiVi1bz+RotG2Qq2bhDLzD8jNN9c+6VdJjcOEM10hNY3MHg6IB1SzNX5h2R0W +nGVmIcgbc3hwVIciQmUPM1OtGeH4wRv9l8tv9Zu7oJ4XWtDl9C/BslYO2eklbG7ryKD V0PjopqziA/Hlwebb6k1mi9hZvrfDuG+2EJIDGn71RsTtx2hCVlL0h40VvlVqxQLmJHm jVVwZgRTDZLkSvJqhy6wSv3qX/K0Hesv9uZDzowg/ry5YHQUkvB2+C9+YB4phbKqGDTM 2rKGED1mQhwTlLrzhj/VY2DR4wCkpgRuasH6ALOMUbXdlB4hn25EXTepwqCe/N6Yzz/O ufOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782794; x=1786387594; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=w7ASYggieirjDdtwumqn+FDfbcMK1nGnAGwXV10QRd8=; b=mdfkxts8k8tDXDJ2b8lIGbqCqn3S0QIhb9N50pBR/pZp53U7TrAFFTCqpZnqfpPkE7 +aRIeB1CjNwCZh6ANvWM8nCFFs5fMkKnzDFjKSD/5WJ1YAfi7Knkh4bpXLbt2KKkCqQf 9a1//Y07IiiN9lIYTUzw9HQQ5nr4xxPVdM55oHYTIe9hIWIIF5KqobkEm4qmLxvZL3PE 6yCBB8AYeyiCHVijN7tKBHX42QWUL3VC16YNzxUNqqSHWj1ph7Gi/QY3zLHnQConXivN 9toduPV3o/0M5Y1tqxWAiXXwMu2aZHW5Kog1934FyJ/VQ5tLJidlCOR+9gWj0/QJRmZ5 5qYQ== X-Forwarded-Encrypted: i=1; AHgh+RpzRkn7dSywGF68VYWTNHgdMvryM/ksIXEQzo3LFaRx23xJSWewuYESmdHYr3y0Idvx2ZJWE2DeLXnTbjc=@vger.kernel.org X-Gm-Message-State: AOJu0YwFSWKhaCIwrkMiHK+lhjt7v06mKyFmxED2bw3dIRAdfdnvVj9l VXATAcYyYOpDs6rwsXCplL6rwMCRODXYujInHhqi/XWfPsf/RPgA/C5wtj+7G1ugout96AkefK8 N+/mW46z7oGfB17dCiupPUVMGBA== X-Received: from pfblr45.prod.google.com ([2002:a05:6a00:73ad:b0:845:f28c:430e]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:9296:b0:847:8dec:1427 with SMTP id d2e1a72fcca58-84ee47dc388mr10092613b3a.8.1785782793256; Mon, 03 Aug 2026 11:46:33 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:16 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-2-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF035433E81 for ; Mon, 3 Aug 2026 18:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782798; cv=none; b=m8Miw/ojpzjtJRFe1VlDeK8lMBeS3F+thK7ODnPgx5R09LxbwUPAZ2TpB2I9/4hhODc1+zADR7/JUobd7Du2p0NwCP3X+Q718K9VhOnhVr3IlialTlf4jSueGqohOgs+/VBuoY6rSzJjuYOzNCpVmaH4MN7VIBXART96R2eG0Mg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782798; c=relaxed/simple; bh=jbKjjaCQnP0pxgEOJNcMtgqJV0Fdpyc3gfnnGlCv9f8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MgMBwzf6/B0LytmS7pIJyVQFPxBpbzZ4RdR446QSDOyKE/gaxEpoMQ+gjSK7gk+yJQxepKXzeic9WtV2tDb5FmOf9Unb34OwdzyBi5W6a0fQXqviErFTVdxzQa+Xn54S61xusboLQy+yBEO3CbkDkvWCSesabu9+t0JObrr0elw= 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=U5SaQxpr; arc=none smtp.client-ip=209.85.210.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="U5SaQxpr" Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-84e375d9736so5644787b3a.2 for ; Mon, 03 Aug 2026 11:46:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782795; x=1786387595; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=n6Z+knL/Vym2bTZhQ2MmdO9vfyLJl3tvT3HruMB1kzI=; b=U5SaQxprx/KdX/tWRxWAhG/g0NPAQqxAT7nes3ZnEUHNHBEH/b6J58U7O2KmxZcVAE FYSJfUUIKSxZFPUnOKUMxEQ92S97XS15+Bple/oESxt9fxCPa98n7hBAq/gLCppPA7O8 S9Qb0A1V0/1/BZVPymdZTaXxuB5btfUFz1+JHTAhgdWJt4Gsel05ogWtycPm5KQHA8FI H7AoxFOCgg7cKHZIC4nA5WPC4ZWzl73j3fVSV2Ut/Iik8mOTQLo6z0a8njZ+6gVfljGK eBmfrk89O/5dVue0wTWz+y57UIiWZx5p7NYMStQnzxFbY261cCrltq1Gmkx9YVALVBTQ h9/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782795; x=1786387595; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=n6Z+knL/Vym2bTZhQ2MmdO9vfyLJl3tvT3HruMB1kzI=; b=QfCJqcV7JvM5PTGJ2/y8JHtqVG4jPqo/2E3fNiK79VzujCQmiDPHnPxCK9JseZNnEN XbecWSkUs2ZmIzZhB7pC0Er82oYtg0JF+2g6GNg2EM3fsFAWnqbuao1FBJgSv6XbHYhu Tag+ZswSmsWp4nd1Ma/nCB8tAh2t6ExQkKls++iCOIHqo7Wx6yxjb1kED3H10W99eL8s I2ps1cw/ZmPClq4SSmwBcHCIq7dtay/4xU5vCf0FSmKJOwUq9duH4aosrPphJ2ktIxgk VNFgr0XQn4QQWTl4f6V++2aQqzCQzx+fxwVrwUOpPPcGpMEu3I4q5bj/l/58eGYUptkh RQ2A== X-Forwarded-Encrypted: i=1; AHgh+Rooba5JmyjLiW7cBKDRDpEbzjRsfUpehLWvetDmSPjJt4S3lftwMlFRf6Kb0Av9f5SuholIZqcZUCpzgcM=@vger.kernel.org X-Gm-Message-State: AOJu0Yxdsqbwsz+ZBuXsX269XAiIFhRKUQb3tlj8aug6glkBmqDo7LQU 22w92LSTVUjdkZgHeGycUIdkpHp+PKsD3z54y/5iMGkV1CGOCrWCThBsg2QMw+Esm+JAh6buyvK /4waWW1fUn79BtAYXAdlsnN96xQ== X-Received: from pfbbx16.prod.google.com ([2002:a05:6a00:4290:b0:847:9199:e06]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4fca:b0:848:2f6e:e532 with SMTP id d2e1a72fcca58-84ee48fb3f5mr9012046b3a.70.1785782794280; Mon, 03 Aug 2026 11:46:34 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:17 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-3-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 --- Changes in v3: - ensure to call verify driver compatibility in reset path drivers/net/ethernet/google/gve/gve_adminq.c | 8 -- drivers/net/ethernet/google/gve/gve_main.c | 104 +++++++++++-------- 2 files changed, 63 insertions(+), 49 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..6510aea62b92 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2398,9 +2398,54 @@ static const struct xdp_metadata_ops gve_xdp_metadat= a_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; + + 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) +{ + 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 (priv->default_num_queues > 0) { + priv->tx_cfg.num_queues =3D min_t(int, priv->default_num_queues, + priv->tx_cfg.num_queues); + priv->rx_cfg.num_queues =3D min_t(int, priv->default_num_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 int gve_init_priv(struct gve_priv *priv, bool skip_describe_device) +{ int err; =20 /* Set up the adminq */ @@ -2431,57 +2476,34 @@ static int gve_init_priv(struct gve_priv *priv, boo= l skip_describe_device) "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) { + + err =3D gve_set_num_ntfy_blks(priv); + if (err) { dev_err(&priv->pdev->dev, - "could not count MSI-x vectors: err=3D%d\n", num_ntfy); - err =3D num_ntfy; - goto err; - } 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; + "Could not setup notify blocks: err=3D%d\n", err); goto err; } =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); - - 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); + gve_set_num_queues(priv); =20 - priv->tx_cfg.num_queues =3D priv->tx_cfg.max_queues; - priv->rx_cfg.num_queues =3D priv->rx_cfg.max_queues; - if (priv->default_num_queues > 0) { - priv->tx_cfg.num_queues =3D min_t(int, priv->default_num_queues, - priv->tx_cfg.num_queues); - 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; + 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; =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); + 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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 209E5435510 for ; Mon, 3 Aug 2026 18:46:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782799; cv=none; b=g3HMrjCwUiT1Fv72YdZbi+JepmWV2+AUNWNGZVRAa7MU2jPlsZJkIj20+egQjBuUoY8CUOVrvSPa9ntR0AMHZ/5/4RLeaLVWXPjCFTGA0Vl3Uj3HOs/LpuYy/SsSkzzfXzxK245YGGYCGe3Qr9jwpuHLLRVz/hJ7jDD/7NwAJLQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782799; c=relaxed/simple; bh=etI8e+sT66DzWo4LOICOABXbHGS3zV7c/BFbpZf84ms=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ApYMr4nQuyx4s+/XVLJQjj2SJXjxRjJtL57xFWHfXy2FH1761755oM+tXCXhLnq1gUowhT+wh0JC4avWn9HfxT3Uc1ZV7B8hAZ7+p2KIBAjDcLpVaWseH/0ghv2JE2gP0ayrEGO0KAgLzUyETmlrzQqNzgWS2UAD7+9lwxAYcWQ= 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=Tkj3FfkI; arc=none smtp.client-ip=209.85.210.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Tkj3FfkI" Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-84842381150so7367275b3a.3 for ; Mon, 03 Aug 2026 11:46:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782795; x=1786387595; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=g0vu+fy30PN67mmeEypCW5wKZeCfMTP0waJvT1m5hRU=; b=Tkj3FfkIZEVxQnjfJULeECd6NfiNRbLoGCcgfn2H6a19mrRwUKa/CRoNMLwae2y+b9 ouEPtczcDkCoZNg0ryWvRTzdnWrhfnlN13WIaSvBbPmO/IVC78YlImK/G74nOw1rGHOU cFId7mYPv2DboQr3niZZTeRQ1SC8gg5U9rfNod9ljzrMxj28i9hjRhC18NG+p4/6ZIgL rbdNitg5qI4D/70B7xCBWUhczQh5ODLROWbPIs2PRO0w9uaZz66rjuymzQj4k6BW7j/1 o4spi7Kq5vjVjpsQ3g8BwLke81RDKyMUn0IYvsmEZELcrWOAXJyX7kZnIm1vN7bZTa34 THVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782795; x=1786387595; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=g0vu+fy30PN67mmeEypCW5wKZeCfMTP0waJvT1m5hRU=; b=QVTwI6KqpJ/+VQZgifiani1I206sio2lNVD1Y6GCdMxRA7n8vuoKO9oR5igI+wk9JU 7c4QtIrZF6s+4TAo/9N7SCEji4xRbPMn5eSlGruCySek0yx1F6jeTRQGUhXq/KLvINFC 3yahyJnF4LvVOT0dyd6PAAHZqsQGz+loCSN98H3Wu5WXcUTLW3J9iM8hDcdNWIpp/F9X 9zXsQ/AJNVyJs6auLmtsVI9URxgplsdiz7DgLWhit6iBqOHRU+Hl4X5ZKftGPy3ScNYZ IMkDDBObD/nTnGkgRlxUChxL8/4fQTYgv0AjlmxesCOnzrZw++ncJ9FcXWS/wXO6zktr 05WA== X-Forwarded-Encrypted: i=1; AHgh+RrM+ZC113g/obq4ppsSdv1cnQk/NJ9SbDdhLxUx3lLDe82b5vL94Xoa0QkVWXbBhzj46GbOlMXqfSIdYcQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2nyw7fCYWMwt4VSDxBAYcTUygdheJH1btRZgWax6L1ItGBOTW ifeSVbPWXdaSu2svKb7rVF8SI8gUyxSVvxOGpOy9xtbjq1N6dJF4gQJT8ip1CwdNNBkPGkG7TM2 NuiiRa6X7KS7RvL7dnEjo+jwoXg== X-Received: from pfle9.prod.google.com ([2002:aa7:9209:0:b0:847:b0e2:92a3]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:189d:b0:84c:4d9a:ae42 with SMTP id d2e1a72fcca58-84ee47d7283mr10045977b3a.27.1785782795100; Mon, 03 Aug 2026 11:46:35 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:18 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-4-hramamurthy@google.com> Subject: [PATCH net-next v3 03/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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 dfeabddfb396..2ae15289e2c8 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 8e80f36116ec..580332df28db 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -656,5 +656,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 6510aea62b92..e818ebc6ec27 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2444,6 +2444,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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0938433BC1 for ; Mon, 3 Aug 2026 18:46:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782802; cv=none; b=mSTpOQim5flnLZ+MiqUfi5Jh1/5EVRA2rawhrFixvykvyf6+EUI0ky80vh8Du4uyqxAxIwqUwRmikoo0+pSPFvTlbojMtIzQtJnyczyVKOcg3m8n3xfeKsXfZQNhiTHcY2zHpds3DkXNM4f9j8UZDsawTfAzdT7E5B3kAr6qFRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782802; c=relaxed/simple; bh=d8y/i38EWMOa3XZahlKluTXKf296k0rHmcQLZOUteno=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Bvge8awYzcOP4waXzr5Dgg/cxzfj3/vXAOfMPi7tSWHCun/j17GoRJe5szj19BwriZaldf/islI8ts0ZRDaQXmDXRo4dtoDDwcN961gITj8GgIfZHyh9zdcbC80DG8aBLi/NeOOfZeF3EmnZXsXP9hkKyS5zTvsIMc/0VZHiE6s= 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=EKhoWRo+; arc=none smtp.client-ip=209.85.210.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="EKhoWRo+" Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-848d21bbb55so6819041b3a.0 for ; Mon, 03 Aug 2026 11:46:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782796; x=1786387596; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=l1WgtNFtgeXOLaFbZC1Pu0jj6lmf5wEBgzLuUdJfTRU=; b=EKhoWRo+fuXM+j5KfEBMnMnpa9ZL9V7NC70Ocpg3yzdOD+n+hL/Tw1nxm6dauxw3a5 EncV2E2ugE7DQpfTWOXP76Cqv9+AsY/R/K51Eq/mzOCa0pPSAaXjnoisXkKySl8ZmLk3 /nlReUDNeyy+CFODp1E9saUiOvk+a1FCGveJB7cdikPTndQd+O1HmQM5wFRn6mEsehIG pjw+EclKa1LF+BD2twqB6YBpNP8lzBmI04eHUe4PBHstNooKtIL/unZ2hjnW/BFzIHLw kzD13sI/HytPluB4ypSt9BDplJWupgUgrXYA6Bp1WmPhvBSLhAzOLIjZR0BnXtoJtCVn n5Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782796; x=1786387596; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=l1WgtNFtgeXOLaFbZC1Pu0jj6lmf5wEBgzLuUdJfTRU=; b=Me5U9WPe63WEMD5LAnV90Pf4pqNhJepnFYIOPWvXgNRICaNkz8MwvNLXLA1AZSP2GN Hz7vEYnNmGtGgjN7DUqsOEjo1cra6TJ07IVBJPE3nPFElrUXaF88WgkqX7Etf04Osaze Iq/OKovMSJHX4sasjlCodUvbXIPuUaj9eKzaOZzwiWVDhOd84Qkdy6trvbAWkyWsiYIX SHDdFY/uhJodwS+chtuPwnhTnN1TJxY4TdFQDXU7ZZjQKBgwDMDc7FSmLGM88GxuYRi1 a6UO/JEX/raY+iEoxes5q8DCwrJQvzR2sJlGOM56CwXSK6pwO5zESNbC6y//bNtTsfSu uFvw== X-Forwarded-Encrypted: i=1; AHgh+Ro/RAC9ewW10G9Ra1WdIbz5BJDqO96yF1YGIcIIJsJIrBYyX9kIExZAoyvNMbpqOM4xuc2otDi5jbP16aM=@vger.kernel.org X-Gm-Message-State: AOJu0YwOkpex/jLfpD556ELk9TcysSK5igzGPBZ4fdMXUoEcyuSBX8Zl vu5LUZI6KWtcpADXH4FFNbI9G/RiVoO+HAzyI3ODPGUO1JSzFSJ3hBwA0W8/PXHi+bFy5wJX+Wh EfdtYIfGhGaqbdUKQXZgEaCEx2w== X-Received: from pgbcn9.prod.google.com ([2002:a05:6a02:a89:b0:cbe:4197:83b1]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:3a8a:b0:84e:e809:dd30 with SMTP id d2e1a72fcca58-84ee809e13emr7366931b3a.67.1785782795976; Mon, 03 Aug 2026 11:46:35 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:19 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-5-hramamurthy@google.com> Subject: [PATCH net-next v3 04/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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the current AdminQ mode, device properties are written into struct gve_device_descriptor that is allocated in shared memory between the driver and device. In the upcoming MailboxQ mode, these properties will be returned in the response of a mailbox message. Hence, add struct gve_device_info as the structure that holds all the properties that are negotiated with the device in either mode. Change the AdminQ mode method gve_adminq_describe_device() and its children to fill up device information into this newly introduced struct gve_device_info. Move a few helper functions and code that set device properties in the priv structure into gve_init_priv(). So now gve_init_priv() calls/does the following: - gve_set_mtu() - gve_set_mac() - gve_set_queue_properties() - gve_set_buf_sizes() - set flow steering and RSS properties - set other priv properties When MailboxQ support is added, device information will be filled into the same structure and the same gve_init_priv() path would be used to set device properties to ensure common code reusage. These changes are refactors only, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- Changes in v3: - Read default_min_ring_size from device info instead of priv drivers/net/ethernet/google/gve/gve.h | 29 +++++ drivers/net/ethernet/google/gve/gve_adminq.c | 115 +++++++++++-------- drivers/net/ethernet/google/gve/gve_adminq.h | 6 - drivers/net/ethernet/google/gve/gve_main.c | 101 +++++++++++----- 4 files changed, 170 insertions(+), 81 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index c280ff35ee77..021adb9108df 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -797,6 +797,34 @@ struct gve_ptp { struct gve_priv *priv; }; =20 +struct gve_device_info { + enum gve_queue_format queue_format; + u16 default_tx_queues; + u16 default_rx_queues; + u16 max_tx_queues; + u16 max_rx_queues; + u16 default_tx_ring_size; + u16 default_rx_ring_size; + u16 max_tx_ring_size; + u16 max_rx_ring_size; + u16 min_tx_ring_size; + u16 min_rx_ring_size; + u16 max_mtu; + u8 mac[ETH_ALEN]; + u16 max_rx_buffer_size; + u16 header_buf_size; + u32 max_flow_rules; + u16 rss_key_size; + u16 rss_lut_size; + u16 tx_pages_per_qpl; + u16 num_event_counters; + u64 max_registered_pages; + bool default_min_ring_size; + bool nic_timestamp_supported; + bool modify_ring_size_enabled; + bool cache_rss_config; +}; + struct gve_priv { struct net_device *dev; struct gve_tx_ring *tx; /* array of tx_cfg.num_queues */ @@ -929,6 +957,7 @@ struct gve_priv { struct gve_nic_ts_report *nic_ts_report; dma_addr_t nic_ts_report_bus; u64 last_sync_nic_counter; /* Clock counter from last NIC TS report */ + struct gve_device_info device_info; }; =20 enum gve_service_task_flags_bit { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 2ae15289e2c8..bb18e5af958b 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -70,7 +70,7 @@ void gve_parse_device_option(struct gve_priv *priv, =20 dev_info(&priv->pdev->dev, "Gqi raw addressing device option enabled.\n"); - priv->queue_format =3D GVE_GQI_RDA_FORMAT; + priv->device_info.queue_format =3D GVE_GQI_RDA_FORMAT; break; case GVE_DEV_OPT_ID_GQI_RDA: if (option_length < sizeof(**dev_op_gqi_rda) || @@ -190,7 +190,7 @@ void gve_parse_device_option(struct gve_priv *priv, =20 /* device has not provided min ring size */ if (option_length =3D=3D GVE_DEVICE_OPTION_NO_MIN_RING_SIZE) - priv->default_min_ring_size =3D true; + priv->device_info.default_min_ring_size =3D true; break; case GVE_DEV_OPT_ID_FLOW_STEERING: if (option_length < sizeof(**dev_op_flow_steering) || @@ -922,10 +922,13 @@ int gve_adminq_destroy_rx_queues(struct gve_priv *pri= v, u32 num_queues) =20 static void gve_set_default_rss_sizes(struct gve_priv *priv) { - if (!gve_is_gqi(priv)) { - priv->rss_key_size =3D GVE_RSS_KEY_SIZE; - priv->rss_lut_size =3D GVE_RSS_INDIR_SIZE; - priv->cache_rss_config =3D true; + struct gve_device_info *device_info =3D &priv->device_info; + + if (device_info->queue_format =3D=3D GVE_DQO_RDA_FORMAT || + device_info->queue_format =3D=3D GVE_DQO_QPL_FORMAT) { + device_info->rss_key_size =3D GVE_RSS_KEY_SIZE; + device_info->rss_lut_size =3D GVE_RSS_INDIR_SIZE; + device_info->cache_rss_config =3D true; } } =20 @@ -946,77 +949,105 @@ static void gve_enable_supported_features(struct gve= _priv *priv, const struct gve_device_option_modify_ring *dev_op_modify_ring) { + struct gve_device_info *info =3D &priv->device_info; + /* Before control reaches this point, the page-size-capped max MTU from * the gve_device_descriptor field has already been stored in - * priv->dev->max_mtu. We overwrite it with the true max MTU below. + * device_info->max_mtu. We overwrite it with the true max MTU below. */ if (dev_op_jumbo_frames && (supported_features_mask & GVE_SUP_JUMBO_FRAMES_MASK)) { dev_info(&priv->pdev->dev, "JUMBO FRAMES device option enabled.\n"); - priv->dev->max_mtu =3D be16_to_cpu(dev_op_jumbo_frames->max_mtu); + info->max_mtu =3D be16_to_cpu(dev_op_jumbo_frames->max_mtu); } =20 if (dev_op_buffer_sizes && (supported_features_mask & GVE_SUP_BUFFER_SIZES_MASK)) { - priv->max_rx_buffer_size =3D + info->max_rx_buffer_size =3D be16_to_cpu(dev_op_buffer_sizes->packet_buffer_size); - priv->header_buf_size =3D + info->header_buf_size =3D be16_to_cpu(dev_op_buffer_sizes->header_buffer_size); dev_info(&priv->pdev->dev, "BUFFER SIZES device option enabled with max_rx_buffer_size of %u, hea= der_buf_size of %u.\n", - priv->max_rx_buffer_size, priv->header_buf_size); - if (gve_is_dqo(priv) && - priv->max_rx_buffer_size > GVE_DEFAULT_RX_BUFFER_SIZE) - priv->rx_cfg.packet_buffer_size =3D - priv->max_rx_buffer_size; + info->max_rx_buffer_size, info->header_buf_size); } =20 /* Read and store ring size ranges given by device */ if (dev_op_modify_ring && (supported_features_mask & GVE_SUP_MODIFY_RING_MASK)) { - priv->modify_ring_size_enabled =3D true; - priv->max_rx_desc_cnt =3D + info->modify_ring_size_enabled =3D true; + info->max_rx_ring_size =3D be16_to_cpu(dev_op_modify_ring->max_rx_ring_size); - priv->max_tx_desc_cnt =3D + info->max_tx_ring_size =3D be16_to_cpu(dev_op_modify_ring->max_tx_ring_size); - if (priv->default_min_ring_size) { + if (info->default_min_ring_size) { /* If device hasn't provided minimums, use default minimums */ - priv->min_tx_desc_cnt =3D GVE_DEFAULT_MIN_TX_RING_SIZE; - priv->min_rx_desc_cnt =3D GVE_DEFAULT_MIN_RX_RING_SIZE; + info->min_tx_ring_size =3D GVE_DEFAULT_MIN_TX_RING_SIZE; + info->min_rx_ring_size =3D GVE_DEFAULT_MIN_RX_RING_SIZE; } else { - priv->min_rx_desc_cnt =3D be16_to_cpu(dev_op_modify_ring->min_rx_ring_s= ize); - priv->min_tx_desc_cnt =3D be16_to_cpu(dev_op_modify_ring->min_tx_ring_s= ize); + info->min_rx_ring_size =3D + be16_to_cpu(dev_op_modify_ring->min_rx_ring_size); + info->min_tx_ring_size =3D + be16_to_cpu(dev_op_modify_ring->min_tx_ring_size); } } =20 if (dev_op_flow_steering && (supported_features_mask & GVE_SUP_FLOW_STEERING_MASK)) { if (dev_op_flow_steering->max_flow_rules) { - priv->max_flow_rules =3D + info->max_flow_rules =3D be32_to_cpu(dev_op_flow_steering->max_flow_rules); - priv->dev->hw_features |=3D NETIF_F_NTUPLE; dev_info(&priv->pdev->dev, "FLOW STEERING device option enabled with max rule limit of %u.\n", - priv->max_flow_rules); + info->max_flow_rules); } } =20 if (dev_op_rss_config && (supported_features_mask & GVE_SUP_RSS_CONFIG_MASK)) { - priv->rss_key_size =3D + info->rss_key_size =3D be16_to_cpu(dev_op_rss_config->hash_key_size); - priv->rss_lut_size =3D + info->rss_lut_size =3D be16_to_cpu(dev_op_rss_config->hash_lut_size); - priv->cache_rss_config =3D false; + info->cache_rss_config =3D false; dev_dbg(&priv->pdev->dev, "RSS device option enabled with key size of %u, lut size of %u.\n", - priv->rss_key_size, priv->rss_lut_size); + info->rss_key_size, info->rss_lut_size); } =20 if (dev_op_nic_timestamp && (supported_features_mask & GVE_SUP_NIC_TIMESTAMP_MASK)) - priv->nic_timestamp_supported =3D true; + info->nic_timestamp_supported =3D true; +} + +static void gve_fill_device_info(struct gve_priv *priv, + struct gve_device_descriptor *descriptor) +{ + struct gve_device_info *device_info =3D &priv->device_info; + u16 default_num_queues; + + device_info->tx_pages_per_qpl =3D + be16_to_cpu(descriptor->tx_pages_per_qpl); + device_info->max_registered_pages =3D + be64_to_cpu(descriptor->max_registered_pages); + device_info->num_event_counters =3D be16_to_cpu(descriptor->counters); + ether_addr_copy(device_info->mac, descriptor->mac); + device_info->max_mtu =3D be16_to_cpu(descriptor->mtu); + + default_num_queues =3D be16_to_cpu(descriptor->default_num_queues); + device_info->default_tx_queues =3D default_num_queues; + device_info->default_rx_queues =3D default_num_queues; + device_info->default_tx_ring_size =3D + be16_to_cpu(descriptor->tx_queue_entries); + device_info->default_rx_ring_size =3D + be16_to_cpu(descriptor->rx_queue_entries); + + /* set default ranges */ + device_info->max_tx_ring_size =3D device_info->default_tx_ring_size; + device_info->max_rx_ring_size =3D device_info->default_rx_ring_size; + device_info->min_tx_ring_size =3D device_info->default_tx_ring_size; + device_info->min_rx_ring_size =3D device_info->default_rx_ring_size; } =20 int gve_adminq_describe_device(struct gve_priv *priv) @@ -1027,6 +1058,7 @@ int gve_adminq_describe_device(struct gve_priv *priv) struct gve_device_option_jumbo_frames *dev_op_jumbo_frames =3D NULL; struct gve_device_option_modify_ring *dev_op_modify_ring =3D NULL; struct gve_device_option_rss_config *dev_op_rss_config =3D NULL; + struct gve_device_info *device_info =3D &priv->device_info; struct gve_device_option_gqi_rda *dev_op_gqi_rda =3D NULL; struct gve_device_option_gqi_qpl *dev_op_gqi_qpl =3D NULL; struct gve_device_option_dqo_rda *dev_op_dqo_rda =3D NULL; @@ -1070,26 +1102,26 @@ int gve_adminq_describe_device(struct gve_priv *pri= v) * DqoRda, DqoQpl, GqiRda, GqiQpl. Use GqiQpl as default. */ if (dev_op_dqo_rda) { - priv->queue_format =3D GVE_DQO_RDA_FORMAT; + device_info->queue_format =3D GVE_DQO_RDA_FORMAT; dev_info(&priv->pdev->dev, "Driver is running with DQO RDA queue format.\n"); supported_features_mask =3D be32_to_cpu(dev_op_dqo_rda->supported_features_mask); } else if (dev_op_dqo_qpl) { - priv->queue_format =3D GVE_DQO_QPL_FORMAT; + device_info->queue_format =3D GVE_DQO_QPL_FORMAT; supported_features_mask =3D be32_to_cpu(dev_op_dqo_qpl->supported_features_mask); } else if (dev_op_gqi_rda) { - priv->queue_format =3D GVE_GQI_RDA_FORMAT; + device_info->queue_format =3D GVE_GQI_RDA_FORMAT; dev_info(&priv->pdev->dev, "Driver is running with GQI RDA queue format.\n"); supported_features_mask =3D be32_to_cpu(dev_op_gqi_rda->supported_features_mask); - } else if (priv->queue_format =3D=3D GVE_GQI_RDA_FORMAT) { + } else if (device_info->queue_format =3D=3D GVE_GQI_RDA_FORMAT) { dev_info(&priv->pdev->dev, "Driver is running with GQI RDA queue format.\n"); } else { - priv->queue_format =3D GVE_GQI_QPL_FORMAT; + device_info->queue_format =3D GVE_GQI_QPL_FORMAT; if (dev_op_gqi_qpl) supported_features_mask =3D be32_to_cpu(dev_op_gqi_qpl->supported_features_mask); @@ -1097,18 +1129,9 @@ int gve_adminq_describe_device(struct gve_priv *priv) "Driver is running with GQI QPL queue format.\n"); } =20 + gve_fill_device_info(priv, descriptor); gve_set_default_rss_sizes(priv); =20 - err =3D gve_set_mtu(priv, descriptor); - if (err) - goto free_device_descriptor; - - priv->num_event_counters =3D be16_to_cpu(descriptor->counters); - - gve_set_mac(priv, descriptor); - - gve_set_queue_properties(priv, descriptor); - gve_enable_supported_features(priv, supported_features_mask, dev_op_jumbo_frames, dev_op_dqo_qpl, dev_op_buffer_sizes, dev_op_flow_steering, diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 580332df28db..8e80f36116ec 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -656,11 +656,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 e818ebc6ec27..9a484fa15abe 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2424,6 +2424,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 @@ -2431,12 +2433,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); @@ -2444,54 +2448,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 */ @@ -2514,7 +2533,7 @@ static int gve_init_priv(struct gve_priv *priv, bool = skip_describe_device) if (skip_describe_device) goto setup_device; =20 - priv->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; + device_info->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; /* Get the initial information we need from the device */ err =3D gve_adminq_describe_device(priv); if (err) { @@ -2523,6 +2542,8 @@ static int gve_init_priv(struct gve_priv *priv, bool = skip_describe_device) goto err; } =20 + priv->queue_format =3D priv->device_info.queue_format; + err =3D gve_set_num_ntfy_blks(priv); if (err) { dev_err(&priv->pdev->dev, @@ -2546,12 +2567,34 @@ static int gve_init_priv(struct gve_priv *priv, boo= l skip_describe_device) netif_set_tso_max_size(priv->dev, GVE_DQO_TX_MAX); } =20 - priv->dev->mtu =3D priv->dev->max_mtu; + if (gve_set_mtu(priv)) { + err =3D -EINVAL; + goto err; + } + + priv->num_event_counters =3D device_info->num_event_counters; + + gve_set_mac(priv); + + gve_set_queue_properties(priv); + priv->modify_ring_size_enabled =3D device_info->modify_ring_size_enabled; + + gve_set_buf_sizes(priv); + + priv->max_flow_rules =3D device_info->max_flow_rules; + if (priv->max_flow_rules) + priv->dev->hw_features |=3D NETIF_F_NTUPLE; + + priv->rss_key_size =3D device_info->rss_key_size; + priv->rss_lut_size =3D device_info->rss_lut_size; + priv->cache_rss_config =3D device_info->cache_rss_config; + priv->numa_node =3D dev_to_node(&priv->pdev->dev); priv->tx_cfg.num_xdp_queues =3D 0; priv->rx_copybreak =3D GVE_DEFAULT_RX_COPYBREAK; priv->ts_config.tx_type =3D HWTSTAMP_TX_OFF; priv->ts_config.rx_filter =3D HWTSTAMP_FILTER_NONE; + priv->nic_timestamp_supported =3D device_info->nic_timestamp_supported; =20 setup_device: priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); --=20 2.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (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 10EFC435AAA for ; Mon, 3 Aug 2026 18:46:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782801; cv=none; b=VRMk1LK5ipNHzFLiu6glXifHOB3J/DScmzj2hP6scIUe8MrdFbrVeznvg9G7MrhFJNGaZMj4bs5UJ402byWJWxcEk5k959R+HCpmmH82wTXXF/H0F/SuzZ2TfNB5KGa0FfyN7SoxmuEx0mtrN3HUy7eqHdPlb1URBCd+zfOWmMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782801; c=relaxed/simple; bh=1uzoRqTMdqVMflAU37K8DRbZlGfidd6mc2WfPRpa6mo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rtXqf8/B1TxdHSfOSDvzAEgAias4xtcn4dm/y7KdYxCDFPg1JW54HVleqihHhU7l4C9kP694jWtAPSCQfUsFK3sfanwe/hHFZFGwDs8L306cPd9WilECUUSO7TumxPQ2roXa+njoW+ES0qgsRzpiWgSsSWJK2Zc8D2W7S3GOJUk= 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=Js7c/+zD; arc=none smtp.client-ip=209.85.216.70 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="Js7c/+zD" Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38e7b87ce77so9783279a91.0 for ; Mon, 03 Aug 2026 11:46:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782797; x=1786387597; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=9Ykco/UIbXJhQGzB6LylG7Ki+XX+QafHm/6QOILOpK0=; b=Js7c/+zDKS/LH0FrexKQ642/9ms7NwO96PRi5oXrGrrbC8XrN+RKfcJBIEO+r7eb7h e3JZpZehPoh5frMmlSpEks64pe/F0QkJAF7Lo23c4OuiHco4JCkGBrw0tUD7cTKY2GPf d9VdU3UyEBiB0yQRsKJ7WBWOCoBhox6yeIKi74vxrhf55gItW0WpBp2cfiHDR2U3KNIR 9yBF9kCSKYzjdHNF3h64JB9eq6qFrWhTxmBPPCPaD6QSFx/zhaxGOCwmp+KujEaFRhnQ ekLW7UhanGZyBqYz3cUkoCw1Y0Svhuwzfe72tuOA9omvi8rfQH4ORNglDr+MiACL1aOR oCAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782797; x=1786387597; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=9Ykco/UIbXJhQGzB6LylG7Ki+XX+QafHm/6QOILOpK0=; b=AA3qKgxx42RsWF89dGLUPXzNctX1QjQjfAbfCKJnGVz8F95zRhTwKnccJ/rCgu7omy JOI6dopNLETOdVN0eIQyMSBq9mXnWSBVd0Nz27cP4Az+bwVz9wJajQP9UgjYf873dHO6 sI28gmdwajntEZMQ7MDrGdHxPRJFmpVGr+/jrEQUzxNCn6o1RNXPv6lYmebrVAduCH2i d269gEmGOQS8qrLk/Y09U7MBEoANreoSOCkej46CSfGWds1kZLNy42K4gmtJ1/6DoaSM BzadP9xQXII31z7goFbN89SPx06AnJE0ZKj8GXIc4VjV1pBT0VHam4aycO6dnEGtXTVk 6R/g== X-Forwarded-Encrypted: i=1; AHgh+RqCCvGxmPYdX0FlVXfUrZ5gHZob4uAEkCZBGQQp4eoda1Je3eVLIB5zzPjmGGsBChL5FPfj8w88EsFvk2o=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1zUV4IAPpgAvhBfpl/nyMoKLTUvY36ikFQYV8TWFCMGtWUEuo 7Vl8aOYxCQrxRwimxtrKYhqwBZ8Pfb7LWs1PuLm/8nluExDj0kh36gabkaWccz1aBvkV4A0yz7r eEuUF4R3GLPymYKyu/DurbIAEHA== X-Received: from pjzv17.prod.google.com ([2002:a17:90b:411:b0:38e:bc7d:7164]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:1c86:b0:38d:ef48:b04 with SMTP id 98e67ed59e1d1-38fbc4249efmr10521937a91.10.1785782796767; Mon, 03 Aug 2026 11:46:36 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:20 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-6-hramamurthy@google.com> Subject: [PATCH net-next v3 05/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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 021adb9108df..56148ea3cfbf 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -825,6 +825,16 @@ struct gve_device_info { bool cache_rss_config; }; =20 +/** + * struct gve_ctrl_ops - Control plane operations structure + * @map_db_bar: Maps the doorbell BAR for the device and store in @priv. + * @unmap_db_bar: Unmaps the doorbell BAR previously mapped by @map_db_bar. + */ +struct gve_ctrl_ops { + int (*map_db_bar)(struct gve_priv *priv); + void (*unmap_db_bar)(struct gve_priv *priv); +}; + struct gve_priv { struct net_device *dev; struct gve_tx_ring *tx; /* array of tx_cfg.num_queues */ @@ -958,6 +968,7 @@ struct gve_priv { dma_addr_t nic_ts_report_bus; u64 last_sync_nic_counter; /* Clock counter from last NIC TS report */ struct gve_device_info device_info; + const struct gve_ctrl_ops *ctrl_ops; }; =20 enum gve_service_task_flags_bit { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index bb18e5af958b..9c3ebdb547cf 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1591,3 +1591,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 8e80f36116ec..2a184e051202 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -656,5 +656,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 9a484fa15abe..fff63b90dcbb 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2508,6 +2508,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; @@ -2905,7 +2910,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; @@ -2933,13 +2937,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); @@ -2949,7 +2946,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); @@ -2981,19 +2978,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); @@ -3023,12 +3028,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 @@ -3044,14 +3049,13 @@ static void gve_remove(struct pci_dev *pdev) { struct net_device *netdev =3D pci_get_drvdata(pdev); struct gve_priv *priv =3D netdev_priv(netdev); - __be32 __iomem *db_bar =3D priv->db_bar2; void __iomem *reg_bar =3D priv->reg_bar0; =20 unregister_netdev(netdev); gve_teardown_priv_resources(priv); destroy_workqueue(priv->gve_wq); + priv->ctrl_ops->unmap_db_bar(priv); free_netdev(netdev); - pci_iounmap(pdev, db_bar); pci_iounmap(pdev, reg_bar); pci_release_regions(pdev); pci_disable_device(pdev); --=20 2.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2556943637C for ; Mon, 3 Aug 2026 18:46:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782803; cv=none; b=CEQyo1ZiexGornWqsxIUOHwwEvfKM0jvL+3QyjnOp5wrl/Qw2MDTwjF0y5/k+1Ws7L7L+gfUNvcVucsS8pgG2pgpv6XfFH8qAk0VcHlFtF97LbNC5eHQy3fMAo1JKUrPLc1sSgrFDgFUHmvQDvUf7p1UfErvZq5JXw6kJBxBVAw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782803; c=relaxed/simple; bh=h6xQGct/nhkoVeBbYmUudD+rEMij2bI8q98OiZMkgBk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MXITdsm3EPSuDQJC2G/W4vMpxgPD3lzjxpS1BbAjkCG/fzdR9M+Dk4X2gu/lbD3+kB4g3WtGwIr2TcJnn8ufSAhGeUOZG2GAqDhllsjE/1AttofMGpqs3mXygWFxN1hdQ0ovielGmnr6n/f2f4wq1wBCJQczbTCg8SxGtCWXuQY= 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=rNuCxLJv; arc=none smtp.client-ip=209.85.210.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rNuCxLJv" Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8485b7e18b4so7346017b3a.1 for ; Mon, 03 Aug 2026 11:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782798; x=1786387598; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=HfUfOCq7/2QIqfYje0VU1xxGfohZ1YP9PuYwb3/VuQM=; b=rNuCxLJvdOWlqZFzGY/AacGwtj/icfh9QGhIJxegUvLVajk0g2lH9eqVidFW1cNkCE hfZ6rXtsCoOA+0KnlH7K2y1y/B/0Zyou7+Ko9LIpkNWoXqT+yimeroFl2747+gI9cCoP 2TU26/Piin2clBEVtWFsBQm5M1o0EWzq0ZxT0UTd+JyRRaCjDCNS+K4QvUmniPsRwkuT nzmDOanDUae1b8sUR741SGhl7C4A8oFrlL0uHXhsga22YViY0oEQDIe82qnYnjqpMOMs 0ZJSYE3pHSEKzy9dbg1vYfhwsC0sWErF8DA7SsnuIjJVxyi0IQ1ONx7efUaKqKjaJGK3 B7+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782798; x=1786387598; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=HfUfOCq7/2QIqfYje0VU1xxGfohZ1YP9PuYwb3/VuQM=; b=dXjVcSlij4ZgqiMv429OsL5XKnglNcmVkeBgY8xj2kp0puqbRdxNUqYToQ534kP+/y LUMJi5x1Z9S81Gx8YZyD31DL0dSsJcKX+bN4faHLpgm4k8RIwePwTDCS1ubLPTtodCl/ iZKbACD75MPiLg0DYOMcMWwFA339Y+ca8xKXGZnWlHag/gQsnuCWu1vZTosT4dieVt6q CHpmtTOKdZpFviIycjgLHH1r5jSzmxya9swod7pcGCnqK7f/NXjnF/PRc62a0KoXtNo0 yBYA3jIm/n2KLnY2ZOIfTcDmGDOAXGQVJJtU6f/AgWY/p8PqyGf36CjatJuFLWRrik4c 27IQ== X-Forwarded-Encrypted: i=1; AHgh+RouhiXuOHyEyUVH+VOn06yHjTnysfFRV1k+HSeA6NjiGgR9jGMm7pro27qGL7lHLadCfTAn1zx1CvUQAwM=@vger.kernel.org X-Gm-Message-State: AOJu0YyJ/1vCufyOPgaWfThLsYv+mYKAWbP/AdZV0eakat1xoKEv6/xB RRoMNb5cmmQ4/Eiv5udE0wYHDeh5o+wuuOWI9GoLGtHdKQeMmTcbGMHzUmNyhnxjUqQaVhbpZfS eWEDsOtNWNfTCUF3KnmPRfor8+g== X-Received: from pgif14.prod.google.com ([2002:a63:f10e:0:b0:c85:735b:ca4a]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:180f:b0:845:ebe2:c656 with SMTP id d2e1a72fcca58-84ee49549eemr9477099b3a.47.1785782797639; Mon, 03 Aug 2026 11:46:37 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:21 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-7-hramamurthy@google.com> Subject: [PATCH net-next v3 06/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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 56148ea3cfbf..1bc5e32b6618 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -829,10 +829,16 @@ struct gve_device_info { * struct gve_ctrl_ops - Control plane operations structure * @map_db_bar: Maps the doorbell BAR for the device and store in @priv. * @unmap_db_bar: Unmaps the doorbell BAR previously mapped by @map_db_bar. + * @set_num_queues: Sets default and max TX/RX queues into allocation + * structures stored in @priv to be used during initializ= ation. + * @set_num_ntfy_blks: Sets no. of vectors into @priv to be used during + * initialization. */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); void (*unmap_db_bar)(struct gve_priv *priv); + void (*set_num_queues)(struct gve_priv *priv); + int (*set_num_ntfy_blks)(struct gve_priv *priv); }; =20 struct gve_priv { diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 9c3ebdb547cf..1d9ae601cdeb 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1612,3 +1612,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 2a184e051202..52fe4a9f7b87 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -658,5 +658,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 fff63b90dcbb..ce55f845a6f9 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2398,56 +2398,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; @@ -2509,8 +2459,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) @@ -2549,14 +2501,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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F3B843744A for ; Mon, 3 Aug 2026 18:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782803; cv=none; b=IlyYc/ZSTsE5WylKK+PFl1xMJUhcmL2trjwj0UVCL/KdlCqngyjSfNeKJMQuiM3u0xUflBioear15W35Y2Ns5F8FXKF2ddBZrnMF9RRABtJbVidHdDcNodMHSTrOOvEMh6vpD4DCNt3trSsmI3dLxnbvK4BDA5x/tJHYQVoBh4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782803; c=relaxed/simple; bh=Fr7yMztMPLMzV9SRayKnLmgYz+q/JGWMiHCgsnQkIXQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HlUopmctYESpcHSuXIyC/1XU2dB9LpYaWk7ZEWy9V+RERaL0vDkSyyFXmtxLKUSVOCEysrJ8cMtlwJDRunK3rtdgVdnmQTGtil1sUY52ViUYARqBch5VqwG6rDUXDdWaTPoQX7U/eb+z/+032nywgZ5Om/VWsXUBjFp/0TjjImE= 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=v8h8RJqj; arc=none smtp.client-ip=209.85.214.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="v8h8RJqj" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cccfa32670so44286305ad.2 for ; Mon, 03 Aug 2026 11:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782799; x=1786387599; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=hN3o/DHJskmjhwULiSmrO1hn115gEBds8zafSVyGpbM=; b=v8h8RJqjEVIMXncD8x+cTrKnLO2/CpoWs9F/UH0tz5dWT2w0PkYd8C8oNNJHruhNMj pWkIE1UlhMblu1rEzkJ+2RN/NVy8g+lccSw6ltuKHTIRzy3hFqvO5oQykl7FM0RvB6Ve OS5hUeaBzvUt9pI1MviHB5eVmW6jxEF11Q6rTdgQSSWfpmKnwbCq5rFw5hrLAil7+GMM 5WdbjADOqlDZ7w/16q1znz0ZBOQzIHEHkFFmfOL0/se3WhH0VeVzp/6O+8d//bglYyg1 BC1OPcw1OYsi2Q6/DWFFoH1/MhkIP5t0TVRU/SYzUgn2z1brSbBepjtIlvOcZWwhAL4x VjOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782799; x=1786387599; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=hN3o/DHJskmjhwULiSmrO1hn115gEBds8zafSVyGpbM=; b=BHnIkJSEL0yDF3s1Y8Ml/vhbGWHx+MLrjiHryTBPDLfCa+hwDnxabnqwQpdLTbpFJh QGm1iDvOatd15pxcSG3XWoLCLxpfWpuYEDC7w9wUj0fo9dKo4SuunvHZwgf6XrmS7sd8 ziNXDRQXl39fGIHO81fxggWsKY8DlCHSo0/p1GxX/VkxHbml/uxvijXNiOj/XK6yn4Ty /TzKWkwz48gYK1w42geXzem1UJncmdfVZWbWY7c7UqLrhLE7yflzK1dMM60OPWZlDHvb x7gPECrYpmxaNm5lACP/DIz4n8iuTl8jgGNR5oiP+Ct99W14Udq9BERosOVABPvHZKLa l+1A== X-Forwarded-Encrypted: i=1; AHgh+Rr9c87dihn8IjPUjcMW0BhDK1H4vECyO86bmlL23uWozbD7aMUr98FEKkfAqZlQDB7ZTQVAcry9+NPru1s=@vger.kernel.org X-Gm-Message-State: AOJu0YwFOqVPQGzZF+4Meo7S5p+ZMS9+KoGtbPP0NZgrwK4O6sOLTZB+ uP4vIdflgKxeLWse/hXgY7AU9YpsxB5v6WEM1YB5Tr3FKKvXCqg8DDotZeZ5GNzFSDBNkcTJSjw XRslAuF3iwtK3I/3AxSZ3N5AKYA== X-Received: from plbjw2.prod.google.com ([2002:a17:903:2782:b0:2c7:702a:36a4]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:e888:b0:2ca:d818:61e5 with SMTP id d9443c01a7336-2d0523e147amr110305635ad.26.1785782798541; Mon, 03 Aug 2026 11:46:38 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:22 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-8-hramamurthy@google.com> Subject: [PATCH net-next v3 07/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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move driver compatibility verification from gve_main.c to gve_adminq.c as gve_adminq_verify_driver_compatibility() and update gve_init_priv() to call it. 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. Mark it as unused since it's going to be hooked into initialization in the following patch. This is just code movement, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- Changes v3: - move patch down so that the function is introduced just before usage - mark function as maybe_unused - update commit message drivers/net/ethernet/google/gve/gve.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 | 46 +------------- 4 files changed, 65 insertions(+), 54 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 1bc5e32b6618..d6e7ab0649ac 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -16,6 +16,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 1d9ae601cdeb..66a3e774b7c4 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1143,6 +1143,27 @@ int gve_adminq_describe_device(struct gve_priv *priv) return err; } =20 +int __maybe_unused gve_adminq_get_device_properties(struct gve_priv *priv) +{ + int err; + + err =3D gve_adminq_verify_driver_compatibility(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not verify driver compatibility: err=3D%d\n", err); + return err; + } + + /* Get the initial information we need from the device */ + err =3D gve_adminq_describe_device(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not get device information: err=3D%d\n", err); + return err; + } + return 0; +} + int gve_adminq_register_page_list(struct gve_priv *priv, struct gve_queue_page_list *qpl) { @@ -1205,20 +1226,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 52fe4a9f7b87..ac3ef9fd8d24 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 ce55f845a6f9..0d308bde52c8 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) @@ -2478,7 +2434,7 @@ static int gve_init_priv(struct gve_priv *priv, bool = skip_describe_device) return err; } =20 - err =3D gve_verify_driver_compatibility(priv); + err =3D gve_adminq_verify_driver_compatibility(priv); if (err) { dev_err(&priv->pdev->dev, "Could not verify driver compatibility: err=3D%d\n", err); --=20 2.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (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 118DC438015 for ; Mon, 3 Aug 2026 18:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782806; cv=none; b=cwkthpNvr0Lu/0eVdMMO7H2M+nmShQ9fgxt/IgLCO7i9y4CKqQb182zMDP6k0YNElGg/PSpyy4TpKHz2GXnzupQGnG5UXT4T3VsDLUy0lXRMJ22jZxa3bOgRZn7ogZfE7jcdyJjP6CDPbVFsnB9sMAmLOhvDY9dYwsHf2/FlDnM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782806; c=relaxed/simple; bh=nWLOvZ0eOkhNxkJxBJWr/R/aAC3T0XbRNa6Ll3kMRQo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GEQjGV3XkycvF2gcMnBRROo6jm02NxQBiuYK9LgXyNV7nFYJ93okbE7BTaFz5NjouLQT7fQXwgwfbPJxRdRNyF3gQerIpFhMXMJVaC8EKT4aSNxy3ziCcXsJZ6E+5ePk/A/YUbYfdduPM6aUi8jjFxBnPzuydKWjjoVMPtG0nqw= 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=jETKW3hh; arc=none smtp.client-ip=209.85.210.200 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="jETKW3hh" Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-8487eb67173so7098567b3a.2 for ; Mon, 03 Aug 2026 11:46:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782800; x=1786387600; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=OuU9Ygzd6X4zI8sN2+ZVMLckbqCwg/7oEO4wZTDJRdE=; b=jETKW3hhGspVqUj0+XgzUFUPw61d3+FlfEg89wfMeM5p9/gKkxXpkeTjFkAR8wykbG bsqqeWhChCcObNv3jRdf7FGL2MBQJpBOtFlvPD1/Uhm/wNLmAFrFLef5+MgzlL775FzT eDOshm2BG3Pu0Tgyf6LfZaYHqOyZa86jqkRWregk1c4K9Dm0dc0q/YBRepd+SGf0RjJg AMEeORVmjoTUHxXFhbeo4om1iskWrtbDfS5AkHDyjF6kCUkKVcZ6sLSQDDgv9tqszWIl paZmgSvtjsZvXxeMX5UUTNQOMpxRs9h2bUYBzd7PPWNsTrgxO68PDmjcw/Dmait63pS9 Q+YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782800; x=1786387600; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=OuU9Ygzd6X4zI8sN2+ZVMLckbqCwg/7oEO4wZTDJRdE=; b=iuVtY7Bm9UegJ2tqhCAZSNR/4SNpj0xzE2+u7bFWzJMAfK0WQltJMMEpZYyvOC7HIG eMBTeTTZLSQLwLATrjRk/pxYDw+TmrUf7kq38L2Aw7XqeSrtTjbdDn3bvE7Qws+0pyh5 MBTo+MNaP+L17LkzkWKN/NWJpclOPkmonCV5QlZ6pgbXzd2Aunmz+uHWF8JAOa3MmeIK uKxm5MhwmCcyygFaHCa22tvRFvz0Qb/Uyn8TfuoBMtqImWk9bjxfvnXEUeIKLGWrsvis rE+pA9BrsEZ0TTc7Exb+P0wYS0nzVUh8eW+rY+8yLEdKHuOTyQ8S//rfDQI0utMBn+GP Tw4w== X-Forwarded-Encrypted: i=1; AHgh+RrQeDrHC+Y5cYSqCS4kG1C+Wx94Im1PSRj8U8NDUb9s9fSXnC3XmNxEZoA9Ip1rlnHTP3wpNqnIvqkZLTE=@vger.kernel.org X-Gm-Message-State: AOJu0YzGkA6hTU4AO/bEcscjsqGxGITj2qMevNMqKGGWShpweb48PN7E 0I6q3QqVE8NDQ9kuAb2ywBdF68/E1BGBrhgOe7PxpJacB0xohJ33OSRPyuy9VljLhV9FdqVK2Ut oION9MrZQn2D8sNifGIKkOe6/EA== X-Received: from pfbfj32.prod.google.com ([2002:a05:6a00:3a20:b0:847:82b3:aca]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:2381:b0:848:6dd5:f69 with SMTP id d2e1a72fcca58-84ee48a4d02mr10215045b3a.42.1785782799390; Mon, 03 Aug 2026 11:46:39 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:23 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-9-hramamurthy@google.com> Subject: [PATCH net-next v3 08/15] gve: refactor gve_init_priv for reset path From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, 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() - call gve_adminq_get_device_properties() into gve_probe() to learn device properties - introduce gve_setup_device() which deals with device setup logic and call it in gve_probe() - resetting no. of registered pages is moved into gve_setup_device() since that needs to be reset every time queues are re-created. With these changes, gve_adminq_get_device_properties() and gve_init_priv() are only called once during gve_probe. gve_reset_recovery() now calls targeted setup functions directly. This prepares the driver to add mailbox mode's control plane initialization and device properties negotiation in the same place as is done in AdminQ mode in the upcoming patches when adding the mailbox ABI. These changes are only code movement, no functional change. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- Changes in v3: - gve_reset_recovery also calls verify driver compatibility - don't free device resources if gve_open() fails in the reset path - move resetting no. of registered pages to gve_setup_device() drivers/net/ethernet/google/gve/gve.h | 2 + drivers/net/ethernet/google/gve/gve_adminq.c | 12 +- drivers/net/ethernet/google/gve/gve_adminq.h | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 146 ++++++++++--------- 4 files changed, 95 insertions(+), 67 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index d6e7ab0649ac..143c666fcebd 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1255,6 +1255,8 @@ static inline bool gve_is_clock_enabled(struct gve_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 66a3e774b7c4..91e2f3b0665f 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 0d308bde52c8..6f04eefd0416 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -2414,6 +2414,35 @@ static void gve_set_buf_sizes(struct gve_priv *priv) priv->header_buf_size =3D device_info->header_buf_size; } =20 +static int gve_setup_device(struct gve_priv *priv) +{ + int err; + + priv->num_registered_pages =3D 0; + + priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); + if (!priv->xsk_pools) { + err =3D -ENOMEM; + goto err; + } + + gve_set_netdev_xdp_features(priv); + if (!gve_is_gqi(priv)) + priv->dev->xdp_metadata_ops =3D &gve_xdp_metadata_ops; + + err =3D gve_setup_device_resources(priv); + if (err) + goto err_free_xsk_bitmap; + + return 0; + +err_free_xsk_bitmap: + bitmap_free(priv->xsk_pools); + priv->xsk_pools =3D NULL; +err: + return err; +} + static const struct gve_ctrl_ops gve_adminq_ops =3D { .map_db_bar =3D gve_adminq_map_db_bar, .unmap_db_bar =3D gve_adminq_unmap_db_bar, @@ -2421,47 +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; - } - - err =3D gve_adminq_verify_driver_compatibility(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not verify driver compatibility: err=3D%d\n", err); - goto err; - } - - priv->num_registered_pages =3D 0; - - if (skip_describe_device) - goto setup_device; - - device_info->queue_format =3D GVE_QUEUE_FORMAT_UNSPECIFIED; - /* Get the initial information we need from the device */ - err =3D gve_adminq_describe_device(priv); - if (err) { - dev_err(&priv->pdev->dev, - "Could not get device information: err=3D%d\n", err); - goto err; - } - priv->queue_format =3D priv->device_info.queue_format; =20 err =3D priv->ctrl_ops->set_num_ntfy_blks(priv); if (err) { dev_err(&priv->pdev->dev, "Could not setup notify blocks: err=3D%d\n", err); - goto err; + return err; } =20 priv->ctrl_ops->set_num_queues(priv); @@ -2484,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 @@ -2512,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) @@ -2565,15 +2540,32 @@ static int gve_reset_recovery(struct gve_priv *priv= , bool was_up) { int err; =20 - err =3D gve_init_priv(priv, true); - if (err) + err =3D gve_adminq_init(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Failed to alloc admin queue: err=3D%d\n", err); goto err; + } + + err =3D gve_adminq_verify_driver_compatibility(priv); + if (err) { + dev_err(&priv->pdev->dev, + "Could not verify driver compatibility: err=3D%d\n", err); + goto err_free_adminq; + } + + err =3D gve_setup_device(priv); + if (err) + goto err_free_adminq; if (was_up) { err =3D gve_open(priv->dev); if (err) - goto err; + return err; } return 0; + +err_free_adminq: + gve_adminq_free(priv); err: dev_err(&priv->pdev->dev, "Reset failed! !!! DISABLING ALL QUEUES !!!\n"); gve_turndown(priv); @@ -2616,7 +2608,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 @@ -2849,7 +2841,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); @@ -2896,13 +2887,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); @@ -2917,10 +2923,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 @@ -2943,6 +2956,9 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) abort_with_unmap_db_bar: priv->ctrl_ops->unmap_db_bar(priv); =20 +abort_with_adminq: + gve_adminq_free(priv); + abort_with_netdev: free_netdev(dev); =20 --=20 2.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3395D438FE8 for ; Mon, 3 Aug 2026 18:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782805; cv=none; b=pldrOaPtNyWRL4TJtlZ/Rpmz+bWlwGIfcet5UICJkECspiA//MQDHi5jvRv91oec/RF267aSAHIe/dEJ7PYyreC5/CVlJRPlNVXyjXBHbWRl9qBIe9+iN3g5q6/8N8jDwnme5NKl/+1HvZaHl1xiAWaq2a+GfRwn4/F2K78YDZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782805; c=relaxed/simple; bh=a3Q0bEJittQayXT+UDSJpGI5k7E2PMVWdzjoxnedlqI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=koGGDBW4BdhkmIkz0gFgBsNRZAeP2lxxYg8WuCrO/FCzB6eaBeD5ReA9tV0Z4DbgQ7xXObTbu2Ig5nkL47OzSUBBRX9PKn2oH+s2tWhl8gtzW2A/7pHkZ/Pn69C5vh7mIzm1QNBsaZpuPfjSdnrTb02fIR8a5K5YSdj+WPfGCsQ= 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=a9dO35Q6; arc=none smtp.client-ip=209.85.214.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="a9dO35Q6" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cc5faecf01so71851855ad.1 for ; Mon, 03 Aug 2026 11:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782801; x=1786387601; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=6NfIgCfo+i1PhfBwWO+z05GrYiwKA3jG71uPdcYmhmA=; b=a9dO35Q6xPAdgixc59xgkvHTG46sz2exqv2KPNp44fS7QBDT+f+fzwVyHaMnvYt3cV VbSFOZkm/+fVFZq93GoOXXUO+I3ED+dxbhXGpEfyMhkUvSYALhg6jHK586eIOn2fr7aj 2yRV6OUSLxIQT2XneMcvQeb6DkmLddU78nV0R35WBBX5HPiTAuqqNMtlOvKqc6uUpFOE H1CB/hsCp+fj6lsxjhFy8JQYH1qQAL5qm6n0mWPQBQEsFyTvRdCBAVemZJTXeCfpYKD8 wwse5O8EDVXMfbkUCwHYsOEEyLqcbRokTEfvbSENYlGDaEvhvv9P/WSMyudbmjdL2D7R G7Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782801; x=1786387601; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=6NfIgCfo+i1PhfBwWO+z05GrYiwKA3jG71uPdcYmhmA=; b=svAftgij/pi598E5JBzrhoQ0GX4NSvoERR61dTLTyotRlDsb/JXddlHAq5kEzc1cD1 qL84dnN7YO3BnI5s1VPkBaUXSB2hebgw26hHaaukCjIFUqPjzKPgO1XPgOjtfN/RM30Y LXk+igFsIMCK2P1b3RWaMXQbfqOg07v/s317eDQ/WeoedgK1hVHliVKn4XoMwTW208Zm vZsVtaTmT2HhdyUkWT4Sc4SsaEBA38hC4EvoPcAr6dJceWcvQ5fieicvEgEXblPYs/V2 S15qt89wu55R5BZqhny7BEE7G72OjCFZDnnIcJBfuo9G85UA/kzOoFCSiFgCIAALijr/ 61+A== X-Forwarded-Encrypted: i=1; AHgh+RogtzhNdYVkYojYi3jTS7w/dKQ7u56/hqzt4ufnBysrQe/7DGAUGZoS9Vmt0QvgXvQB1oalST+a5U8QocQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwYcwZORRR3N0oCRObVShcpdE7YW+PVBaOtcC8Fgb/DjN2GG6gv 0uqLl2y1JGHXepVaZ9IUYvBQSuxk3jeuEXu3e/7K4HtZM5dvWPLEhmTnZ5WmJTSnHMzTVTzG3er +PV6ZwOhtAY9JTZoO+aJ60qYItA== X-Received: from plbmb11.prod.google.com ([2002:a17:903:98b:b0:2ca:e068:9da4]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3c26:b0:2c9:97a7:3289 with SMTP id d9443c01a7336-2d0524a43ffmr107027415ad.43.1785782800290; Mon, 03 Aug 2026 11:46:40 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:24 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-10-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 v3: - only reset when failing to program flow rules as ethtool op - don't attempt to teardown rings in reset path if AQ is not allocated - fix work queue semantics related to management IRQ handler 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 | 9 +- drivers/net/ethernet/google/gve/gve_adminq.h | 1 - drivers/net/ethernet/google/gve/gve_ethtool.c | 2 +- .../net/ethernet/google/gve/gve_flow_rule.c | 15 +- drivers/net/ethernet/google/gve/gve_main.c | 352 +++++++++--------- 6 files changed, 197 insertions(+), 184 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 143c666fcebd..7d40267b0672 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -1350,7 +1350,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 91e2f3b0665f..cb0fceb20f69 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) @@ -1375,12 +1374,8 @@ gve_adminq_configure_flow_rule(struct gve_priv *priv, sizeof(struct gve_adminq_configure_flow_rule), flow_rule_cmd); =20 - if (err =3D=3D -ETIME) { - dev_err(&priv->pdev->dev, "Timeout to configure the flow rule, trigger r= eset"); - gve_reset(priv, true); - } else if (!err) { + if (!err) priv->flow_rules_cache.rules_cache_synced =3D false; - } =20 return err; } diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 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 8199738ba979..dd1c44fedc77 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -651,7 +651,7 @@ static int gve_user_reset(struct net_device *netdev, u3= 2 *flags) =20 if (*flags =3D=3D ETH_RESET_ALL) { *flags =3D 0; - return gve_reset(priv, true); + return gve_reset(priv, false); } =20 return -EOPNOTSUPP; diff --git a/drivers/net/ethernet/google/gve/gve_flow_rule.c b/drivers/net/= ethernet/google/gve/gve_flow_rule.c index 2c80cda28ef3..fae552f4ad6f 100644 --- a/drivers/net/ethernet/google/gve/gve_flow_rule.c +++ b/drivers/net/ethernet/google/gve/gve_flow_rule.c @@ -278,6 +278,11 @@ int gve_add_flow_rule(struct gve_priv *priv, struct et= htool_rxnfc *cmd) goto out; =20 err =3D gve_adminq_add_flow_rule(priv, rule, fsp->location); + if (err =3D=3D -ETIME) { + dev_err(&priv->pdev->dev, + "Timeout to add flow rule, trigger reset."); + gve_reset(priv, false); + } =20 out: kvfree(rule); @@ -290,9 +295,17 @@ int gve_add_flow_rule(struct gve_priv *priv, struct et= htool_rxnfc *cmd) int gve_del_flow_rule(struct gve_priv *priv, struct ethtool_rxnfc *cmd) { struct ethtool_rx_flow_spec *fsp =3D (struct ethtool_rx_flow_spec *)&cmd-= >fs; + int err; =20 if (!priv->max_flow_rules) return -EOPNOTSUPP; =20 - return gve_adminq_del_flow_rule(priv, fsp->location); + err =3D gve_adminq_del_flow_rule(priv, fsp->location); + if (err =3D=3D -ETIME) { + dev_err(&priv->pdev->dev, + "Timeout to delete flow rule, trigger reset."); + gve_reset(priv, false); + } + + return err; } diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 6f04eefd0416..578520e10793 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) { @@ -1158,8 +1188,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 @@ -1270,11 +1298,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); } @@ -1417,10 +1446,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)); @@ -1436,6 +1466,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); @@ -1452,41 +1488,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) @@ -1494,12 +1507,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) =20 priv->num_registered_pages =3D 0; =20 - priv->xsk_pools =3D bitmap_zalloc(priv->rx_cfg.max_queues, GFP_KERNEL); - if (!priv->xsk_pools) { - err =3D -ENOMEM; - goto err; - } - gve_set_netdev_xdp_features(priv); if (!gve_is_gqi(priv)) priv->dev->xdp_metadata_ops =3D &gve_xdp_metadata_ops; =20 - err =3D gve_setup_device_resources(priv); + err =3D gve_alloc_control_plane_resources(priv); if (err) - goto err_free_xsk_bitmap; - + goto err; + err =3D gve_setup_control_plane_resources(priv); + if (err) + goto err; return 0; - -err_free_xsk_bitmap: - bitmap_free(priv->xsk_pools); - priv->xsk_pools =3D NULL; err: return err; } @@ -2513,93 +2534,81 @@ 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) { + bool service_task_enabled =3D false; int err; =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 err; + goto teardown_device; } =20 err =3D gve_adminq_verify_driver_compatibility(priv); if (err) { dev_err(&priv->pdev->dev, "Could not verify driver compatibility: err=3D%d\n", err); - goto err_free_adminq; + goto teardown_device; } =20 err =3D gve_setup_device(priv); if (err) - goto err_free_adminq; - if (was_up) { + goto teardown_device; + + /* In the case of cascading failures, the disable count could be greater + * than 1. The service task must be enabled before starting queues. + */ + while (!service_task_enabled) + service_task_enabled =3D enable_work(&priv->service_task); + + if (setup_queues) { err =3D gve_open(priv->dev); if (err) - return err; + goto disable_work; } + return 0; =20 -err_free_adminq: - gve_adminq_free(priv); -err: - dev_err(&priv->pdev->dev, "Reset failed! !!! DISABLING ALL QUEUES !!!\n"); - gve_turndown(priv); +disable_work: + disable_work(&priv->service_task); +teardown_device: + dev_err(&priv->pdev->dev, "Recover failed! !!! DISABLING ALL QUEUES !!!\n= "); + gve_teardown_device(priv); return err; } =20 -int gve_reset(struct gve_priv *priv, bool attempt_teardown) +int gve_reset(struct gve_priv *priv, bool skip_queue_setup) { bool was_up =3D netif_running(priv->dev); int err; =20 + if (gve_get_reset_in_progress(priv)) + return 0; + dev_info(&priv->pdev->dev, "Performing reset\n"); gve_clear_do_reset(priv); gve_set_reset_in_progress(priv); - /* If we aren't attempting to teardown normally, just go turndown and - * reset right away. - */ - if (!attempt_teardown) { - gve_turndown(priv); - gve_reset_and_teardown(priv, was_up); - } else { - /* Otherwise attempt to close normally */ - if (was_up) { - err =3D gve_close(priv->dev); - /* If that fails reset as we did above */ - if (err) - gve_reset_and_teardown(priv, was_up); + + if (was_up) { + gve_queues_stop(priv); + if (gve_get_device_rings_ok(priv)) { + gve_clear_device_rings_ok(priv); + gve_destroy_rings(priv); + gve_unregister_qpls(priv); } - /* Clean up any remaining resources */ - gve_teardown_priv_resources(priv); } =20 - /* Set it all back up */ - err =3D gve_reset_recovery(priv, was_up); + disable_work(&priv->service_task); + gve_teardown_device(priv); + gve_queues_mem_remove(priv); + + 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; @@ -2931,7 +2940,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)) @@ -2939,7 +2948,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); @@ -2947,8 +2956,9 @@ static int gve_probe(struct pci_dev *pdev, const stru= ct pci_device_id *ent) queue_work(priv->gve_wq, &priv->service_task); return 0; =20 -abort_with_gve_init: - gve_teardown_priv_resources(priv); +abort_teardown_device: + disable_work(&priv->stats_report_task); + gve_teardown_device(priv); =20 abort_with_wq: destroy_workqueue(priv->gve_wq); @@ -2980,7 +2990,8 @@ static void gve_remove(struct pci_dev *pdev) void __iomem *reg_bar =3D priv->reg_bar0; =20 unregister_netdev(netdev); - gve_teardown_priv_resources(priv); + disable_work_sync(&priv->service_task); + gve_teardown_device(priv); destroy_workqueue(priv->gve_wq); priv->ctrl_ops->unmap_db_bar(priv); free_netdev(netdev); @@ -2996,16 +3007,13 @@ static void gve_shutdown(struct pci_dev *pdev) bool was_up =3D netif_running(priv->dev); =20 netif_device_detach(netdev); + disable_work_sync(&priv->service_task); =20 rtnl_lock(); netdev_lock(netdev); - if (was_up && gve_close(priv->dev)) { - /* If the dev was up, attempt to close, if close fails, reset */ - gve_reset_and_teardown(priv, was_up); - } else { - /* If the dev wasn't up or close worked, finish tearing down */ - gve_teardown_priv_resources(priv); - } + if (was_up) + gve_close(priv->dev); + gve_teardown_device(priv); netdev_unlock(netdev); rtnl_unlock(); } @@ -3017,16 +3025,14 @@ static int gve_suspend(struct device *dev) struct gve_priv *priv =3D netdev_priv(netdev); bool was_up =3D netif_running(priv->dev); =20 + disable_work_sync(&priv->service_task); + priv->suspend_cnt++; rtnl_lock(); netdev_lock(netdev); - if (was_up && gve_close(priv->dev)) { - /* If the dev was up, attempt to close, if close fails, reset */ - gve_reset_and_teardown(priv, was_up); - } else { - /* If the dev wasn't up or close worked, finish tearing down */ - gve_teardown_priv_resources(priv); - } + if (was_up) + gve_close(priv->dev); + gve_teardown_device(priv); priv->up_before_suspend =3D was_up; netdev_unlock(netdev); rtnl_unlock(); @@ -3043,7 +3049,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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:33 2026 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (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 95D1D43901F for ; Mon, 3 Aug 2026 18:46:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782808; cv=none; b=LhvSPsLgsnWg3XHeUbwsVJ5eWdbS9ehy2n/t03OtwKiA8H+mJqRrnSqkcPRx2DjaC4gXZ4u3dHYiulmVnHMxEpjOeyplxccH8dAAycCr/jaAEIVyRGy31xLDV5c81wkcKXihEfWTaI5ZzogH6IZp2/AVhQZujT8ydccZHWNbJbo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782808; c=relaxed/simple; bh=o4sl3p7EzsNiniVxH17fUGn1Ut+fjVtnh67MYn+VtIc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=sooHtc5lRBE4T4o5KrvfKoxX+UfvdjLrMdLRNlbv7qDXXgy8uLxWwZjTXmMp+Si2mDs0hlup+STnGTBWl+gzKN5mwwh3ctWOVf/ZiXIJLAK2pd+aFgF+5hZZnhA0Vk5Pz7RMqgtuQAp0JVFctO77pzBe3cRyJNA7PosYLUp9iCo= 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=Zu9PSmGL; arc=none smtp.client-ip=209.85.216.70 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="Zu9PSmGL" Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38ec0f510a9so9203328a91.2 for ; Mon, 03 Aug 2026 11:46:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782801; x=1786387601; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1OjdDoxIDxWtacvmMk5xwArStpy9Vv9TskgMY78Ajt0=; b=Zu9PSmGLXGfp5YSvcDN/KfBgs4mYJK7+HFC4a5l/vq+dscixzD/bZuVFVTiKJf+V0J khVBU63Fy55GwLaIFeAGBlas2EbtEjbbt60k+Rc8HBnJ9OgA/3UNnu0rNcGODw3E70NY JOEf8VmDS4KtUVaurwk0NrXtmST6426pslg17xvkIBxqo/GoFHrZvGLt6Plug7rN8irj /QVeN0h33g/2ae5nhca9sUnAM9w+tVVrpG+XwMsBubW2PgbKZjHH9JQxJd5DiZsP77/K ZpSxFKmBkWW1J4q60C1NJrTybAqFbukIoZq1Pp56KGJQI5JtIWd4Be1v0DGSfRnovtfO 0vfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782801; x=1786387601; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1OjdDoxIDxWtacvmMk5xwArStpy9Vv9TskgMY78Ajt0=; b=ckDwqpdzYzBSSYGJBGeOmGFf4cOXShn4F+97+QdNVzj9zQkjCWeM++GS0uksshcsIX 0sjLN2lQFc8Kiu5Mic86Iqad0inlHbcZBV1zEhLJISqjeAsU1QwOe3Wrxm4mHhfaHP3S WCzNexXVHd+HvCFbLQ14xQ4j9gcKa8B+8hZnzKg9bfrmkWXq08RlhNXluEuoz10yj9Hi Trcz55IUcvvzbbI65FVFXODhGElKlLMBxrCcav4zGK0vZi/6Ff0xOGu22k7uxdmWjlUR LrPSm//5O/uQ/QxIxpijANAlTKBiErT6ebiOsX0Q8CIiDwF/E/NGs8WNNEsG2XhhK+3H 6EXg== X-Forwarded-Encrypted: i=1; AHgh+Rq0pG5jXCSilmb2XcgyiFuFw3DUIY87q01ZdSIEJoTw3Fonxab5nKuAYIK0CIW0B17PFfPx6P+8X7DBMCs=@vger.kernel.org X-Gm-Message-State: AOJu0Yz89X7TlDtHtFtucxlJuN6NNasIVNziyBrtem9W8GjtfPo1j7H3 xil93GvXvBkrydHxZn3IJ5ahsWihXtlxxGraCzGWjTEpzzMcdJUTt3p3KTX4cJdsvxJUp5ZhcX6 jHKx8TBY/VZ4JVLmUEZzRx2dt4A== X-Received: from pjyt13.prod.google.com ([2002:a17:90a:e50d:b0:381:1b76:a387]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5807:b0:387:e0db:3fae with SMTP id 98e67ed59e1d1-38fbc588cc1mr10596300a91.39.1785782801152; Mon, 03 Aug 2026 11:46:41 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:25 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-11-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 7d40267b0672..c65c7d264430 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -835,12 +835,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 cb0fceb20f69..cb0e7005dd3c 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 578520e10793..c347661faac0 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, @@ -1809,6 +1814,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; @@ -1824,15 +1830,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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:34 2026 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E84044399E1 for ; Mon, 3 Aug 2026 18:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782807; cv=none; b=q9h56v7dtuU2gLR9tQIoAG6yeYAHC7MPuhgevNHLXUqvCq6qCqmaZ6hqBsK7H9jjUYppQCBh8OtVzHsNwa3EANfMyyqgBx7FMOq+gzpWl/zVM3OHZIGVJAkxUMQwmPxHdu1Wb4NdYXXqRyLKY+dPaLEzw34T0xOBJUGYItEMXCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782807; c=relaxed/simple; bh=swHpb9vxTO+foeJE+Q76TCdgPL3p0UHenUZiD39KE3Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=du0vmZXSVsVwM3QeXlb72lpjc8+Sa1q4bh+NcyPKbvQE6mH1M8qjdVIwadNFm0MG8TdSoWMfj2psaU/NzvsDym+ZxItoIC16kIqnOa+CZaECUvmlhW5pYZEO2EldrwJ9UrFgOxGenFbeKd1AFLNnZtWULHjrfGTnuv0Kh3ll9mA= 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=gpobhMhv; arc=none smtp.client-ip=209.85.210.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gpobhMhv" Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8485d853b08so7245764b3a.1 for ; Mon, 03 Aug 2026 11:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782802; x=1786387602; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Ymf6gVf7hhfD/Cj2vLek84ReFq4TWmos1ZzKi/3gAHc=; b=gpobhMhv5bSg/2cQXWRHXv9Ai5UAz0LKDvrFiD//+6u+GXHMD5mhv7ThgCJqSkZq30 AyfVGdUQ4jQT/ueljkEn/dbcHYCRnTTLpExO2u987oKXoNhT7+Ez2viIvWx09LzJu1tV 8Df/lpfIxsf6uZZ7ivuBO3SVTv/PzbTMvpYu3yNMMZsKVqc+wOyOcB0A3VfZwYhRlcsl AS03ae5Ltgar0LBDgl/EFGgt4O8mrAH3tHtC2Zy5fKKr6P5rbpnsUIMjWeCUS2UF3FaC HGYrhagOldKup5ckpAX3Wn+jbboPIFEBLucNma8yjzsY3e+CxUQAk8nVPypE7z1vqYx7 LjTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782802; x=1786387602; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Ymf6gVf7hhfD/Cj2vLek84ReFq4TWmos1ZzKi/3gAHc=; b=AqD9NA94kvsaEzJcX+YcV6isKZxSC4ZsQB9VGd5zad/TDya8JwwLAgD/PucCROX7UH bOqGVagjB6/W5F9E++yxup64f8qrd5SpWAcsRpm9jKQQRMobs17qDNhJr0obKNcigyEB un2YOKe4cIGzUiVzjh7vUytWGEIzB5ez7meOAcAdOnxtPYIs0VNdlboVGGO46uLedC89 YjP8D1chbQKW0tuOxhSaHBQduYv+7wmp6KopCAyaEWWTm437g+Ff1T+j7NHm1QcMtlRx C/YcxyIIn3RO7AccQl+lUwC7ki7JmKOalddugiHcwm7Z7zymnjvt6l0A5piDEUK/a7cM lxPg== X-Forwarded-Encrypted: i=1; AHgh+Rpe+Keg+hdH450ukJCYIfoBDhMo395RZwPjMmoCrzaFS7yrgkkjQU/i4Lt/KM7f9NHm+6xJgUt9Cm3MOqI=@vger.kernel.org X-Gm-Message-State: AOJu0YytcpjXYoCyugv0toWDavxXBj5P5AxLZHDrk+SRXsyuWKIrBxcG YQdMyD8Xj2TFY1n/lnBtl0ZkCYrdrlmrbpczfstdNCmgbFXuJU1BO47Lzgc1DAT8k6HMEh33j/X cQQMMTPyfA9CrV9x81v6oeo4bZA== X-Received: from pfbbx16.prod.google.com ([2002:a05:6a00:4290:b0:847:9199:e06]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:cd6:b0:848:4b49:27fb with SMTP id d2e1a72fcca58-84ee4963dc0mr10104395b3a.78.1785782802047; Mon, 03 Aug 2026 11:46:42 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:26 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-12-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 --- Changes in v3: - remove redundant call to gve_teardown_clock() drivers/net/ethernet/google/gve/gve.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 155 +++++++++++---------- 2 files changed, 86 insertions(+), 71 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index c65c7d264430..8766ea62baf1 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -676,6 +676,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 */ @@ -956,6 +957,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 c347661faac0..e96e353be04d 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 { --=20 2.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:34 2026 Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E85EF4399E2 for ; Mon, 3 Aug 2026 18:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782809; cv=none; b=hPPq0LHSx9L8qY1iYvv8AVx26XUeZrJGFjStvLBLrKyl1btZU2B4INz7uVV+txXs46S9lwKRBhbn+F+eg4SJoGepVI8ZZdCPVwMDfvE0CW9wjWyQa5Qr28HZdeZZVxHiAVI2G2izTUb2bF0Q+3abrodI5AQwGYxZ28zTcN8ntFk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782809; c=relaxed/simple; bh=As2iuhBKGVFDmjfNDmXmvm84pwNh+JZkf8CsZI1rsrU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rsJmuOimefg4WpBaDN3VLr+XL9BAmSosBBattpr0hI1f6uarJBQZHbXE/wMqzd4oWxuPJgPOOL21YcLtYbEtujnbKndn297O4Rc0Qn8rquOwnqtVoiMwi9rEGlL3ZfLUDT95FDT6zPiJKf8iqdVbmAHe5igtfnhYXFtAHmBq5N4= 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=hFMhDZS1; arc=none smtp.client-ip=209.85.210.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hFMhDZS1" Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-84e1da97175so6091963b3a.0 for ; Mon, 03 Aug 2026 11:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782803; x=1786387603; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=XbDYHYUNZKMfx2VYsfy7vCkzNZljrFVxn0EQOTgiBP8=; b=hFMhDZS1N2UMYIdSGCA7WlnPoy6rfeQ/QhjEh/JHD2BRDd02zx3drNBVXMmA04W03s J/8JBCObEXgQ8XlwXJEpI40x+teR7AQJ/2WImTO2hSQ7vWl3exV4alFP/p5PpuHqTvO9 ziy4qnwlZDaQhJulUJNmrj46KRZB0vM3by8ZQF2TZyCHCguUQAbwR75vISNXQ4rqQdTr YM315BCrjmo9Uh5CDHnFsKuG6YdVb9UiyCwXIaIbWhwxguRYKTSwQvBhOF5zKAg3WB8p mJ+iP0WKJwmz3w5r3SFBvBSA23bEN488yHJxNrDnrVgoZEL9XoUy3ZaEIczQxNiEeZ2J 4JXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782803; x=1786387603; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=XbDYHYUNZKMfx2VYsfy7vCkzNZljrFVxn0EQOTgiBP8=; b=s664hvnz4T4jn0zHff2D49deI9MksWBw3IiQE+u/MH2eGiCeVXxHB9TDfmdRIxXCs5 VBcfGMGud2PkU3UHJmB3FyQ7Ozg21SRCDYiV2vAtUEptvAPY4f4xz8AINUugj2TsqOxs 2YRjJ+UA5P9Z6SBvbyu4GpfuHZTES30yihxxNR8YNbuxlqsARqsmjyVRqi2T9TKHqjf+ hzHfP1qvGx/b2fFCoKSprJpvdVx5Umv/WVYpJQfpJqIXXyDK6i+W9pBZ3bTpQUgimD9R aXi2dS+TqDCSItUaNYzNJ2vO35WZ6YKhv6sRRh3Yyg0yyOGYfnzcG0lmSfQoBOdYtL9m hdJw== X-Forwarded-Encrypted: i=1; AHgh+RouNgMbVVIb/Ofk3Akt1yB+bupldtPCZXl3GxWt9OU1gA4rGw+wIFpAWEi9Q1eOJto7QnINV1Uyk9YOUvg=@vger.kernel.org X-Gm-Message-State: AOJu0YwprDWteDuozfT/mB4qVMlQgFcg7VgsiLmm4BsHs4BvIJuIABw5 TJLu6TARPdNq+r5hS/Ys+nZhs86o4+ym4wUdHLk9dZ13ZvTobeCwxFQRBpz9WJXkXgvXPe7IBWU KPV/34jtwUQHEJ7tDrtVfIw5jmA== X-Received: from pfbfj17.prod.google.com ([2002:a05:6a00:3a11:b0:84e:7be:bd38]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1d9c:b0:846:7fb0:4ca2 with SMTP id d2e1a72fcca58-84ee4968292mr10289556b3a.61.1785782802923; Mon, 03 Aug 2026 11:46:42 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:27 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-13-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 --- Changes in v3: - move allocation of IRQ DB indices and counter array back into gve_alloc_control_plane_resources() from gve_adminq_request_db_info(). - Similar to above, move free logic out of gve_adminq_free_db_resources() and rename all introduced methods from *free_db_resources to *release_db_resources to reflect the behavioral change. drivers/net/ethernet/google/gve/gve.h | 9 ++ drivers/net/ethernet/google/gve/gve_adminq.c | 37 ++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 2 + drivers/net/ethernet/google/gve/gve_main.c | 98 ++++++++++---------- 4 files changed, 96 insertions(+), 50 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 8766ea62baf1..f3cfc9d0cdec 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -836,6 +836,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) @@ -846,6 +848,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); @@ -1166,6 +1170,11 @@ static inline u32 gve_rx_idx_to_ntfy(struct gve_priv= *priv, u32 queue_idx) return (priv->num_ntfy_blks / 2) + queue_idx; } =20 +static inline u32 gve_ntfy_to_msix_idx(struct gve_priv *priv, u32 ntfy_blk= _idx) +{ + return ntfy_blk_idx; +} + static inline bool gve_is_qpl(struct gve_priv *priv) { return priv->queue_format =3D=3D GVE_GQI_QPL_FORMAT || diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index cb0e7005dd3c..f1ac55cc5b10 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1715,3 +1715,40 @@ 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; + + err =3D gve_adminq_configure_device_resources(priv, + priv->counter_array_bus, + priv->num_event_counters, + priv->irq_db_indices_bus, + priv->num_ntfy_blks); + if (unlikely(err)) { + dev_err(&priv->pdev->dev, + "could not setup device_resources: err=3D%d\n", err); + return -ENXIO; + } + + for (i =3D 0; i < priv->num_ntfy_blks; i++) + priv->ntfy_blocks[i].irq_db_index =3D + &priv->irq_db_indices[i].index; + return 0; +} + +void gve_adminq_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); +} 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 e96e353be04d..8f4a246cad18 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -204,6 +204,30 @@ static void gve_free_counter_array(struct gve_priv *pr= iv) priv->counter_array =3D NULL; } =20 +static int gve_alloc_irq_db_indices(struct gve_priv *priv) +{ + priv->irq_db_indices =3D + dma_alloc_coherent(&priv->pdev->dev, + priv->num_ntfy_blks * + sizeof(*priv->irq_db_indices), + &priv->irq_db_indices_bus, GFP_KERNEL); + if (!priv->irq_db_indices) + return -ENOMEM; + + return 0; +} + +static void gve_free_irq_db_indices(struct gve_priv *priv) +{ + if (!priv->irq_db_indices) + return; + + dma_free_coherent(&priv->pdev->dev, priv->num_ntfy_blks * + sizeof(*priv->irq_db_indices), + priv->irq_db_indices, priv->irq_db_indices_bus); + priv->irq_db_indices =3D NULL; +} + /* NIC requests to report stats */ static void gve_stats_report_task(struct work_struct *work) { @@ -428,15 +452,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 +508,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 +530,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 +566,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 +580,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 +603,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 +611,10 @@ static void gve_free_control_plane_resources(struct gv= e_priv *priv) kvfree(priv->ptype_lut_dqo); priv->ptype_lut_dqo =3D NULL; =20 - gve_free_stats_report(priv); - gve_free_notify_blocks(priv); + gve_free_irq_db_indices(priv); gve_free_counter_array(priv); + gve_free_notify_blocks(priv); + gve_free_stats_report(priv); gve_free_rss_config_cache(priv); gve_free_flow_rule_caches(priv); } @@ -623,15 +627,18 @@ static int gve_alloc_control_plane_resources(struct g= ve_priv *priv) if (err) return err; err =3D gve_alloc_rss_config_cache(priv); - if (err) - goto abort; - err =3D gve_alloc_counter_array(priv); if (err) goto abort; err =3D gve_alloc_notify_blocks(priv); if (err) goto abort; err =3D gve_alloc_stats_report(priv); + if (err) + goto abort; + err =3D gve_alloc_counter_array(priv); + if (err) + goto abort; + err =3D gve_alloc_irq_db_indices(priv); if (err) goto abort; =20 @@ -661,15 +668,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 +679,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 +709,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 +740,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 +2490,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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:34 2026 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31EBB423EB0 for ; Mon, 3 Aug 2026 18:46:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782810; cv=none; b=YyIZ42E8KiikzhWaxgEW0iTxyHueyJ/IJ4DKAeFvhCuOL7MSAJIVr3zu9s44econSkqH7BG6gsLJ3aR6oia1pyHiNMTmlRq+TiBmvCEC/DiVpPHnY5YfRm4qXI9l3w/sr81YC2NUXBqXUDb2bnUCKq1Y2x2QYlofghJPK+hHbmc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782810; c=relaxed/simple; bh=9DFROtzDiHlTQfzIKkmduVXjhrlPhb+mKANyvQpSKKA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=R5udO/pdvg65ps/AB0Y2PUM3yJbhUE8oK9Ot7ZgWsxq3WGW4EAIHkzi2aHv43Mr1l4K6qoI5yOvj0mgO9SXwv2hUGw4n4ER/H+c/+KOv61K7hoF4YKqxprhB8aCTFiCgg6WNsii7TdHSOixYN+NcTq23La8RQpafc0EkZwnTm98= 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=sbp/VQ0G; arc=none smtp.client-ip=209.85.215.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sbp/VQ0G" Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-cb5bdd8450dso2223330a12.0 for ; Mon, 03 Aug 2026 11:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782804; x=1786387604; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=b2RBbZvLGwRhyDy9lRoYOxayZ8+y6KrV4gj+1lXpV68=; b=sbp/VQ0GtsZ9ZjsMYX7uUWx51tKeXSRZVqJnr1qemghcFb5i8TvOdoMaSG06736KxN TrE+8vx2jpRgvdUFIoxgFM8z9l98UQ42NithQ7yAVnyxbAd1yXnpU45e1b8hNLJ7+cJc of6HvTK3r1ZOQlxr6fpwVE11jFs4KzCPHDLxJ/DF8+P/EAeuKtR5Rjhw3Z9ibQs0pSwP E6/qupxatknjHc81E/6hlYx4fk7+jnJPHBJEA91ngNIO+ObWrwokmIttQVz4m5kKwpOO ynChbN3ExZrlK0lPUH7Y6yCAzLBKWfOty4PEtcKms46yvajnEnPveeVkcwb7U3LAiDBX Jjzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782804; x=1786387604; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=b2RBbZvLGwRhyDy9lRoYOxayZ8+y6KrV4gj+1lXpV68=; b=YzGza81HBHMPqWdEzMHXXph74v2uvVELqVlNBLYaFiO2SbucEmHC6mzCzPqDbtVquG OPa3dUJo6U18uYMf1hWrVdrIrtiLLRSpQ7CKvnPLHnqp57vHYqP8NTpkgGwk87ScHjFm 6R3mpo/5uAAVJ6s5ZDyLqpSkWME62sRidtLBexbQm4GSw6GRkmq+lmMJdYOp4lrub2QY 6JNSLhDPqEEaG8h8+JAn5LzUueH8OZ0t5qyAnqEhkTmsyM+dh9w4GQYM5EwJYDI+rOwk 4pj2uEPnE4q52Gdf7loUVS+gk/BkJdrPZYA6+bu8MTt6+QdZW23CUGIKVSjHw6ZsL47Q lZ2A== X-Forwarded-Encrypted: i=1; AHgh+RpkUIsZoldOuGsuss4/4roedX87EVMeUXjB9DkLSBmmkdJXhokZI5OYM0+zerBkgqavSXajKc/4AzO8pn0=@vger.kernel.org X-Gm-Message-State: AOJu0YxSyya/SYn7V3f/WSTEx8FeufDq+OOXK4+E7kexQAJzrYSSOhI7 eMYoA2D+GAyGMIMi38b70Ei74rMjUT6BfOStz5x1oHSJe6750BB56vcf/zcPrWq0E156s/6NgMB JLpckAP/JUXED4LTCHC0VrOZnVA== X-Received: from pgja2.prod.google.com ([2002:a63:cd42:0:b0:c97:228f:37ae]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:700c:b0:3c3:9aff:7a5b with SMTP id adf61e73a8af0-3c92aa27f78mr11077710637.50.1785782803657; Mon, 03 Aug 2026 11:46:43 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:28 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-14-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 f3cfc9d0cdec..352755660138 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -838,6 +838,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) @@ -850,6 +852,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 f1ac55cc5b10..4299a3931789 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1752,3 +1752,35 @@ void gve_adminq_free_db_resources(struct gve_priv *p= riv) "Could not deconfigure device resources: err=3D%d\n", err); } + +static irqreturn_t gve_mgmnt_intr(int irq, void *arg) +{ + struct gve_priv *priv =3D arg; + + 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 8f4a246cad18..f2dd82f6c254 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -291,14 +291,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; @@ -523,6 +515,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) @@ -542,29 +535,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); @@ -2492,6 +2480,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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:34 2026 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F57343551E for ; Mon, 3 Aug 2026 18:46:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.198 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782811; cv=none; b=gknMxtoj1nLIC5I/1oSBNlHv2Ig8h2eme2ye5U3pvNkzrBpGpGX3Y+X5ca6jV4tmpJZn37/QrpcqwTaUpCgvkuBWxiRIM6K0sgVrzjYVjGYw/DLLiXM6FqV/lUauwHbQGeapCgmGTbKYXKT5bZmlamnlBzkn6j4+0iVWuu1IbV0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782811; c=relaxed/simple; bh=t6HBq+w6rky5CjIGVie+Ul/ENCeEYFN/jda0PTWlOuU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=H7+4dRm9gmtbKAMbFqry93g0mt+Gw9q9gf6V5wQgL1rpfFQbSiRFI3Pi1GGz7NBaZ6a5SyEGzn9wU98vwvgl76/HkjZ5IsqicZjKXkK+uLbzcR5e5FlxlVHLThopZz9CYwevizovuLw8fOFskKrqnbRWs3ujUhTvwviMZhaIemA= 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=ECfEZKrW; arc=none smtp.client-ip=209.85.210.198 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ECfEZKrW" Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-8484f26852dso4210284b3a.1 for ; Mon, 03 Aug 2026 11:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782805; x=1786387605; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=R1tOCOGQChFEvfXheFlEBUxLZ6TJFnKo2WVfob4bak4=; b=ECfEZKrWiYCHAT3fir0MNBNQTLdsDvMbsZmvPwlzTptHMT9Qtq3gKJ8sZIKC3f3Ofk TG4ijSsPpxf7qphmqblOWiuWT6fqL65ZZcQkKaRBUFjl04OwRX6Qi1oYEg9l+SIxrzJX AxUplpCugRsOLJJwhofo/zo9SU18v2fNfJdRVnfIaeey3NWqPN5hxf6mTETBfRVbl8xM TAoH850m1BV7xl9vtfPR3H+iehCqKWbmEpWC8jVuCRxo4tCjWqhhEtvL2Tiq22qQuZa+ uy9KYZP4zCgoTO9NgbH5mdyXiTPutaTnc/wYlb2aaytxkH8p1CTxSL2lOtbU0PE3flya SKjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782805; x=1786387605; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=R1tOCOGQChFEvfXheFlEBUxLZ6TJFnKo2WVfob4bak4=; b=ktPP4anhppD2EG1bYdt1yIjaBw7CfQdlkEVfRh1HjUntSQgs4Goj//j8KQGtddkwQn IkJvsApTkKNn/FEPyuS8xjad9gV+phAfH0rvWyowJ+el4UP+HyHi5OF1PmwYy9IHsoJv 8PLRIHAP+Flj02bG1nPlW6IWg8OyEVQk/ENJYQxMyiQp1plbVdY0EJzUDOJf0oW16RyX m5uOqHk/Htzx2udkcvdCLfkJzZuj13UgN+HZ3PTRHmM4nJNWc5E2sOdLeyyIxDq31+Jh TcwPz1SpJ/rFmZqKl6K7ulC4ZCs9YGwetdZZX9gnGGaNCyJskHrM2H+DdjsmofQxD6W8 wUPQ== X-Forwarded-Encrypted: i=1; AHgh+RrlS7JHsKi5ZqfFR8g781uMZpbIDGN3tJ8ISk1NM8gsG/RwVSrnnl498kDUnqahY1owh6XRwpywxADUpoI=@vger.kernel.org X-Gm-Message-State: AOJu0YykN5/Y8FSDG0zs//oeTb6WUvYVokCrTO6qzcll/u3d7VxC90XM DWUg+P4oozs+QXNygvfljewwXleqeocBy1mIdrNFr+3NuJ3feO9sa0OoJlxEG6aK3V6dkVvj1rf WDZpppVpFt43nmtU7uxf9bSoagw== X-Received: from pfgs25.prod.google.com ([2002:a05:6a00:1799:b0:848:4460:aed3]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4b45:b0:847:9c3a:b77f with SMTP id d2e1a72fcca58-84ee48eac4fmr10278505b3a.35.1785782804441; Mon, 03 Aug 2026 11:46:44 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:29 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-15-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 v3: - remove double logging in the create queues path 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_dqo.h | 2 +- drivers/net/ethernet/google/gve/gve_main.c | 48 +++++-------------- 5 files changed, 68 insertions(+), 39 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 352755660138..38b93238e2ca 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -844,6 +844,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); @@ -862,6 +864,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 4299a3931789..b04968257355 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 @@ -1784,3 +1808,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_dqo.h b/drivers/net/ethern= et/google/gve/gve_dqo.h index 5871f773f0c7..ce402020dff6 100644 --- a/drivers/net/ethernet/google/gve/gve_dqo.h +++ b/drivers/net/ethernet/google/gve/gve_dqo.h @@ -66,7 +66,7 @@ void gve_rx_write_doorbell_dqo(const struct gve_priv *pri= v, int queue_idx); void gve_xdp_tx_flush_dqo(struct gve_priv *priv, u32 xdp_qid); =20 static inline void -gve_tx_put_doorbell_dqo(const struct gve_priv *priv, +gve_tx_put_doorbell_dqo(struct gve_priv *priv, const struct gve_queue_resources *q_resources, u32 val) { u64 index; diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index f2dd82f6c254..484f5a54a408 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -871,33 +871,15 @@ 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); - if (err) { - netif_err(priv, drv, priv->dev, "failed to create %d tx queues\n", - num_tx_queues); - /* This failure will trigger a reset - no need to clean - * up - */ - return err; - } - netif_dbg(priv, drv, priv->dev, "created %d tx queues\n", - num_tx_queues); - - err =3D gve_adminq_create_rx_queues(priv, priv->rx_cfg.num_queues); - if (err) { - netif_err(priv, drv, priv->dev, "failed to create %d rx queues\n", - priv->rx_cfg.num_queues); - /* This failure will trigger a reset - no need to clean - * up - */ + err =3D priv->ctrl_ops->create_queues(priv); + /* This failure will trigger a reset - no need to clean + * up + */ + if (err) 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 @@ -1052,26 +1034,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, @@ -2482,6 +2454,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.55.0.571.g244d577d93-goog From nobody Fri Oct 2 07:45:34 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE99643B4A2 for ; Mon, 3 Aug 2026 18:46:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782811; cv=none; b=TUF9NmM3TIZfrJ/UZzPpL9jME+VhjHeOi4wH2Q2dZ6dJnqzQ88yNYWOIz2Ts199KOU9YJtPjNXN14a4Xc9wDDDCvPziSEPFGtDigDj2TCUT3XtwnVrxXGRVNihLOqpZoY7Sx3fylKRItR2TteF1FYRAejyqZ10LLBoAZgsU9GJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785782811; c=relaxed/simple; bh=+5keIfq+ahGjGb23E34eAMBpGZbIe+0PkejsdNponjM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fayl7xqVn41RBUWdXrWH/b0mvAaEDDWNBDIINbyDp6xKYY/QoNBXhI9Xx2S63kA0UjFEE8plsSgR821S20+56tfGQC/oQCdUGelrVEPcoeaQy+8k5XFkAAyIz4ajtbEStLkFLlEZdP6/NqS+N0IjRDoMarTLYDs6j1TMBqW5Fg4= 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=lj6oc3F/; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="lj6oc3F/" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-38e2f61c09dso5241726a91.2 for ; Mon, 03 Aug 2026 11:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785782807; x=1786387607; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=cw3abLLZFYPMN/Q20aJiudIzDZfANzTR+tzIkHl7qzg=; b=lj6oc3F/yasAiWTktWDo6fWh4PZMqEzU+arUbGXnxGglH2foeoZor1rIJ9HxWoiK3E K9oya0hS7CyVd+VfETV4/kGPt7ppXQhHDCce/kJ6tvnutH8+QRhfHY496PlbU6QkLYhK Yho9JzbNCenQJ/tWVyDLHdX5Vi6XVOXJA8dTgp+yzxrPXA227P0wRjs2ofJYvwakQy86 ZeANl31QGJZKNsWa7jzE8gPCPDwNuJoL75ioVkd8N/zGEdV6RYhuQ66LznKJWYXpT6PW nEDNchNXnm6C0Ny7Lfb+KVbhhSeVd5sFOItlv13L7LxwriBhtqcKjLNSBnZdojIYSJHg 0/CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785782807; x=1786387607; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cw3abLLZFYPMN/Q20aJiudIzDZfANzTR+tzIkHl7qzg=; b=b1dXOX/cTgxphF8kN2CRgU5K3TVwG8Rjfu/15pNjWr2N07f/ZkNv++yR/cOn1hPsWC SbVuO+mOHq6sUgELbvpOBJ2273tBCtM0abadHIIayD/K80/A2b2KhZbJqyc9rosPyeeP yg0J93n7kKjWbgL6xUGJf8cnf8XIZcu2eHus6wEUsjuxkRBeZ0JqItkWodVmdXWHut0h 2cnltQQO3g7mkxFZqQPv4NFDP9Ek2WaAr4bJ+mk2DFSnc+jsBbuBpwREBD1IWNJdY/45 JC4klsNleuMsPSdC5H0tfHW16VQStuW6bAZ/JXYHZCowlSfWVHSpxqcpK9SMDhrAw5LV kpdQ== X-Forwarded-Encrypted: i=1; AHgh+RqUOb83k0ZFyXzWThV7DEjmrxQS5n7nIBBFdR2e67NDYrHf+r58gZErjKIkaLy/eLhPtdpcEX2/Oz1PUyM=@vger.kernel.org X-Gm-Message-State: AOJu0YzTYGrLY9LigJCyKVJmcCygZ0+/OfWRI84zaNHQsOS/NUQ7eLcZ Q7PKERlUt1BHEj7FojfSGCvKlN/AFHN3E2e0nU2R91MUpx6KXARpIxm5BAwBzO+jdlBRn85lTeB LDgVzvMlriN0ONC+z4pFUsuc+CQ== X-Received: from pjuu7.prod.google.com ([2002:a17:90b:5867:b0:38d:f003:cd24]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:57e6:b0:38d:e658:5959 with SMTP id 98e67ed59e1d1-38fbc3e596cmr10248328a91.5.1785782805278; Mon, 03 Aug 2026 11:46:45 -0700 (PDT) Date: Mon, 3 Aug 2026 18:46:30 +0000 In-Reply-To: <20260803184630.3813311-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: <20260803184630.3813311-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.571.g244d577d93-goog Message-ID: <20260803184630.3813311-16-hramamurthy@google.com> Subject: [PATCH net-next v3 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, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org 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 --- Changes in v3: - Fix kdoc typo ("set link status" -> "set link speed") - Copy link speed into local variable instead of reading twice to prevent TOCTOU issue. drivers/net/ethernet/google/gve/gve.h | 5 ++++ drivers/net/ethernet/google/gve/gve_adminq.c | 10 +++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 1 + drivers/net/ethernet/google/gve/gve_ethtool.c | 3 +-- drivers/net/ethernet/google/gve/gve_main.c | 26 ++++++++++++------- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 38b93238e2ca..8e34e9f75006 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -846,6 +846,8 @@ struct gve_device_info { * @reset_flow_rules: Flush all flow rules from device * @create_queues: Sends commands to the device to create TX/RX queues. * @destroy_queues: Sends commands to the device to destroy TX/RX queues. + * @report_link_status: Set link status into @priv->link_up + * @report_link_speed: Set link speed into @priv->link_speed */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); @@ -866,6 +868,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 { @@ -967,6 +971,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 b04968257355..fe975d1547b2 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1834,3 +1834,13 @@ int gve_adminq_create_queues(struct gve_priv *priv) =20 return err; } + +int gve_adminq_report_link_status(struct gve_priv *priv) +{ + u32 status; + + status =3D ioread32be(&priv->reg_bar0->device_status); + WRITE_ONCE(priv->link_up, + !!(GVE_DEVICE_STATUS_LINK_STATUS_MASK & status)); + return 0; +} diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 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 dd1c44fedc77..a3220c651438 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -749,12 +749,11 @@ static int gve_get_link_ksettings(struct net_device *= netdev, int err =3D 0; =20 if (priv->link_speed =3D=3D 0) - err =3D gve_adminq_report_link_speed(priv); + err =3D priv->ctrl_ops->report_link_speed(priv); =20 cmd->base.speed =3D priv->link_speed; =20 cmd->base.duplex =3D DUPLEX_FULL; - return err; } =20 diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ether= net/google/gve/gve_main.c index 484f5a54a408..19e4b56238a0 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1502,15 +1502,18 @@ static int gve_close(struct net_device *dev) return err; } =20 -static void gve_handle_link_status(struct gve_priv *priv, bool link_status) +static void gve_handle_link_status(struct gve_priv *priv) { + bool link_up; + if (!gve_get_napi_enabled(priv)) return; =20 - if (link_status =3D=3D netif_carrier_ok(priv->dev)) + link_up =3D READ_ONCE(priv->link_up); + if (link_up =3D=3D netif_carrier_ok(priv->dev)) return; =20 - if (link_status) { + if (link_up) { netdev_info(priv->dev, "Device link is up.\n"); netif_carrier_on(priv->dev); } else { @@ -1537,7 +1540,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)) { @@ -1564,8 +1566,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 @@ -1998,11 +2000,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, @@ -2326,12 +2328,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) @@ -2456,6 +2460,8 @@ static const struct gve_ctrl_ops gve_adminq_ops =3D { .teardown_mgmt_irq =3D gve_adminq_teardown_mgmt_irq, .create_queues =3D gve_adminq_create_queues, .destroy_queues =3D gve_adminq_destroy_queues, + .report_link_status =3D gve_adminq_report_link_status, + .report_link_speed =3D gve_adminq_report_link_speed, }; =20 static int gve_init_priv(struct gve_priv *priv) --=20 2.55.0.571.g244d577d93-goog