xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skbuff: Release nfct refcount on napi stolen or re-used skbs

Browse Source 
commit 8550ff8d8c75416e984d9c4b082845e57e560984 upstream.

When multiple SKBs are merged to a new skb under napi GRO,
or SKB is re-used by napi, if nfct was set for them in the
driver, it will not be released while freeing their stolen
head state or on re-use.

Release nfct on napi's stolen or re-used SKBs, and
in gro_list_prepare, check conntrack metadata diff.

Fixes: 5c6b946047 ("net/mlx5e: CT: Handle misses after executing CT action")
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Paul Blakey <paulb@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paul Blakey
2021-07-05 13:54:51 +03:00
committed by Greg Kroah-Hartman
parent 31828ffdab
commit 570341f10e
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
net/core/dev.c
View File

@@ -5870,6 +5870,18 @@ static struct list_head *gro_list_prepare(struct napi_struct *napi,
diffs = memcmp(skb_mac_header(p), diffs = memcmp(skb_mac_header(p),
skb_mac_header(skb), skb_mac_header(skb),
maclen); maclen);
diffs |= skb_get_nfct(p) ^ skb_get_nfct(skb);
if (!diffs) {
struct tc_skb_ext *skb_ext = skb_ext_find(skb, TC_SKB_EXT);
struct tc_skb_ext *p_ext = skb_ext_find(p, TC_SKB_EXT);
diffs |= (!!p_ext) ^ (!!skb_ext);
if (!diffs && unlikely(skb_ext))
diffs |= p_ext->chain ^ skb_ext->chain;
}
NAPI_GRO_CB(p)->same_flow = !diffs; NAPI_GRO_CB(p)->same_flow = !diffs;
} }
@@ -6149,6 +6161,7 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
skb_shinfo(skb)->gso_type = 0; skb_shinfo(skb)->gso_type = 0;
skb->truesize = SKB_TRUESIZE(skb_end_offset(skb)); skb->truesize = SKB_TRUESIZE(skb_end_offset(skb));
skb_ext_reset(skb); skb_ext_reset(skb);
nf_reset_ct(skb);
napi->skb = skb; napi->skb = skb;
} }

1
net/core/skbuff.c
View File

@@ -659,6 +659,7 @@ fastpath:
void skb_release_head_state(struct sk_buff *skb) void skb_release_head_state(struct sk_buff *skb)
{ {
nf_reset_ct(skb);
skb_dst_drop(skb); skb_dst_drop(skb);
if (skb->destructor) { if (skb->destructor) {
WARN_ON(in_irq()); WARN_ON(in_irq());