From nobody Thu Feb 12 15:47:50 2026 Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB480155CA7 for ; Tue, 11 Jun 2024 20:11:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136710; cv=none; b=kFtUfaEE3MCV/9cHZ9cUgDLV8HdcZ2FHUsjR9Aby/ecHwq+behymGUgABJIRXLN7HBm19vq1IR/En9/TFeRnkBZJedefBetqoZpnBJqqL3mdeec3XyWjpF/ZqX8Bxsn+TKKAxxvz3GvwW8H7ya2SjyhiXLiBOCCneumdtWGmDt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136710; c=relaxed/simple; bh=uEGMHEFbMp0HLSU5Z7U4ENmeA4RvQ8IslnoZTeDpYIQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=DdlnDuoRDw4cBUBhJtAO5RpbHMc05nwSyXO2Kf44mR6psNWkvAVP/epURaBQ9UwGrdnZqExpqYeFYxP8UFoGPrJaxl3198oF47bQNLgofGRrjRjU3a8/8udF8JfjEaVbxjeduswpWOo84BWLgLiGXJSzKbKBHC+v5aJwp6DA3fc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=BLAdvYPO; arc=none smtp.client-ip=209.85.167.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="BLAdvYPO" Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3d215a594b9so2351134b6e.3 for ; Tue, 11 Jun 2024 13:11:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136708; x=1718741508; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=+04wpAGrgh0quqRhPOuIE9e5b5DYf6qkerlRm6e6uUE=; b=BLAdvYPOmNLvO8NmKWEtx0nklLBJaYUdVFzgkK2dVlbNnqgFPkwxJoWZZKwhq0671J q7PA/wVKvXCNC+WKDsvdxlL4Ehnc9FirtVlKkcdFMIT8zHM+hFXDTYF5IXOAtCMaUn4k zDdXjr8Gfl7KyXdkf/eODvTJlR+sCXpjk4OE66LkT+pW/fRiRjxwMZmxdxU5I5HIMbHb 576JECWCQEkchcDsJQyTMwmOhchiX1Du3C3DOPiXW3IccHsgfUJzttvrSyPWSJhSiSHV vTUf3wiuKxYC5tw3jprYqd988DXFNmbOupFZ9z0SSmq7g9a2RrtdE5oKahTD4JcJYwsk BdFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136708; x=1718741508; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+04wpAGrgh0quqRhPOuIE9e5b5DYf6qkerlRm6e6uUE=; b=TQ3mU9q+51hT1ebCRjDOK9HjSJILgdRUjNsLKXqGbXFYnpcfeqHF2+4MobigDJabXx JSycSBsgX2TZWfA2TNKzE+9R+QckbRgFpf69eP2YKiSQ+PGlXUB81HE8+0b5zUuWo3Vc 3UEkxEqj2PIhHWUTwejZGXM+TiTtYBqn/h4zvUe2GZveuomwMurYhW+NHv+e6wyR7PC9 R+j6Ow3xYIckQcJEoWErg5xIxB2i5oqgvt9/F/GvPhF3Vxex5TRqH5+rzJ1yj1VFJu3U lf7Oyxxm4/QAm8t6dR4JCBQaukA0/Kmk/2tl9sf45YuNCDoJH9Q3MDhqTBfS1lu7I5et ym7A== X-Forwarded-Encrypted: i=1; AJvYcCULyE3s8Lz/OJIp2PZ7mwoUfYyyvNofsJ31w8sOKjuh+Rex4REdt/i9Xi8MB+6H6JJvNdIYgK+Sn4S1b3bIsXGxp2e43Qbm4VLTc+EF X-Gm-Message-State: AOJu0YzIFEHic0I00fyv1OtTDP/BIB1rZOuaChwVXcIkTwV8EwBwYyhL dht93/lI3nZmX4hauCBnJwUl7yiEV4ZqJsxGC1axD264P7r23EAXSFhURQSctqQ= X-Google-Smtp-Source: AGHT+IEGIV0gZp72yRtvxivrL8faWuzoltB8Q4iILsjQhsbDP5KDliZvlfbJPyDSrZPDnmEc+K4n+Q== X-Received: by 2002:a05:6808:f07:b0:3d2:2721:8a7e with SMTP id 5614622812f47-3d227218ac9mr8752502b6e.34.1718136707949; Tue, 11 Jun 2024 13:11:47 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4404fe04e87sm39018771cf.55.2024.06.11.13.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:47 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11:44 -0700 From: Yan Zhai To: netdev@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , David Ahern , Abhishek Chauhan , Mina Almasry , Florian Westphal , Alexander Lobakin , David Howells , Jiri Pirko , Daniel Borkmann , Sebastian Andrzej Siewior , Lorenzo Bianconi , Pavel Begunkov , linux-kernel@vger.kernel.org, kernel-team@cloudflare.com, Jesper Dangaard Brouer , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Neil Horman , linux-trace-kernel@vger.kernel.org, Dan Carpenter Subject: [PATCH v4 net-next 7/7] af_packet: use sk_skb_reason_drop to free rx packets Message-ID: <922de9af0ce7fd5ba6028d95da6c4d918b563876.1718136376.git.yan@cloudflare.com> References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace kfree_skb_reason with sk_skb_reason_drop and pass the receiving socket to the tracepoint. Reported-by: kernel test robot Closes: https://lore.kernel.org/r/202406011859.Aacus8GV-lkp@intel.com/ Signed-off-by: Yan Zhai --- v2->v3: fixed uninitialized sk, added missing report tags. --- net/packet/af_packet.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index fce390887591..42d29b8a84fc 100644 --- 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 =3D SKB_CONSUMED; - struct sock *sk; + struct sock *sk =3D NULL; struct sockaddr_ll *sll; struct packet_sock *po; u8 *skb_head =3D skb->data; @@ -2226,7 +2226,7 @@ static int packet_rcv(struct sk_buff *skb, struct net= _device *dev, skb->len =3D skb_len; } drop: - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return 0; } =20 @@ -2234,7 +2234,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct ne= t_device *dev, struct packet_type *pt, struct net_device *orig_dev) { enum skb_drop_reason drop_reason =3D SKB_CONSUMED; - struct sock *sk; + struct sock *sk =3D 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 ne= t_device *dev, skb->len =3D skb_len; } drop: - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return 0; =20 drop_n_account: @@ -2503,7 +2503,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct ne= t_device *dev, drop_reason =3D SKB_DROP_REASON_PACKET_SOCK_ERROR; =20 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; } =20 --=20 2.30.2