[Draft] Get vmlinux id without syscall

drivers/net/ethernet/intel/ice/ice.h

@@ -424,6 +424,9 @@ struct ice_vsi {
 
 	struct ice_channel *ch;
 
+	u8 xdp_metadata_support:1;	 /* true if VSI should support xdp meta */
+	struct xdp_meta_tail xdp_meta_tail;
+
 	/* setup back reference, to which aggregator node this VSI
 	 * corresponds to
 	 */

drivers/net/ethernet/intel/ice/ice_main.c

@@ -2607,6 +2607,21 @@ static void ice_vsi_assign_bpf_prog(struct ice_vsi *vsi, struct bpf_prog *prog)
 		WRITE_ONCE(vsi->rx_rings[i]->xdp_prog, vsi->xdp_prog);
 }
 
+static void ice_xdp_rings_set_metadata(const struct ice_vsi *vsi)
+{
+	int i;
+
+	ice_for_each_rxq(vsi, i) {
+		vsi->rx_rings[i]->xdp_metadata_support = vsi->xdp_metadata_support;
+		vsi->rx_rings[i]->xdp_meta_tail = vsi->xdp_meta_tail;
+	}
+
+	for (i = 0; i < vsi->num_xdp_txq; i++) {
+		vsi->xdp_rings[i]->xdp_metadata_support = vsi->xdp_metadata_support;
+		vsi->xdp_rings[i]->xdp_meta_tail = vsi->xdp_meta_tail;
+	}
+}
+
 /**
  * ice_prepare_xdp_rings - Allocate, configure and setup Tx rings for XDP
  * @vsi: VSI to bring up Tx rings used by XDP
@@ -2650,6 +2665,8 @@ int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog)
 	if (ice_xdp_alloc_setup_rings(vsi))
 		goto clear_xdp_rings;
 
+	ice_xdp_rings_set_metadata(vsi);
+
 	/* follow the logic from ice_vsi_map_rings_to_vectors */
 	ice_for_each_q_vector(vsi, v_idx) {
 		struct ice_q_vector *q_vector = vsi->q_vectors[v_idx];
@@ -2842,7 +2859,7 @@ int ice_vsi_determine_xdp_res(struct ice_vsi *vsi)
  */
 static int
 ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
-		   struct netlink_ext_ack *extack)
+		   struct netlink_ext_ack *extack, u32 flags)
 {
 	int frame_size = vsi->netdev->mtu + ICE_ETH_PKT_HDR_PAD;
 	bool if_running = netif_running(vsi->netdev);
@@ -2862,6 +2879,18 @@ ice_xdp_setup_prog(struct ice_vsi *vsi, struct bpf_prog *prog,
 		}
 	}
 
+	if (flags & XDP_FLAGS_USE_METADATA) {
+		vsi->xdp_metadata_support = true;
+		ret = xdp_meta_fill_id_magic(&vsi->xdp_meta_tail, THIS_MODULE,
+					     "xdp_meta_generic");
+		if (ret) {
+			NL_SET_ERR_MSG_MOD(extack, "Could not fill in xdp meta tail");
+			vsi->xdp_metadata_support = false;
+		}
+	} else {
+		vsi->xdp_metadata_support = false;
+	}
+
 	if (!ice_is_xdp_ena_vsi(vsi) && prog) {
 		xdp_ring_err = ice_vsi_determine_xdp_res(vsi);
 		if (xdp_ring_err) {
@@ -2924,7 +2953,7 @@ static int ice_xdp(struct net_device *dev, struct netdev_bpf *xdp)
 
 	switch (xdp->command) {
 	case XDP_SETUP_PROG:
-		return ice_xdp_setup_prog(vsi, xdp->prog, xdp->extack);
+		return ice_xdp_setup_prog(vsi, xdp->prog, xdp->extack, xdp->flags);
 	case XDP_SETUP_XSK_POOL:
 		return ice_xsk_pool_setup(vsi, xdp->xsk.pool,
 					  xdp->xsk.queue_id);

drivers/net/ethernet/intel/ice/ice_txrx.c

@@ -1184,6 +1184,10 @@ int ice_clean_rx_irq(struct ice_rx_ring *rx_ring, int budget)
 		hard_start = page_address(rx_buf->page) + rx_buf->page_offset -
 			     offset;
 		xdp_prepare_buff(&xdp, hard_start, offset, size, true);
+
+		if (likely(rx_ring->xdp_metadata_support))
+			ice_xdp_set_meta(&xdp, rx_desc, rx_ring->xdp_meta_tail);
+
 #if (PAGE_SIZE > 4096)
 		/* At larger PAGE_SIZE, frame_sz depend on len size */
 		xdp.frame_sz = ice_rx_frame_truesize(rx_ring, size);

drivers/net/ethernet/intel/ice/ice_txrx.h

@@ -294,6 +294,10 @@ struct ice_rx_ring {
 	struct xsk_buff_pool *xsk_pool;
 	struct sk_buff *skb;
 	dma_addr_t dma;			/* physical address of ring */
+
+	u8 xdp_metadata_support:1;	/* is xdp metadata supported */
+	struct xdp_meta_tail xdp_meta_tail;
+
 #define ICE_RX_FLAGS_RING_BUILD_SKB	BIT(1)
 	u64 cached_phctime;
 	u8 dcb_tc;			/* Traffic class of ring */
@@ -322,6 +326,7 @@ struct ice_tx_ring {
 	u16 reg_idx;			/* HW register index of the ring */
 	u16 count;			/* Number of descriptors */
 	u16 q_index;			/* Queue number of ring */
+
 	/* stats structs */
 	struct ice_txq_stats tx_stats;
 	/* CL3 - 3rd cacheline starts here */
@@ -335,6 +340,10 @@ struct ice_tx_ring {
 	u32 txq_teid;			/* Added Tx queue TEID */
 	/* CL4 - 4th cacheline starts here */
 	u16 xdp_tx_active;
+
+	u8 xdp_metadata_support:1;	/* is xdp metadata supported */
+	struct xdp_meta_tail xdp_meta_tail;
+
 #define ICE_TX_FLAGS_RING_XDP		BIT(0)
 #define ICE_TX_FLAGS_RING_VLAN_L2TAG1	BIT(1)
 #define ICE_TX_FLAGS_RING_VLAN_L2TAG2	BIT(2)

drivers/net/ethernet/intel/ice/ice_txrx_lib.h

@@ -70,6 +70,32 @@ static inline void ice_xdp_ring_update_tail(struct ice_tx_ring *xdp_ring)
 	writel_relaxed(xdp_ring->next_to_use, xdp_ring->tail);
 }
 
+static inline void ice_xdp_set_meta(struct xdp_buff *xdp, const union ice_32b_rx_flex_desc *desc,
+				    const struct xdp_meta_tail tail)
+{
+	const struct ice_32b_rx_flex_desc_nic *flex = (struct ice_32b_rx_flex_desc_nic *)desc;
+	struct xdp_meta_generic *md = xdp->data - sizeof(struct xdp_meta_generic);
+
+	/* Fields are already in little endian*/
+	md->rx_vid = flex->flex_ts.flex.vlan_id;
+	md->rx_hash = flex->rss_hash;
+
+	md->rx_flags = 0;
+	md->rx_qid = 0;
+	md->rx_csum = 0;
+	md->rx_tstamp = 0;
+
+	md->tx_flags = 0;
+	md->tx_csum_off = 0;
+	md->tx_vid = 0;
+
+	md->btf_id = tail.btf_id;
+	md->type_id = tail.type_id;
+	md->magic = tail.magic;
+
+	xdp->data_meta = md;
+}
+
 void ice_finalize_xdp_rx(struct ice_tx_ring *xdp_ring, unsigned int xdp_res);
 int ice_xmit_xdp_buff(struct xdp_buff *xdp, struct ice_tx_ring *xdp_ring);
 int ice_xmit_xdp_ring(void *data, u16 size, struct ice_tx_ring *xdp_ring);

include/linux/btf.h

@@ -117,6 +117,7 @@ u32 btf_obj_id(const struct btf *btf);
 bool btf_is_kernel(const struct btf *btf);
 bool btf_is_module(const struct btf *btf);
 struct module *btf_try_get_module(const struct btf *btf);
+struct btf *btf_get_module_btf(const struct module *module);
 u32 btf_nr_types(const struct btf *btf);
 bool btf_member_is_reg_int(const struct btf *btf, const struct btf_type *s,
 			   const struct btf_member *m,

include/net/xdp.h

@@ -245,6 +245,15 @@ struct sk_buff *xdp_build_skb_from_frame(struct xdp_frame *xdpf,
 int xdp_alloc_skb_bulk(void **skbs, int n_skb, gfp_t gfp);
 struct xdp_frame *xdpf_clone(struct xdp_frame *xdpf);
 
+struct xdp_meta_tail {
+	__le32 btf_id;
+	__le32 type_id;
+	__le32 magic;
+};
+
+int xdp_meta_fill_id_magic(struct xdp_meta_tail *tail, const struct module *mod,
+			   const char *type_name);
+
 static inline
 void xdp_convert_frame_to_buff(struct xdp_frame *frame, struct xdp_buff *xdp)
 {
@@ -395,7 +404,7 @@ xdp_data_meta_unsupported(const struct xdp_buff *xdp)
 
 static inline bool xdp_metalen_invalid(unsigned long metalen)
 {
-	return (metalen & (sizeof(__u32) - 1)) || (metalen > 32);
+	return (metalen & (sizeof(__u32) - 1)) || (metalen > 256);
 }
 
 struct xdp_attachment_info {

include/uapi/linux/bpf.h

@@ -6634,4 +6634,58 @@ struct bpf_core_relo {
 	enum bpf_core_relo_kind kind;
 };
 
+enum {
+	XDP_META_RX_QID_BIT = (0x1 << 9),
+	XDP_META_RX_TSTAMP_BIT = (0x1 << 8),
+	XDP_META_RX_VLAN_TYPE = (0x3 << 6),
+	XDP_META_RX_VLAN_NONE = 0x0,
+	XDP_META_RX_CVID = 0x1,
+	XDP_META_RX_SVID = 0x2,
+	XDP_META_RX_HASH_TYPE = (0x3 << 4),
+	XDP_META_RX_HASH_NONE = 0x0,
+	XDP_META_RX_HASH_L2 = 0x1,
+	XDP_META_RX_HASH_L3 = 0x2,
+	XDP_META_RX_HASH_L4 = 0x3,
+	XDP_META_RX_CSUM_LEVEL = (0x3 << 2),
+	XDP_META_RX_CSUM_STATUS = (0x3 << 0),
+	XDP_META_RX_CSUM_NONE = 0x0,
+	XDP_META_RX_CSUM_OK = 0x1,
+	XDP_META_RX_CSUM_COMP = 0x2,
+	XDP_META_TX_VLAN_TYPE = (0x3 << 1),
+	XDP_META_TX_CVID = 0x1,
+	XDP_META_TX_SVID = 0x2,
+	XDP_META_TX_CSUM_BIT = (0x1 << 0),
+	XDP_META_GENERIC_MAGIC = 0xe4a6327d,
+	XDP_META_ALIGN = 8,
+};
+
+struct xdp_meta_generic {
+	__u8 padding[4];
+
+	/* Add new fields here */
+
+	/* Ingress */
+	__le32 rx_flags;
+
+	__le16 rx_qid;
+	__le16 rx_vid;
+	__le32 rx_csum;
+	__le32 rx_hash;
+	__le64 rx_tstamp;
+
+	/* Egress */
+
+	__le32 tx_flags;
+
+	__le16 tx_csum_off;
+	__le16 tx_vid;
+
+	/* Unique identifiers */
+	__le32 btf_id;
+	__le32 type_id;
+	__le32 magic;
+}
+__attribute__((__packed__))			/* Might be composed directly by HW */
+__attribute__((aligned(XDP_META_ALIGN)));	/* Resides before Eth header, padded/aligned */
+
 #endif /* _UAPI__LINUX_BPF_H__ */

include/uapi/linux/if_link.h

@@ -1275,11 +1275,13 @@ enum {
 #define XDP_FLAGS_DRV_MODE		(1U << 2)
 #define XDP_FLAGS_HW_MODE		(1U << 3)
 #define XDP_FLAGS_REPLACE		(1U << 4)
+#define XDP_FLAGS_USE_METADATA		(1U << 5)
 #define XDP_FLAGS_MODES			(XDP_FLAGS_SKB_MODE | \
 					 XDP_FLAGS_DRV_MODE | \
 					 XDP_FLAGS_HW_MODE)
 #define XDP_FLAGS_MASK			(XDP_FLAGS_UPDATE_IF_NOEXIST | \
-					 XDP_FLAGS_MODES | XDP_FLAGS_REPLACE)
+					 XDP_FLAGS_MODES | XDP_FLAGS_REPLACE | \
+					 XDP_FLAGS_USE_METADATA)
 
 /* These are stored into IFLA_XDP_ATTACHED on dump. */
 enum {

kernel/bpf/btf.c

@@ -6576,7 +6576,7 @@ struct module *btf_try_get_module(const struct btf *btf)
 /* Returns struct btf corresponding to the struct module.
  * This function can return NULL or ERR_PTR.
  */
-static struct btf *btf_get_module_btf(const struct module *module)
+struct btf *btf_get_module_btf(const struct module *module)
 {
 #ifdef CONFIG_DEBUG_INFO_BTF_MODULES
 	struct btf_module *btf_mod, *tmp;

kernel/bpf/cpumap.c

@@ -215,6 +215,7 @@ static int cpu_map_bpf_prog_run_xdp(struct bpf_cpu_map_entry *rcpu,
 {
 	struct xdp_rxq_info rxq;
 	struct xdp_buff xdp;
+	volatile struct xdp_meta_generic xdp_meta_generic;
 	int i, nframes = 0;
 
 	xdp_set_return_frame_no_direct();

net/core/xdp.c

@@ -4,6 +4,7 @@
  * Copyright (c) 2017 Jesper Dangaard Brouer, Red Hat Inc.
  */
 #include <linux/bpf.h>
+#include <linux/btf.h>
 #include <linux/filter.h>
 #include <linux/types.h>
 #include <linux/mm.h>
@@ -711,3 +712,39 @@ struct xdp_frame *xdpf_clone(struct xdp_frame *xdpf)
 
 	return nxdpf;
 }
+
+int xdp_meta_fill_id_magic(struct xdp_meta_tail *tail, const struct module *mod,
+			   const char *type_name)
+{
+	struct btf *btf = NULL, *vmlinux;
+	int id, err = 0;
+	u32 vmlinux_len;
+
+	vmlinux = bpf_get_btf_vmlinux();
+	if (IS_ERR(vmlinux))
+		return PTR_ERR(vmlinux);
+
+	btf = btf_get_module_btf(mod);
+	if (IS_ERR(btf))
+		return PTR_ERR(btf);
+	else if (!btf)
+		btf = vmlinux;
+
+	id = btf_find_by_name_kind(btf, type_name, BTF_KIND_STRUCT);
+	if (id < 0) {
+		err = id;
+		goto put;
+	}
+
+	tail->type_id = cpu_to_le32(id);
+	tail->magic = cpu_to_le32(XDP_META_GENERIC_MAGIC);
+
+	vmlinux_len = btf_nr_types(vmlinux);
+	tail->btf_id = cpu_to_le32(btf_obj_id(id < vmlinux_len ? vmlinux : btf));
+put:
+	if (btf_is_module(btf))
+		btf_put(btf);
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(xdp_meta_fill_id_magic);

samples/bpf/Makefile

@@ -59,6 +59,7 @@ tprogs-y += xdp_redirect_map_multi
 tprogs-y += xdp_redirect_map
 tprogs-y += xdp_redirect
 tprogs-y += xdp_monitor
+tprogs-y += xdp_meta
 
 # Libbpf dependencies
 LIBBPF_SRC = $(TOOLS_PATH)/lib/bpf
@@ -124,6 +125,7 @@ xdp_redirect_cpu-objs := xdp_redirect_cpu_user.o $(XDP_SAMPLE)
 xdp_redirect_map-objs := xdp_redirect_map_user.o $(XDP_SAMPLE)
 xdp_redirect-objs := xdp_redirect_user.o $(XDP_SAMPLE)
 xdp_monitor-objs := xdp_monitor_user.o $(XDP_SAMPLE)
+xdp_meta-objs := xdp_meta_user.o $(XDP_SAMPLE)
 
 # Tell kbuild to always build the programs
 always-y := $(tprogs-y)
@@ -220,6 +222,7 @@ TPROGLDLIBS_xdp_redirect	+= -lm
 TPROGLDLIBS_xdp_redirect_cpu	+= -lm
 TPROGLDLIBS_xdp_redirect_map	+= -lm
 TPROGLDLIBS_xdp_redirect_map_multi += -lm
+TPROGLDLIBS_xdp_meta 		+= -lm
 TPROGLDLIBS_tracex4		+= -lrt
 TPROGLDLIBS_trace_output	+= -lrt
 TPROGLDLIBS_map_perf_test	+= -lrt
@@ -342,6 +345,7 @@ $(obj)/xdp_redirect_map_multi_user.o: $(obj)/xdp_redirect_map_multi.skel.h
 $(obj)/xdp_redirect_map_user.o: $(obj)/xdp_redirect_map.skel.h
 $(obj)/xdp_redirect_user.o: $(obj)/xdp_redirect.skel.h
 $(obj)/xdp_monitor_user.o: $(obj)/xdp_monitor.skel.h
+$(obj)/xdp_meta_user.o: $(obj)/xdp_meta.skel.h
 
 $(obj)/tracex5_kern.o: $(obj)/syscall_nrs.h
 $(obj)/hbm_out_kern.o: $(src)/hbm.h $(src)/hbm_kern.h
@@ -409,14 +413,16 @@ $(obj)/%.bpf.o: $(src)/%.bpf.c $(obj)/vmlinux.h $(src)/xdp_sample.bpf.h $(src)/x
 		-c $(filter %.bpf.c,$^) -o $@
 
 LINKED_SKELS := xdp_redirect_cpu.skel.h xdp_redirect_map_multi.skel.h \
-		xdp_redirect_map.skel.h xdp_redirect.skel.h xdp_monitor.skel.h
+		xdp_redirect_map.skel.h xdp_redirect.skel.h xdp_monitor.skel.h \
+		xdp_meta.skel.h
 clean-files += $(LINKED_SKELS)
 
 xdp_redirect_cpu.skel.h-deps := xdp_redirect_cpu.bpf.o xdp_sample.bpf.o
 xdp_redirect_map_multi.skel.h-deps := xdp_redirect_map_multi.bpf.o xdp_sample.bpf.o
 xdp_redirect_map.skel.h-deps := xdp_redirect_map.bpf.o xdp_sample.bpf.o
 xdp_redirect.skel.h-deps := xdp_redirect.bpf.o xdp_sample.bpf.o
 xdp_monitor.skel.h-deps := xdp_monitor.bpf.o xdp_sample.bpf.o
+xdp_meta.skel.h-deps := xdp_meta.bpf.o
 
 LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.bpf.c,$(foreach skel,$(LINKED_SKELS),$($(skel)-deps)))