From mboxrd@z Thu Jan 1 00:00:00 1970 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 001AB3191D0 for ; Fri, 19 Dec 2025 20:30:01 +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=1766176204; cv=none; b=Pbnv7N8XbbW4Cc4aq+kLEhlw1jMJ282QQycgoW+GHg4l9RahrL/4p6PYobB+GGvBc4O3i3216bVkrOLLWnC7t9JsvcyXcZ1D+XK6GWlQSs51Qr2rl7nc4lvXJKXydKXQo/xjVrhBFlH7Qx6BCUvXY2KLZgPdMdOPlhSfdWimykM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766176204; c=relaxed/simple; bh=AK9s3g7olH8MG4EtHhTwdxUK+xOuSdA2bXOfBOgp6s4=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=pPgy+H72lxytdsFOtxm/JzGvNwHc3KTaOfUwSXFk3douLMrBPV5JxTC2+63nA+NQeCTP0vdEhxTtH19chcJW7ilkkuSKUxOa0PTOcPDgqsPNR8yNzLys1jufoVRUkugsiDPUxI8Q/KMetC6JSgRGQSZcTtloi+B5aRBgQXQmFeI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=MOZrqCmD; 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--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MOZrqCmD" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b5edecdf94eso3705029a12.2 for ; Fri, 19 Dec 2025 12:30:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1766176201; x=1766781001; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=IHd0Ny6KDmA7/BvDV3C3X6zKg5S+EEhCYi1NRz/+6Xg=; b=MOZrqCmDl9+t0cA0o1e9Cvs/hVvZMnPih684S7CAWbmrVkMIvJHSB5mXBVkwASf65C HY48S8EeFP9CtixKqDDHvX9TDYxaOTgh1lBa1cp/uieoTX0ZgMdJs34X9zTXGkwT1O1h qyWHW/6h9Xz3nRh+qb7Ilo4THcJhyg7v/PuRF1XxZSx0ChImTGQh3OaaOR4hYZlnTMRR Kdl1xS5RPvZyeY69Z7u1tQhrUsbNLpTNydZqZvdNxnGhBhmVzryySUkxqtJiD1h6+ZGz Rk2pQX0QUT83MDvT1oSUe424zlIeDJBgq57jKGRk6yIEH0/y10RaevpxrtHFQxf8vQw+ FKpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766176201; x=1766781001; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=IHd0Ny6KDmA7/BvDV3C3X6zKg5S+EEhCYi1NRz/+6Xg=; b=Ee/SX1LY0QAtSj/QLPSwaBRK7dT3navoaNe4++rj3zMPncKXBKBMYOBHnzZQ8JAj5X VOqHWQadvJe/vSjl2EwSQ/jafyDoojhk/GInuzySiTYxUco5tEsElPY68i9jl62BSZQR 7HySKtV2NrSglGW7MPntwg41IMQNZfuKDMy862ky+hunqFPH2UMjUg2mC3BTjl0emY0M 3GR1Fxci6FmgR368HuwtDaTySiFX2r5m7fFCnfxAM/t8D2+IQOELZtL39BHv8lV3xKbp fwAJjNbpj/nY7CeWSDK5h2DB0BhpDtdVMa07BKHMMqqxgS8ByfAZ07aGpDTUd+3ilcGK MPeA== X-Forwarded-Encrypted: i=1; AJvYcCWuvQraelFmdCSD9L4dnxV4bVmp5nap0WP/AMoLp2pON+zBdnfc5+2Z34RZuAQ+jQ0CLmI=@vger.kernel.org X-Gm-Message-State: AOJu0YzKGN1Wpr8bKLdRLzMSzDVekqh/R7veEcR2O2r5TiAqSvgwNTfH awI0G6EwasBG01oOtBVZe2PJlIteNAt/Do0C+2jm+cL2BJXd4f7hJIwOVa2jZl/mJ4Wt5dFj9hs kqzCPjy8kTrfaZZJW+4gYdsnhug== X-Google-Smtp-Source: AGHT+IGmgbM0XudpJcpiXGRPuXw6UTKfKP2tpvG3JOdbqKaPKFoWMNG1e8WaCbFXC3+5Y53tESIYxz7+RDX3yTy+iA== X-Received: from dlbbk38.prod.google.com ([2002:a05:7022:42a6:b0:11d:cd2a:4c1b]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6291:b0:11e:3e9:3ea2 with SMTP id a92af1059eb24-1217230eeafmr5221570c88.49.1766176201087; Fri, 19 Dec 2025 12:30:01 -0800 (PST) Date: Fri, 19 Dec 2025 20:29:54 +0000 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.52.0.322.g1dd061c0dc-goog Message-ID: <20251219202957.2309698-1-almasrymina@google.com> Subject: [PATCH net-next v3] idpf: export RX hardware timestamping information to XDP From: Mina Almasry To: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Cc: YiFei Zhu , Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Tony Nguyen , Przemek Kitszel , Andrew Lunn , Eric Dumazet , Paolo Abeni , Alexander Lobakin , Richard Cochran , intel-wired-lan@lists.osuosl.org, Mina Almasry , Aleksandr Loktionov Content-Type: text/plain; charset="UTF-8" From: YiFei Zhu The logic is similar to idpf_rx_hwtstamp, but the data is exported as a BPF kfunc instead of appended to an skb. A idpf_queue_has(PTP, rxq) condition is added to check the queue supports PTP similar to idpf_rx_process_skb_fields. Cc: intel-wired-lan@lists.osuosl.org Signed-off-by: YiFei Zhu Signed-off-by: Mina Almasry Reviewed-by: Aleksandr Loktionov --- v3: https://lore.kernel.org/netdev/20251218022948.3288897-1-almasrymina@google.com/ - Do the idpf_queue_has(PTP) check before we read qw1 (lobakin) - Fix _qw1 not copying over ts_low on on !__LIBETH_WORD_ACCESS systems (AI) v2: https://lore.kernel.org/netdev/20251122140839.3922015-1-almasrymina@google.com/ - Fixed alphabetical ordering - Use the xdp desc type instead of virtchnl one (required some added helpers) --- drivers/net/ethernet/intel/idpf/xdp.c | 31 +++++++++++++++++++++++++++ drivers/net/ethernet/intel/idpf/xdp.h | 22 ++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/idpf/xdp.c b/drivers/net/ethernet/intel/idpf/xdp.c index 958d16f87424..0916d201bf98 100644 --- a/drivers/net/ethernet/intel/idpf/xdp.c +++ b/drivers/net/ethernet/intel/idpf/xdp.c @@ -2,6 +2,7 @@ /* Copyright (C) 2025 Intel Corporation */ #include "idpf.h" +#include "idpf_ptp.h" #include "idpf_virtchnl.h" #include "xdp.h" #include "xsk.h" @@ -391,8 +392,38 @@ static int idpf_xdpmo_rx_hash(const struct xdp_md *ctx, u32 *hash, pt); } +static int idpf_xdpmo_rx_timestamp(const struct xdp_md *ctx, u64 *timestamp) +{ + const struct libeth_xdp_buff *xdp = (typeof(xdp))ctx; + struct idpf_xdp_rx_desc desc __uninitialized; + const struct idpf_rx_queue *rxq; + u64 cached_time, ts_ns; + u32 ts_high; + + rxq = libeth_xdp_buff_to_rq(xdp, typeof(*rxq), xdp_rxq); + + if (!idpf_queue_has(PTP, rxq)) + return -ENODATA; + + idpf_xdp_get_qw1(&desc, xdp->desc); + + if (!(idpf_xdp_rx_ts_low(&desc) & VIRTCHNL2_RX_FLEX_TSTAMP_VALID)) + return -ENODATA; + + cached_time = READ_ONCE(rxq->cached_phc_time); + + idpf_xdp_get_qw3(&desc, xdp->desc); + + ts_high = idpf_xdp_rx_ts_high(&desc); + ts_ns = idpf_ptp_tstamp_extend_32b_to_64b(cached_time, ts_high); + + *timestamp = ts_ns; + return 0; +} + static const struct xdp_metadata_ops idpf_xdpmo = { .xmo_rx_hash = idpf_xdpmo_rx_hash, + .xmo_rx_timestamp = idpf_xdpmo_rx_timestamp, }; void idpf_xdp_set_features(const struct idpf_vport *vport) diff --git a/drivers/net/ethernet/intel/idpf/xdp.h b/drivers/net/ethernet/intel/idpf/xdp.h index 479f5ef3c604..9daae445bde4 100644 --- a/drivers/net/ethernet/intel/idpf/xdp.h +++ b/drivers/net/ethernet/intel/idpf/xdp.h @@ -112,11 +112,13 @@ struct idpf_xdp_rx_desc { aligned_u64 qw1; #define IDPF_XDP_RX_BUF GENMASK_ULL(47, 32) #define IDPF_XDP_RX_EOP BIT_ULL(1) +#define IDPF_XDP_RX_TS_LOW GENMASK_ULL(31, 24) aligned_u64 qw2; #define IDPF_XDP_RX_HASH GENMASK_ULL(31, 0) aligned_u64 qw3; +#define IDPF_XDP_RX_TS_HIGH GENMASK_ULL(63, 32) } __aligned(4 * sizeof(u64)); static_assert(sizeof(struct idpf_xdp_rx_desc) == sizeof(struct virtchnl2_rx_flex_desc_adv_nic_3)); @@ -128,6 +130,8 @@ static_assert(sizeof(struct idpf_xdp_rx_desc) == #define idpf_xdp_rx_buf(desc) FIELD_GET(IDPF_XDP_RX_BUF, (desc)->qw1) #define idpf_xdp_rx_eop(desc) !!((desc)->qw1 & IDPF_XDP_RX_EOP) #define idpf_xdp_rx_hash(desc) FIELD_GET(IDPF_XDP_RX_HASH, (desc)->qw2) +#define idpf_xdp_rx_ts_low(desc) FIELD_GET(IDPF_XDP_RX_TS_LOW, (desc)->qw1) +#define idpf_xdp_rx_ts_high(desc) FIELD_GET(IDPF_XDP_RX_TS_HIGH, (desc)->qw3) static inline void idpf_xdp_get_qw0(struct idpf_xdp_rx_desc *desc, @@ -149,7 +153,10 @@ idpf_xdp_get_qw1(struct idpf_xdp_rx_desc *desc, desc->qw1 = ((const typeof(desc))rxd)->qw1; #else desc->qw1 = ((u64)le16_to_cpu(rxd->buf_id) << 32) | - rxd->status_err0_qw1; + ((u64)rxd->ts_low << 24) | + ((u64)rxd->fflags1 << 16) | + ((u64)rxd->status_err1 << 8) | + rxd->status_err0_qw1; #endif } @@ -166,6 +173,19 @@ idpf_xdp_get_qw2(struct idpf_xdp_rx_desc *desc, #endif } +static inline void +idpf_xdp_get_qw3(struct idpf_xdp_rx_desc *desc, + const struct virtchnl2_rx_flex_desc_adv_nic_3 *rxd) +{ +#ifdef __LIBETH_WORD_ACCESS + desc->qw3 = ((const typeof(desc))rxd)->qw3; +#else + desc->qw3 = ((u64)le32_to_cpu(rxd->ts_high) << 32) | + ((u64)le16_to_cpu(rxd->fmd6) << 16) | + le16_to_cpu(rxd->l2tag1); +#endif +} + void idpf_xdp_set_features(const struct idpf_vport *vport); int idpf_xdp(struct net_device *dev, struct netdev_bpf *xdp); base-commit: 7b8e9264f55a9c320f398e337d215e68cca50131 -- 2.52.0.322.g1dd061c0dc-goog