Hi Marcus Since your patches are about the virtual network, I'd like to test it, but it conflicts (Please review the attachment to review more details) when I apply it to the master branch. My test based on this commit: commit 1e15510b71c99c6e49134d756df91069f7d18141 (origin/master, origin/HEAD) Merge: f09d694cf799 54e1b4becf5e Author: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Date: Thu Feb 27 09:32:42 2025 -0800 Merge tag 'net-6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Pull networking fixes from Jakub Kicinski: "Including fixes from bluetooth. Thanks Lei On Thu, Feb 27, 2025 at 10:28 PM Marcus Wichelmann <marcus.wichelmann@xxxxxxxxxxxxxxxx> wrote: > > Hi all, > > this series contains some improvements for the selftest patches. The other > patches remain unchanged. Please check the changelist below. > > I have reverted the addition of the NOARP flag from the previous version, > as it was not effective and the CI was still failing occasionally because > of the race condition caused by foreign packets interfering with the veth > tests. This series contains an alternative solution by filtering all but > the test packets using the attached XDP program. > > Successful pipeline: > https://github.com/kernel-patches/bpf/actions/runs/13552017584 > > --- > > v4: > - strip unrelated changes from the selftest patches > - extend commit message for "selftests/bpf: refactor xdp_context_functional > test and bpf program" > - the NOARP flag was not effective to prevent other packets from > interfering with the tests, add a filter to the XDP program instead > - run xdp_context_tuntap in a separate namespace to avoid conflicts with > other tests > > v3: https://lore.kernel.org/bpf/20250224152909.3911544-1-marcus.wichelmann@xxxxxxxxxxxxxxxx/ > - change the condition to handle xdp_buffs without metadata support, as > suggested by Willem de Bruijn <willemb@xxxxxxxxxx> > - add clarifying comment why that condition is needed > - set NOARP flag in selftests to ensure that the kernel does not send > packets on the test interfaces that may interfere with the tests > > v2: https://lore.kernel.org/bpf/20250217172308.3291739-1-marcus.wichelmann@xxxxxxxxxxxxxxxx/ > - submit against bpf-next subtree > - split commits and improved commit messages > - remove redundant metasize check and add clarifying comment instead > - use max() instead of ternary operator > - add selftest for metadata support in the tun driver > > v1: https://lore.kernel.org/all/20250130171614.1657224-1-marcus.wichelmann@xxxxxxxxxxxxxxxx/ > > Marcus Wichelmann (6): > net: tun: enable XDP metadata support > net: tun: enable transfer of XDP metadata to skb > selftests/bpf: move open_tuntap to network helpers > selftests/bpf: refactor xdp_context_functional test and bpf program > selftests/bpf: add test for XDP metadata support in tun driver > selftests/bpf: fix file descriptor assertion in open_tuntap helper > > drivers/net/tun.c | 28 +++- > tools/testing/selftests/bpf/network_helpers.c | 28 ++++ > tools/testing/selftests/bpf/network_helpers.h | 3 + > .../selftests/bpf/prog_tests/lwt_helpers.h | 29 ---- > .../bpf/prog_tests/xdp_context_test_run.c | 138 +++++++++++++++++- > .../selftests/bpf/progs/test_xdp_meta.c | 53 +++++-- > 6 files changed, 223 insertions(+), 56 deletions(-) > > -- > 2.43.0 > >
Attachment:
conflict
Description: Binary data