From nobody Sat Jun 13 11:22:09 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 358683290C3 for ; Thu, 7 May 2026 21:13:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778188389; cv=none; b=Kj9Dq2VxeZAz6+865UrDLUubRuzAt5/bU3yaoHVP5Vk8RuM8yW6ei770TpmR0F2YOyRxAB2RNjS7Z3gIenSxBSIaeOg8FcgYoGODCpBuws7gX/s6c5gosGwNeWAjKrm2RWohGIMO9SrMg8aG+9E86OjnZTtf1jndMgfgJceSJK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778188389; c=relaxed/simple; bh=xGCwW9AJ00w0E9A81uL8RSVHIPPhwZ/YeQ2rEJ++s8I=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UF6pohdeLtAXQvlcLQh59y5EqsQlILElxuir7GGcqsrARWZ1yzCxqEdgqW+e56Gjgq0bDKN/KwIq4p67SaiqcdvnpaE/1ixtmwNg/dgt0quWEfwwElEA1qPooy/H1OTzy6/57fHrhDzAeWAptUpFl1RfXOh+5OHE+HYVFyQK2rM= 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=jJSXJTqY; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jJSXJTqY" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c80b103360cso736964a12.3 for ; Thu, 07 May 2026 14:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778188387; x=1778793187; 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=B/sqZJ2nakkLZrxrJSKax1gOUohwsZLRlvLL9dCFNUk=; b=jJSXJTqY74MR/hM4QrKHeF+bqkz713LEKRW7P31FMF4w4O39zeOmzatvhwPOMvwSwN xbqQZn7ctUSDGDv2Kx36afSQbPJ/i72O+RHcuafdX7vmgM0C2RpUe2P9plzk1xAW9MaI qWrLPHbDimeq6ApRznjFt+Kh5ka78k4dH9/u/CnhImRbY6o9PkNYISFu4T+y2hZPdwYv Pthwr99lkeoMwLS/PlZv4+7NtavWxwaESgjpiyPW6jBwTq+ci4ivyXd1AKRfpl0FMd+z AW2woHNUDYSjlqTniSKBGmGTIK5uwxRUBBxdVlchvb6S/Rz3yEhI/dvX3piYLWjNyRlv 6tHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778188387; x=1778793187; 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=B/sqZJ2nakkLZrxrJSKax1gOUohwsZLRlvLL9dCFNUk=; b=cUY/egS83ndYPTd+Yon9ATdW/djTVGZtJ8MpKU/lOrCXiXxzXa7GNhcf4mM2la09xm jfbEcBTWxLg2/qtdJ3EUOV2tNwR/W3AUyAkay/A+s88shqGTrWraZ3BTOo/xWvrHHBUC GwjrAqhvt3YXY/f92bHQ7Lpohu9IdU33Ef8fsOv2ExHnZP+Z2K7sJX606QVzIC5XE629 rxifocJ+0v/ZKG1Ndn1ZucxjEhPdjsdwx7eapHrpyrLMD5GZUkkBc1zlSB33llJOuVsM 3ZFJnXgZmZ3mT7Rd3j8ZJ4iqDTg5VyFX77wIH7d+4GjuxI/PvkK3fiB4KZ2JwIvq8Dbr ze3g== X-Forwarded-Encrypted: i=1; AFNElJ+IOCcLbsQVvqK6XhGQ1r77i4qZ/GKnQ5keIZGKnFZrSyPm+aVM/KOSSB9PyaCxvAGR7PWCIFsCT3/Edqk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/7yemORzbokBKHaKRo9YdjkNZK7c8OfejdHqWjTuAd1qReV5X cHfGW/I3hGXZ98qg5w07W7QNjAk61GVWJnZfBCxLm93Dykm/ZmQmgvdgyaIrCsscx+Tllyc/2Xv x83mPEi77v93BR1ig00Eh7tfU7g== X-Received: from pgjw1.prod.google.com ([2002:a63:fb41:0:b0:c7b:fdce:6626]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:9392:b0:3a2:ebfc:6bf5 with SMTP id adf61e73a8af0-3aa5ac1aa08mr10649787637.52.1778188387276; Thu, 07 May 2026 14:13:07 -0700 (PDT) Date: Thu, 7 May 2026 21:13:02 +0000 In-Reply-To: <20260507211304.3046526-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: <20260507211304.3046526-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260507211304.3046526-2-hramamurthy@google.com> Subject: [PATCH net-next v6 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, jstultz@google.com, tglx@kernel.org, sboyd@kernel.org, willemb@google.com, nktgrg@google.com, jfraker@google.com, ziweixiao@google.com, maolson@google.com, jordanrhee@google.com, thostet@google.com, alok.a.tiwari@oracle.com, pkaligineedi@google.com, horms@kernel.org, dwmw2@infradead.org, jacob.e.keller@intel.com, yyd@google.com, jefrogers@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, and move logging to dev_err_ratelimited() to avoid spamming the log. Reviewed-by: Joshua Washington Signed-off-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy Reviewed-by: Jacob Keller --- Changes in v4: - call out change to dev_err_ratelimited() in the commit message (Jacob Kel= ler) - remove extra print when adminQ status is GVE_ADMINQ_COMMAND_UNSET (Jacob = Keller) --- drivers/net/ethernet/google/gve/gve_adminq.c | 27 +++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/eth= ernet/google/gve/gve_adminq.c index 08587bf40ed4..a65b14835aa0 100644 --- a/drivers/net/ethernet/google/gve/gve_adminq.c +++ b/drivers/net/ethernet/google/gve/gve_adminq.c @@ -416,16 +416,10 @@ static bool gve_adminq_wait_for_cmd(struct gve_priv *= priv, 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; case GVE_ADMINQ_COMMAND_UNSET: - dev_err(&priv->pdev->dev, "parse_aq_err: err and status both unset, this= should not be possible.\n"); return -EINVAL; case GVE_ADMINQ_COMMAND_ERROR_ABORTED: case GVE_ADMINQ_COMMAND_ERROR_CANCELLED: @@ -455,6 +449,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 +486,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.54.0.545.g6539524ca2-goog From nobody Sat Jun 13 11:22:09 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E07DA33B6F8 for ; Thu, 7 May 2026 21:13:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778188390; cv=none; b=cYEqV2ZKRrRrhV4QW1J1uFpjyYX+cc6QgiO+uMiJzpywatzNMKNhJbmznRE45X5bIwEcShI0iy9h6KTUaaZJNcRzbi7fFDZEGn4FNMdwScJFz260wOjRADoI4jr03Wvh7+5gdyN9lRTaGWpWMh7+lerJg3+IO1tM6X4taLXHRB4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778188390; c=relaxed/simple; bh=i9L8XnvSFiPpXIC0LouXBHFGUfPyALs9LPvamcJaDKk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gDCJo1HfvvTqyR2Isap85QEebK9vo/350ikGpNcs4ntTMmOlYV5ap6X8HYTfXjY83wRR1CvpM9sSZhZBIB0Qs7IjRs+UAIxp5QbHnuN3FdJA+ziRW5ANuUHcaff+X4LIZvys1Kdv5Vkoq7SrSlgulRS1d1kb15WvRynieC3RLvo= 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=IiXnkU7C; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IiXnkU7C" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-36603ad6709so1272697a91.2 for ; Thu, 07 May 2026 14:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778188388; x=1778793188; 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=RlzKRi1235IEdxnPrVCGp9XETwfEZvpjn5soN3/viWU=; b=IiXnkU7C06qlvaOn220HCJVHjIAvDr4kuhqK7Ax9vjlqi+atNoEixNfptafZkNSujJ L9HVImUqkIz9aX09x8fUiikxWqh6ShmXue5f5d9Pkd91JpZxHdcpnUTH6A3Vp18nklIu EQuQXVvjZ5j5jC34oqHe1ks3dFgXzQyjo0CFeBkla1ztNDvCKt2islhsscdQyxZuv8Ws ql9DzsEJrw6FNC8scHpjUokbOv2Nkdq/n5KsxuF+Wpr+q12HZCuUg7BHtl8EjsNlkgwJ sktPe8KQLehOPzI5cw96F9ng+gF375LcXRXduU8M8+yJDNnXpR4BO+8agDpqHFj5GRRS hYkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778188388; x=1778793188; 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=RlzKRi1235IEdxnPrVCGp9XETwfEZvpjn5soN3/viWU=; b=bFnanf4jcY1UciZXvlMI7No0wRBvFoB3ABIqTJoYLnysPHpZKRkFm0OKqiY5rbnaC1 IkAO+ONTX/fJN5J6CQYThM00aZgzElRytGnvTGBbavNIyC34yaxKIHJUNoliOf1Wq7JU qLs5jNvpcA2uDaPpRGxXe+/1/9pCnmTUo8JoJJDJC7IpY0PuServWkISukl5kcm2V0Ux cZFl3nbry/2AESMY8TROnX/ISLNV7hg2KmFA/HNsPn9RjCwp53lYePiVzJuJK/fBShkS GG4jstsG0dipQvT+suvdlOarh2ak82TUF46WHaPrWAWjI7TEwO2B6QnmzZRfBQ6nNXwv Mn0w== X-Forwarded-Encrypted: i=1; AFNElJ81ocTkKPbK+DanxnXELc92hCEAHfvSo08VT4TaNp0i3Aylq40S/uqofFhVi6G5zMfLmdSDCKNARNNHSj0=@vger.kernel.org X-Gm-Message-State: AOJu0YzL4NaVCicpFVS3zf+eztOv3T9g9T3GSSzI6a+vCuvRBsa2Szzi aAAHmI1LdhBpnFkN9k+4nAptWEtB5UX89f94H3V/xq6tJ7e++GMqqp8SkrW5eq7SE9VemSCU9An haheMdx37IWG/de5kxiXWNw9XNA== X-Received: from pgbcp3.prod.google.com ([2002:a05:6a02:4003:b0:c82:2dd8:9d49]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3c90:b0:3a1:90fd:dcd6 with SMTP id adf61e73a8af0-3aab16e9e2bmr24266637.31.1778188388016; Thu, 07 May 2026 14:13:08 -0700 (PDT) Date: Thu, 7 May 2026 21:13:03 +0000 In-Reply-To: <20260507211304.3046526-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: <20260507211304.3046526-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260507211304.3046526-3-hramamurthy@google.com> Subject: [PATCH net-next v6 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, jstultz@google.com, tglx@kernel.org, sboyd@kernel.org, willemb@google.com, nktgrg@google.com, jfraker@google.com, ziweixiao@google.com, maolson@google.com, jordanrhee@google.com, thostet@google.com, alok.a.tiwari@oracle.com, pkaligineedi@google.com, horms@kernel.org, dwmw2@infradead.org, jacob.e.keller@intel.com, yyd@google.com, jefrogers@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`. Move clock registration to the last step of initialization to ensure that all data needed by the clock module is initialized before the clock is exposed to usermode. Reviewed-by: Joshua Washington Signed-off-by: Ankit Garg Signed-off-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy Reviewed-by: Jacob Keller --- Changes in v3: - Reorder init/teardown to register PTP clock last, and simplify code - Move ptp-related members from gve_priv to gve_ptp - Only assign priv->ptp after ptp module is successfully initialized --- drivers/net/ethernet/google/gve/gve.h | 12 +- drivers/net/ethernet/google/gve/gve_ethtool.c | 3 +- drivers/net/ethernet/google/gve/gve_ptp.c | 134 ++++++++---------- 3 files changed, 63 insertions(+), 86 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 1d66d3834f7e..7b69d0cfc0d5 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -792,6 +792,9 @@ struct gve_ptp { struct ptp_clock_info info; struct ptp_clock *clock; struct gve_priv *priv; + 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; }; =20 struct gve_priv { @@ -923,8 +926,6 @@ struct gve_priv { bool nic_timestamp_supported; struct gve_ptp *ptp; struct kernel_hwtstamp_config ts_config; - 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 */ }; =20 @@ -1201,7 +1202,7 @@ static inline bool gve_supports_xdp_xmit(struct gve_p= riv *priv) =20 static inline bool gve_is_clock_enabled(struct gve_priv *priv) { - return priv->nic_ts_report; + return priv->ptp; } =20 /* gqi napi handler defined in gve_main.c */ @@ -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_ethtool.c b/drivers/net/et= hernet/google/gve/gve_ethtool.c index dc2213b5ce24..4fd7e8a442c5 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -972,8 +972,7 @@ static int gve_get_ts_info(struct net_device *netdev, info->rx_filters |=3D BIT(HWTSTAMP_FILTER_NONE) | BIT(HWTSTAMP_FILTER_ALL); =20 - if (priv->ptp) - info->phc_index =3D ptp_clock_index(priv->ptp->clock); + info->phc_index =3D ptp_clock_index(priv->ptp->clock); } =20 return 0; diff --git a/drivers/net/ethernet/google/gve/gve_ptp.c b/drivers/net/ethern= et/google/gve/gve_ptp.c index 06b1cf4a5efc..ad15f1209a83 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_ptp *ptp, u64 *nic_raw) { - u64 nic_raw; int err; =20 - err =3D gve_adminq_report_nic_ts(priv, priv->nic_ts_report_bus); + mutex_lock(&ptp->nic_ts_read_lock); + err =3D gve_adminq_report_nic_ts(ptp->priv, ptp->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(ptp->nic_ts_report->nic_timestamp); =20 - return 0; +out: + mutex_unlock(&ptp->nic_ts_read_lock); + return err; } =20 static int gve_ptp_gettimex64(struct ptp_clock_info *info, @@ -41,17 +42,21 @@ static int gve_ptp_settime64(struct ptp_clock_info *inf= o, =20 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_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(ptp, &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); @@ -65,94 +70,71 @@ static const struct ptp_clock_info gve_ptp_caps =3D { .do_aux_work =3D gve_ptp_do_aux_work, }; =20 -static int gve_ptp_init(struct gve_priv *priv) +int gve_init_clock(struct gve_priv *priv) { struct gve_ptp *ptp; + u64 nic_raw; int err; =20 - priv->ptp =3D kzalloc_obj(*priv->ptp); - if (!priv->ptp) + ptp =3D kzalloc_obj(*priv->ptp); + if (!ptp) return -ENOMEM; =20 - ptp =3D priv->ptp; ptp->info =3D gve_ptp_caps; - ptp->clock =3D ptp_clock_register(&ptp->info, &priv->pdev->dev); - - if (IS_ERR(ptp->clock)) { - dev_err(&priv->pdev->dev, "PTP clock registration failed\n"); - err =3D PTR_ERR(ptp->clock); - goto free_ptp; - } - ptp->priv =3D priv; - return 0; - -free_ptp: - kfree(ptp); - priv->ptp =3D NULL; - return err; -} - -static void gve_ptp_release(struct gve_priv *priv) -{ - struct gve_ptp *ptp =3D priv->ptp; - - if (!ptp) - return; - - if (ptp->clock) - ptp_clock_unregister(ptp->clock); - - kfree(ptp); - priv->ptp =3D NULL; -} - -int gve_init_clock(struct gve_priv *priv) -{ - int err; - - err =3D gve_ptp_init(priv); - if (err) - return err; - - priv->nic_ts_report =3D + mutex_init(&ptp->nic_ts_read_lock); + ptp->nic_ts_report =3D dma_alloc_coherent(&priv->pdev->dev, sizeof(struct gve_nic_ts_report), - &priv->nic_ts_report_bus, - GFP_KERNEL); - if (!priv->nic_ts_report) { + &ptp->nic_ts_report_bus, GFP_KERNEL); + if (!ptp->nic_ts_report) { dev_err(&priv->pdev->dev, "%s dma alloc error\n", __func__); err =3D -ENOMEM; - goto release_ptp; + goto free_ptp; } - err =3D gve_clock_nic_ts_read(priv); + + err =3D gve_clock_nic_ts_read(ptp, &nic_raw); if (err) { dev_err(&priv->pdev->dev, "failed to read NIC clock %d\n", err); - goto release_nic_ts_report; + goto free_dma_mem; } - ptp_schedule_worker(priv->ptp->clock, + WRITE_ONCE(priv->last_sync_nic_counter, nic_raw); + + ptp->clock =3D ptp_clock_register(&ptp->info, &priv->pdev->dev); + if (IS_ERR(ptp->clock)) { + dev_err(&priv->pdev->dev, "PTP clock registration failed\n"); + err =3D PTR_ERR(ptp->clock); + goto free_dma_mem; + } + + priv->ptp =3D ptp; + ptp_schedule_worker(ptp->clock, msecs_to_jiffies(GVE_NIC_TS_SYNC_INTERVAL_MS)); =20 return 0; =20 -release_nic_ts_report: - dma_free_coherent(&priv->pdev->dev, - sizeof(struct gve_nic_ts_report), - priv->nic_ts_report, priv->nic_ts_report_bus); - priv->nic_ts_report =3D NULL; -release_ptp: - gve_ptp_release(priv); +free_dma_mem: + dma_free_coherent(&priv->pdev->dev, sizeof(struct gve_nic_ts_report), + ptp->nic_ts_report, ptp->nic_ts_report_bus); + ptp->nic_ts_report =3D NULL; +free_ptp: + mutex_destroy(&ptp->nic_ts_read_lock); + kfree(ptp); return err; } =20 void gve_teardown_clock(struct gve_priv *priv) { - gve_ptp_release(priv); + struct gve_ptp *ptp =3D priv->ptp; =20 - if (priv->nic_ts_report) { - dma_free_coherent(&priv->pdev->dev, - sizeof(struct gve_nic_ts_report), - priv->nic_ts_report, priv->nic_ts_report_bus); - priv->nic_ts_report =3D NULL; - } + if (!ptp) + return; + + priv->ptp =3D NULL; + ptp_clock_unregister(ptp->clock); + dma_free_coherent(&priv->pdev->dev, sizeof(struct gve_nic_ts_report), + ptp->nic_ts_report, ptp->nic_ts_report_bus); + ptp->nic_ts_report =3D NULL; + mutex_destroy(&ptp->nic_ts_read_lock); + kfree(ptp); } --=20 2.54.0.545.g6539524ca2-goog From nobody Sat Jun 13 11:22:09 2026 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8C34342C80 for ; Thu, 7 May 2026 21:13:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778188391; cv=none; b=PVHoZ6O57eRqdXNXconnP+zimPcOc7yWZ0XMtWxSTOSYqeGWMMKOmHXt+yoolLLq4x1n3l1TzXotUtxxoS2bu6JGurcPA15kk8dNzkRoEXOgUkh2G4QPSLmG7yvaqJuD0tWCHb/1QMr77VgtQ1kTid5TrFxMsq/p6d6xLS4EnaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778188391; c=relaxed/simple; bh=djka4XUM+nSConmfd3gLZl90M/IV8iCE2NiOJnRo9xU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MhsCdUe+G+e7y3iXHEaMyN1DCMePi10xyHB9NbI+aMtARcQGUV3xjH6tNU8pF+z38KJXvdFOZNQDExsrNRtRvLT1DxWApuWoH39T/QGhQusvxab3W0stSEASWr1A3IpOgyaeTHCO5JSoapLq25mfETHkJOAfG3Av/RHWrM0hbHY= 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=d3oMN5em; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--hramamurthy.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="d3oMN5em" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b6097ca315bso2143525a12.3 for ; Thu, 07 May 2026 14:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778188389; x=1778793189; 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=CQWw1Y0UpqBl/nokhDQ3OAPFYHiDmVUDolYlpCEFvks=; b=d3oMN5emfy66VOFhKqUWp6ZW5yh2zUly0C3SoUKlaXoIvHB0VIMClPs6nigg52PBLC xUlzx8Ov1PZNzMlHFVroAWSFzjYLgjCtAmSJYu6EfcxeAU+XDby9vf2C7i9mcxXEXUMf Z6De/d7DuFTquuhQtbhECZBkdOAmewi2WhAq1ligM/CO1IdwvzYAHRlLKjE82hsL0Zv7 oUz7LZtb04pOXXlYoqtGURhTbd1zidsWU5K5xHsrZF7zw00hjZte5bmI1aFJ7uEnfLIV i0ESQrVD3ErJB4icDjMY/7O5JMEkF2Q+Gs7jh/TNTaw98Rr93/NX4Y3K83cAzyQXkAQG YWFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778188389; x=1778793189; 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=CQWw1Y0UpqBl/nokhDQ3OAPFYHiDmVUDolYlpCEFvks=; b=KaxgnNDRsl65S0QJYKVso7mW0GaumI3QcZQL2V6m1+kNg8QoLoq99RMqEY+dlbfTZO YeBI9xXPPfh2iURdxlSbmbZf77S6dSXJmrSQCDadMRKEm6b8Q5RMBNytDsAvgnMj6Nql nUQ/skmSwzxR+6HpIhywRgMV76bJcErIGg4XVIBLQ3bwcYIRWKv/ucCEjFIjovozVnGv jmHq0KH7vKrKVm8TKwXItCcKFOv3EPOOgQ5DaIcuUxW1kgz4C1M2zFj1GpfCXX3PM+cZ J+zyekSD0EycU90IK3w/V3drOW1Z1eh5XfQVIUIyLINs3pK9FR6ZOEHqN7ZRJEgp1Lxl En/g== X-Forwarded-Encrypted: i=1; AFNElJ8qucNy5oJqMsg+C3RqCNFPWITrf1z44vHix1mV+Kky7IAUuTgQ/aTzOijRbR3gktPrjihxUcilHT0JY9Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yyc3leDtHq6WZq8D0Xo0/PSjOmgheasokWRNar/U0qX3MxQg+IB pxLMZgiGkoj56Z1f10HQK9Vksv2gkdGXO+aMgPZU0b4a3iynO9S+ZZV8z1FMKMkOPwdxiByiLyT PKxJP8QHg/oZ7H5QvzJuBxWiZUA== X-Received: from pgbfy18.prod.google.com ([2002:a05:6a02:2a92:b0:c79:8740:a0a3]) (user=hramamurthy job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:394d:b0:398:71e4:6287 with SMTP id adf61e73a8af0-3aa5a830dacmr9966275637.10.1778188388812; Thu, 07 May 2026 14:13:08 -0700 (PDT) Date: Thu, 7 May 2026 21:13:04 +0000 In-Reply-To: <20260507211304.3046526-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: <20260507211304.3046526-1-hramamurthy@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260507211304.3046526-4-hramamurthy@google.com> Subject: [PATCH net-next v6 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, jstultz@google.com, tglx@kernel.org, sboyd@kernel.org, willemb@google.com, nktgrg@google.com, jfraker@google.com, ziweixiao@google.com, maolson@google.com, jordanrhee@google.com, thostet@google.com, alok.a.tiwari@oracle.com, pkaligineedi@google.com, horms@kernel.org, dwmw2@infradead.org, jacob.e.keller@intel.com, yyd@google.com, jefrogers@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. Two paths are implemented: a precise path using system counter values sampled by the device, and a fallback path using system counter values sampled in the driver using ptp_read_system_prets()/postts(). To use the precise path, the current system clocksource must match the units returned by the device, which on x86 is X86_TSC and on ARM64 is ARM_ARCH_COUNTER. The clockid requested for the cross-timestamp must be either CLOCK_REALTIME or CLOCK_MONOTONIC_RAW. These conditions hold by default on GCP VMs using Chrony, so we expect the precise path to be used the vast majority of the time. If the system clocksource is changed to kvm-clock, it activates the fallback path. Ethtool counters have been added to count how many times each path is used. The uncertainty window in the precise path is typically around 1-2us, while in the fallback path is around 60-80us. Stub implementions of adjfine and adjtime are added to avoid NULL dereference when phc2sys tries to adjust the clock. Cc: John Stultz Cc: Thomas Gleixner Cc: Stephen Boyd Cc: David Woodhouse Reviewed-by: Willem de Bruijn Reviewed-by: Kevin Yang Reviewed-by: Naman Gulati Signed-off-by: Jordan Rhee Signed-off-by: Harshitha Ramamurthy Reviewed-by: Jacob Keller --- Changes in v6: - Added a fallback to driver-sampled time sandwich that is used when the following conditions are not met: - The system clock source is X86_TSC or ARM_ARCH_COUNTER - The requested clockid is CLOCK_REALTIME or CLOCK_MONOTONIC_RAW - The architecture is x86 or ARM64 - Added ethtool statistics to count how many cross-timestamps used the precise path versus fallback path. - Fixed printf format specifier. - Added stub implementions of adjtime and adjfine to prevent NULL dereference when phc2sys tries to adjust clock. - Moved system time snapshot back to gve_ptp_gettimex64() so we can get the current system clock source from it. It is OK for it to not be inside the mutex or retry loop because lock contention and retries should be extremely rare, and chrony filters out bad samples. Changes in v5: - Reformulate retry loop in terms of total timeout (Jakub Kicinski) Changes in v3: - Take system time snapshot inside the mutex - Return -EOPNOTSUPP if cross-timestamp is requested on an arch other than x86 or arm64 Changes in v2: - fix compilation warning on ARM by casting cycles_t to u64 --- drivers/net/ethernet/google/gve/gve.h | 8 + drivers/net/ethernet/google/gve/gve_adminq.h | 4 +- drivers/net/ethernet/google/gve/gve_ethtool.c | 3 + drivers/net/ethernet/google/gve/gve_ptp.c | 237 +++++++++++++++++- 4 files changed, 243 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/g= oogle/gve/gve.h index 7b69d0cfc0d5..4de3ce60060e 100644 --- a/drivers/net/ethernet/google/gve/gve.h +++ b/drivers/net/ethernet/google/gve/gve.h @@ -880,6 +880,14 @@ struct gve_priv { u32 stats_report_trigger_cnt; /* count of device-requested stats-reports = since last reset */ u32 suspend_cnt; /* count of times suspended */ u32 resume_cnt; /* count of times resumed */ + /* count of cross-timestamps attempted using system timestamps + * from the AQ command + */ + u32 ptp_precise_xtstamps; + /* count of cross-timestamps attempted using system timestamps sampled + * by the driver + */ + u32 ptp_fallback_xtstamps; struct workqueue_struct *gve_wq; struct work_struct service_task; struct work_struct stats_report_task; 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_ethtool.c b/drivers/net/et= hernet/google/gve/gve_ethtool.c index 4fd7e8a442c5..8a088dcc3603 100644 --- a/drivers/net/ethernet/google/gve/gve_ethtool.c +++ b/drivers/net/ethernet/google/gve/gve_ethtool.c @@ -46,6 +46,7 @@ static const char gve_gstrings_main_stats[][ETH_GSTRING_L= EN] =3D { "rx_hsplit_unsplit_pkt", "interface_up_cnt", "interface_down_cnt", "reset_cnt", "page_alloc_fail", "dma_mapping_error", "stats_report_trigger_cnt", + "ptp_precise_xtstamps", "ptp_fallback_xtstamps", }; =20 static const char gve_gstrings_rx_stats[][ETH_GSTRING_LEN] =3D { @@ -269,6 +270,8 @@ gve_get_ethtool_stats(struct net_device *netdev, data[i++] =3D priv->page_alloc_fail; data[i++] =3D priv->dma_mapping_error; data[i++] =3D priv->stats_report_trigger_cnt; + data[i++] =3D priv->ptp_precise_xtstamps; + data[i++] =3D priv->ptp_fallback_xtstamps; i =3D GVE_MAIN_STATS_LEN; =20 rx_base_stats_idx =3D 0; diff --git a/drivers/net/ethernet/google/gve/gve_ptp.c b/drivers/net/ethern= et/google/gve/gve_ptp.c index ad15f1209a83..9711521ce1d0 100644 --- a/drivers/net/ethernet/google/gve/gve_ptp.c +++ b/drivers/net/ethernet/google/gve/gve_ptp.c @@ -10,28 +10,251 @@ /* 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_ptp_read_timestamp(struct gve_ptp *ptp, cycles_t *pre_cycle= s, + cycles_t *post_cycles) +{ + unsigned long deadline =3D jiffies + msecs_to_jiffies(100); + unsigned long delay_us =3D 1000; + int err; + + lockdep_assert_held(&ptp->nic_ts_read_lock); + + do { + *pre_cycles =3D get_cycles(); + err =3D gve_adminq_report_nic_ts(ptp->priv, + ptp->nic_ts_report_bus); + + /* Prevent get_cycles() from being speculatively executed + * before the AdminQ command + */ + rmb(); + *post_cycles =3D get_cycles(); + if (likely(err !=3D -EAGAIN)) + return err; + + fsleep(delay_us); + + /* Exponential backoff */ + delay_us *=3D 2; + } while (time_before(jiffies, deadline)); + + return -ETIMEDOUT; +} + /* Read the nic timestamp from hardware via the admin queue. */ -static int gve_clock_nic_ts_read(struct gve_ptp *ptp, u64 *nic_raw) +static int gve_clock_nic_ts_read(struct gve_ptp *ptp, 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(&ptp->nic_ts_read_lock); - err =3D gve_adminq_report_nic_ts(ptp->priv, ptp->nic_ts_report_bus); - if (err) + err =3D gve_ptp_read_timestamp(ptp, &host_pre_cycles, &host_post_cycles); + if (err) { + dev_err_ratelimited(&ptp->priv->pdev->dev, + "AdminQ timestamp read failed: %d\n", err); goto out; + } + + ts_report =3D ptp->nic_ts_report; + *nic_raw =3D be64_to_cpu(ts_report->nic_timestamp); =20 - *nic_raw =3D be64_to_cpu(ptp->nic_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(&ptp->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 %llu 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 bool +gve_can_use_system_ts_from_device(enum clocksource_ids system_clock_source, + clockid_t clockid) +{ + if (clockid !=3D CLOCK_REALTIME && clockid !=3D CLOCK_MONOTONIC_RAW) + return false; + + /* If the system clock source matches the system clock + * returned by the AdminQ command, we can use the system + * timestamps returned by the device, otherwise we have to + * fall back to sampling system time from the host which + * is less accurate. + */ + if (IS_ENABLED(CONFIG_X86)) + return system_clock_source =3D=3D CSID_X86_TSC; + else if (IS_ENABLED(CONFIG_ARM64)) + return system_clock_source =3D=3D CSID_ARM_ARCH_COUNTER; + + return false; +} + 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}; + bool use_system_ts_from_device =3D false; + struct gve_priv *priv =3D ptp->priv; + struct system_time_snapshot snap; + u64 nic_ts; + int err; + + if (sts) { + /* This snapshot is used both to query the current system + * clocksource and to convert the cycle counts returned + * by the AdminQ command to ktime. It does not need to be + * taken inside the retry loop because retries and lock + * contention are expected to be extremely rare. + * + * If the system clock source changes between here and + * when get_device_system_crosststamp() is called, + * get_device_system_crosststamp() will fail which will + * cause one failed sample, and the next one will succeed. + */ + ktime_get_snapshot(&snap); + use_system_ts_from_device =3D + gve_can_use_system_ts_from_device(snap.cs_id, + sts->clockid); + if (use_system_ts_from_device) + priv->ptp_precise_xtstamps++; + else + priv->ptp_fallback_xtstamps++; + } + + if (unlikely(!use_system_ts_from_device)) + ptp_read_system_prets(sts); + + err =3D gve_clock_nic_ts_read(ptp, &nic_ts, sts ? &sysclock : NULL); + if (err) + return err; + + if (unlikely(!use_system_ts_from_device)) + ptp_read_system_postts(sts); + + if (sts && likely(use_system_ts_from_device)) { + /* Reject samples with out of order system clock values. + * Firmware must return valid non-zero cycle counts. + */ + 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 +273,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(ptp, &nic_raw); + err =3D gve_clock_nic_ts_read(ptp, &nic_raw, NULL); if (err) { dev_err_ratelimited(&priv->pdev->dev, "%s read err %d\n", __func__, err); @@ -93,7 +316,7 @@ int gve_init_clock(struct gve_priv *priv) goto free_ptp; } =20 - err =3D gve_clock_nic_ts_read(ptp, &nic_raw); + err =3D gve_clock_nic_ts_read(ptp, &nic_raw, NULL); if (err) { dev_err(&priv->pdev->dev, "failed to read NIC clock %d\n", err); goto free_dma_mem; --=20 2.54.0.545.g6539524ca2-goog