From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E98F456B849 for ; Wed, 9 Sep 2026 19:11:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981116; cv=none; b=FaqANy07KJzZYbj1FD5tkIaQSvls+XEhzQReFaNmysEC0ilmBJ4z1+mfnRJS1Mnd5jSn7yLtBfD2fijm3Rw3v3RFcUSRF4z/2AyaAcH1bCdW3jSJt0bz9Is5KqcXHUX/zXCWpYbXEEncXp2EtBMZ13mZ23WGGjQp7keXzyuBBUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788981116; c=relaxed/simple; bh=VAniQhMzaC6SsX9ldWgZlcmfA3M/hOHrNtMTdXsLKEE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hka8DHQpQ/vQgz5iBZaedTnA1+ebWzZMQLt0tjuUo8LCz9cR2hgHI7++DNRWuQWDzr1Mh090fkzXUGzCJpLLYZ4b5KXDIt2HV64gzyVo5c4Vwnz1raZX2002OS8POBfeo8rdVVnu3FgczO/KExJnSMxcg6xMNIg0F6cUZ7f5Fpk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bxoDYH/N; arc=none smtp.client-ip=209.85.214.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bxoDYH/N" Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2d94f086fedso86092885ad.1 for ; Wed, 09 Sep 2026 12:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1788981108; x=1789585908; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=cPFYtU/9RxAjn/jpxF9s2qsv43MfqLKklIHoDpf5Mpk=; b=bxoDYH/Ni/AGl3/X4jQ6g80znww38/GHG0ZfdCPjulRtQbsCm7WLiSPQzhSy0ogg7r ACuEPvdNjUUf0pH2DOvOfL0xCE+BE9Lb2Jmctq6V/12iwBVUZ73RQwAHR0EbSh6nfjVP IhKALaCHJBNvqf8L4AFc0DTQ+51lsKa/Gph7HDtccF3KVuVM+2BEWSbEo7r4dIaKYZhk Ac/+9ZnPG6gwLCH5jNiuPlBgF1qzwYVQIz/dt8tQzgywJhXYzet4Ns8KaWu5tV2K2QPt khDDnaH1Apb2m7J2EgwT5VP869X9CDCRs84Ba/30tOK2RSJ4ganitiuEstOJ2wb3NIh/ LYtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788981108; x=1789585908; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cPFYtU/9RxAjn/jpxF9s2qsv43MfqLKklIHoDpf5Mpk=; b=SG/CeyR2gt9C1F4IKQxhE2DtmxYlQAjqFP0B1i224hug61jHq0NoU6C6X01/qxYIu3 AukENTxpVc62gnPRtXKdcQlq3fFtqbQS+ckcwFYOuFqioFnBA8wnnpuicmJl4dPmaQdq 0we0LqgnHNjyA0zS0hMPf+UPsNxd4GK5nZgKr7u6go2V6pFeXTNMg38PClq1pISZPuat xHjXjJsqqSE4996lnf/2fLsTOqywUFvXINtY5s1854+Sv5moOXYZyuNo/jtyK61rrpAk 1vRCjhevPpBFzErX6DIRbGvEhQpdRtZv/YehZ9lbtD3GIXl03xAqO2IBOTvgpa9Tee9i fHQg== X-Forwarded-Encrypted: i=1; AKwUvBw8FMScY8vkVdx1/TXf+y0dP/IqRxZFh+4PgHpA89tmUALvoveXaKPIgmRQJWFWPyWvPb6lR7lqZqvWk2o=@vger.kernel.org X-Gm-Message-State: AFuF++mLVm2d25oZI/aHe8JM1i0JS9VpBpYMn+qPe5hyudjaGU9q8E9D jhYlDcErbCT6YuxOHpEoj3q/5eCENSSisQ2Z1ViGXoHporYWjC6jlZalJEmvsp1/rC08wEyyLhN AJ/jOWuJSKYOzL22f9RnrgDvWhA== X-Received: from plhz2.prod.google.com ([2002:a17:902:d9c2:b0:2dc:ff56:3f4c]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:704:b0:2d8:f965:7e48 with SMTP id d9443c01a7336-2db1235b1fbmr326250635ad.1.1788981108306; Wed, 09 Sep 2026 12:11:48 -0700 (PDT) Date: Wed, 9 Sep 2026 19:11:35 +0000 In-Reply-To: <20260909191136.3811892-1-hramamurthy@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260909191136.3811892-1-hramamurthy@google.com> X-Mailer: git-send-email 2.55.0.1003.g10538fe699-goog Message-ID: <20260909191136.3811892-13-hramamurthy@google.com> Subject: [PATCH net-next v6 12/12] gve: add link status/speed ctrl ops From: Harshitha Ramamurthy To: netdev@vger.kernel.org Cc: joshwash@google.com, hramamurthy@google.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, sdf@fomichev.me, jordanrhee@google.com, willemb@google.com, nktgrg@google.com, maolson@google.com, thostet@google.com, jacob.e.keller@intel.com, debarghyak@google.com, kees@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, przemyslaw.kitszel@intel.com Content-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 9a0a94ebdcd8..ed64f298e80d 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -1841,3 +1841,13 @@ int gve_adminq_create_queues(struct gve_priv *priv) 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 c9abb9681dca..cc65986276be 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1501,15 +1501,18 @@ static int gve_close(struct net_device *dev) return err; } -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 { @@ -1536,7 +1539,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)) { @@ -1563,8 +1565,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; } @@ -1997,11 +1999,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, @@ -2325,12 +2327,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) @@ -2457,6 +2461,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.55.0.979.g7e5102b832-goog