From: Ederson de Souza <ederson.desouza@intel.com> To: xdp-hints@xdp-project.net Cc: bpf@vger.kernel.org Subject: [[RFC xdp-hints] 10/16] igc: XDP packet RX timestamp Date: Mon, 2 Aug 2021 18:03:25 -0700 [thread overview] Message-ID: <20210803010331.39453-11-ederson.desouza@intel.com> (raw) In-Reply-To: <20210803010331.39453-1-ederson.desouza@intel.com> Using XDP hints, driver adds the PTP timestamp of when a packet was received by the i225 NIC. Signed-off-by: Ederson de Souza <ederson.desouza@intel.com> --- drivers/net/ethernet/intel/igc/igc.h | 4 + drivers/net/ethernet/intel/igc/igc_main.c | 40 ++++++++-- drivers/net/ethernet/intel/igc/igc_xdp.c | 93 +++++++++++++++++++++++ drivers/net/ethernet/intel/igc/igc_xdp.h | 11 +++ 4 files changed, 143 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h index 6fd5901f07c7..84e5f3c97351 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -13,6 +13,7 @@ #include <linux/ptp_clock_kernel.h> #include <linux/timecounter.h> #include <linux/net_tstamp.h> +#include <linux/if_xdp.h> #include "igc_hw.h" @@ -252,6 +253,9 @@ struct igc_adapter { struct timespec64 start; struct timespec64 period; } perout[IGC_N_PEROUT]; + + struct btf *btf; + u8 btf_enabled; }; void igc_up(struct igc_adapter *adapter); diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index fe3619c25c05..82e9b493cad6 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -13,6 +13,7 @@ #include <linux/bpf_trace.h> #include <net/xdp_sock_drv.h> #include <net/ipv6.h> +#include <linux/btf.h> #include "igc.h" #include "igc_hw.h" @@ -2374,8 +2375,20 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget) if (!skb) { xdp_init_buff(&xdp, truesize, &rx_ring->xdp_rxq); + xdp_prepare_buff(&xdp, pktbuf - igc_rx_offset(rx_ring), - igc_rx_offset(rx_ring) + pkt_offset, size, false); + igc_rx_offset(rx_ring) + pkt_offset, size, + adapter->btf_enabled); + + if (adapter->btf_enabled) { + struct xdp_hints___igc *hints; + + hints = xdp.data - sizeof(*hints); + xdp.data_meta = hints; + hints->rx_timestamp = timestamp; + hints->valid_map = XDP_GENERIC_HINTS_RX_TIMESTAMP; + hints->btf_id = btf_obj_id(adapter->btf); + } skb = igc_xdp_run_prog(adapter, &xdp); } @@ -2539,12 +2552,18 @@ static int igc_clean_rx_irq_zc(struct igc_q_vector *q_vector, const int budget) bi->xdp->data); bi->xdp->data += IGC_TS_HDR_LEN; - - /* HW timestamp has been copied into local variable. Metadata - * length when XDP program is called should be 0. - */ bi->xdp->data_meta += IGC_TS_HDR_LEN; size -= IGC_TS_HDR_LEN; + + if (adapter->btf_enabled) { + struct xdp_hints___igc *hints; + + hints = bi->xdp->data - sizeof(*hints); + bi->xdp->data_meta = hints; + hints->rx_timestamp = timestamp; + hints->valid_map = XDP_GENERIC_HINTS_RX_TIMESTAMP; + hints->btf_id = btf_obj_id(adapter->btf); + } } bi->xdp->data_end = bi->xdp->data + size; @@ -5949,6 +5968,12 @@ static int igc_bpf(struct net_device *dev, struct netdev_bpf *bpf) case XDP_SETUP_XSK_POOL: return igc_xdp_setup_pool(adapter, bpf->xsk.pool, bpf->xsk.queue_id); + case XDP_SETUP_MD_BTF: + return igc_xdp_set_btf_md(dev, bpf->btf_enable); + case XDP_QUERY_MD_BTF: + bpf->btf_id = igc_xdp_query_btf(dev, &bpf->btf_enable); + return 0; + default: return -EOPNOTSUPP; } @@ -6436,6 +6461,11 @@ static void igc_remove(struct pci_dev *pdev) cancel_work_sync(&adapter->reset_task); cancel_work_sync(&adapter->watchdog_task); + if (adapter->btf) { + adapter->btf_enabled = 0; + btf_unregister(adapter->btf); + } + /* Release control of h/w to f/w. If f/w is AMT enabled, this * would have already happened in close and is redundant. */ diff --git a/drivers/net/ethernet/intel/igc/igc_xdp.c b/drivers/net/ethernet/intel/igc/igc_xdp.c index a8cf5374be47..00d223703424 100644 --- a/drivers/net/ethernet/intel/igc/igc_xdp.c +++ b/drivers/net/ethernet/intel/igc/igc_xdp.c @@ -2,10 +2,103 @@ /* Copyright (c) 2020, Intel Corporation. */ #include <net/xdp_sock_drv.h> +#include <linux/btf.h> #include "igc.h" #include "igc_xdp.h" +#define IGC_XDP_HINTS_NUM_MMBRS 0 +static const char names_str[] = XDP_GENERIC_HINTS_NAMES "yet_another_timestamp\0"; + +/** + * struct igc_xdp_hints { + * { generic_xdp_hints } + * } + */ + +static const u32 igc_xdp_hints_raw[] = { + XDP_GENERIC_HINTS_TYPES, + XDP_GENERIC_HINTS_STRUCT(IGC_XDP_HINTS_NUM_MMBRS, 0), + XDP_GENERIC_HINTS_MEMBERS(0), +}; + +static int igc_xdp_register_btf(struct igc_adapter *priv) +{ + unsigned int type_sec_sz, str_sec_sz; + char *types_sec, *str_sec; + struct btf_header *hdr; + unsigned int btf_size; + void *raw_btf = NULL; + int err = 0; + + type_sec_sz = sizeof(igc_xdp_hints_raw); + str_sec_sz = sizeof(names_str); + + btf_size = sizeof(*hdr) + type_sec_sz + str_sec_sz; + raw_btf = kzalloc(btf_size, GFP_KERNEL); + if (!raw_btf) + return -ENOMEM; + + hdr = raw_btf; + hdr->magic = BTF_MAGIC; + hdr->version = BTF_VERSION; + hdr->hdr_len = sizeof(*hdr); + hdr->type_off = 0; + hdr->type_len = type_sec_sz; + hdr->str_off = type_sec_sz; + hdr->str_len = str_sec_sz; + + types_sec = raw_btf + sizeof(*hdr); + str_sec = types_sec + type_sec_sz; + memcpy(types_sec, igc_xdp_hints_raw, type_sec_sz); + memcpy(str_sec, names_str, str_sec_sz); + + priv->btf = btf_register(raw_btf, btf_size); + if (IS_ERR(priv->btf)) { + err = PTR_ERR(priv->btf); + priv->btf = NULL; + netdev_err(priv->netdev, "failed to register BTF MD, err (%d)\n", err); + } + + kfree(raw_btf); + return err; +} + +int igc_xdp_query_btf(struct net_device *dev, u8 *enabled) +{ + struct igc_adapter *priv = netdev_priv(dev); + u32 md_btf_id = 0; + + if (!IS_ENABLED(CONFIG_BPF_SYSCALL)) + return md_btf_id; + + if (!priv->btf) + igc_xdp_register_btf(priv); + + *enabled = !!priv->btf_enabled; + md_btf_id = priv->btf ? btf_obj_id(priv->btf) : 0; + + return md_btf_id; +} + +int igc_xdp_set_btf_md(struct net_device *dev, u8 enable) +{ + struct igc_adapter *priv = netdev_priv(dev); + int err = 0; + + if (enable && !priv->btf) { + igc_xdp_register_btf(priv); + if (!priv->btf) { + err = -EINVAL; + goto unlock; + } + } + + priv->btf_enabled = enable; +unlock: + return err; +} + int igc_xdp_set_prog(struct igc_adapter *adapter, struct bpf_prog *prog, struct netlink_ext_ack *extack) { diff --git a/drivers/net/ethernet/intel/igc/igc_xdp.h b/drivers/net/ethernet/intel/igc/igc_xdp.h index a74e5487d199..2bf591f42cec 100644 --- a/drivers/net/ethernet/intel/igc/igc_xdp.h +++ b/drivers/net/ethernet/intel/igc/igc_xdp.h @@ -4,6 +4,8 @@ #ifndef _IGC_XDP_H_ #define _IGC_XDP_H_ +#include <linux/btf.h> + int igc_xdp_set_prog(struct igc_adapter *adapter, struct bpf_prog *prog, struct netlink_ext_ack *extack); int igc_xdp_setup_pool(struct igc_adapter *adapter, struct xsk_buff_pool *pool, @@ -14,4 +16,13 @@ static inline bool igc_xdp_is_enabled(struct igc_adapter *adapter) return !!adapter->xdp_prog; } +int igc_xdp_query_btf(struct net_device *dev, u8 *enabled); +int igc_xdp_set_btf_md(struct net_device *dev, u8 enable); + +struct xdp_hints___igc { + XDP_GENERIC_HINTS_STRUCT_MEMBERS; +} __packed; + +#define IGC_XDP_HINT_DMA_TIMESTAMP BIT(XDP_GENERIC_HINTS_BIT_MAX + 1) + #endif /* _IGC_XDP_H_ */ -- 2.32.0
next prev parent reply other threads:[~2021-08-03 1:03 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-03 1:03 [[RFC xdp-hints] 00/16] XDP hints and AF_XDP support Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 01/16] bpf: add btf register/unregister API Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 02/16] net/core: XDP metadata BTF netlink API Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 03/16] tools/bpf: Query XDP metadata BTF ID Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 04/16] tools/bpf: Add xdp set command for md btf Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 05/16] igc: Fix race condition in PTP Tx code Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 06/16] igc: Retrieve the TX timestamp directly (instead of in a interrupt) Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 07/16] igc: Add support for multiple in-flight TX timestamps Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 08/16] igc: Use irq safe locks for timestamping Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 09/16] net/xdp: Support for generic XDP hints Ederson de Souza 2021-08-03 1:03 ` Ederson de Souza [this message] 2021-08-03 1:03 ` [[RFC xdp-hints] 11/16] igc: XDP packet TX timestamp Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 12/16] ethtool,igc: Add "xdp_headroom" driver info Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 13/16] libbpf: Helpers to access XDP frame metadata Ederson de Souza 2021-08-06 22:59 ` Andrii Nakryiko 2021-08-19 11:47 ` Toke Høiland-Jørgensen 2021-08-03 1:03 ` [[RFC xdp-hints] 14/16] libbpf: Helpers to access XDP hints based on BTF definitions Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 15/16] samples/bpf: XDP hints AF_XDP example Ederson de Souza 2021-08-03 1:03 ` [[RFC xdp-hints] 16/16] samples/bpf: Show XDP hints usage Ederson de Souza 2021-08-06 23:14 ` Andrii Nakryiko 2021-08-03 9:12 ` [[RFC xdp-hints] 00/16] XDP hints and AF_XDP support Alexander Lobakin 2021-08-03 15:23 ` John Fastabend 2021-08-04 15:15 ` Alexander Lobakin 2021-08-04 23:45 ` John Fastabend 2021-08-13 22:04 ` Desouza, Ederson
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=20210803010331.39453-11-ederson.desouza@intel.com \ --to=ederson.desouza@intel.com \ --cc=bpf@vger.kernel.org \ --cc=xdp-hints@xdp-project.net \ --subject='Re: [[RFC xdp-hints] 10/16] igc: XDP packet RX timestamp' \ /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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox