Revert "xfrm: destroy xfrm_state synchronously on net exit path"

Browse source

[ Upstream commit 2a198bbec6 ]

This reverts commit f75a2804da.

With all states (whether user or kern) removed from the hashtables
during deletion, there's no need for synchronous destruction of
states. xfrm6_tunnel states still need to have been destroyed (which
will be the case when its last user is deleted (not destroyed)) so
that xfrm6_tunnel_free_spi removes it from the per-netns hashtable
before the netns is destroyed.

This has the benefit of skipping one synchronize_rcu per state (in
__xfrm_state_destroy(sync=true)) when we exit a netns.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Sabrina Dubroca 2025-07-29 17:11:53 -04:00 • committed by Greg Kroah-Hartman

parent 0da961fa46

commit 47626e65d1

5 changed files with 15 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

include/net/xfrm.h

View file

2

net/ipv6/xfrm6_tunnel.c

View file

2

net/key/af_key.c

View file

23

net/xfrm/xfrm_state.c

View file

2

net/xfrm/xfrm_user.c

View file