From nobody Thu Feb 12 14:08:41 2026 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (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 C1DD915251C for ; Tue, 11 Jun 2024 20:11:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136690; cv=none; b=L4DsSdGULfYAqqHE/6/u0+Pgp5x1BKIEjXcU4dMxdwRwk118Py1Baew9f8Fr4BlQLETF59aqHwL2HvD2Th+zmeNRVPUpDgj+aF1GZ9VAJiXhEqfvksH//Xc7ubsc6jSycAIcFUVDZgfew9uOwpIfgymqjO4IWfjdDEY3rWOSPiM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136690; c=relaxed/simple; bh=hhH8GnZMFKtdtvPLm83V032mx4PN8otdUOGCLKtSSSI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=lwEexqVdycXCx/zAZTOimEpfdz7BT99AS/MG7vvzbwOtmXzlT7NMad4Th8VfSLYUEG+RAaxySZ0pgFsdxW1+N4OiJ1ZOIZU9pFKm9Yvo3GT9oHnEJRGiS09yyIv927ySTSRGJPPxNsP7/29hVaU67ruPkCae2CvSg8k5FqvGOys= 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=XeXz8YVw; arc=none smtp.client-ip=209.85.222.175 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="XeXz8YVw" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-797f2d8b408so15154685a.1 for ; Tue, 11 Jun 2024 13:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136688; x=1718741488; 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=NI1bBF93UkH74xgerslgPDj8Tvu8cKRQYZFS9ZEoK6U=; b=XeXz8YVwwNsm4V9N2OydCvUdaTUWhiv+1HCm8ewAW8N5uPnZCOcNTgzLBCqWrccEN6 lV1TAKct/USCsYd0VIY6q/h+Dl6wZ7yCOZNXN/KC8Y1549cbKiThQWimsVssXxdEWFDO 6fvy77lAm7mkhoF8bTNSkVUw9LCV3hkccy+0tuSOybL3dLEJAuPcQygfbr+YaMezSbZl uxeUku5Ub8kcNq8s2DbIsSY71IuxcjtS0rkqI86uNJ5DO04OfTRa+mO3sPJgR4lSkTPo 6O+OKJ8xtKCs+RxZ/5YDsVSxDdfs8ZQL5crNdVX/9Q077OLf3oZOzrjKisKoFzLs6Nae EDtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136688; x=1718741488; 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=NI1bBF93UkH74xgerslgPDj8Tvu8cKRQYZFS9ZEoK6U=; b=EVylsfg6fn3XsQ1r4d/62+to1Gqr95bTUu1oclnkmXRQQPnZr8jQs69EX2pOx2Tl+a NmL1C4VX5Z3zK7RKfgtu12Lf6/TACHFRz0+RGFsqnHyWn/YWcCsXEOUd+DvkDj7GNz1A wee79PORvQLxaiG4c+mKFG69pYquzwOoeUpv95Ez0yTTKFWBdOXdrkQN2+PwLoJMiBv3 LsGFZxGlpEePkG4jnjfA6OxmcKHRwYTZPV7oHY4sOxmwxiwFi0Pj0VVwgfmQgzuDuOGe UEeOzIASafbSrsbrTgGqQkRXqt/3YfX5tM2S4HYBiPh2TMjfFOUsPHnvyU4UOUlsCsc8 91sw== X-Forwarded-Encrypted: i=1; AJvYcCVhlSnx/sMvvtMGDHkonkPVrJXEnit8T5xT3DP4wIgkkiyDlm6fP+k2nEOYMcPQSIy66TzkFTS6NNaNPJ8QBw/XyRX9a2Y5rDrD7y+i X-Gm-Message-State: AOJu0YxbDHYVzPHoVHI2BMCxLLECX4hTL+opIuEfGayfL9v6yRdejnK9 oC44uKnYun+ADI4KpwSZu50nGT2FpLWHfdcmSSJgj2Z/9HoQ0APwk/58GkNx9EGyTc1mCpjJUON iyow= X-Google-Smtp-Source: AGHT+IHiCzXvs8wyuKiOi6CTgYFKRuCBKiteO6ebBtGe09HeJsKeBaIOxV5PinkxLBs8LosS3k2Uhw== X-Received: by 2002:a05:620a:2685:b0:796:a392:a2c5 with SMTP id af79cd13be357-796a392a48fmr691845885a.53.1718136687680; Tue, 11 Jun 2024 13:11:27 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7955de5594dsm268565785a.54.2024.06.11.13.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:26 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11:24 -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 1/7] net: add rx_sk to trace_kfree_skb Message-ID: 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" skb does not include enough information to find out receiving sockets/services and netns/containers on packet drops. In theory skb->dev tells about netns, but it can get cleared/reused, e.g. by TCP stack for OOO packet lookup. Similarly, skb->sk often identifies a local sender, and tells nothing about a receiver. Allow passing an extra receiving socket to the tracepoint to improve the visibility on receiving drops. Signed-off-by: Yan Zhai --- v3->v4: adjusted the TP_STRUCT field order to be consistent v2->v3: fixed drop_monitor function prototype --- include/trace/events/skb.h | 11 +++++++---- net/core/dev.c | 2 +- net/core/drop_monitor.c | 9 ++++++--- net/core/skbuff.c | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index 07e0715628ec..3e9ea1cca6f2 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h @@ -24,13 +24,14 @@ DEFINE_DROP_REASON(FN, FN) TRACE_EVENT(kfree_skb, =20 TP_PROTO(struct sk_buff *skb, void *location, - enum skb_drop_reason reason), + enum skb_drop_reason reason, struct sock *rx_sk), =20 - TP_ARGS(skb, location, reason), + TP_ARGS(skb, location, reason, rx_sk), =20 TP_STRUCT__entry( __field(void *, skbaddr) __field(void *, location) + __field(void *, rx_skaddr) __field(unsigned short, protocol) __field(enum skb_drop_reason, reason) ), @@ -38,12 +39,14 @@ TRACE_EVENT(kfree_skb, TP_fast_assign( __entry->skbaddr =3D skb; __entry->location =3D location; + __entry->rx_skaddr =3D rx_sk; __entry->protocol =3D ntohs(skb->protocol); __entry->reason =3D reason; ), =20 - TP_printk("skbaddr=3D%p protocol=3D%u location=3D%pS reason: %s", - __entry->skbaddr, __entry->protocol, __entry->location, + TP_printk("skbaddr=3D%p rx_skaddr=3D%p protocol=3D%u location=3D%pS reaso= n: %s", + __entry->skbaddr, __entry->rx_skaddr, __entry->protocol, + __entry->location, __print_symbolic(__entry->reason, DEFINE_DROP_REASON(FN, FNe))) ); diff --git a/net/core/dev.c b/net/core/dev.c index 85fe8138f3e4..7844227ecbfd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5233,7 +5233,7 @@ static __latent_entropy void net_tx_action(struct sof= tirq_action *h) trace_consume_skb(skb, net_tx_action); else trace_kfree_skb(skb, net_tx_action, - get_kfree_skb_cb(skb)->reason); + get_kfree_skb_cb(skb)->reason, NULL); =20 if (skb->fclone !=3D SKB_FCLONE_UNAVAILABLE) __kfree_skb(skb); diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c index 430ed18f8584..2e0ae3328232 100644 --- a/net/core/drop_monitor.c +++ b/net/core/drop_monitor.c @@ -109,7 +109,8 @@ static u32 net_dm_queue_len =3D 1000; struct net_dm_alert_ops { void (*kfree_skb_probe)(void *ignore, struct sk_buff *skb, void *location, - enum skb_drop_reason reason); + enum skb_drop_reason reason, + struct sock *rx_sk); void (*napi_poll_probe)(void *ignore, struct napi_struct *napi, int work, int budget); void (*work_item_func)(struct work_struct *work); @@ -264,7 +265,8 @@ static void trace_drop_common(struct sk_buff *skb, void= *location) =20 static void trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, void *location, - enum skb_drop_reason reason) + enum skb_drop_reason reason, + struct sock *rx_sk) { trace_drop_common(skb, location); } @@ -491,7 +493,8 @@ static const struct net_dm_alert_ops net_dm_alert_summa= ry_ops =3D { static void net_dm_packet_trace_kfree_skb_hit(void *ignore, struct sk_buff *skb, void *location, - enum skb_drop_reason reason) + enum skb_drop_reason reason, + struct sock *rx_sk) { ktime_t tstamp =3D ktime_get_real(); struct per_cpu_dm_data *data; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 466999a7515e..2854afdd713f 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1203,7 +1203,7 @@ bool __kfree_skb_reason(struct sk_buff *skb, enum skb= _drop_reason reason) if (reason =3D=3D SKB_CONSUMED) trace_consume_skb(skb, __builtin_return_address(0)); else - trace_kfree_skb(skb, __builtin_return_address(0), reason); + trace_kfree_skb(skb, __builtin_return_address(0), reason, NULL); return true; } =20 --=20 2.30.2 From nobody Thu Feb 12 14:08:41 2026 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (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 6C815153509 for ; Tue, 11 Jun 2024 20:11:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136694; cv=none; b=D7mwwhxUb3HlT1QuTNnZTa0tOvL2ZOv6tjKCA62e6shVI3miCSZRRW8ODT/kicukFjuAqFrJ4VstlmbaSd82/LVtWdqW4ceTnfr1Y8IMCaqarJ2HdjL8mI57v48pctZgMNo4tnp39FdRdaylRURV8SELxs4VIovj2/J24EWc5FU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136694; c=relaxed/simple; bh=Gs30pldD4IYhwgM9Z2RPF0lE51iD4CooDjoR4sEXvh0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OJdhrPEk6lxAeJRMhxwsNPy2xIERoyOx1K6pmRCZtKxhik9Lmo6n3nLYHpIKvVi31mhDmuaM86ky+n+lAV4bCsb/HBDCqgaGkJzCaZJsJpg1jIUmExo3IdhFgGGr5MLMG6E3gZMKJDJQQZioJBGwinMX1rJ1MYggv/9bcpDPWWM= 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=cq+xKo32; arc=none smtp.client-ip=209.85.167.178 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="cq+xKo32" Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3cabac56b38so3623921b6e.3 for ; Tue, 11 Jun 2024 13:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136691; x=1718741491; 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=8Z9GdxrPO2MLCd8f731wHDlufWSwkyCPNseSHb6h3wQ=; b=cq+xKo32LLjjWpIql/Z4G+sZy0UsMtXDJhx9/MGdgONfciRiOxEZMTfz18OiSqNAM0 MloqM+RMn2CeYWTR5kMTdB76tlVQ/uI3cyktsWmv9bBa5zvCeOgMxIfDcMXar1P/pPbC +KHsjGuVxi9iW4O9SvLL0H5c5vk4llxclH6UJUYyJ2j4dmo14nmPbm/XnQEV7KRAd/vU deguuyPWsZxjZALd3U2T5qWe7o71QYekV2rxMMoTijydZHQNr7/zd4qg62Jvk91AvuoU xM8VjeORQtiWGF4VzSAzuvm9/6/hVvCZHPG0tpb486ZJ2XjSvcr4jzIxmvL48/9KJ4zy n70Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136691; x=1718741491; 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=8Z9GdxrPO2MLCd8f731wHDlufWSwkyCPNseSHb6h3wQ=; b=wYdSya8UL+B4X/Hnu81iCH08Mee6Jkb9yWJ/cj8oYlbwEgVjD/uc6XmTTzkPsn/tIh xrB7BgFGmiAY2jk4LiJ7Z2tRSktJLO6QR2s2HRK8IsVWlTBsqNJeNfjHjBKMwQG61U3Y ZpgdHCmdZUGJKMECF7fUVXgdbkYI2kBbE6A4wWL8LswfsYXCIpXF/yK6AYYOFUyvPBiH s+uOMP7nWRl5g6hCIay60/NGLvxM2DZbd5m684xfy06NvdI1uEKVdXLxM6BU59vasYa9 ddNrkYb6BAKPANtuObUq43sf+/kI7PqUFe5oKcbfpwpJD+oZorRTWKmQs43DpJoR4RCy ukTw== X-Forwarded-Encrypted: i=1; AJvYcCX8P18cxrCQQIQ2BEUSvXaepWgkADvUeHgazEOdQQ7Qtz4u2MIv4K1AglX2FUzMQWiI2l39+3UuUwemtG41dUB6TpHmYGHbfd26yj/A X-Gm-Message-State: AOJu0Yxii9lBHaWscHvnu2HsoWMMbXC98PDtW4MToVZjX5op9abe6zUC 8RRCeQaEgB0jCqry3Jun++Gt1Kl1+bUmh9L+DpkyobhVAFWse9c4xTwwySnZYWY= X-Google-Smtp-Source: AGHT+IFJP4zNmeqrkkMtxprNnhjyaW8BD6jY1LNk4cFHEerqHQKxd78N0bcr8httHKTFrx++YRgKUQ== X-Received: by 2002:a05:6808:3085:b0:3d2:3dba:f599 with SMTP id 5614622812f47-3d23dbafceemr56055b6e.11.1718136691331; Tue, 11 Jun 2024 13:11:31 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-440ee9ca87esm21560111cf.23.2024.06.11.13.11.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:30 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11: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 v4 net-next 2/7] net: introduce sk_skb_reason_drop function Message-ID: <4dffb0fb7b26f803c7fcf6dfdbcd76489615c4de.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" Long used destructors kfree_skb and kfree_skb_reason do not pass receiving socket to packet drop tracepoints trace_kfree_skb. This makes it hard to track packet drops of a certain netns (container) or a socket (user application). The naming of these destructors are also not consistent with most sk/skb operating functions, i.e. functions named "sk_xxx" or "skb_xxx". Introduce a new functions sk_skb_reason_drop as drop-in replacement for kfree_skb_reason on local receiving path. Callers can now pass receiving sockets to the tracepoints. kfree_skb and kfree_skb_reason are still usable but they are now just inline helpers that call sk_skb_reason_drop. Note it is not feasible to do the same to consume_skb. Packets not dropped can flow through multiple receive handlers, and have multiple receiving sockets. Leave it untouched for now. Suggested-by: Eric Dumazet Signed-off-by: Yan Zhai --- v1->v2: changes function names to be more consistent with common sk/skb operations --- include/linux/skbuff.h | 10 ++++++++-- net/core/skbuff.c | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index fe7d8dbef77e..c479a2515a62 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1251,8 +1251,14 @@ static inline bool skb_data_unref(const struct sk_bu= ff *skb, return true; } =20 -void __fix_address -kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason); +void __fix_address sk_skb_reason_drop(struct sock *sk, struct sk_buff *skb, + enum skb_drop_reason reason); + +static inline void +kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason) +{ + sk_skb_reason_drop(NULL, skb, reason); +} =20 /** * kfree_skb - free an sk_buff with 'NOT_SPECIFIED' reason diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 2854afdd713f..9def11fe42c4 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1190,7 +1190,8 @@ void __kfree_skb(struct sk_buff *skb) EXPORT_SYMBOL(__kfree_skb); =20 static __always_inline -bool __kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason) +bool __sk_skb_reason_drop(struct sock *sk, struct sk_buff *skb, + enum skb_drop_reason reason) { if (unlikely(!skb_unref(skb))) return false; @@ -1203,26 +1204,27 @@ bool __kfree_skb_reason(struct sk_buff *skb, enum s= kb_drop_reason reason) if (reason =3D=3D SKB_CONSUMED) trace_consume_skb(skb, __builtin_return_address(0)); else - trace_kfree_skb(skb, __builtin_return_address(0), reason, NULL); + trace_kfree_skb(skb, __builtin_return_address(0), reason, sk); return true; } =20 /** - * kfree_skb_reason - free an sk_buff with special reason + * sk_skb_reason_drop - free an sk_buff with special reason + * @sk: the socket to receive @skb, or NULL if not applicable * @skb: buffer to free * @reason: reason why this skb is dropped * - * Drop a reference to the buffer and free it if the usage count has - * hit zero. Meanwhile, pass the drop reason to 'kfree_skb' - * tracepoint. + * Drop a reference to the buffer and free it if the usage count has hit + * zero. Meanwhile, pass the receiving socket and drop reason to + * 'kfree_skb' tracepoint. */ void __fix_address -kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason) +sk_skb_reason_drop(struct sock *sk, struct sk_buff *skb, enum skb_drop_rea= son reason) { - if (__kfree_skb_reason(skb, reason)) + if (__sk_skb_reason_drop(sk, skb, reason)) __kfree_skb(skb); } -EXPORT_SYMBOL(kfree_skb_reason); +EXPORT_SYMBOL(sk_skb_reason_drop); =20 #define KFREE_SKB_BULK_SIZE 16 =20 @@ -1261,7 +1263,7 @@ kfree_skb_list_reason(struct sk_buff *segs, enum skb_= drop_reason reason) while (segs) { struct sk_buff *next =3D segs->next; =20 - if (__kfree_skb_reason(segs, reason)) { + if (__sk_skb_reason_drop(NULL, segs, reason)) { skb_poison_list(segs); kfree_skb_add_bulk(segs, &sa, reason); } --=20 2.30.2 From nobody Thu Feb 12 14:08:41 2026 Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (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 8EC03154430 for ; Tue, 11 Jun 2024 20:11:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136697; cv=none; b=BJOPJ5ftKuVF1E1zJqvTZm288R2lEOMbkuZzbN97bFfy+1TxFJpGBrLh/bZNTBt8I60Mg8if98Q4nLvDJEdXLug8oPeg8XJR3ADeOKTyKSdJ7bjG6mcl+yfuLBHbHPZPRk0hlWDSOpooqidxq9FIeV0ukx+CcKYridF9KC+cl78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136697; c=relaxed/simple; bh=jkzjDY7vnEB8DqdbcGuw7ABHpoGpOOOicO2KkYgqYYM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=WhOTaBSG7NIt7aE8D9yrCji5aOyDkpIfi9WPQQWkXgTPSyJX0US7icWOaTvIWBweRMDqN9pp1kicJYHMbcfjqZ7+bQgUPs5/Yf17+i3X93PbqcHVJQidJ2h/gVkAZymiOC+2ouGaB5bKoAkOwnrX4xa8BPWC8EEaxgrtU66uZ9Y= 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=e+BePbcu; arc=none smtp.client-ip=209.85.219.42 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="e+BePbcu" Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6ae259b1c87so1927896d6.1 for ; Tue, 11 Jun 2024 13:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136694; x=1718741494; 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=ZokBvFXzTLhgVv1PaHNF9XfQX0m9YCf5c4LTRhvqEjE=; b=e+BePbcu8ZjGcArQu6Z63bcVoN2WEDS+54nsb7qzW2UGNbanIk834sFQ/lJqIXX0ad PElzQgX3oI7KjLwZbRAJ63Yndve7vIliRfM1/02lx+xh7I9dbwnMKWhDbAzF3f/2jBx/ KyKJ2PJlACfvEwb3W5wXGePw3C41Si0Gx5TBLhwIpBQMuqkxg+2Dz8Bt9efxd/GDHddv ehWHKmv0sfv93kna3hVUE87uKHQNwcfSeKtC/aL6vikViBmTkhDC+jerlFebXLGbyPUm umgB/NVMaFsELeyMkP0rU/9OmqjQAmXkIlNeKI1Yhyt4Ff5wNbOEJMXZ63LK1j702s2z ECgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136694; x=1718741494; 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=ZokBvFXzTLhgVv1PaHNF9XfQX0m9YCf5c4LTRhvqEjE=; b=RWnUDnViTGCltaMaHoLNAzAFh7074baA9AuJy88Wf6ciCqyqGAPbHytiZvi4Ghv8y1 Q3n/H2kPiQ4HJCZl8gU/GBB+LHu+t8OZNXff7RmAAEugdNsTtPtBHECyRJ3vKrQtuM2U us++V3lYxAMilMHXft4gHj5ZUqwRNShsnybyaWR2rYSbFSrwGy+azBD9t0lQVZBgddqu BrahrX8XLvx6S/sChwlAE2qFMaV0hKP7yo1QSrwN1JVFKAQ/s4+EP5DhQxSOSHrGDmFg gRWN5HwOq9Sb7Mv/Ls+tMaVY8ScvPwK3HfuuNoIGHtBBJZNRsqDqaqVIERDsFqQxm+V7 bnFQ== X-Forwarded-Encrypted: i=1; AJvYcCVIKaRaaMZDPA23gur4iXNzErDYsWMWANNIQe1YJOypDOvxDYte42rNSowAcCFBgj/oVUu8EHGdHANsJO166NDBh2wcNtGmgHpT4WRZ X-Gm-Message-State: AOJu0Yy7oAhDI9Rvj1jZdpFhYYfjIcv6BaF2aGtrobDdePMTuO6Y465i CbcoXO1Ev4c7SmGDRAYYbDS+6O1DAH77gNmmS28Agc2bn4N16rZIUBaY02+NsLM= X-Google-Smtp-Source: AGHT+IEIVKV/a0EOOQ2T3f8JufAk9clK5Yfa/OE6wFOWw3Hdml8aRpN+s1jZuSt/UZhuL5AijoE+yA== X-Received: by 2002:a05:6214:5b85:b0:6b0:767d:4c25 with SMTP id 6a1803df08f44-6b0d3cf4fffmr154996d6.22.1718136694494; Tue, 11 Jun 2024 13:11:34 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b06795349csm41843116d6.1.2024.06.11.13.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:33 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11:31 -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 3/7] ping: use sk_skb_reason_drop to free rx packets Message-ID: 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. Signed-off-by: Yan Zhai --- net/ipv4/ping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 823306487a82..619ddc087957 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -946,7 +946,7 @@ static enum skb_drop_reason __ping_queue_rcv_skb(struct= sock *sk, pr_debug("ping_queue_rcv_skb(sk=3D%p,sk->num=3D%d,skb=3D%p)\n", inet_sk(sk), inet_sk(sk)->inet_num, skb); if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) { - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); pr_debug("ping_queue_rcv_skb -> failed\n"); return reason; } --=20 2.30.2 From nobody Thu Feb 12 14:08:41 2026 Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (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 1BBAF1552EF for ; Tue, 11 Jun 2024 20:11:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136700; cv=none; b=HDfL9Mcwc82yGb2/8AE3qL/BeECFReApBNRKKzGrOURkO1x/z1LMfVONFKonY/vwKjcwiE+hX6fNV9NekJGOHKBWDCCzgFaevPuEGR+0uZSiKoCg13CAqk2zlR6mIor9LzTdVSYEJe9uLyozqkMv/O7anzaQwx2oM2qPaGw3p5A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136700; c=relaxed/simple; bh=kSyvuVmoawm0A1229Z9cjCnSswrtkKHtT2WgaP8HoEM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=tlH5vDSRHuBzMpCnQ6OXMSOy5B18IIz4iuuqCcroFaeKjezg5tVsEGE+UHhve0S0VH6PrTbxeb6F+bgWS0nJu/RbG+uJjQXG72yjqBNYVQd/9Jgy4AhEgtrIQRsrDcT5o+DTSQfs8wau/hcZytEgke9hjN4XzGEBFq4F2K5tZQQ= 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=QdNHsRvr; arc=none smtp.client-ip=209.85.160.173 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="QdNHsRvr" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-440655e64bdso15996001cf.0 for ; Tue, 11 Jun 2024 13:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136698; x=1718741498; 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=GJDm6iwovalgWz0sxMpvGD5PNxGmSKas+lavj2Qq0ow=; b=QdNHsRvrK/UIDkzD04IWuss4jSKUmKqm0ZHqFWUwBkRgK5xsYV2Gc2vyi4CHxQ0gaj U1SA8tcDR3lokSPN5NcIvpsEmNS9KJCTNBSkO2rL1HuXoqRvyFNqVJfK7YEtn3WCPlGC dKeo2cIZ1tIR9Eo3tu0b+s+iNiywvehiXMJ/UPy21vbPSNJDBTJxgEOtAH5kuTG/AOMY kKxB++fE1Rhmps2Mb263QKGGe5JUsRkVMruhYY0o8c/Ym1NGEVLqvk4iXsHmeH5mdVGh Su4yN9vLUm1MxAE6RFcIF3QNbBeScr4RUId2hmPZyGSPZPLJmEHH1xR/lMtgKtaWcRz4 nF2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136698; x=1718741498; 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=GJDm6iwovalgWz0sxMpvGD5PNxGmSKas+lavj2Qq0ow=; b=Mnu/qyPN+Jtb4CfoFcDKPCdiIdg3BzHeRrP5jb9BUwhgP0yHKATYgT9az2/RbNCtHg o9m9KaX0JEU27IkltLDTNLoOzTmToyD29X9s0CB7adAhs8MTsmciKjWu1HXp1vpG9zYl US8yjoKpzykPFaOFfZoGvXNxXD4E1IKsVSNwlNfBdTXTUrQ5u5fpZ+CKY9NXeTdZBgmW h5ZVtt2nR/vAE2b4//VEeLzgV8Hhm1F4Foxt9mJEwnLpGFIVAFFmdM9fDMfZshLG39Cf Sfpvp+LTCOOzwxbmgmXaXQctpNt6uTPxL25veV/ptZ0HHf2qBaNm7n+8bjGpszY8dzAQ HCKg== X-Forwarded-Encrypted: i=1; AJvYcCXlrzmOldSWMOCfRnHZd7SLZMqK9+Uu0c+vBMG2TMKBUXfPOkpwUOs6+9fmMcBbtMOCZq82mraqtkK5j42JWxDICkb5NmL1oAQQSiWE X-Gm-Message-State: AOJu0YyC5ExNXL4NHlJ0IonQAE9JNpjGmZX/7MsKY3OruiOYkcQ9KER1 NLqrD9PgEfw2IWHiCl0PVSz+D7Vq6FnmZHVyXelu3hNCAhYpuoRBE0hG2HWpg7o= X-Google-Smtp-Source: AGHT+IFG2LHNkNrmM8LwyxsmAjLFzEZPaw4Rgpe4bevZPvjwtxPqdhXi5BWC700Tr4m+jS69RvXT0A== X-Received: by 2002:a05:6214:3011:b0:6b0:64d5:62a8 with SMTP id 6a1803df08f44-6b06651fcd8mr140324296d6.33.1718136697822; Tue, 11 Jun 2024 13:11:37 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b075a5b295sm31838136d6.38.2024.06.11.13.11.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:37 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11:34 -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 4/7] net: raw: use sk_skb_reason_drop to free rx packets Message-ID: <3657744364d746046fae2306c26cdbf2e8c8c4a8.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. Signed-off-by: Yan Zhai --- net/ipv4/raw.c | 4 ++-- net/ipv6/raw.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 1a0953650356..474dfd263c8b 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -301,7 +301,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff = *skb) =20 ipv4_pktinfo_prepare(sk, skb, true); if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) { - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return NET_RX_DROP; } =20 @@ -312,7 +312,7 @@ int raw_rcv(struct sock *sk, struct sk_buff *skb) { if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) { atomic_inc(&sk->sk_drops); - kfree_skb_reason(skb, SKB_DROP_REASON_XFRM_POLICY); + sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_XFRM_POLICY); return NET_RX_DROP; } nf_reset_ct(skb); diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index f838366e8256..608fa9d05b55 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -362,14 +362,14 @@ static inline int rawv6_rcv_skb(struct sock *sk, stru= ct sk_buff *skb) if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) && skb_checksum_complete(skb)) { atomic_inc(&sk->sk_drops); - kfree_skb_reason(skb, SKB_DROP_REASON_SKB_CSUM); + sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_SKB_CSUM); return NET_RX_DROP; } =20 /* Charge it to the socket. */ skb_dst_drop(skb); if (sock_queue_rcv_skb_reason(sk, skb, &reason) < 0) { - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return NET_RX_DROP; } =20 @@ -390,7 +390,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) =20 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) { atomic_inc(&sk->sk_drops); - kfree_skb_reason(skb, SKB_DROP_REASON_XFRM_POLICY); + sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_XFRM_POLICY); return NET_RX_DROP; } nf_reset_ct(skb); @@ -415,7 +415,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) if (inet_test_bit(HDRINCL, sk)) { if (skb_checksum_complete(skb)) { atomic_inc(&sk->sk_drops); - kfree_skb_reason(skb, SKB_DROP_REASON_SKB_CSUM); + sk_skb_reason_drop(sk, skb, SKB_DROP_REASON_SKB_CSUM); return NET_RX_DROP; } } --=20 2.30.2 From nobody Thu Feb 12 14:08:41 2026 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (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 A268515530F for ; Tue, 11 Jun 2024 20:11:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136704; cv=none; b=WUTcNAwdEjMq8IVx1c2b4+HV1zMLX775uhZTNmqE1mrbVUS7RlZKH8zY9i319tUllmwbClt9nnRO/k4PxaoqmecmrfCGODO4DPtOEy1Th9+l3diZp1oQ871LOxSbTTCdSFvP3OQUbPi4L3x0SaBgMgSARfDBe10gyjaHqa64Io4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136704; c=relaxed/simple; bh=deJZMXGB4u9IlWilhC165qOhNKSkcsd0Cq2qS5gJdV8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=dX6Hkwnl756KDDZ/gMmm03mKGUOY8v40/l217qcNqy4QPHwsqUgXyP6veH9G1hXeWEey8e6iw8e2hdg1F/BNqXx19JJUgGdAk4bIuOJ/hJ6qM/7qPWtcAHQmyhEhyQbYVphW0EkCGcD3nDWLQLMDMaHxiRpS6S0Jw2+6mx/ZJwg= 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=IFSpVwUu; arc=none smtp.client-ip=209.85.160.175 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="IFSpVwUu" Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-440655e64bdso15996341cf.0 for ; Tue, 11 Jun 2024 13:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136701; x=1718741501; 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=J+g79hCGPCQt1VIhgByLxRis8HiHyiHDdOiniWzs6eI=; b=IFSpVwUuraSPkcoGXVjxU5fmvJdCnpH05WjgeT30wd65YubebBOWDPqjMHyQfJ5tX6 w/pA2TIC3lWKubf2p229wfYw5ozN5otLmHgjrjqeiCtgWdpMqH1u3+WkXY9Rwv+TmO2c VlRxCuzYdXKyt6N5hUwqTozUQ9quNmlriW5fh8L4RlRi2XOp1bxnkod4EVNo5CiAYdLK 6Gkiwps6D4PaIDkBk7OlvT5IBGZerZHRxSYYacGAnjY+kKFlEAnoqRPlCoqt5bHx3Z6J unJvtokL/qmGHvnSKAji1jAkLeXr7RAxGeslqRM1kEUzJO2nE6n+odD8Q0d2gMfvhBi+ GV5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136701; x=1718741501; 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=J+g79hCGPCQt1VIhgByLxRis8HiHyiHDdOiniWzs6eI=; b=CFO+ArmvsNyWp4srYmnX8/Fhxwe/mNzl8iiQ3Zf4okoUYBhlUlELfVFDf1bkre4nda 9vB3HrejknjL507nexU9AJlEEpkLHymfdyWILL52KgQBs3QkHCogZzJ/0J61txXBaaWJ gRmZIvru3GCIW7jIsglyvNkzNrLlVbIGq2kuF0oAbAAbuw24mB8RYAE4rqA6GYNoF8pF dmg/3XUCZZNJAYVUs0dszsY+j2JGhChQeqX63Tu/Mr8f6JEx93iwcM0Nu5Sg37vkFpcf 27LeI4dNRy8/8543cUzxOEDK6q+5AzOjIPoqMH/7fK3zZVfzI8Jbt4vV0mvWR15N+95e IKGg== X-Forwarded-Encrypted: i=1; AJvYcCUjAdtPzFTSzxbPrj6KsK+aIpDdnw6ZPJeUWGtVW9FBGuiAiJKUIVqY31t+xGhetwpYGtGG3c3ZLJ6NLubwGuaADaqUx6EWKDr1mXSx X-Gm-Message-State: AOJu0YzrkEjrKPbRB/MyBHP+qNNlfohh2OM5gOJeKAQ0rEJiLFCcBSMS mtH2v6rE8Xr0L1uBaEfXp0qAqqTIeLqtr618BVn71XU7hb+jg9WEAJ94hn6J9D0= X-Google-Smtp-Source: AGHT+IEWtuUfSx77Bbf2QPCSwXpf5lk+TXIDXuDGBLk4/0nf17pY4+xXrJ50vWppx/TAeftTZpJB+w== X-Received: by 2002:ac8:5a51:0:b0:441:338c:77cf with SMTP id d75a77b69052e-441338c7e81mr42000111cf.65.1718136701328; Tue, 11 Jun 2024 13:11:41 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4405cfb81fcsm31452431cf.69.2024.06.11.13.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:40 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11:38 -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 5/7] tcp: use sk_skb_reason_drop to free rx packets Message-ID: 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/202406011539.jhwBd7DX-lkp@intel.com/ Signed-off-by: Yan Zhai --- v2->v3: added missing report tags --- net/ipv4/syncookies.c | 2 +- net/ipv4/tcp_input.c | 2 +- net/ipv4/tcp_ipv4.c | 6 +++--- net/ipv6/syncookies.c | 2 +- net/ipv6/tcp_ipv6.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c index b61d36810fe3..1948d15f1f28 100644 --- a/net/ipv4/syncookies.c +++ b/net/ipv4/syncookies.c @@ -496,6 +496,6 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk= _buff *skb) out_free: reqsk_free(req); out_drop: - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return NULL; } diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 5aadf64e554d..bedb079de1f0 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4859,7 +4859,7 @@ static void tcp_drop_reason(struct sock *sk, struct s= k_buff *skb, enum skb_drop_reason reason) { sk_drops_add(sk, skb); - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); } =20 /* This one checks to see if we can put data from the diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 041c7eda9abe..f7a046bc4b27 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1939,7 +1939,7 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *sk= b) 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, @@ -2176,8 +2176,8 @@ int tcp_v4_rcv(struct sk_buff *skb) int dif =3D inet_iif(skb); const struct iphdr *iph; const struct tcphdr *th; + struct sock *sk =3D NULL; bool refcounted; - struct sock *sk; int ret; u32 isn; =20 @@ -2376,7 +2376,7 @@ int tcp_v4_rcv(struct sk_buff *skb) 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; =20 discard_and_relse: diff --git a/net/ipv6/syncookies.c b/net/ipv6/syncookies.c index bfad1e89b6a6..9d83eadd308b 100644 --- a/net/ipv6/syncookies.c +++ b/net/ipv6/syncookies.c @@ -275,6 +275,6 @@ struct sock *cookie_v6_check(struct sock *sk, struct sk= _buff *skb) out_free: reqsk_free(req); out_drop: - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return NULL; } diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 1ac7502e1bf5..93967accc35d 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1678,7 +1678,7 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *sk= b) 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 =3D SKB_DROP_REASON_TCP_CSUM; @@ -1751,8 +1751,8 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff= *skb) int dif =3D inet6_iif(skb); const struct tcphdr *th; const struct ipv6hdr *hdr; + struct sock *sk =3D NULL; bool refcounted; - struct sock *sk; int ret; u32 isn; struct net *net =3D dev_net(skb->dev); @@ -1944,7 +1944,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff= *skb) =20 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; =20 discard_and_relse: --=20 2.30.2 From nobody Thu Feb 12 14:08:41 2026 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 B36BF155A43 for ; Tue, 11 Jun 2024 20:11:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136707; cv=none; b=BDqLq48lXEItKTbF+gbLC3KiFIffNetT9ADhgEP2feK0vRq/72NImTNC+LzJcOH+h8jNjIcZj1pNNmWhDHEDzTisfdIdKSdu5Q48y5NVZawlweGyt98Fb9FGWChe0o8bB50UtcSS0P//SBjUHZb7mcvUjKx7WSELF/ryj0ncw/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718136707; c=relaxed/simple; bh=j0ydkIBK6v7Eeei6xO8sCTgU/f0LdUJsud2ZNVHdLms=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Dn0QTx4FENH5VuZNyUd9d+s97gkOZKfKUJVWxvrisVwW5L3qYPatOh5/2qxyAYV4JPM6LmnVMt6SVTB3Dok64JSXr7ZITo1bQsGwQgQ9XawJM/3cExDm4+Nr5J5KP/092LvvdDjnJfJcAmL5AVq7vd4bsdev9h+AePf5/jxCDlg= 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=btQCwUEn; arc=none smtp.client-ip=209.85.219.45 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="btQCwUEn" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-6b06b78e716so19773346d6.3 for ; Tue, 11 Jun 2024 13:11:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718136705; x=1718741505; 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=rAchTAFhWTofDy57Shf/o1FtCjgXoHrGCl9Vam22s+I=; b=btQCwUEnz5mYGvQivuuuQwtQFHqYcLe85KdCB9GWw4BwmMAwm/WitqR2aLYDydLe2+ 5rcgY12GsJ0++tYhUec/4nW5eaOOJgt5j4GG/mi9QteHSfTAG4abq/mkZtKdAOm2um/J 43repbhJ4b61ZOUlfGRd8F39X+oFgdfRGtRCir0jULxA+iFjzGUBfwFagnqq/NAKACjy XZTPlyGE/jcwY0ROiWPPWHHc9HzyiRyLcpfRiwfbK8BdvQKA9c3J+2OVG9uVE6LNr067 6chlEAiZEVuuTx5urW+sXnvjVinmW5C1p/EnuUUzbkezN+ESelF8SQvGaSGoWwrK736w 7qHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136705; x=1718741505; 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=rAchTAFhWTofDy57Shf/o1FtCjgXoHrGCl9Vam22s+I=; b=X6N4BCgNkHPRGxzq4SuCQQJro11Ff5YuvJBiOhMe6z9RcJjEv43xX8GvAHeRDpUZgh ZXs9ZVWEvWwPF+mYCU10lY4uhjf3p91fEMxh5lkbETWbUHuIF8X/fF120FK2TD5YeVnD 9dOY+OxHgE60UyHX7LvAGMiNnPRb9P2j9SQ0ouI6lxCKtyL3cVRpnZ3O3DtqVTKTRmT6 tVhoYiTg12FrboeFP6u2/zBkSvu8GjfKpFhq4eX58tL7sxzSOlgvzsnJX6SN7l5Jd7jh DC8EJBdOxxGwgAVT5W0tzi5qtTHi+56bkABzIYiyAdZntc3cjp9V1qARpa6D8Ogd3Rdv iUbg== X-Forwarded-Encrypted: i=1; AJvYcCX0A1+454ELFsTrYgiMRiaUFB+1Ri2YkZK/mZVLpdC/rkE64EPsjdTUXPJjUATkoTM0AcGAmppB6rxQBpeI9mO8z4FBrjsU8pozZiGi X-Gm-Message-State: AOJu0YxtKavCgYt/HXIy2MpfXOppQQzkw9pjpYm4vwBwSYuHPhlMTmmG K5Gau+NxJnQa0SrsghJLaY4Z2wHAHtqrCksOi0vb2T/Zo/d9KCqNYkHn0Z80a7g= X-Google-Smtp-Source: AGHT+IEK2A7vGoKY5E2V9Rwtbr7PMRiox+OCvFwNmPWCHFGCi9cRvjVD9gQTHMU1KfmJN2HlWmQyug== X-Received: by 2002:a05:6214:3a08:b0:6b0:8d20:e57e with SMTP id 6a1803df08f44-6b08d20eba6mr25114156d6.7.1718136704595; Tue, 11 Jun 2024 13:11:44 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b06ed7213bsm37089046d6.15.2024.06.11.13.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jun 2024 13:11:43 -0700 (PDT) Date: Tue, 11 Jun 2024 13:11:41 -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 6/7] udp: use sk_skb_reason_drop to free rx packets Message-ID: <3398cda9d35d079a7563ceb08c49fbc2aa7c9021.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/202406011751.NpVN0sSk-lkp@intel.com/ Signed-off-by: Yan Zhai --- v2->v3: added missing report tags --- net/ipv4/udp.c | 10 +++++----- net/ipv6/udp.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 189c9113fe9a..ecafb1695999 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2074,7 +2074,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struc= t sk_buff *skb) } UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite); trace_udp_fail_queue_rcv_skb(rc, sk, skb); - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return -1; } =20 @@ -2196,7 +2196,7 @@ static int udp_queue_rcv_one_skb(struct sock *sk, str= uct sk_buff *skb) drop: __UDP_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite); atomic_inc(&sk->sk_drops); - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return -1; } =20 @@ -2383,7 +2383,7 @@ static int udp_unicast_rcv_skb(struct sock *sk, struc= t sk_buff *skb, int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, int proto) { - struct sock *sk; + struct sock *sk =3D NULL; struct udphdr *uh; unsigned short ulen; struct rtable *rt =3D skb_rtable(skb); @@ -2460,7 +2460,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, * Hmm. We got an UDP packet to a port to which we * don't wanna listen. Ignore it. */ - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return 0; =20 short_packet: @@ -2485,7 +2485,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, __UDP_INC_STATS(net, UDP_MIB_CSUMERRORS, proto =3D=3D IPPROTO_UDPLITE); drop: __UDP_INC_STATS(net, UDP_MIB_INERRORS, proto =3D=3D IPPROTO_UDPLITE); - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return 0; } =20 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index c81a07ac0463..b56f0b9f4307 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -673,7 +673,7 @@ static int __udpv6_queue_rcv_skb(struct sock *sk, struc= t sk_buff *skb) } UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite); trace_udp_fail_queue_rcv_skb(rc, sk, skb); - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return -1; } =20 @@ -776,7 +776,7 @@ static int udpv6_queue_rcv_one_skb(struct sock *sk, str= uct sk_buff *skb) drop: __UDP6_INC_STATS(sock_net(sk), UDP_MIB_INERRORS, is_udplite); atomic_inc(&sk->sk_drops); - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return -1; } =20 @@ -940,8 +940,8 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_tabl= e *udptable, enum skb_drop_reason reason =3D SKB_DROP_REASON_NOT_SPECIFIED; const struct in6_addr *saddr, *daddr; struct net *net =3D dev_net(skb->dev); + struct sock *sk =3D NULL; struct udphdr *uh; - struct sock *sk; bool refcounted; u32 ulen =3D 0; =20 @@ -1033,7 +1033,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, __UDP6_INC_STATS(net, UDP_MIB_NOPORTS, proto =3D=3D IPPROTO_UDPLITE); icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0); =20 - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return 0; =20 short_packet: @@ -1054,7 +1054,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_ta= ble *udptable, __UDP6_INC_STATS(net, UDP_MIB_CSUMERRORS, proto =3D=3D IPPROTO_UDPLITE); discard: __UDP6_INC_STATS(net, UDP_MIB_INERRORS, proto =3D=3D IPPROTO_UDPLITE); - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return 0; } =20 --=20 2.30.2 From nobody Thu Feb 12 14:08:41 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