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: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202406011859.Aacus8GV-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>

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index fce3908875912f67551cf090a524f96427c09ab3..42d29b8a84fc158b618fa835fecdc32046518179 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -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 @@ drop_n_restore:
                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 @@ drop_n_restore:
                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 @@ drop_n_account:
        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;
 }