Skip to content

net: struct netdev_rx_queue and xdp.h reshuffling

Jakub Kicinski bpf linux-hyperv netdev 2 versions – Applied

Status from this message: This series was applied to bpf/bpf-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 5 repliesApplied 3/3
  2. v13 patches 6 repliesSuperseded

Changes in v2 from the cover letter

- build fix
- reorder some includes
v1: https://lore.kernel.org/all/[email protected]/

Patches in v2 All 3 applied

#Subject and filesSizeRepliesApplied
1/3eth: add missing xdp.h includes in driversdrivers/net/bonding/bond_main.c drivers/net/ethernet/amazon/ena/ena_netdev.h drivers/net/ethernet/engleder/tsnep.h +13 more+17 -02 repliesApplied
2/3net: move struct netdev_rx_queue out of netdevice.hdrivers/net/virtio_net.c include/linux/netdevice.h include/net/netdev_rx_queue.h +4 more+58 -442 repliesApplied
3/3net: invert the netdevice.h vs xdp.h dependencyinclude/linux/filter.h include/linux/netdevice.h include/net/busy_poll.h +6 more+35 -281 replyApplied

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchWei FangGerhard EnglederAmritha NambiarJesper Dangaard BrouerHoratiu Vultur
1/3R-b R-b A-b R-b
2/3R-b A-b
3/3A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v2 thread

Cover letter [PATCH bpf-next v2 0/3] 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