Follow-up BPF helper improvements

[kernel-patches-bot]

Pull request for series with
subject: Follow-up BPF helper improvements
version: 4
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=362443

[kernel-patches-bot]

Master branch: ac53a0d
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=362443
version: 4

[kernel-patches-bot]

Master branch: ac53a0d
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=362611
version: 5

[kernel-patches-bot]

Master branch: ac53a0d
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=362681
version: 6

[kernel-patches-bot]

Master branch: 673e375
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=362681
version: 6

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=362681
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: bpf: improve bpf_redirect_neigh helper description
Using index info to reconstruct a base tree...
M	include/uapi/linux/bpf.h
M	tools/include/uapi/linux/bpf.h
Falling back to patching base and 3-way merge...
Auto-merging tools/include/uapi/linux/bpf.h
Auto-merging include/uapi/linux/bpf.h
No changes -- Patch already applied.
Applying: bpf: add redirect_peer helper
Using index info to reconstruct a base tree...
M	drivers/net/veth.c
M	include/linux/netdevice.h
M	include/uapi/linux/bpf.h
M	net/core/dev.c
M	net/core/filter.c
M	tools/include/uapi/linux/bpf.h
Falling back to patching base and 3-way merge...
Auto-merging tools/include/uapi/linux/bpf.h
Auto-merging include/uapi/linux/bpf.h
No changes -- Patch already applied.
Applying: bpf: allow for map-in-map with dynamic inner array map entries
Using index info to reconstruct a base tree...
M	include/linux/bpf.h
M	include/uapi/linux/bpf.h
M	kernel/bpf/arraymap.c
M	kernel/bpf/hashtab.c
M	kernel/bpf/verifier.c
M	net/xdp/xskmap.c
M	tools/include/uapi/linux/bpf.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: bpf, selftests: add test for different array inner map size
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c
M	tools/testing/selftests/bpf/progs/test_btf_map_in_map.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: bpf, selftests: make redirect_neigh test more extensible
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/progs/test_tc_neigh.c
A	tools/testing/selftests/bpf/test_tc_neigh.sh
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in tools/testing/selftests/bpf/test_tc_redirect.sh
Auto-merging tools/testing/selftests/bpf/test_tc_redirect.sh
Patch failed at 0005 bpf, selftests: make redirect_neigh test more extensible
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch'

conflict:

diff --cc tools/testing/selftests/bpf/test_tc_redirect.sh
index 6d7482562140,6ad441405132..000000000000
--- a/tools/testing/selftests/bpf/test_tc_redirect.sh
+++ b/tools/testing/selftests/bpf/test_tc_redirect.sh
@@@ -4,10 -4,9 +4,16 @@@
  # This test sets up 3 netns (src <-> fwd <-> dst). There is no direct veth link
  # between src and dst. The netns fwd has veth links to each src and dst. The
  # client is in src and server in dst. The test installs a TC BPF program to each
++<<<<<<< HEAD
 +# host facing veth in fwd which calls into i) bpf_redirect_neigh() to perform the
 +# neigh addr population and redirect or ii) bpf_redirect_peer() for namespace
 +# switch from ingress side; it also installs a checker prog on the egress side
 +# to drop unexpected traffic.
++=======
+ # host facing veth in fwd which calls into bpf_redirect_peer() to perform the
+ # neigh addr population and redirect; it also installs a dropper prog on the
+ # egress side to drop skbs if neigh addrs were not populated.
++>>>>>>> bpf, selftests: make redirect_neigh test more extensible
  
  if [[ $EUID -ne 0 ]]; then
  	echo "This script must be run as root"
@@@ -167,17 -166,15 +173,29 @@@ hex_mem_str(
  	perl -e 'print join(" ", unpack("(H2)8", pack("L", @ARGV)))' $1
  }
  
++<<<<<<< HEAD
 +netns_setup_bpf()
 +{
 +	local obj=$1
 +
 +	ip netns exec ${NS_FWD} tc qdisc add dev veth_src_fwd clsact
 +	ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd ingress bpf da obj $obj sec src_ingress
 +	ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd egress  bpf da obj $obj sec chk_egress
 +
 +	ip netns exec ${NS_FWD} tc qdisc add dev veth_dst_fwd clsact
 +	ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd ingress bpf da obj $obj sec dst_ingress
 +	ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd egress  bpf da obj $obj sec chk_egress
++=======
+ netns_setup_neigh()
+ {
+ 	ip netns exec ${NS_FWD} tc qdisc add dev veth_src_fwd clsact
+ 	ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd ingress bpf da obj test_tc_neigh.o sec src_ingress
+ 	ip netns exec ${NS_FWD} tc filter add dev veth_src_fwd egress  bpf da obj test_tc_neigh.o sec chk_egress
+ 
+ 	ip netns exec ${NS_FWD} tc qdisc add dev veth_dst_fwd clsact
+ 	ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd ingress bpf da obj test_tc_neigh.o sec dst_ingress
+ 	ip netns exec ${NS_FWD} tc filter add dev veth_dst_fwd egress  bpf da obj test_tc_neigh.o sec chk_egress
++>>>>>>> bpf, selftests: make redirect_neigh test more extensible
  
  	veth_src=$(ip netns exec ${NS_FWD} cat /sys/class/net/veth_src_fwd/ifindex)
  	veth_dst=$(ip netns exec ${NS_FWD} cat /sys/class/net/veth_dst_fwd/ifindex)
@@@ -196,9 -193,5 +214,13 @@@ trap netns_cleanup EXI
  set -e
  
  netns_setup
++<<<<<<< HEAD
 +netns_setup_bpf test_tc_neigh.o
 +netns_test_connectivity
 +netns_cleanup
 +netns_setup
 +netns_setup_bpf test_tc_peer.o
++=======
+ netns_setup_neigh
++>>>>>>> bpf, selftests: make redirect_neigh test more extensible
  netns_test_connectivity

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=362681 irrelevant now. Closing PR.