Commit e2e7d78d authored by Yan Zhai's avatar Yan Zhai Committed by David S. Miller
Browse files

af_packet: use sk_skb_reason_drop to free rx packets 



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

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202406011859.Aacus8GV-lkp@intel.com/


Signed-off-by: default avatarYan Zhai <yan@cloudflare.com>
Acked-by: default avatarJesper Dangaard Brouer <hawk@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc0cc924

net/packet/af_packet.c

+5 −5
Original line number Diff line number Diff line
@@ -2121,7 +2121,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, 
		      struct packet_type *pt, struct net_device *orig_dev)

{

	enum skb_drop_reason drop_reason = SKB_CONSUMED;

	struct sock *sk;

	struct sock *sk = NULL;

	struct sockaddr_ll *sll;

	struct packet_sock *po;

	u8 *skb_head = skb->data;
@@ -2226,7 +2226,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, 
		skb->len = skb_len;

	}

drop:

	kfree_skb_reason(skb, drop_reason);

	sk_skb_reason_drop(sk, skb, drop_reason);

	return 0;

}
@@ -2234,7 +2234,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, 
		       struct packet_type *pt, struct net_device *orig_dev)

{

	enum skb_drop_reason drop_reason = SKB_CONSUMED;

	struct sock *sk;

	struct sock *sk = NULL;

	struct packet_sock *po;

	struct sockaddr_ll *sll;

	union tpacket_uhdr h;
@@ -2494,7 +2494,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, 
		skb->len = skb_len;

	}

drop:

	kfree_skb_reason(skb, drop_reason);

	sk_skb_reason_drop(sk, skb, drop_reason);

	return 0;



drop_n_account:
@@ -2503,7 +2503,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, 
	drop_reason = SKB_DROP_REASON_PACKET_SOCK_ERROR;



	sk->sk_data_ready(sk);

	kfree_skb_reason(copy_skb, drop_reason);

	sk_skb_reason_drop(sk, copy_skb, drop_reason);

	goto drop_n_restore;

}