kevin/linux
1
Fork 0
Code

tcp: use sk_skb_reason_drop to free rx packets

Browse Source 
Replace kfree_skb_reason with sk_skb_reason_drop and pass the receiving
socket to the tracepoint.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202406011539.jhwBd7DX-lkp@intel.com/
Signed-off-by: Yan Zhai <yan@cloudflare.com>
Acked-by: Jesper Dangaard Brouer <hawk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yan Zhai 2024-06-17 11:09:20 -07:00 committed by David S. Miller
parent ce9a2424e9
commit 46a02aa357
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/syncookies.c
View File

@ -496,6 +496,6 @@ out:
out_free:
reqsk_free(req);
out_drop:
kfree_skb_reason(skb, reason);
sk_skb_reason_drop(sk, skb, reason);
return NULL;
}

2
net/ipv4/tcp_input.c
View File

@ -4860,7 +4860,7 @@ static void tcp_drop_reason(struct sock *sk, struct sk_buff *skb,
enum skb_drop_reason reason)
{
sk_drops_add(sk, skb);
kfree_skb_reason(skb, reason);
sk_skb_reason_drop(sk, skb, reason);
}
/* This one checks to see if we can put data from the

6
net/ipv4/tcp_ipv4.c
View File

@ -1932,7 +1932,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
reset:
tcp_v4_send_reset(rsk, skb, sk_rst_convert_drop_reason(reason));
discard:
kfree_skb_reason(skb, reason);
sk_skb_reason_drop(sk, skb, reason);
/* Be careful here. If this function gets more complicated and
* gcc suffers from register pressure on the x86, sk (in %ebx)
* might be destroyed here. This current version compiles correctly,
@ -2168,8 +2168,8 @@ int tcp_v4_rcv(struct sk_buff *skb)
int dif = inet_iif(skb);
const struct iphdr *iph;
const struct tcphdr *th;
struct sock *sk = NULL;
bool refcounted;
struct sock *sk;
int ret;
u32 isn;
@ -2368,7 +2368,7 @@ bad_packet:
discard_it:
SKB_DR_OR(drop_reason, NOT_SPECIFIED);
/* Discard frame. */
kfree_skb_reason(skb, drop_reason);
sk_skb_reason_drop(sk, skb, drop_reason);
return 0;
discard_and_relse:

2
net/ipv6/syncookies.c
View File

@ -275,6 +275,6 @@ out:
out_free:
reqsk_free(req);
out_drop:
kfree_skb_reason(skb, reason);
sk_skb_reason_drop(sk, skb, reason);
return NULL;
}

6
net/ipv6/tcp_ipv6.c
View File

@ -1674,7 +1674,7 @@ reset:
discard:
if (opt_skb)
__kfree_skb(opt_skb);
kfree_skb_reason(skb, reason);
sk_skb_reason_drop(sk, skb, reason);
return 0;
csum_err:
reason = SKB_DROP_REASON_TCP_CSUM;
@ -1747,8 +1747,8 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb)
int dif = inet6_iif(skb);
const struct tcphdr *th;
const struct ipv6hdr *hdr;
struct sock *sk = NULL;
bool refcounted;
struct sock *sk;
int ret;
u32 isn;
struct net *net = dev_net(skb->dev);
@ -1940,7 +1940,7 @@ bad_packet:
discard_it:
SKB_DR_OR(drop_reason, NOT_SPECIFIED);
kfree_skb_reason(skb, drop_reason);
sk_skb_reason_drop(sk, skb, drop_reason);
return 0;
discard_and_relse: