From nobody Sun Dec 14 12:11:03 2025 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) (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 3F74C199251 for ; Mon, 17 Jun 2024 18:09:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647773; cv=none; b=aVuAqVY7beuBMT7GO+5g680FxYz0mByxUkAmgwSuD8r8qJxFequu/YCKo7grEJGoVbxPsakQUtRs/bRCjJEvYR5TEPeArjnuZyNbPsALw+n2VJ99PraHs4931xHWRD5e/xSs+510D7FkNKOKa5+GtMqliu2DJtcxWo+GACamuV8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647773; c=relaxed/simple; bh=uEGMHEFbMp0HLSU5Z7U4ENmeA4RvQ8IslnoZTeDpYIQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eGdXsSCUJ7w1JVgCMhQAu6fmgGG+BE4rque+A1FC6kZpSX/C68YC2Yz4yPu/EZQsUCekWgeDV+Ph6PDiaEe0dmn/SVkLTtIS9Ss4Y/rPE4r6k4czq0rUQLs9DB559OiXCFQ33Ce7YTQpBjVsUT6KvRay2h2qQzBPTr7+TyfjDLU= 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=UfBBODtG; arc=none smtp.client-ip=209.85.219.49 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="UfBBODtG" Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-6b06b78e716so29365676d6.3 for ; Mon, 17 Jun 2024 11:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718647771; x=1719252571; 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=UfBBODtGKX/lYpNEADTZF7usQLHAoR7lXwZbFTkCpc9B7H2T3I/qYP7GWU92eAz7SK zmaNweOEbrnmPRsjPUlZTDKNxP2qsZkNN5h/l5B/dYvfVrCgWIBDWYbz/5oboRKEYabs pU0b6btpML9W2UmqbXhViWf5fUSU4LQRDn7IzEhHUL4LLcMEKx2WJ6RWli3mflUKNm+h p8sdZBX6DGzKQ4TUVyQ9FJqwm29WMJOc8L+Yknqwgw0blc5twDq7gwZWzL2MQ8D0rAvK 420o8o9gHFdRjMhLKKQTKv1kDTHJ5Rob7HGGWbJIi+JlA3YA4ty1td/a19WrEJ8CwzMY xMQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718647771; x=1719252571; 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=pEMMPqGhHc3vqyV3plegLI0s+of9hSKw1hAI+KY6hq0Hb4Os7fZF82btVNjNpd8czZ P1HijA+LP9l9kjTn4B3BGmPZMbd6UG0wuCH0vz4DcYem+IIyUS240bNnntHmWUF0BtL8 yRSQrji+KSF6DuAGF6DIgpxLzRTQ0KSl2GoPZ/qHgOHjmasDtpKufp7u+MfAbhELQ6fc UnTAPcllXK9ECXsJpERFlcthitpihmf18PAhLgAtFND71KegtRAxYJ4MjfkRmjvWQiiu 6d2gRbI2Xi3ejgepsDsHsjnj+voG2Z/tz2CkmIj795a2Ht36soyPdUG4G+U267f58AuB PFqQ== X-Forwarded-Encrypted: i=1; AJvYcCVMT2bbVqoRfuW32PnxdmcQsoswhzjPb3SLRMfOmzQGYciFPk71xcjB/5fYjDsXZw9G8aKsjkpV95G9etCrEFS/QsVMazs6lXA1xLCP X-Gm-Message-State: AOJu0Yw2iMvjY09TTrCn9kt+p7moAw32awTJDYJUp/2dh3Vv9GJ/g2qf vTT93ExlUXUTjYqh+HVHj2WDpTN5GAK8jHL/pu1VUQtYClrNmiCB5m39Cb00+Qc= X-Google-Smtp-Source: AGHT+IGDb1Z2mu+N6vTL3KwtF1RLgOFuZEZO687nwA+LSC1hobQujIxWESlnTh3cU3IQaPtqTnbLhA== X-Received: by 2002:a0c:aa59:0:b0:6b0:82ad:e89c with SMTP id 6a1803df08f44-6b2afc7924emr107624276d6.11.1718647771318; Mon, 17 Jun 2024 11:09:31 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:164]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5c4664csm57391246d6.65.2024.06.17.11.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 11:09:30 -0700 (PDT) Date: Mon, 17 Jun 2024 11:09:27 -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 net-next v5 7/7] af_packet: use sk_skb_reason_drop to free rx packets Message-ID: <5c336e8da85ce9940e75b9090b296cc7fd727cad.1718642328.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 Acked-by: Jesper Dangaard Brouer --- 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