net: struct netdev_rx_queue and xdp.h reshuffling
Subsystems (24)
Jakub Kicinski
maintainerv2 cover net: struct netdev_rx_queue and xdp.h reshuffling
While poking at struct netdev_rx_queue I got annoyed by the huge rebuild times. I split it out from netdevice.h and then realized that it was the main reason we included xdp.h in there. So I removed that dependency as well.
This gives us very pleasant build times for both xdp.h and struct netdev_rx_queue changes.
I'm sending this for bpf-next because I think it'd be easiest if it goes in there, and then bpf-next gets flushed soon after? I can also make a branch on merge-base for net-next and bpf-next..
v2:
- build fix
- reorder some includes
v1: https://lore.kernel.org/all/[email protected]/
Jakub Kicinski (3):
eth: add missing xdp.h includes in drivers
net: move struct netdev_rx_queue out of netdevice.h
net: invert the netdevice.h vs xdp.h dependency
drivers/net/bonding/bond_main.c | 1 + drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + drivers/net/ethernet/engleder/tsnep.h | 1 + .../net/ethernet/freescale/dpaa2/dpaa2-eth.h | 1 + drivers/net/ethernet/freescale/enetc/enetc.h | 1 + drivers/net/ethernet/freescale/fec.h | 1 + .../ethernet/fungible/funeth/funeth_txrx.h | 1 + drivers/net/ethernet/google/gve/gve.h | 1 + drivers/net/ethernet/intel/igc/igc.h | 1 + .../ethernet/microchip/lan966x/lan966x_main.h | 1 + drivers/net/ethernet/microsoft/mana/mana_en.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + drivers/net/ethernet/ti/cpsw_priv.h | 1 + drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/tap.c | 1 + drivers/net/virtio_net.c | 1 + include/linux/filter.h | 17 ------ include/linux/netdevice.h | 55 ++----------------- include/net/busy_poll.h | 1 + include/net/mana/mana.h | 2 + include/net/netdev_rx_queue.h | 53 ++++++++++++++++++ include/net/xdp.h | 29 ++++++++-- include/trace/events/xdp.h | 1 + kernel/bpf/btf.c | 1 + kernel/bpf/offload.c | 1 + kernel/bpf/verifier.c | 1 + net/bpf/test_run.c | 1 + net/core/dev.c | 1 + net/core/net-sysfs.c | 1 + net/netfilter/nf_conntrack_bpf.c | 1 + net/xdp/xsk.c | 1 + 31 files changed, 110 insertions(+), 72 deletions(-) create mode 100644 include/net/netdev_rx_queue.h
Signature · 1 line
2.41.0
Jakub Kicinski
maintainerPATCH v2 1/3 eth: add missing xdp.h includes in drivers
Handful of drivers currently expect to get xdp.h by virtue of including netdevice.h. This will soon no longer be the case so add explicit includes.
---
v2: try a little harder with the alphabetic order of includes
--- drivers/net/bonding/bond_main.c | 1 + drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + drivers/net/ethernet/engleder/tsnep.h | 1 + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 1 + drivers/net/ethernet/freescale/enetc/enetc.h | 1 + drivers/net/ethernet/freescale/fec.h | 1 + drivers/net/ethernet/fungible/funeth/funeth_txrx.h | 1 + drivers/net/ethernet/google/gve/gve.h | 1 + drivers/net/ethernet/intel/igc/igc.h | 1 + drivers/net/ethernet/microchip/lan966x/lan966x_main.h | 1 + drivers/net/ethernet/microsoft/mana/mana_en.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + drivers/net/ethernet/ti/cpsw_priv.h | 1 + drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/tap.c | 1 + include/net/mana/mana.h | 2 ++ 16 files changed, 17 insertions(+)
drivers/net/bonding/bond_main.c +1 -0
@@ -90,6 +90,7 @@#include <net/tls.h> #endif #include <net/ip6_route.h> +#include <net/xdp.h> #include "bonding_priv.h"
drivers/net/ethernet/amazon/ena/ena_netdev.h +1 -0
@@ -14,6 +14,7 @@#include <linux/interrupt.h> #include <linux/netdevice.h> #include <linux/skbuff.h> +#include <net/xdp.h> #include <uapi/linux/bpf.h> #include "ena_com.h"
drivers/net/ethernet/engleder/tsnep.h +1 -0
@@ -14,6 +14,7 @@#include <linux/net_tstamp.h> #include <linux/ptp_clock_kernel.h> #include <linux/miscdevice.h> +#include <net/xdp.h> #define TSNEP "tsnep"
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +1 -0
@@ -12,6 +12,7 @@#include <linux/fsl/mc.h> #include <linux/net_tstamp.h> #include <net/devlink.h> +#include <net/xdp.h> #include <soc/fsl/dpaa2-io.h> #include <soc/fsl/dpaa2-fd.h>
drivers/net/ethernet/freescale/enetc/enetc.h +1 -0
@@ -11,6 +11,7 @@#include <linux/if_vlan.h> #include <linux/phylink.h> #include <linux/dim.h> +#include <net/xdp.h> #include "enetc_hw.h"
drivers/net/ethernet/freescale/fec.h +1 -0
@@ -22,6 +22,7 @@#include <linux/timecounter.h> #include <dt-bindings/firmware/imx/rsrc.h> #include <linux/firmware/imx/sci.h> +#include <net/xdp.h> #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \
drivers/net/ethernet/fungible/funeth/funeth_txrx.h +1 -0
@@ -5,6 +5,7 @@#include <linux/netdevice.h> #include <linux/u64_stats_sync.h> +#include <net/xdp.h> /* Tx descriptor size */ #define FUNETH_SQE_SIZE 64U
drivers/net/ethernet/google/gve/gve.h +1 -0
@@ -11,6 +11,7 @@#include <linux/netdevice.h> #include <linux/pci.h> #include <linux/u64_stats_sync.h> +#include <net/xdp.h> #include "gve_desc.h" #include "gve_desc_dqo.h"
drivers/net/ethernet/intel/igc/igc.h +1 -0
@@ -15,6 +15,7 @@#include <linux/net_tstamp.h> #include <linux/bitfield.h> #include <linux/hrtimer.h> +#include <net/xdp.h> #include "igc_hw.h"
drivers/net/ethernet/microchip/lan966x/lan966x_main.h +1 -0
@@ -14,6 +14,7 @@#include <net/pkt_cls.h> #include <net/pkt_sched.h> #include <net/switchdev.h> +#include <net/xdp.h> #include <vcap_api.h> #include <vcap_api_client.h>
drivers/net/ethernet/microsoft/mana/mana_en.c +1 -0
@@ -11,6 +11,7 @@#include <net/checksum.h> #include <net/ip6_checksum.h> +#include <net/xdp.h> #include <net/mana/mana.h> #include <net/mana/mana_auxiliary.h>
drivers/net/ethernet/stmicro/stmmac/stmmac.h +1 -0
@@ -22,6 +22,7 @@#include <linux/net_tstamp.h> #include <linux/reset.h> #include <net/page_pool.h> +#include <net/xdp.h> #include <uapi/linux/bpf.h> struct stmmac_resources {
drivers/net/ethernet/ti/cpsw_priv.h +1 -0
@@ -6,6 +6,7 @@#ifndef DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_ #define DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_ +#include <net/xdp.h> #include <uapi/linux/bpf.h> #include "davinci_cpdma.h"
drivers/net/hyperv/hyperv_net.h +1 -0
@@ -16,6 +16,7 @@#include <linux/hyperv.h> #include <linux/rndis.h> #include <linux/jhash.h> +#include <net/xdp.h> /* RSS related */ #define OID_GEN_RECEIVE_SCALE_CAPABILITIES 0x00010203/* query only */
drivers/net/tap.c +1 -0
@@ -22,6 +22,7 @@#include <net/net_namespace.h> #include <net/rtnetlink.h> #include <net/sock.h> +#include <net/xdp.h> #include <linux/virtio_net.h> #include <linux/skb_array.h>
include/net/mana/mana.h +2 -0
@@ -4,6 +4,8 @@#ifndef _MANA_H#define _MANA_H +#include <net/xdp.h> +#include "gdma.h" #include "hw_channel.h"
Signature · 1 line
2.41.0
Re: [PATCH bpf-next v2 1/3] eth: add missing xdp.h includes in drivers
Quoted 8 lines · Jakub Kicinski
Handful of drivers currently expect to get
xdp.hby virtue of includingnetdevice.h. This will soon no longer be the case so add explicit includes.Reviewed-by Wei Fang<[email protected]>Reviewed-by Gerhard Engleder<[email protected]>Signed-off-by Jakub Kicinski<[email protected]>---
LGTM
Re: [PATCH bpf-next v2 1/3] eth: add missing xdp.h includes in drivers
In reply to Jakub KicinskiQuoted 9 lines · Jakub Kicinski
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Handful of drivers currently expect to get
xdp.hby virtue of includingnetdevice.h. This will soon no longer be the case so add explicit includes.Reviewed-by Wei Fang <[email protected]>Reviewed-by Gerhard Engleder <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>
Quoted 254 lines
---
v2: try a little harder with the alphabetic order of includes--- drivers/net/bonding/bond_main.c | 1 + drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + drivers/net/ethernet/engleder/tsnep.h | 1 + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 1 + drivers/net/ethernet/freescale/enetc/enetc.h | 1 + drivers/net/ethernet/freescale/fec.h | 1 + drivers/net/ethernet/fungible/funeth/funeth_txrx.h | 1 + drivers/net/ethernet/google/gve/gve.h | 1 + drivers/net/ethernet/intel/igc/igc.h | 1 + drivers/net/ethernet/microchip/lan966x/lan966x_main.h | 1 + drivers/net/ethernet/microsoft/mana/mana_en.c | 1 + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + drivers/net/ethernet/ti/cpsw_priv.h | 1 + drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/tap.c | 1 + include/net/mana/mana.h | 2 ++ 16 files changed, 17 insertions(+)drivers/net/bonding/bond_main.c +1
-0@@ -90,6 +90,7 @@#include <net/tls.h> #endif #include <net/ip6_route.h> +#include <net/xdp.h> #include "bonding_priv.h" drivers/net/ethernet/amazon/ena/ena_netdev.h +1
-0@@ -14,6 +14,7 @@#include <linux/interrupt.h> #include <linux/netdevice.h> #include <linux/skbuff.h> +#include <net/xdp.h> #include <uapi/linux/bpf.h> #include "ena_com.h" drivers/net/ethernet/engleder/tsnep.h +1
-0@@ -14,6 +14,7 @@#include <linux/net_tstamp.h> #include <linux/ptp_clock_kernel.h> #include <linux/miscdevice.h> +#include <net/xdp.h> #define TSNEP "tsnep"drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h +1
-0@@ -12,6 +12,7 @@#include <linux/fsl/mc.h> #include <linux/net_tstamp.h> #include <net/devlink.h> +#include <net/xdp.h> #include <soc/fsl/dpaa2-io.h> #include <soc/fsl/dpaa2-fd.h> drivers/net/ethernet/freescale/enetc/enetc.h +1
-0@@ -11,6 +11,7 @@#include <linux/if_vlan.h> #include <linux/phylink.h> #include <linux/dim.h> +#include <net/xdp.h> #include "enetc_hw.h" drivers/net/ethernet/freescale/fec.h +1
-0@@ -22,6 +22,7 @@#include <linux/timecounter.h> #include <dt-bindings/firmware/imx/rsrc.h> #include <linux/firmware/imx/sci.h> +#include <net/xdp.h> #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) || \ defined(CONFIG_M520x) || defined(CONFIG_M532x) || defined(CONFIG_ARM) || \drivers/net/ethernet/fungible/funeth/funeth_txrx.h +1
-0@@ -5,6 +5,7 @@#include <linux/netdevice.h> #include <linux/u64_stats_sync.h> +#include <net/xdp.h> /* Tx descriptor size */ #define FUNETH_SQE_SIZE 64Udrivers/net/ethernet/google/gve/gve.h +1
-0@@ -11,6 +11,7 @@#include <linux/netdevice.h> #include <linux/pci.h> #include <linux/u64_stats_sync.h> +#include <net/xdp.h> #include "gve_desc.h" #include "gve_desc_dqo.h" drivers/net/ethernet/intel/igc/igc.h +1
-0@@ -15,6 +15,7 @@#include <linux/net_tstamp.h> #include <linux/bitfield.h> #include <linux/hrtimer.h> +#include <net/xdp.h> #include "igc_hw.h" drivers/net/ethernet/microchip/lan966x/lan966x_main.h +1
-0@@ -14,6 +14,7 @@#include <net/pkt_cls.h> #include <net/pkt_sched.h> #include <net/switchdev.h> +#include <net/xdp.h> #include <vcap_api.h> #include <vcap_api_client.h> drivers/net/ethernet/microsoft/mana/mana_en.c +1
-0@@ -11,6 +11,7 @@#include <net/checksum.h> #include <net/ip6_checksum.h> +#include <net/xdp.h> #include <net/mana/mana.h> #include <net/mana/mana_auxiliary.h> drivers/net/ethernet/stmicro/stmmac/stmmac.h +1
-0@@ -22,6 +22,7 @@#include <linux/net_tstamp.h> #include <linux/reset.h> #include <net/page_pool.h> +#include <net/xdp.h> #include <uapi/linux/bpf.h> struct stmmac_resources {drivers/net/ethernet/ti/cpsw_priv.h +1
-0@@ -6,6 +6,7 @@#ifndef DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_ #define DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_ +#include <net/xdp.h> #include <uapi/linux/bpf.h> #include "davinci_cpdma.h" drivers/net/hyperv/hyperv_net.h +1
-0@@ -16,6 +16,7 @@#include <linux/hyperv.h> #include <linux/rndis.h> #include <linux/jhash.h> +#include <net/xdp.h> /* RSS related */ #define OID_GEN_RECEIVE_SCALE_CAPABILITIES 0x00010203/* query only */ drivers/net/tap.c +1
-0@@ -22,6 +22,7 @@#include <net/net_namespace.h> #include <net/rtnetlink.h> #include <net/sock.h> +#include <net/xdp.h> #include <linux/virtio_net.h> #include <linux/skb_array.h> include/net/mana/mana.h +2
-1@@ -4,6 +4,8 @@#ifndef _MANA_H#define _MANA_H +#include <net/xdp.h> +#include "gdma.h" #include "hw_channel.h" --2.41.0
Signature · 1 line
/Horatiu
Jakub Kicinski
maintainerPATCH v2 2/3 net: move struct netdev_rx_queue out of netdevice.h
In reply to Jakub Kicinskistruct netdev_rx_queue is touched in only a few places and having it defined in netdevice.h brings in the dependency on xdp.h, because struct xdp_rxq_info gets embedded in struct netdev_rx_queue.
In prep for removal of xdp.h from netdevice.h move all the netdev_rx_queue stuff to a new header.
We could technically break the new header up to avoid the sysfs.h include but it's so rarely included it doesn't seem to be worth it at this point.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/virtio_net.c | 1 + include/linux/netdevice.h | 44 ----------------------------- include/net/netdev_rx_queue.h | 53 +++++++++++++++++++++++++++++++++++ net/bpf/test_run.c | 1 + net/core/dev.c | 1 + net/core/net-sysfs.c | 1 + net/xdp/xsk.c | 1 + 7 files changed, 58 insertions(+), 44 deletions(-) create mode 100644 include/net/netdev_rx_queue.h
drivers/net/virtio_net.c +1 -0
@@ -22,6 +22,7 @@#include <net/route.h> #include <net/xdp.h> #include <net/net_failover.h> +#include <net/netdev_rx_queue.h> static int napi_weight =NAPI_POLL_WEIGHT ;module_param (napi_weight, int,0444 );
include/linux/netdevice.h +0 -44
56 lines not on this page · raw message
include/net/netdev_rx_queue.h new file +53 -0
53 lines not on this page · raw message
net/bpf/test_run.c +1 -0
@@ -20,6 +20,7 @@#include <linux/smp.h> #include <linux/sock_diag.h> #include <linux/netfilter.h> +#include <net/netdev_rx_queue.h> #include <net/xdp.h> #include <net/netfilter/nf_bpf_link.h>
net/core/dev.c +1 -0
@@ -152,6 +152,7 @@#include <linux/pm_runtime.h> #include <linux/prandom.h> #include <linux/once_lite.h> +#include <net/netdev_rx_queue.h> #include "dev.h" #include "net-sysfs.h"
net/core/net-sysfs.c +1 -0
@@ -23,6 +23,7 @@#include <linux/of.h> #include <linux/of_net.h> #include <linux/cpu.h> +#include <net/netdev_rx_queue.h> #include "dev.h" #include "net-sysfs.h"
net/xdp/xsk.c +1 -0
@@ -25,6 +25,7 @@#include <linux/vmalloc.h> #include <net/xdp_sock_drv.h> #include <net/busy_poll.h> +#include <net/netdev_rx_queue.h> #include <net/xdp.h> #include "xsk_queue.h"
Signature · 1 line
2.41.0
Re: [PATCH bpf-next v2 2/3] net: move struct netdev_rx_queue out of netdevice.h
Quoted 8 lines · Jakub Kicinski
struct
netdev_rx_queueis touched in only a few places and having it defined innetdevice.hbrings in the dependency onxdp.h, because structxdp_rxq_infogets embedded in structnetdev_rx_queue.In prep for removal of
xdp.hfromnetdevice.hmove all thenetdev_rx_queuestuff to a new header.
Quoted 7 lines
We could technically break the new header up to avoid the
sysfs.hinclude but it's so rarely included it doesn't seem to be worth it at this point.Reviewed-by Amritha Nambiar<[email protected]>Signed-off-by Jakub Kicinski<[email protected]>---
Re: [PATCH bpf-next v2 2/3] net: move struct netdev_rx_queue out of netdevice.h
In reply to Jakub KicinskiFrom: Jakub Kicinski <[email protected]>
Date: Wed, 2 Aug 2023 18:02:29 -0700
Quoted 4 lines
struct
netdev_rx_queueis touched in only a few places and having it defined innetdevice.hbrings in the dependency onxdp.h, because structxdp_rxq_infogets embedded in structnetdev_rx_queue.
[...]
Quoted 8 lines
include/net/netdev_rx_queue.h new file +8
-0+static inline struct netdev_rx_queue * +__netif_get_rx_queue (struct net_device *dev,unsigned int rxq) +{ +return dev->_rx + rxq; +} + +#ifdef CONFIG_SYSFS +static inline unsigned int
include/net/netdev_rx_queue.h line 53
Quoted 10 lines
include/net/netdev_rx_queue.h new file +10
-0+get_netdev_rx_queue_index(struct netdev_rx_queue *queue) +{ +struct net_device *dev = queue->dev; +int index = queue - dev->_rx; + +BUG_ON (index >= dev->num_rx_queues); +return index; +} +#endif +#endif
Looks a bit confusing :s Could you separate then by a NL and leave a comment near each one with the corresponding definition? Like
return index; }
#endif /* CONFIG_SYSFS */
#endif /* _LINUX_NETDEV_RX_QUEUE_H */
Maybe Alex could do that when applying, given that there are no more change requests.
net/bpf/test_run.c
Quoted 5 lines
net/bpf/test_run.c +0
-0@@ -20,6 +20,7 @@
[...]
Thanks,
Olek
Jakub Kicinski
maintainerPATCH v2 3/3 net: invert the netdevice.h vs xdp.h dependency
In reply to Jakub Kicinskixdp.h is far more specific and is included in only 67 other files vs netdevice.h's 1538 include sites.
Make xdp.h include netdevice.h, instead of the other way around. This decreases the incremental allmodconfig builds size when xdp.h is touched from 5947 to 662 objects.
Move bpf_prog_run_xdp() to xdp.h, seems appropriate and filter.h is a mega-header in its own right so it's nice to avoid xdp.h getting included there as well.
The only unfortunate part is that the typedef for xdp_features_t has to move to netdevice.h, since its embedded in struct netdevice.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- include/linux/filter.h | 17 ----------------- include/linux/netdevice.h | 11 ++++------- include/net/busy_poll.h | 1 + include/net/xdp.h | 29 +++++++++++++++++++++++++---- include/trace/events/xdp.h | 1 + kernel/bpf/btf.c | 1 + kernel/bpf/offload.c | 1 + kernel/bpf/verifier.c | 1 + net/netfilter/nf_conntrack_bpf.c | 1 + 9 files changed, 35 insertions(+), 28 deletions(-)
include/linux/filter.h +0 -17
@@ -774,23 +774,6 @@ DECLARE_STATIC_KEY_FALSE(bpf_master_redirect_enabled_key);u32 xdp_master_redirect (struct xdp_buff *xdp); -static __always_inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog, -struct xdp_buff *xdp) -{ -/* Driver XDP hooks are invoked within a single NAPI poll cycle and thus -* under local_bh_disable(), which provides the needed RCU protection -* for accessing map entries. -*/ -u32 act =__bpf_prog_run (prog, xdp,BPF_DISPATCHER_FUNC (xdp)); - -if (static_branch_unlikely (&bpf_master_redirect_enabled_key)) { -if (act ==XDP_TX &&netif_is_bond_slave (xdp->rxq->dev)) - act =xdp_master_redirect (xdp); - } - -return act; -} -void bpf_prog_change_xdp (struct bpf_prog *prev_prog,struct bpf_prog *prog);static inline u32 bpf_prog_insn_size (const struct bpf_prog *prog)
include/linux/netdevice.h +4 -7
@@ -40,7 +40,6 @@#include <net/dcbnl.h> #endif #include <net/netprio_cgroup.h> -#include <net/xdp.h> #include <linux/netdev_features.h> #include <linux/neighbour.h>
@@ -76,8 +75,12 @@ struct udp_tunnel_nic_info;struct udp_tunnel_nic ;struct bpf_prog ;struct xdp_buff ; +struct xdp_frame ; +struct xdp_metadata_ops ;struct xdp_md ; +typedef u32 xdp_features_t ; +void synchronize_net (void );void netdev_set_default_ethtool_ops (struct net_device *dev,const struct ethtool_ops *ops);
@@ -1628,12 +1631,6 @@ struct net_device_ops { bool cycles); }; -struct xdp_metadata_ops { -int (*xmo_rx_timestamp)(const struct xdp_md *ctx,u64 *timestamp); -int (*xmo_rx_hash)(const struct xdp_md *ctx,u32 *hash, -enum xdp_rss_hash_type *rss_type); -}; -/** * enum netdev_priv_flags - &struct net_device priv_flags *
include/net/busy_poll.h +1 -0
@@ -16,6 +16,7 @@#include <linux/sched/clock.h> #include <linux/sched/signal.h> #include <net/ip.h> +#include <net/xdp.h> /* 0 - Reserved to indicate value not set * 1..NR_CPUS - Reserved for sender_cpu
include/net/xdp.h +25 -4
@@ -6,9 +6,10 @@#ifndef __LINUX_NET_XDP_H__#define __LINUX_NET_XDP_H__ -#include <linux/skbuff.h> /* skb_shared_info */ -#include <uapi/linux/netdev.h> #include <linux/bitfield.h> +#include <linux/filter.h> +#include <linux/netdevice.h> +#include <linux/skbuff.h> /* skb_shared_info */ /** * DOC: XDP RX-queue information
@@ -45,8 +46,6 @@ enum xdp_mem_type { MEM_TYPE_MAX, }; -typedef u32 xdp_features_t ; -/* XDP flags for ndo_xdp_xmit */ #define XDP_XMIT_FLUSH (1U << 0)/* doorbell signal consumer */ #define XDP_XMIT_FLAGS_MASK XDP_XMIT_FLUSH
@@ -443,6 +442,12 @@ enum xdp_rss_hash_type { XDP_RSS_TYPE_L4_IPV6_SCTP_EX = XDP_RSS_TYPE_L4_IPV6_SCTP | XDP_RSS_L3_DYNHDR, }; +struct xdp_metadata_ops { +int (*xmo_rx_timestamp)(const struct xdp_md *ctx,u64 *timestamp); +int (*xmo_rx_hash)(const struct xdp_md *ctx,u32 *hash, +enum xdp_rss_hash_type *rss_type); +}; +#ifdef CONFIG_NET u32 bpf_xdp_metadata_kfunc_id (int id);bool bpf_dev_bound_kfunc_id (u32 btf_id);
@@ -474,4 +479,20 @@ static inline void xdp_clear_features_flag(struct net_device *dev)xdp_set_features_flag (dev,0 ); } +static __always_inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog, +struct xdp_buff *xdp) +{ +/* Driver XDP hooks are invoked within a single NAPI poll cycle and thus +* under local_bh_disable(), which provides the needed RCU protection +* for accessing map entries. +*/ +u32 act =__bpf_prog_run (prog, xdp,BPF_DISPATCHER_FUNC (xdp)); + +if (static_branch_unlikely (&bpf_master_redirect_enabled_key)) { +if (act ==XDP_TX &&netif_is_bond_slave (xdp->rxq->dev)) + act =xdp_master_redirect (xdp); + } + +return act; +}#endif /* __LINUX_NET_XDP_H__ */
include/trace/events/xdp.h +1 -0
@@ -9,6 +9,7 @@#include <linux/filter.h> #include <linux/tracepoint.h> #include <linux/bpf.h> +#include <net/xdp.h> #define __XDP_ACT_MAP (FN ) \ FN(ABORTED) \
kernel/bpf/btf.c +1 -0
@@ -29,6 +29,7 @@#include <net/netfilter/nf_bpf_link.h> #include <net/sock.h> +#include <net/xdp.h> #include "../tools/lib/bpf/relo_core.h" /* BTF (BPF Type Format) is the meta data format which describes
kernel/bpf/offload.c +1 -0
@@ -25,6 +25,7 @@#include <linux/rhashtable.h> #include <linux/rtnetlink.h> #include <linux/rwsem.h> +#include <net/xdp.h> /* Protects offdevs, members of bpf_offload_netdev and offload members * of all progs.
kernel/bpf/verifier.c +1 -0
@@ -26,6 +26,7 @@#include <linux/poison.h> #include <linux/module.h> #include <linux/cpumask.h> +#include <net/xdp.h> #include "disasm.h"
net/netfilter/nf_conntrack_bpf.c +1 -0
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/btf_ids.h> #include <linux/net_namespace.h> +#include <net/xdp.h> #include <net/netfilter/nf_conntrack_bpf.h> #include <net/netfilter/nf_conntrack_core.h>
Signature · 1 line
2.41.0
Re: [PATCH bpf-next v2 3/3] net: invert the netdevice.h vs xdp.h dependency
Quoted 28 lines · Jakub Kicinski
xdp.his far more specific and is included in only 67 other files vs netdevice.h's 1538 include sites.
Makexdp.hincludenetdevice.h, instead of the other way around. This decreases the incremental allmodconfig builds size whenxdp.his touched from 5947 to 662 objects.Move
bpf_prog_run_xdp()toxdp.h, seems appropriate andfilter.his a mega-header in its own right so it's nice to avoidxdp.hgetting included there as well.The only unfortunate part is that the typedef for
xdp_features_thas to move tonetdevice.h, since its embedded in struct netdevice.Signed-off-by Jakub Kicinski<[email protected]>---
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
CC:[email protected]
Quoted 11 lines
--- include/linux/filter.h | 17 ----------------- include/linux/netdevice.h | 11 ++++------- include/net/busy_poll.h | 1 + include/net/xdp.h | 29 +++++++++++++++++++++++++---- include/trace/events/xdp.h | 1 + kernel/bpf/btf.c | 1 + kernel/bpf/offload.c | 1 + kernel/bpf/verifier.c | 1 + net/netfilter/nf_conntrack_bpf.c | 1 + 9 files changed, 35 insertions(+), 28 deletions(-)
LGTM
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Quoted 9 lines · On Wed, 2 Aug 2023 18:02:27 -0700 you wrote:
While poking at struct
netdev_rx_queueI got annoyed by the huge rebuild times. I split it out fromnetdevice.hand then realized that it was the main reason we includedxdp.hin there. So I removed that dependency as well.This gives us very pleasant build times for both
xdp.hand structnetdev_rx_queuechanges.[...]
Here is the summary with links:
- [bpf-next,v2,1/3] eth: add missing xdp.h includes in drivers
https://git.kernel.org/bpf/bpf-next/c/92272ec4107e - [bpf-next,v2,2/3] net: move struct netdev_rx_queue out of netdevice.h https://git.kernel.org/bpf/bpf-next/c/49e47a5b6145 - [bpf-next,v2,3/3] net: invert the netdevice.h vs xdp.h dependency https://git.kernel.org/bpf/bpf-next/c/680ee0456a57
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html