Skip to content

Commit 39ae83a

Browse files
atenartjfvogel
authored andcommitted
net: decrease cached dst counters in dst_release
[ Upstream commit 3a0a3ff6593d670af2451ec363ccb7b18aec0c0a ] Upstream fix ac888d5 ("net: do not delay dst_entries_add() in dst_release()") moved decrementing the dst count from dst_destroy to dst_release to avoid accessing already freed data in case of netns dismantle. However in case CONFIG_DST_CACHE is enabled and OvS+tunnels are used, this fix is incomplete as the same issue will be seen for cached dsts: Unable to handle kernel paging request at virtual address ffff5aabf6b5c000 Call trace: percpu_counter_add_batch+0x3c/0x160 (P) dst_release+0xec/0x108 dst_cache_destroy+0x68/0xd8 dst_destroy+0x13c/0x168 dst_destroy_rcu+0x1c/0xb0 rcu_do_batch+0x18c/0x7d0 rcu_core+0x174/0x378 rcu_core_si+0x18/0x30 Fix this by invalidating the cache, and thus decrementing cached dst counters, in dst_release too. Fixes: d71785f ("net: add dst_cache to ovs vxlan lwtunnel") Signed-off-by: Antoine Tenart <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit 92a5c18513117be69bc00419dd1724c1940f8fcd) Signed-off-by: Jack Vogel <[email protected]>
1 parent c5bc625 commit 39ae83a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

net/core/dst.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,14 @@ static void dst_count_dec(struct dst_entry *dst)
165165
void dst_release(struct dst_entry *dst)
166166
{
167167
if (dst && rcuref_put(&dst->__rcuref)) {
168+
#ifdef CONFIG_DST_CACHE
169+
if (dst->flags & DST_METADATA) {
170+
struct metadata_dst *md_dst = (struct metadata_dst *)dst;
171+
172+
if (md_dst->type == METADATA_IP_TUNNEL)
173+
dst_cache_reset_now(&md_dst->u.tun_info.dst_cache);
174+
}
175+
#endif
168176
dst_count_dec(dst);
169177
call_rcu_hurry(&dst->rcu_head, dst_destroy_rcu);
170178
}

0 commit comments

Comments
 (0)