From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.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 86FA335E1D1 for ; Thu, 24 Sep 2026 18:53:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790276028; cv=none; b=UVcdHT24OjE7Vk5UGEGNH2iMzgHzzJgoBGkfk9X8mp22n+Q016JKP8nIaNJ7FfswrKmVde6MzOV8Vu+raKisIlYJ1WAPfOtqIl2NvPGPyc2PXwlK/ERHvLK3oCjePMp0hxP7U40QJW0zzp/+iWQdFT0fPNs9qBbv2eQ54s7is94= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790276028; c=relaxed/simple; bh=v4lj/oNYIff71693rCfldaoukS8Xeu7M79m8AUE/FN8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bPivFSPnpkSOmNa66A4Q0J6uhNyYdUklWo3r3CAMohRJt4XA2jgZnbPO6KfpFBmwrHydmG1hd/iUg0T8I66d5yT2/OperNR8Sg1yvrK6eDbWYAP60CLo22Iw8qbZji58HK9R/4Bxq04UvA8t8NjoxgX2ij/yh4T2EW3sDNLYOhk= 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=p6PYXyGr; arc=none smtp.client-ip=209.85.215.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="p6PYXyGr" Received: by mail-pg1-f200.google.com with SMTP id 41be03b00d2f7-cc1b8088203so49497a12.3 for ; Thu, 24 Sep 2026 11:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790276016; x=1790880816; 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=CrYtTrpIBi155IqjERdC4I2LntOtJMD6hquHz7MlpCc=; b=p6PYXyGrI4Q2GmF1ClMm/L9h1XGpDWldUZeNdJHEQFdJecmS+arJBLfWbF1nLAWYzk 5LPXagx67fOo55MxYmMzSQpwRlm6eLeEuquFzK19DX8Jz7KDFqQLck40UBDEzTU7oBdY bYWPXrcOruwE6Tnj1nEjx3GF5oYKtOrMWg4rgiAOQP0+o13xl+efxtT2hc5Gslqifl7u ZkT8MYk3L7VDg7Qu4FxWcyMdLmwEeh5pMsnqIdpWEvn3B6SBf0thYqhgRce0LJkYWipi 9eoxAen6gmiMRW/PZrAUJD+DrLeE0kzYiHavYqCk5xAfWEo2+v62HcoO1PTFgk7vZmZQ eQFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790276016; x=1790880816; 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=CrYtTrpIBi155IqjERdC4I2LntOtJMD6hquHz7MlpCc=; b=EaL8QOtrJKBT2k9RgC2N6GRaFMnqnfJgjtwj8jXjqYAB6V4jn+ygzarxJx+2bV8Lwn qwMJzzPCrrNhc3e6Nhjo/BogUlRG9w7WLLc6mEpeEBvmnz3Zt2J2n0xm85LMOPx1eYTa aSUQWa/3fwYEeUjV4xbatqMRggsm8J7ky821NLTLdEemMEm4/Rj2bfhG1mOQB1pee18u VnzjNtEsGJkXyIOzh0HYWsNK3HZPdIyHh+WRjilC7eixFtw6G6qkUqpyoaYKQDmdc7k7 W5xUKK5HzAcfXDQc83rw1ctC4vpol8Hsfp0GFS2yFHoTgFgLEoMsUrsuWr2ICCJ4C38h wv/A== X-Forwarded-Encrypted: i=1; AKwUvBwRA2hrxcE/TPmIrla3TfjPG0PVYXC0TXf+awAWU6GghNrTjfs+rV9KM9r2eVYa4eyCkaPH2orOFLDfHkU=@vger.kernel.org X-Gm-Message-State: AFuF++nNPpoci/xOse402lENX943zIWauCx3qNJwIDmb70NPEC6GDp3F xbfJqs2zblSK4deei0z5ZM7zHTTRCPQszXIPCfyHh1XUyt7tLrjiT3Ys4xFwl5wMg3RPFejVidP iNQat9DGNvWgBtaV1gcztYk2Eog== X-Received: from pgbcv2.prod.google.com ([2002:a05:6a02:4202:b0:cc7:50b1:eedc]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9145:b0:3dd:85a9:55a1 with SMTP id adf61e73a8af0-3de0e89ed89mr3199142637.35.1790276015317; Thu, 24 Sep 2026 11:53:35 -0700 (PDT) Date: Thu, 24 Sep 2026 18:53:16 +0000 In-Reply-To: <20260924185316.2831077-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: <20260924185316.2831077-1-hramamurthy@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20260924185316.2831077-13-hramamurthy@google.com> Subject: [PATCH net-next v8 12/12] gve: add link status/speed ctrl ops From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-Type: text/plain; charset="UTF-8" From: Joshua Washington Refactor link status check to use a control plane op. Introduce new op for retrieving the link status in AQ mode. This op reads the link status from the device status register and stores the value in priv. Also add an op for retrieving link speed in AQ mode which calls into gve_adminq_report_link_speed. Reviewed-by: Willem de Bruijn Reviewed-by: Jordan Rhee Reviewed-by: Przemek Kitszel Signed-off-by: Joshua Washington Signed-off-by: Harshitha Ramamurthy --- v3: - Fix kdoc typo ("set link status" -> "set link speed") - Copy link status into local variable instead of reading twice to prevent TOCTOU issue drivers/net/ethernet/google/gve/gve.h | 5 +++++ drivers/net/ethernet/google/gve/gve_adminq.c | 10 ++++++++++ drivers/net/ethernet/google/gve/gve_adminq.h | 1 + drivers/net/ethernet/google/gve/gve_ethtool.c | 3 +-- drivers/net/ethernet/google/gve/gve_main.c | 26 ++++++++++++++++---------- 5 files changed, 33 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h index 00966b6a730f..b7ce6e8632db 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -845,6 +845,8 @@ struct gve_device_info { * @reset_flow_rules: Flush all flow rules from device * @create_queues: Sends commands to the device to create TX/RX queues. * @destroy_queues: Sends commands to the device to destroy TX/RX queues. + * @report_link_status: Set link status into @priv->link_up + * @report_link_speed: Set link speed into @priv->link_speed */ struct gve_ctrl_ops { int (*map_db_bar)(struct gve_priv *priv); @@ -865,6 +867,8 @@ struct gve_ctrl_ops { int (*reset_flow_rules)(struct gve_priv *priv); int (*create_queues)(struct gve_priv *priv); int (*destroy_queues)(struct gve_priv *priv); + int (*report_link_status)(struct gve_priv *priv); + int (*report_link_speed)(struct gve_priv *priv); }; struct gve_priv { @@ -966,6 +970,7 @@ struct gve_priv { /* Gvnic device link speed from hypervisor. */ u64 link_speed; + bool link_up; bool up_before_suspend; /* True if dev was up before suspend */ bool mgmt_irq_requested; diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c index 54f235ea27c1..8b215fca9c1b 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1837,3 +1837,13 @@ int gve_adminq_create_queues(struct gve_priv *priv) return err; } + +int gve_adminq_report_link_status(struct gve_priv *priv) +{ + u32 status; + + status = 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/ethernet/google/gve/gve_adminq.h index d696e4932a8b..8daac5fd685a 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -643,6 +643,7 @@ int gve_adminq_report_stats(struct gve_priv *priv, u64 stats_report_len, dma_addr_t stats_report_addr, u64 interval); int gve_adminq_verify_driver_compatibility(struct gve_priv *priv); int gve_adminq_get_device_properties(struct gve_priv *priv); +int gve_adminq_report_link_status(struct gve_priv *priv); int gve_adminq_report_link_speed(struct gve_priv *priv); int gve_adminq_add_flow_rule(struct gve_priv *priv, struct gve_adminq_flow_rule *rule, u32 loc); int gve_adminq_del_flow_rule(struct gve_priv *priv, u32 loc); diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/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 = 0; if (priv->link_speed == 0) - err = gve_adminq_report_link_speed(priv); + err = priv->ctrl_ops->report_link_speed(priv); cmd->base.speed = priv->link_speed; cmd->base.duplex = DUPLEX_FULL; - return err; } diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 38c964ac0e3a..d66dcee58f6a 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1508,15 +1508,18 @@ reset: return err; } -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; - if (link_status == netif_carrier_ok(priv->dev)) + link_up = READ_ONCE(priv->link_up); + if (link_up == netif_carrier_ok(priv->dev)) return; - if (link_status) { + if (link_up) { netdev_info(priv->dev, "Device link is up.\n"); netif_carrier_on(priv->dev); } else { @@ -1543,7 +1546,6 @@ static int gve_set_xdp(struct gve_priv *priv, struct bpf_prog *prog, { struct bpf_prog *old_prog; int err = 0; - u32 status; old_prog = READ_ONCE(priv->xdp_prog); if (!netif_running(priv->dev)) { @@ -1570,8 +1572,8 @@ static int gve_set_xdp(struct gve_priv *priv, struct bpf_prog *prog, bpf_prog_put(old_prog); out: - status = 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; } @@ -2002,11 +2004,11 @@ static void gve_turnup(struct gve_priv *priv) static void gve_turnup_and_check_status(struct gve_priv *priv) { - u32 status; + const struct gve_ctrl_ops *ops = priv->ctrl_ops; gve_turnup(priv); - status = 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); } static struct gve_notify_block *gve_get_tx_notify_block(struct gve_priv *priv, @@ -2334,12 +2336,14 @@ static void gve_service_task(struct work_struct *work) { struct gve_priv *priv = container_of(work, struct gve_priv, service_task); + const struct gve_ctrl_ops *ops = priv->ctrl_ops; u32 status = ioread32be(&priv->reg_bar0->device_status); gve_handle_status(priv, status); 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); } static void gve_set_netdev_xdp_features(struct gve_priv *priv) @@ -2466,6 +2470,8 @@ static const struct gve_ctrl_ops gve_adminq_ops = { .teardown_mgmt_irq = gve_adminq_teardown_mgmt_irq, .create_queues = gve_adminq_create_queues, .destroy_queues = gve_adminq_destroy_queues, + .report_link_status = gve_adminq_report_link_status, + .report_link_speed = gve_adminq_report_link_speed, }; static int gve_init_priv(struct gve_priv *priv) -- 2.56.0.rc1.310.g51773c2048-goog