From: "Song, Yoong Siang" <yoong.siang.song@intel.com>
To: "Brouer, Jesper" <brouer@redhat.com>,
"bpf@vger.kernel.org" <bpf@vger.kernel.org>
Cc: "Brouer, Jesper" <brouer@redhat.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Stanislav Fomichev <sdf@google.com>,
"martin.lau@kernel.org" <martin.lau@kernel.org>,
"ast@kernel.org" <ast@kernel.org>,
"daniel@iogearbox.net" <daniel@iogearbox.net>,
"Lobakin, Aleksander" <aleksander.lobakin@intel.com>,
"Zaremba, Larysa" <larysa.zaremba@intel.com>,
"xdp-hints@xdp-project.net" <xdp-hints@xdp-project.net>,
"Nguyen, Anthony L" <anthony.l.nguyen@intel.com>,
"Ong, Boon Leong" <boon.leong.ong@intel.com>,
"intel-wired-lan@lists.osuosl.org"
<intel-wired-lan@lists.osuosl.org>,
"pabeni@redhat.com" <pabeni@redhat.com>,
"Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
"kuba@kernel.org" <kuba@kernel.org>,
"edumazet@google.com" <edumazet@google.com>,
"john.fastabend@gmail.com" <john.fastabend@gmail.com>,
"hawk@kernel.org" <hawk@kernel.org>,
"davem@davemloft.net" <davem@davemloft.net>
Subject: [xdp-hints] Re: [PATCH bpf-next V3 5/6] igc: add XDP hints kfuncs for RX timestamp
Date: Wed, 12 Apr 2023 11:40:43 +0000 [thread overview]
Message-ID: <PH0PR11MB5830A6488CD7AB8AB0C89A42D89B9@PH0PR11MB5830.namprd11.prod.outlook.com> (raw)
In-Reply-To: <167950089764.2796265.5969267586331535957.stgit@firesoul>
On Thursday, March 23, 2023 12:02 AM , Jesper Dangaard Brouer <brouer@redhat.com> wrote:
>The NIC hardware RX timestamping mechanism adds an optional tailored header
>before the MAC header containing packet reception time. Optional depending on
>RX descriptor TSIP status bit (IGC_RXDADV_STAT_TSIP). In case this bit is set
>driver does offset adjustments to packet data start and extracts the timestamp.
>
>The timestamp need to be extracted before invoking the XDP bpf_prog, because
>this area just before the packet is also accessible by XDP via data_meta context
>pointer (and helper bpf_xdp_adjust_meta). Thus, an XDP bpf_prog can potentially
>overwrite this and corrupt data that we want to extract with the new kfunc for
>reading the timestamp.
>
>Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
>---
> drivers/net/ethernet/intel/igc/igc.h | 1 +
> drivers/net/ethernet/intel/igc/igc_main.c | 20 ++++++++++++++++++++
> 2 files changed, 21 insertions(+)
>
>diff --git a/drivers/net/ethernet/intel/igc/igc.h
>b/drivers/net/ethernet/intel/igc/igc.h
>index bc67a52e47e8..29941734f1a1 100644
>--- a/drivers/net/ethernet/intel/igc/igc.h
>+++ b/drivers/net/ethernet/intel/igc/igc.h
>@@ -503,6 +503,7 @@ struct igc_rx_buffer { struct igc_xdp_buff {
> struct xdp_buff xdp;
> union igc_adv_rx_desc *rx_desc;
>+ ktime_t rx_ts; /* data indication bit IGC_RXDADV_STAT_TSIP */
> };
>
> struct igc_q_vector {
>diff --git a/drivers/net/ethernet/intel/igc/igc_main.c
>b/drivers/net/ethernet/intel/igc/igc_main.c
>index a78d7e6bcfd6..f66285c85444 100644
>--- a/drivers/net/ethernet/intel/igc/igc_main.c
>+++ b/drivers/net/ethernet/intel/igc/igc_main.c
>@@ -2539,6 +2539,7 @@ static int igc_clean_rx_irq(struct igc_q_vector
>*q_vector, const int budget)
> if (igc_test_staterr(rx_desc, IGC_RXDADV_STAT_TSIP)) {
> timestamp = igc_ptp_rx_pktstamp(q_vector->adapter,
> pktbuf);
>+ ctx.rx_ts = timestamp;
> pkt_offset = IGC_TS_HDR_LEN;
> size -= IGC_TS_HDR_LEN;
> }
>@@ -2727,6 +2728,7 @@ static int igc_clean_rx_irq_zc(struct igc_q_vector
>*q_vector, const int budget)
> if (igc_test_staterr(desc, IGC_RXDADV_STAT_TSIP)) {
> timestamp = igc_ptp_rx_pktstamp(q_vector->adapter,
> bi->xdp->data);
>+ ctx->rx_ts = timestamp;
>
> bi->xdp->data += IGC_TS_HDR_LEN;
>
>@@ -6481,6 +6483,23 @@ u32 igc_rd32(struct igc_hw *hw, u32 reg)
> return value;
> }
>
>+static int igc_xdp_rx_timestamp(const struct xdp_md *_ctx, u64
>+*timestamp) {
>+ const struct igc_xdp_buff *ctx = (void *)_ctx;
>+
>+ if (igc_test_staterr(ctx->rx_desc, IGC_RXDADV_STAT_TSIP)) {
>+ *timestamp = ctx->rx_ts;
>+
>+ return 0;
>+ }
>+
>+ return -ENODATA;
>+}
>+
>+const struct xdp_metadata_ops igc_xdp_metadata_ops = {
Hi Jesper,
Since igc_xdp_metadata_ops is used on igc_main.c only, we can make
it static to avoid following build warning:
drivers/net/ethernet/intel/igc/igc_main.c:6499:31: warning: symbol
'igc_xdp_metadata_ops' was not declared. Should it be static?
Thanks & Regards
Siang
>+ .xmo_rx_timestamp = igc_xdp_rx_timestamp,
>+};
>+
> /**
> * igc_probe - Device Initialization Routine
> * @pdev: PCI device information struct @@ -6554,6 +6573,7 @@ static int
>igc_probe(struct pci_dev *pdev,
> hw->hw_addr = adapter->io_addr;
>
> netdev->netdev_ops = &igc_netdev_ops;
>+ netdev->xdp_metadata_ops = &igc_xdp_metadata_ops;
> igc_ethtool_set_ops(netdev);
> netdev->watchdog_timeo = 5 * HZ;
>
>
next prev parent reply other threads:[~2023-04-12 11:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-22 16:01 [xdp-hints] [PATCH bpf-next V3 0/6] XDP-hints kfuncs for Intel driver igc Jesper Dangaard Brouer
2023-03-22 16:01 ` [xdp-hints] [PATCH bpf-next V3 1/6] igc: enable and fix RX hash usage by netstack Jesper Dangaard Brouer
2023-04-12 11:38 ` [xdp-hints] " Song, Yoong Siang
2023-03-22 16:01 ` [xdp-hints] [PATCH bpf-next V3 2/6] selftests/bpf: xdp_hw_metadata track more timestamps Jesper Dangaard Brouer
2023-03-22 16:01 ` [xdp-hints] [PATCH bpf-next V3 3/6] selftests/bpf: xdp_hw_metadata RX hash return code info Jesper Dangaard Brouer
2023-03-22 16:09 ` [xdp-hints] " Alexei Starovoitov
2023-03-22 19:00 ` Stanislav Fomichev
2023-03-22 16:01 ` [xdp-hints] [PATCH bpf-next V3 4/6] igc: add igc_xdp_buff wrapper for xdp_buff in driver Jesper Dangaard Brouer
2023-03-22 16:01 ` [xdp-hints] [PATCH bpf-next V3 5/6] igc: add XDP hints kfuncs for RX timestamp Jesper Dangaard Brouer
2023-04-12 11:40 ` Song, Yoong Siang [this message]
2023-04-12 15:37 ` [xdp-hints] " Song, Yoong Siang
2023-03-22 16:01 ` [xdp-hints] [PATCH bpf-next V3 6/6] igc: add XDP hints kfuncs for RX hash Jesper Dangaard Brouer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://lists.xdp-project.net/postorius/lists/xdp-hints.xdp-project.net/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=PH0PR11MB5830A6488CD7AB8AB0C89A42D89B9@PH0PR11MB5830.namprd11.prod.outlook.com \
--to=yoong.siang.song@intel.com \
--cc=aleksander.lobakin@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=ast@kernel.org \
--cc=boon.leong.ong@intel.com \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jesse.brandeburg@intel.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=larysa.zaremba@intel.com \
--cc=martin.lau@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@google.com \
--cc=xdp-hints@xdp-project.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox