From nobody Thu Apr 2 19:00:23 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E661833F5B0 for ; Thu, 26 Mar 2026 22:45:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774565134; cv=none; b=Qo1tWRnyFLX7hgNfAHF5epCiPBSIwcwwq2BuFf8Znk3i9x6RcgtpeFAErsC/k9APNto2KYxjUiLXL5lcza1pxO1I6TMj1xxf3bqi+0aTFWYONKr9WFt4R3dqr/2Tu99MyvAOVNAB4K6/5ZyTT90Kiukc7e8sZlF9IYbL8g7QakI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774565134; c=relaxed/simple; bh=oZYgYFj1aqx2X4B8JT5W6Sywd6j3ZYGmoQ5hWKQDfVM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tokEYcDyimsH1xOX37COYRvwcy8/Txq+WhDpYC7Wosk5p7a17BHWX+avslT6FItgGvHdb7qFi7MtLWuO/hdOzdhWgE+yWRHavwAhEvxtF8VB1OOtkA6BBQmsOsBZ5Y0+erH0SCIRzNb7N/q3APVeZqXm/nqO0RO6I6PlpA548YM= 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=pVXuBtEs; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pVXuBtEs" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b079b4a8c3so48560525ad.3 for ; Thu, 26 Mar 2026 15:45:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774565132; x=1775169932; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=bEniFEpXYdog1o1ES50Hw6/3TT14/XWuA8fK5Ar+y7E=; b=pVXuBtEsS+x41nYy9uCU7Oc31h+E+a3wCT8JCRrS5uTzdt9+XlmQ1DkI2XXkrdAIO6 IWZc6AcsLSteEL+sBIsPhKcKXo0itCTFLLmXEzzgWmFCCN7TtzTz8Ubx7+6mxN0r3x5C d+htrDeCp7FJLbemfbURk3WQMLiRPSzWHFpqXwJ410C00J+5o4eQ5wThs1vJsm5K1Yi7 cgKKV1OwB2Qq2I7EXk+4EtA5yWkNQjtNpezIA4twxyi3EDiRnVuXHAmsrgKRXop0e5xz pLbQC/woW4n+nk1qQQ4ZqIGolTYsOG+3KKsiUbJ0BjfN0ZyeTSSlv4/d/6Nhu07C/uGZ Dr1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774565132; x=1775169932; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bEniFEpXYdog1o1ES50Hw6/3TT14/XWuA8fK5Ar+y7E=; b=Xe1y9rvCQWc9QjyRfoVUdGTA7MBQfqNP9DFRxulIARnst9vNJcLphPx23KRtmq9JdB UO7Tracb6P4KTHLluEeIUOzkIKWOChMmPb1zcR6PjTz75nz4MaP76qouloYo/sCt0CYQ IK3nc8a4xr7X8Dl17A/2kuiYzN+OZaRLREISJeVP0tzl4lYJE9I8xuC5PKaUy52XHH+l RcTooUDl8d+tqaw9GsUqMya8infv90w2VA2k/nQChrE2ixBtpWqlHXwbkFdc94QduPri pBQ3XkbLhBo1AY/7MvAVF7SacqCfBSalb7QIz3ZvFImz3J062ghqanTbgQadRFhQFNFD n+BA== X-Forwarded-Encrypted: i=1; AJvYcCVFRMr5Pm2ajf+ixTVsk7CosDKcYR/OMN+27mR8ERKeNr39rpNoQWqcfMNoFvdXXZ2lnMtYoKCcUQ9pfPM=@vger.kernel.org X-Gm-Message-State: AOJu0YxY0rq6Cvl8UOi3Pa1PBjUZXs2ATZRlf20cIcRTz73KrmqnUuT8 dTuoExvmHp7u/hpIZTKoXj2fA3H1vLacr+3A02P8eTVqYd1OR3hn/WRV8DcadgJk7GZgQ6nsRcr IknvFoZSJ9yH9wn/3dToxVANqlg== X-Received: from pgip3.prod.google.com ([2002:a63:c143:0:b0:c5e:84e5:d15c]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3d83:b0:39b:edcd:d936 with SMTP id adf61e73a8af0-39c8787f016mr349555637.16.1774565131988; Thu, 26 Mar 2026 15:45:31 -0700 (PDT) Date: Thu, 26 Mar 2026 22:45:25 +0000 In-Reply-To: <20260326224527.1044097-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: <20260326224527.1044097-1-hramamurthy@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326224527.1044097-2-hramamurthy@google.com> Subject: [PATCH net-next v2 1/3] gve: skip error logging for retryable AdminQ commands 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, richardcochran@gmail.com, willemb@google.com, nktgrg@google.com, jfraker@google.com, ziweixiao@google.com, maolson@google.com, thostet@google.com, jordanrhee@google.com, jefrogers@google.com, alok.a.tiwari@oracle.com, yyd@google.com, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jordan Rhee AdminQ commands may return -EAGAIN under certain transient conditions. These commands are intended to be retried by the driver, so logging a formal error to the system log is misleading and creates unnecessary noise. Modify the logging logic to skip the error message when the result is -EAGAIN. Reviewed-by: Joshua Washington Signed-off-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve_adminq.c | 26 +++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 08587bf40ed4..c7834614c5f0 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -416,11 +416,6 @@ static bool gve_adminq_wait_for_cmd(struct gve_priv *p= riv, u32 prod_cnt) =20 static int gve_adminq_parse_err(struct gve_priv *priv, u32 status) { - if (status !=3D GVE_ADMINQ_COMMAND_PASSED && - status !=3D GVE_ADMINQ_COMMAND_UNSET) { - dev_err(&priv->pdev->dev, "AQ command failed with status %d\n", status); - priv->adminq_cmd_fail++; - } switch (status) { case GVE_ADMINQ_COMMAND_PASSED: return 0; @@ -455,6 +450,16 @@ static int gve_adminq_parse_err(struct gve_priv *priv,= u32 status) } } =20 +static bool gve_adminq_is_retryable(enum gve_adminq_opcodes opcode) +{ + switch (opcode) { + case GVE_ADMINQ_REPORT_NIC_TIMESTAMP: + return true; + default: + return false; + } +} + /* Flushes all AQ commands currently queued and waits for them to complete. * If there are failures, it will return the first error. */ @@ -482,9 +487,18 @@ static int gve_adminq_kick_and_wait(struct gve_priv *p= riv) cmd =3D &priv->adminq[i & priv->adminq_mask]; status =3D be32_to_cpu(READ_ONCE(cmd->status)); err =3D gve_adminq_parse_err(priv, status); - if (err) + if (err) { + enum gve_adminq_opcodes opcode =3D + be32_to_cpu(READ_ONCE(cmd->opcode)); + priv->adminq_cmd_fail++; + if (!gve_adminq_is_retryable(opcode) || err !=3D -EAGAIN) + dev_err_ratelimited(&priv->pdev->dev, + "AQ command %d failed with status %d\n", + opcode, status); + // Return the first error if we failed. return err; + } } =20 return 0; --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 19:00:23 2026 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FCB2346FA6 for ; Thu, 26 Mar 2026 22:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774565136; cv=none; b=ZKpN4u+b0W9RDwEE8Vu9cfRmXXJJhj5OVFDV619zzAq2FJQhBZv8xHupAzMC+C19CeK2S1/68KZeZt8s4mw2EzC0iRbE6cJuqTe3kCiR7QgWlVFBrLcSgOz9FDPPCh7WyEsnEJ5v/jU10wHQhVRhIPUZdomdgohdWbhQH7zxmsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774565136; c=relaxed/simple; bh=5Txi5dwhnQhZbwtiLFvwxvxiOL2+dETMit3sCsC05fs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Tp4gZxMwOnZEYbYjz7UEhGNQ7H0MRPLr5i2Acd1b5dxHlEQ73lzUqEMZ5gYIgkdBfzhPHPSS4XltAr0uo8F9vqWNl6uNwcacJDIPnTKJ1Y/m6+yKKouyWDHZIYM+Y3vsI2JWgac2gGRNICL5Yn1QlKZGxvSjHDECpxa1h0pksck= 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=k7hmAYUf; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="k7hmAYUf" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2b068299665so17488705ad.3 for ; Thu, 26 Mar 2026 15:45:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774565135; x=1775169935; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UBqjipqe1hWrqGUrEp4FoAUnPSZh4H54A4uK3kM6Occ=; b=k7hmAYUf/SkMqVS5ApGgaNZy+iSJvnwxBRUnsWNe82Grv3xHSG0djWyB+k9AzELHPo 7EbrUmLYfSiKlJaQIK5JZ4yoaq+eFnJi02RSq5His1isYkZQrwzfg45Yn7AGjmhHesDv X+rEaw+mwS1qCsAUe0xBUO9lIMfr2Pr8TMMpjmFx+8Pn/Z1IhBuMtd8msg8Cb2f1YBaj 8zb8KxYfvNtKCquCbkTXAXR6P2w+GXyau5bOC1HRNLpXWG2eROvCYb7ed+Zd6r8BTYAe MUzH6vqvE7+mOD/cHjHdnYdei41eElm0/KJM1CDvso0pSX4ueI77ya/NXD172tdJHW2+ UaSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774565135; x=1775169935; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UBqjipqe1hWrqGUrEp4FoAUnPSZh4H54A4uK3kM6Occ=; b=blm4FkUKvaAdgG410B73JhGx0o50LA/LFweHsAFhuR9Ck/YL0EFESr1MU0he5wh8qm gaAoPaZGBB9nIns7YztwJtLXLJf90WKxDU1lesJM9HERN47HN8sZ9WjheXpQGwREEtuZ bgXUG9YQjrLsxd4Q0fRmJsmiRhsIbFX7Eu3LvWcT2OBtzWH67M+nxBy0AmDR980BO72F z0EWHb1+PLpoNrDccttzzrjharBS2NMhIK5EhUJ1rpwkHSYB5opQPoos7L8sZ3kjUbuV AEMCyi+btYStZhkMpiK1eq75iHKXTU6syxY7gVt6ZKgkG2nyIIOTYBEBZ0a0Byj8RKBe hP+w== X-Forwarded-Encrypted: i=1; AJvYcCVAif6R2lZwgVuvmUFqHYYRsqXUV5XR6Nit9xK41GdzCE6zZ6EiydG28OxTp34tEDsqSHdF3aTQYhApUwg=@vger.kernel.org X-Gm-Message-State: AOJu0YwdixoxYvw+viHS417XHOzGwzJyJy2H+feEy2CjYktUdmmmKsvf DaMJZExppVJhk0bSpMEVFMAoO3uDT5S58384aviC39KaPYfrk7Keji0EHa4gjm9i5Mgq/ChgXes veaGQuyset5H3zpzrYnphKyG4Ng== X-Received: from pgvf17.prod.google.com ([2002:a65:6291:0:b0:c73:97d4:afe0]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:432b:b0:39b:8b8b:39ed with SMTP id adf61e73a8af0-39c87c0179fmr368442637.68.1774565134419; Thu, 26 Mar 2026 15:45:34 -0700 (PDT) Date: Thu, 26 Mar 2026 22:45:26 +0000 In-Reply-To: <20260326224527.1044097-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: <20260326224527.1044097-1-hramamurthy@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326224527.1044097-3-hramamurthy@google.com> Subject: [PATCH net-next v2 2/3] gve: make nic clock reads thread safe 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, richardcochran@gmail.com, willemb@google.com, nktgrg@google.com, jfraker@google.com, ziweixiao@google.com, maolson@google.com, thostet@google.com, jordanrhee@google.com, jefrogers@google.com, alok.a.tiwari@oracle.com, yyd@google.com, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ankit Garg Add a mutex to protect the shared DMA buffer that receives NIC timestamp reports. The NIC timestamp will be read from two different threads: the periodic worker and upcoming `gettimex64`. Reviewed-by: Joshua Washington Signed-off-by: Ankit Garg Signed-off-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- drivers/net/ethernet/google/gve/gve.h | 6 +---- drivers/net/ethernet/google/gve/gve_ptp.c | 32 +++++++++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 1d66d3834f7e..7b8f78bd1968 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -923,6 +923,7 @@ struct gve_priv { bool nic_timestamp_supported; struct gve_ptp *ptp; struct kernel_hwtstamp_config ts_config; + struct mutex nic_ts_read_lock; /* Protects nic_ts_report */ 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 */ @@ -1321,14 +1322,9 @@ int gve_flow_rules_reset(struct gve_priv *priv); int gve_init_rss_config(struct gve_priv *priv, u16 num_queues); /* PTP and timestamping */ #if IS_ENABLED(CONFIG_PTP_1588_CLOCK) -int gve_clock_nic_ts_read(struct gve_priv *priv); int gve_init_clock(struct gve_priv *priv); void gve_teardown_clock(struct gve_priv *priv); #else /* CONFIG_PTP_1588_CLOCK */ -static inline int gve_clock_nic_ts_read(struct gve_priv *priv) -{ - return -EOPNOTSUPP; -} =20 static inline int gve_init_clock(struct gve_priv *priv) { diff --git a/drivers/net/ethernet/google/gve/gve_ptp.c b/drivers/net/ethern= et/google/gve/gve_ptp.c index 06b1cf4a5efc..140b8fbce4f4 100644 --- a/drivers/net/ethernet/google/gve/gve_ptp.c +++ b/drivers/net/ethernet/google/gve/gve_ptp.c @@ -11,19 +11,20 @@ #define GVE_NIC_TS_SYNC_INTERVAL_MS 250 =20 /* Read the nic timestamp from hardware via the admin queue. */ -int gve_clock_nic_ts_read(struct gve_priv *priv) +static int gve_clock_nic_ts_read(struct gve_priv *priv, u64 *nic_raw) { - u64 nic_raw; int err; =20 + mutex_lock(&priv->nic_ts_read_lock); err =3D gve_adminq_report_nic_ts(priv, priv->nic_ts_report_bus); if (err) - return err; + goto out; =20 - nic_raw =3D be64_to_cpu(priv->nic_ts_report->nic_timestamp); - WRITE_ONCE(priv->last_sync_nic_counter, nic_raw); + *nic_raw =3D be64_to_cpu(priv->nic_ts_report->nic_timestamp); =20 - return 0; +out: + mutex_unlock(&priv->nic_ts_read_lock); + return err; } =20 static int gve_ptp_gettimex64(struct ptp_clock_info *info, @@ -43,15 +44,19 @@ static long gve_ptp_do_aux_work(struct ptp_clock_info *= info) { const struct gve_ptp *ptp =3D container_of(info, struct gve_ptp, info); struct gve_priv *priv =3D ptp->priv; + u64 nic_raw; int err; =20 if (gve_get_reset_in_progress(priv) || !gve_get_admin_queue_ok(priv)) goto out; =20 - err =3D gve_clock_nic_ts_read(priv); - if (err && net_ratelimit()) - dev_err(&priv->pdev->dev, - "%s read err %d\n", __func__, err); + err =3D gve_clock_nic_ts_read(priv, &nic_raw); + if (err) { + dev_err_ratelimited(&priv->pdev->dev, "%s read err %d\n", + __func__, err); + goto out; + } + WRITE_ONCE(priv->last_sync_nic_counter, nic_raw); =20 out: return msecs_to_jiffies(GVE_NIC_TS_SYNC_INTERVAL_MS); @@ -109,6 +114,7 @@ static void gve_ptp_release(struct gve_priv *priv) =20 int gve_init_clock(struct gve_priv *priv) { + u64 nic_raw; int err; =20 err =3D gve_ptp_init(priv); @@ -125,17 +131,20 @@ int gve_init_clock(struct gve_priv *priv) err =3D -ENOMEM; goto release_ptp; } - err =3D gve_clock_nic_ts_read(priv); + mutex_init(&priv->nic_ts_read_lock); + err =3D gve_clock_nic_ts_read(priv, &nic_raw); if (err) { dev_err(&priv->pdev->dev, "failed to read NIC clock %d\n", err); goto release_nic_ts_report; } + WRITE_ONCE(priv->last_sync_nic_counter, nic_raw); ptp_schedule_worker(priv->ptp->clock, msecs_to_jiffies(GVE_NIC_TS_SYNC_INTERVAL_MS)); =20 return 0; =20 release_nic_ts_report: + mutex_destroy(&priv->nic_ts_read_lock); dma_free_coherent(&priv->pdev->dev, sizeof(struct gve_nic_ts_report), priv->nic_ts_report, priv->nic_ts_report_bus); @@ -150,6 +159,7 @@ void gve_teardown_clock(struct gve_priv *priv) gve_ptp_release(priv); =20 if (priv->nic_ts_report) { + mutex_destroy(&priv->nic_ts_read_lock); dma_free_coherent(&priv->pdev->dev, sizeof(struct gve_nic_ts_report), priv->nic_ts_report, priv->nic_ts_report_bus); --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 19:00:23 2026 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4E4A34C128 for ; Thu, 26 Mar 2026 22:45:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774565139; cv=none; b=TbSh3JtRzs6HE/9uT860NXxyem3yALE0EJ81IKrNsk416KfxRXVHOAjJR+JzAkHLGlei/+GfPp1C5Sb7boBHjD/jv4Upkgiker5iyARDqWyKx2fHoAu8fkgtHgCALci94p/RyM7rjOs4T/SVojTXf4YJa6Er/5m+czNqxMTcf3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774565139; c=relaxed/simple; bh=zF9ZSuygMLZDE5w3B0M+2FQ0B1fwuBNYwWZg+W0KJl8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gCSgpwfqhtkap9OaQpoups13V4iCiqtp1ihdlY6Xcj7apkzW0rKuUtWQv82243j6kF+/fgXZ67smuFhmLGo2jsMFzJnL9PRrZrX+Z08sUQguvUuCrINqOtx5BT9tezN1WdUDudkAb5EZABI12XTB3n+JEFE/4PSE0Oa2qLNlez4= 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=GYSNvvuy; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="GYSNvvuy" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-82c69a734a4so1197547b3a.1 for ; Thu, 26 Mar 2026 15:45:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774565137; x=1775169937; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=V7bKIh/7T7RPEt2Wwiu9b1ishS0moS3CmH7Dh0I7XDo=; b=GYSNvvuyh0WRrnnpkIE2+J4+kiFp5e9wRhIWqTgxFIGSdBGRqvPx8i5BfY7NasQJz4 oRGf45dkumCr7dAPmZbkMjx1a+3iw/1qBaS0V7w24M1brrc6jpnAHdEbDZWk/qcSQ2XK 7VHjnrwch34c3AHL9fqWLSAG8HAairLPddKAE5VPSs/Z1oR/F1exeKSeCIuHcAUUyGPb chvLk7jEWMc6MRKoJHlND29NoIKG4BjO3gnL0hc6JaQAJqdT12qFYoJWXmf9SinR3o5j 44SHN8luQe5p/EfrLHJei/WSMemL1HOPfHnKI6h8IdbNsbq+mXar3Tn588/YaGVrgS4y NYXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774565137; x=1775169937; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=V7bKIh/7T7RPEt2Wwiu9b1ishS0moS3CmH7Dh0I7XDo=; b=fqn/4fjnSwhdctZegOu3EEhiBAAfYV/8dRU68iJoWI0UTVm+9+rHq5O8yowqO6KIdQ D9iH7ZbR1V8deWsC2hIyg0nrJSuVtLlld6XUjowD01/JGxngIkHtRXjaHi8aPvjFryj+ UEHKt6QHBiL5gAVfgmlhCKvdihmTHoStE2wR4UNes37zOujKVJdiy+lP9sCZWDpOG4wr jR6yTfIeCaQT/2SYWAExqi/BTuG6kjDsF4qlY9s+aMEOe1HzQTNrBeHfuzjeeXsfcq0n +D4RKjrbCnRiHSiyFD7KD719y6YpWlTsrQe2fv2j05kJzGs/SSGolaAXL+vQ+iUb4ZQg XuMQ== X-Forwarded-Encrypted: i=1; AJvYcCWlFt8TvyAkleKHFX7uOpKW327uy3sWkeXUTyHXydHwDgIwTp+0t2ZAnGgqWo0NiBEHzEOqHPsjOx79fs0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7kmBQcLK88t+g4KHgbAs+7E32n5FsLKBVlA4wbunX2b1CHsaZ 7lrAZXE/JutshYqWe9URyl56Iteq9RZ+cE4VncjDVcFxQyJmd1SUEieQVesY50mHeJk5reuZYIc FtbAhFL8R5vFy6/f1+KfzSO5H+A== X-Received: from pfbdo1.prod.google.com ([2002:a05:6a00:4a01:b0:829:7f86:623]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:440d:b0:824:a22c:c6d7 with SMTP id d2e1a72fcca58-82c95d4fbddmr187720b3a.18.1774565137050; Thu, 26 Mar 2026 15:45:37 -0700 (PDT) Date: Thu, 26 Mar 2026 22:45:27 +0000 In-Reply-To: <20260326224527.1044097-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: <20260326224527.1044097-1-hramamurthy@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326224527.1044097-4-hramamurthy@google.com> Subject: [PATCH net-next v2 3/3] gve: implement PTP gettimex64 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, richardcochran@gmail.com, willemb@google.com, nktgrg@google.com, jfraker@google.com, ziweixiao@google.com, maolson@google.com, thostet@google.com, jordanrhee@google.com, jefrogers@google.com, alok.a.tiwari@oracle.com, yyd@google.com, linux-kernel@vger.kernel.org, Naman Gulati Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jordan Rhee Enable chrony and phc2sys to synchronize system clock to NIC clock. The system cycle counters are sampled by the device to minimize the uncertainty window. If the system times are sampled in the host, the delta between pre and post readings is 100us or more due to AQ command latency. The system times returned by the device have a delta of ~1us, which enables significantly more accurate clock synchronization. Reviewed-by: Willem de Bruijn Reviewed-by: Kevin Yang Reviewed-by: Naman Gulati Signed-off-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy --- Changes in v2: - fix compilation warning on ARM by casting cycles_t to u64 --- drivers/net/ethernet/google/gve/gve_adminq.h | 4 +- drivers/net/ethernet/google/gve/gve_ptp.c | 189 ++++++++++++++++++- 2 files changed, 184 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.h b/drivers/net/eth= ernet/google/gve/gve_adminq.h index 22a74b6aa17e..e6dcf6da9091 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.h +++ b/drivers/net/ethernet/google/gve/gve_adminq.h @@ -411,8 +411,8 @@ static_assert(sizeof(struct gve_adminq_report_nic_ts) = =3D=3D 16); =20 struct gve_nic_ts_report { __be64 nic_timestamp; /* NIC clock in nanoseconds */ - __be64 reserved1; - __be64 reserved2; + __be64 pre_cycles; /* System cycle counter before NIC clock read */ + __be64 post_cycles; /* System cycle counter after NIC clock read */ __be64 reserved3; __be64 reserved4; }; diff --git a/drivers/net/ethernet/google/gve/gve_ptp.c b/drivers/net/ethern= et/google/gve/gve_ptp.c index 140b8fbce4f4..bea794541f30 100644 --- a/drivers/net/ethernet/google/gve/gve_ptp.c +++ b/drivers/net/ethernet/google/gve/gve_ptp.c @@ -10,28 +10,203 @@ /* Interval to schedule a nic timestamp calibration, 250ms. */ #define GVE_NIC_TS_SYNC_INTERVAL_MS 250 =20 +/* + * Stores cycle counter samples in get_cycles() units from a + * sandwiched NIC clock read + */ +struct gve_sysclock_sample { + /* Cycle counter from NIC before clock read */ + u64 nic_pre_cycles; + /* Cycle counter from NIC after clock read */ + u64 nic_post_cycles; + /* Cycle counter from host before issuing AQ command */ + cycles_t host_pre_cycles; + /* Cycle counter from host after AQ command returns */ + cycles_t host_post_cycles; +}; + +/* + * Read NIC clock by issuing the AQ command. The command is subject to + * rate limiting and may need to be retried. Requires nic_ts_read_lock + * to be held. + */ +static int gve_adminq_read_timestamp(struct gve_priv *priv, + cycles_t *pre_cycles, + cycles_t *post_cycles) +{ + unsigned long delay_us =3D 1000; + int retry_count =3D 0; + int err; + + lockdep_assert_held(&priv->nic_ts_read_lock); + + do { + *pre_cycles =3D get_cycles(); + err =3D gve_adminq_report_nic_ts(priv, priv->nic_ts_report_bus); + + /* Ensure cycle counter is sampled after AdminQ cmd returns */ + rmb(); + *post_cycles =3D get_cycles(); + if (likely(err !=3D -EAGAIN)) + return err; + + fsleep(delay_us); + + /* Exponential backoff */ + delay_us *=3D 2; + retry_count++; + } while (retry_count < 5); + + return -ETIMEDOUT; +} + /* Read the nic timestamp from hardware via the admin queue. */ -static int gve_clock_nic_ts_read(struct gve_priv *priv, u64 *nic_raw) +static int gve_clock_nic_ts_read(struct gve_priv *priv, u64 *nic_raw, + struct gve_sysclock_sample *sysclock) { + cycles_t host_pre_cycles, host_post_cycles; + struct gve_nic_ts_report *ts_report; int err; =20 mutex_lock(&priv->nic_ts_read_lock); - err =3D gve_adminq_report_nic_ts(priv, priv->nic_ts_report_bus); - if (err) + err =3D gve_adminq_read_timestamp(priv, &host_pre_cycles, + &host_post_cycles); + if (err) { + dev_err_ratelimited(&priv->pdev->dev, + "AdminQ timestamp read failed: %d\n", err); goto out; + } =20 - *nic_raw =3D be64_to_cpu(priv->nic_ts_report->nic_timestamp); + ts_report =3D priv->nic_ts_report; + *nic_raw =3D be64_to_cpu(ts_report->nic_timestamp); + + if (sysclock) { + sysclock->nic_pre_cycles =3D be64_to_cpu(ts_report->pre_cycles); + sysclock->nic_post_cycles =3D be64_to_cpu(ts_report->post_cycles); + sysclock->host_pre_cycles =3D host_pre_cycles; + sysclock->host_post_cycles =3D host_post_cycles; + } =20 out: mutex_unlock(&priv->nic_ts_read_lock); return err; } =20 +struct gve_cycles_to_clock_callback_ctx { + u64 cycles; +}; + +static int gve_cycles_to_clock_fn(ktime_t *device_time, + struct system_counterval_t *system_counterval, + void *ctx) +{ + struct gve_cycles_to_clock_callback_ctx *context =3D ctx; + + *device_time =3D 0; + + system_counterval->cycles =3D context->cycles; + system_counterval->use_nsecs =3D false; + + if (IS_ENABLED(CONFIG_X86)) + system_counterval->cs_id =3D CSID_X86_TSC; + else if (IS_ENABLED(CONFIG_ARM64)) + system_counterval->cs_id =3D CSID_ARM_ARCH_COUNTER; + else + return -EOPNOTSUPP; + + return 0; +} + +/* + * Convert a raw cycle count (e.g. from get_cycles()) to the system clock + * type specified by clockid. The system_time_snapshot must be taken before + * the cycle counter is sampled. + */ +static int gve_cycles_to_timespec64(struct gve_priv *priv, clockid_t clock= id, + struct system_time_snapshot *snap, + u64 cycles, struct timespec64 *ts) +{ + struct gve_cycles_to_clock_callback_ctx ctx =3D {0}; + struct system_device_crosststamp xtstamp; + int err; + + ctx.cycles =3D cycles; + err =3D get_device_system_crosststamp(gve_cycles_to_clock_fn, &ctx, snap, + &xtstamp); + if (err) { + dev_err_ratelimited(&priv->pdev->dev, + "get_device_system_crosststamp() failed to convert %lld cycles to = system time: %d\n", + cycles, + err); + return err; + } + + switch (clockid) { + case CLOCK_REALTIME: + *ts =3D ktime_to_timespec64(xtstamp.sys_realtime); + break; + case CLOCK_MONOTONIC_RAW: + *ts =3D ktime_to_timespec64(xtstamp.sys_monoraw); + break; + default: + dev_err_ratelimited(&priv->pdev->dev, + "Cycle count conversion to clockid %d not supported\n", + clockid); + return -EOPNOTSUPP; + } + + return 0; +} + static int gve_ptp_gettimex64(struct ptp_clock_info *info, struct timespec64 *ts, struct ptp_system_timestamp *sts) { - return -EOPNOTSUPP; + struct gve_ptp *ptp =3D container_of(info, struct gve_ptp, info); + struct gve_sysclock_sample sysclock =3D {0}; + struct gve_priv *priv =3D ptp->priv; + struct system_time_snapshot snap; + u64 nic_ts; + int err; + + /* Take system clock snapshot before sampling cycle counters */ + if (sts) + ktime_get_snapshot(&snap); + + err =3D gve_clock_nic_ts_read(priv, &nic_ts, &sysclock); + if (err) + return err; + + if (sts) { + /* Reject samples with out of order system clock values */ + if (!(sysclock.host_pre_cycles <=3D sysclock.nic_pre_cycles && + sysclock.nic_pre_cycles <=3D sysclock.nic_post_cycles && + sysclock.nic_post_cycles <=3D sysclock.host_post_cycles)) { + dev_err_ratelimited(&priv->pdev->dev, + "AdminQ system clock cycle counts out of order. Expecting %llu <= =3D %llu <=3D %llu <=3D %llu\n", + (u64)sysclock.host_pre_cycles, + sysclock.nic_pre_cycles, + sysclock.nic_post_cycles, + (u64)sysclock.host_post_cycles); + return -EBADMSG; + } + + err =3D gve_cycles_to_timespec64(priv, sts->clockid, &snap, + sysclock.nic_pre_cycles, + &sts->pre_ts); + if (err) + return err; + + err =3D gve_cycles_to_timespec64(priv, sts->clockid, &snap, + sysclock.nic_post_cycles, + &sts->post_ts); + if (err) + return err; + } + + *ts =3D ns_to_timespec64(nic_ts); + + return 0; } =20 static int gve_ptp_settime64(struct ptp_clock_info *info, @@ -50,7 +225,7 @@ static long gve_ptp_do_aux_work(struct ptp_clock_info *i= nfo) if (gve_get_reset_in_progress(priv) || !gve_get_admin_queue_ok(priv)) goto out; =20 - err =3D gve_clock_nic_ts_read(priv, &nic_raw); + err =3D gve_clock_nic_ts_read(priv, &nic_raw, NULL); if (err) { dev_err_ratelimited(&priv->pdev->dev, "%s read err %d\n", __func__, err); @@ -132,7 +307,7 @@ int gve_init_clock(struct gve_priv *priv) goto release_ptp; } mutex_init(&priv->nic_ts_read_lock); - err =3D gve_clock_nic_ts_read(priv, &nic_raw); + err =3D gve_clock_nic_ts_read(priv, &nic_raw, NULL); if (err) { dev_err(&priv->pdev->dev, "failed to read NIC clock %d\n", err); goto release_nic_ts_report; --=20 2.53.0.1018.g2bb0e51243-goog