Networking fixes for 6.1-rc2, including fixes from netfilter
Current release - regressions:
- revert "net: fix cpu_max_bits_warn() usage in netif_attrmask_next{,_and}"
- revert "net: sched: fq_codel: remove redundant resource cleanup in fq_codel_init()"
- dsa: uninitialized variable in dsa_slave_netdevice_event()
- eth: sunhme: uninitialized variable in happy_meal_init()
Current release - new code bugs:
- eth: octeontx2: fix resource not freed after malloc
Previous releases - regressions:
- sched: fix return value of qdisc ingress handling on success
- sched: fix race condition in qdisc_graft()
- udp: update reuse->has_conns under reuseport_lock.
- tls: strp: make sure the TCP skbs do not have overlapping data
- hsr: avoid possible NULL deref in skb_clone()
- tipc: fix an information leak in tipc_topsrv_kern_subscr
- phylink: add mac_managed_pm in phylink_config structure
- eth: i40e: fix DMA mappings leak
- eth: hyperv: fix a RX-path warning
- eth: mtk: fix memory leaks
Previous releases - always broken:
- sched: cake: fix null pointer access issue when cake_init() fails
-----BEGIN PGP SIGNATURE-----
iQJGBAABCAAwFiEEg1AjqC77wbdLX2LbKSR5jcyPE6QFAmNRKdcSHHBhYmVuaUBy
ZWRoYXQuY29tAAoJECkkeY3MjxOkYn8P/31xjE9/BRQKVGQOMxj78vhQvVHEZYXJ
OJcaLcjxUCqj6hu3pEcuf88PeTicyfEqN32zzH1k+SS8jGQCmoVtXUfbZ7pDR6Tc
rsAqVhLD6JnYkGEgtzm3i+8EfSeBoCy9kT4JZzRxQmOfZr1rBmtoMHOB4cGk9g1K
lSF3KJcKT1GDacB/gVei+ms0Y+Q9WULOg3OFuyLSeltAkhZKaTfx/qqsLLEHFqZc
u6eR31GwG28Y4GVurLQSOdaWrFOKqmPFOpzvjmeKC2RBqS6hVl4/YKZTmTV53Lee
brm6kuVlU7CJVZEN2qF8G2+/SqLgcB0o26JVnml1kT8n0GlFAbyFf5akawjT8/Je
G/zgz6k6wUAI2g3nSPNmgqVtobsypthzWL/bOpWfGfJFXxGOgLG3pbZYIl816Tha
KnibZqQOBHxfPaUzh0xCLhidoi5G0T8ip9o9tyKlnmvbKY/EWk6HiIjCWlxnkPiO
GRdHkyF7KMxqo/QuE9AK3LnD/AsLeWcuqzMveiaTbYLkMjGDW1yz3otL7KXW5l8U
zYoUn1HQLkNqDE17+PjRo28awOMyN6ujXggKBK/hfXVnPpdW3yWPUoslqQdVn5KC
3PLeSNM1v4UQSMWx1alRx1PvA+zYDX4GQpSSXbQgYGVim8LMwZQ1xui2qWF8xEau
k9ZKfMSUNGEr
=y2As
-----END PGP SIGNATURE-----
Merge tag 'net-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Paolo Abeni:
"Including fixes from netfilter.
Current release - regressions:
- revert "net: fix cpu_max_bits_warn() usage in
netif_attrmask_next{,_and}"
- revert "net: sched: fq_codel: remove redundant resource cleanup in
fq_codel_init()"
- dsa: uninitialized variable in dsa_slave_netdevice_event()
- eth: sunhme: uninitialized variable in happy_meal_init()
Current release - new code bugs:
- eth: octeontx2: fix resource not freed after malloc
Previous releases - regressions:
- sched: fix return value of qdisc ingress handling on success
- sched: fix race condition in qdisc_graft()
- udp: update reuse->has_conns under reuseport_lock.
- tls: strp: make sure the TCP skbs do not have overlapping data
- hsr: avoid possible NULL deref in skb_clone()
- tipc: fix an information leak in tipc_topsrv_kern_subscr
- phylink: add mac_managed_pm in phylink_config structure
- eth: i40e: fix DMA mappings leak
- eth: hyperv: fix a RX-path warning
- eth: mtk: fix memory leaks
Previous releases - always broken:
- sched: cake: fix null pointer access issue when cake_init() fails"
* tag 'net-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (43 commits)
net: phy: dp83822: disable MDI crossover status change interrupt
net: sched: fix race condition in qdisc_graft()
net: hns: fix possible memory leak in hnae_ae_register()
wwan_hwsim: fix possible memory leak in wwan_hwsim_dev_new()
sfc: include vport_id in filter spec hash and equal()
genetlink: fix kdoc warnings
selftests: add selftest for chaining of tc ingress handling to egress
net: Fix return value of qdisc ingress handling on success
net: sched: sfb: fix null pointer access issue when sfb_init() fails
Revert "net: sched: fq_codel: remove redundant resource cleanup in fq_codel_init()"
net: sched: cake: fix null pointer access issue when cake_init() fails
ethernet: marvell: octeontx2 Fix resource not freed after malloc
netfilter: nf_tables: relax NFTA_SET_ELEM_KEY_END set flags requirements
netfilter: rpfilter/fib: Set ->flowic_uid correctly for user namespaces.
ionic: catch NULL pointer issue on reconfig
net: hsr: avoid possible NULL deref in skb_clone()
bnxt_en: fix memory leak in bnxt_nvm_test()
ip6mr: fix UAF issue in ip6mr_sk_done() when addrconf_init_net() failed
udp: Update reuse->has_conns under reuseport_lock.
net: ethernet: mediatek: ppe: Remove the unused function mtk_foe_entry_usable()
...
This commit is contained in:
Linus Torvalds
commit
6d36c728bc
58 changed files with 432 additions and 185 deletions
|
|
@ -70,6 +70,7 @@ TEST_PROGS += io_uring_zerocopy_tx.sh
|
|||
TEST_GEN_FILES += bind_bhash
|
||||
TEST_GEN_PROGS += sk_bind_sendto_listen
|
||||
TEST_GEN_PROGS += sk_connect_zero_addr
|
||||
TEST_PROGS += test_ingress_egress_chaining.sh
|
||||
|
||||
TEST_FILES := settings
|
||||
|
||||
|
|
|
|||
79
tools/testing/selftests/net/test_ingress_egress_chaining.sh
Normal file
79
tools/testing/selftests/net/test_ingress_egress_chaining.sh
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
#!/bin/bash
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
# This test runs a simple ingress tc setup between two veth pairs,
|
||||
# and chains a single egress rule to test ingress chaining to egress.
|
||||
#
|
||||
# Kselftest framework requirement - SKIP code is 4.
|
||||
ksft_skip=4
|
||||
|
||||
if [ "$(id -u)" -ne 0 ];then
|
||||
echo "SKIP: Need root privileges"
|
||||
exit $ksft_skip
|
||||
fi
|
||||
|
||||
needed_mods="act_mirred cls_flower sch_ingress"
|
||||
for mod in $needed_mods; do
|
||||
modinfo $mod &>/dev/null || { echo "SKIP: Need act_mirred module"; exit $ksft_skip; }
|
||||
done
|
||||
|
||||
ns="ns$((RANDOM%899+100))"
|
||||
veth1="veth1$((RANDOM%899+100))"
|
||||
veth2="veth2$((RANDOM%899+100))"
|
||||
peer1="peer1$((RANDOM%899+100))"
|
||||
peer2="peer2$((RANDOM%899+100))"
|
||||
ip_peer1=198.51.100.5
|
||||
ip_peer2=198.51.100.6
|
||||
|
||||
function fail() {
|
||||
echo "FAIL: $@" >> /dev/stderr
|
||||
exit 1
|
||||
}
|
||||
|
||||
function cleanup() {
|
||||
killall -q -9 udpgso_bench_rx
|
||||
ip link del $veth1 &> /dev/null
|
||||
ip link del $veth2 &> /dev/null
|
||||
ip netns del $ns &> /dev/null
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
function config() {
|
||||
echo "Setup veth pairs [$veth1, $peer1], and veth pair [$veth2, $peer2]"
|
||||
ip link add $veth1 type veth peer name $peer1
|
||||
ip link add $veth2 type veth peer name $peer2
|
||||
ip addr add $ip_peer1/24 dev $peer1
|
||||
ip link set $peer1 up
|
||||
ip netns add $ns
|
||||
ip link set dev $peer2 netns $ns
|
||||
ip netns exec $ns ip addr add $ip_peer2/24 dev $peer2
|
||||
ip netns exec $ns ip link set $peer2 up
|
||||
ip link set $veth1 up
|
||||
ip link set $veth2 up
|
||||
|
||||
echo "Add tc filter ingress->egress forwarding $veth1 <-> $veth2"
|
||||
tc qdisc add dev $veth2 ingress
|
||||
tc qdisc add dev $veth1 ingress
|
||||
tc filter add dev $veth2 ingress prio 1 proto all flower \
|
||||
action mirred egress redirect dev $veth1
|
||||
tc filter add dev $veth1 ingress prio 1 proto all flower \
|
||||
action mirred egress redirect dev $veth2
|
||||
|
||||
echo "Add tc filter egress->ingress forwarding $peer1 -> $veth1, bypassing the veth pipe"
|
||||
tc qdisc add dev $peer1 clsact
|
||||
tc filter add dev $peer1 egress prio 20 proto ip flower \
|
||||
action mirred ingress redirect dev $veth1
|
||||
}
|
||||
|
||||
function test_run() {
|
||||
echo "Run tcp traffic"
|
||||
./udpgso_bench_rx -t &
|
||||
sleep 1
|
||||
ip netns exec $ns timeout -k 2 10 ./udpgso_bench_tx -t -l 2 -4 -D $ip_peer1 || fail "traffic failed"
|
||||
echo "Test passed"
|
||||
}
|
||||
|
||||
config
|
||||
test_run
|
||||
trap - EXIT
|
||||
cleanup
|
||||
Loading…
Add table
Add a link
Reference in a new issue