[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: d9ccb18f83ea2bb654289b6ecf014fd267cc988b
WARNING: Author mismatch between patch and upstream commit:
Backport author: Rajani kantha<rajanikantha@xxxxxxxxxxxx>
Commit author: Omid Ehtemam-Haghighi<omid.ehtemamhaghighi@xxxxxxxxxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (different SHA1: 34a949e7a086)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: d9ccb18f83ea2 ! 1: 0728fd5237ce0 ipv6: Fix soft lockups in fib6_select_path under high next hop churn
@@ Metadata
## Commit message ##
ipv6: Fix soft lockups in fib6_select_path under high next hop churn
+ [ Upstream commit d9ccb18f83ea2bb654289b6ecf014fd267cc988b ]
+
Soft lockups have been observed on a cluster of Linux-based edge routers
located in a highly dynamic environment. Using the `bird` service, these
routers continuously update BGP-advertised routes due to frequently
@@ Commit message
Reviewed-by: David Ahern <dsahern@xxxxxxxxxx>
Link: https://patch.msgid.link/20241106010236.1239299-1-omid.ehtemamhaghighi@xxxxxxxxxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
+ Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
+ Signed-off-by: Rajani Kantha <rajanikantha@xxxxxxxxxxxx>
## net/ipv6/ip6_fib.c ##
@@ net/ipv6/ip6_fib.c: static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
@@ net/ipv6/route.c: void inet6_rt_notify(int event, struct fib6_info *rt, struct n
+ info->nlh, GFP_ATOMIC);
return;
errout:
- rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);
+ if (err < 0)
## tools/testing/selftests/net/Makefile ##
-@@ tools/testing/selftests/net/Makefile: TEST_PROGS += fdb_flush.sh
- TEST_PROGS += fq_band_pktlimit.sh
- TEST_PROGS += vlan_hw_filter.sh
- TEST_PROGS += bpf_offload.py
+@@ tools/testing/selftests/net/Makefile: TEST_PROGS += test_vxlan_mdb.sh
+ TEST_PROGS += test_bridge_neigh_suppress.sh
+ TEST_PROGS += test_vxlan_nolocalbypass.sh
+ TEST_PROGS += test_bridge_backup_port.sh
+TEST_PROGS += ipv6_route_update_soft_lockup.sh
- # YNL files, must be before "include ..lib.mk"
- YNL_GEN_FILES := ncdevmem
+ TEST_FILES := settings
+ TEST_FILES += in_netns.sh lib.sh net_helper.sh setup_loopback.sh setup_veth.sh
## tools/testing/selftests/net/ipv6_route_update_soft_lockup.sh (new) ##
@@
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
