From nobody Sun Dec 14 06:33:12 2025 Received: from mail-oo1-f45.google.com (mail-oo1-f45.google.com [209.85.161.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 A9EB9197A65 for ; Mon, 17 Jun 2024 18:09:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647752; cv=none; b=KfeofIxVHnvSif3uep2KIRuePCjy6CB2RUlGaxZgMJxmbftrNRLGl9Ap1vKugtTkzlx0wIzIPH9lsZymbQNdjIyRP8/yt1xpA9U5VAsCv6/wdUv2fiYmVeAcLUf5pFS6JGV4pka1UriACAz49+skMq1CWg9nm3diEaBvfDuKng4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647752; c=relaxed/simple; bh=vSfiyKkiX4bwsedqVMUi+UNKfQCtnxdJsfNl5zihRVA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=hq33SsTUeYUEliYIjw9voO1zLJBYOQDWK6bvCEscv6YPIGUZYK7OcmiibufOZh0XqrVNbpmPdzJ6glHISSZFSWP2cv8+dHGFeDGyU6Xvafj2NX+vRnFfVxWHxGSrWXlajKJ3wTsCj3zFQc6IZ+EQn8eOtppbB3EgXAgvr8LJ6aU= 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=JmZlHoby; arc=none smtp.client-ip=209.85.161.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="JmZlHoby" Received: by mail-oo1-f45.google.com with SMTP id 006d021491bc7-5b9a35a0901so1576607eaf.0 for ; Mon, 17 Jun 2024 11:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718647750; x=1719252550; 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=MZfIVT4YSXuJxMsX8GTw0JN3/tH12LSkX+JqfTs4Sf8=; b=JmZlHobyVAPEdakgq7N+mNr3CWS6boyxLXSvHkap/Joz2r5e6MJNwf375UZKEYE/Kn n+oNbGvZ4tp7iHB6uugMCyNkSItmtDaf1HKiiYp6He9bQlmm0X28u1PpTzpu8+le08wr 0uS4CpLIaI+YlhnGc/yIWwiHiE7eEMEu71QgjxEypxS133vB/qIVh4f2t+xEXdGdB4HE 1JoATHyXCwH8QXuFZjOwPo0pqID3dVSHO3fyNPsL67VGIp9UtGNV447UHbAKBzP32k/z B6zAvYxSHddTLGTlqS4UIokBFFIjm2yo8XxcKfKGMIypiGESOXgalHRUogB9tzYpF+zm m4RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718647750; x=1719252550; 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=MZfIVT4YSXuJxMsX8GTw0JN3/tH12LSkX+JqfTs4Sf8=; b=N7CSCn/hF+uFTrvA5U9cYipOOdn4c8rcPRlcmXrOjTurR64693oiyycDlZjHyrICjM mpnX8DD+oFW6psXJ6vZqU7zNvu41JQsZyXHbaIRq4+mLpZvi1NiFFQwB13cDINAo3Ui0 VLr9UrP4cu4a1pOXA50uhR/f1EfKznB1Qr/r64GQxG8l/owIwAKsCtoSKE8o0WRxn4NZ fIloBZqyWIbVhWFP+HLPH0kmsI8WdEGdQRVl6Yh7XWCx1VAwcB6hCVNah/GfZFMUh5oZ 6b7Dox/yfX89DOwi2s1kEHmeLdS1Rqg/wCiaYIFODBJX/UraqgomG6C0SgoEATNYngDa ut+Q== X-Forwarded-Encrypted: i=1; AJvYcCUuha/wZ0i4c+pCWh+PMjiTpS9rB4N1W0P1jpaPMii0zRhx8ZaXxwGuhFTzpedtp9N79txxLrr+KSj0uLMr+uXkHN9VLSFjsa1fKvFe X-Gm-Message-State: AOJu0YwGqM7+7MqmE5+i82xys3YYQWKrRe+galNW5lj0MvLy4kuWk9fV Ch7o8ussDHuSHLEL+5Mzch/JOTJGIo/SrZN/xDBqrUz083ynl+7Z8vm7iPxs9pg= X-Google-Smtp-Source: AGHT+IE9jF56bGHkxuy4EDvf8MTN7hIIaWkCmKCKEdckhdpm3H4A8L3DbSTHe/yoY2O1z/znNYnaDQ== X-Received: by 2002:a05:6820:1624:b0:5b9:89d9:c601 with SMTP id 006d021491bc7-5bdadc6e276mr10356825eaf.5.1718647747624; Mon, 17 Jun 2024 11:09:07 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:164]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5c118a7sm58015446d6.38.2024.06.17.11.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 11:09:06 -0700 (PDT) Date: Mon, 17 Jun 2024 11:09:04 -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 1/7] net: add rx_sk to trace_kfree_skb Message-ID: <1c6af55f8c51e60df39122406248eddd1afee995.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" 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 Acked-by: Jesper Dangaard Brouer --- v4->v5: rename rx_skaddr -> rx_sk as Jesper Dangaard Brouer suggested 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..b877133cd93a 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_sk) __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_sk =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_sk=3D%p protocol=3D%u location=3D%pS reason: %= s", + __entry->skbaddr, __entry->rx_sk, __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 Sun Dec 14 06:33:12 2025 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 2E5C3198A0D for ; Mon, 17 Jun 2024 18:09:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647756; cv=none; b=q8ykE7+8UDBRIu+1DqoZ0UqW5GOUUmj5KFEeKZvTUInDQcFJ6KeZnMKRNJrnrGVgfw/2Yd7/6MEhZIgF/Q+63tgreOmPFrg5NEEOpqVbAI9rjzHCedS4GNyJlBybnpUa2uXdzhG4kxFaNRERDWA2hxeFXRPqNgcV3ylq0zq2NRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647756; c=relaxed/simple; bh=Gs30pldD4IYhwgM9Z2RPF0lE51iD4CooDjoR4sEXvh0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ealAmFK1WLG29O1gspZD97IzVHhush8+EPI4PwJ6OBt7LvFlgJ4P51JvmEeQm4XtXICw+8xny/HIOWnzYLvIl9EsC+2JDKkHrtvz1ee1/nluabD2xfOq2QYJmLH30QIzOfR2FZlwFMR0ejiYqT+nihLd7MbjZnSLz4+Ujt/ZCDc= 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=bvZ7840m; arc=none smtp.client-ip=209.85.222.171 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="bvZ7840m" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7955ddc6516so331867785a.1 for ; Mon, 17 Jun 2024 11:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718647753; x=1719252553; 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=bvZ7840mQ/paBsmPRPxSVBd9fItARG5pJWifKSD0AgfNJs3ckdtYnNpM4aL618vE+e SRVXuAxZwGkRu6jYBjciGkORF0fX2B2Kd6uF+AeiBeQcJOeMcEmLaw9smV7F9MK3CStQ 9IjFii9cZR1xR66PpdVPKayIA/vNIjUMZZdy7/yl9y8JpTs8mus3BXhVoG3dGDgb8pZh Ozfu9i3Vvt4rzIKFld+/0kO8r4H7Lo5sH+MpB6RyLd0Bkk25epI0cpOxfCvcCakeRYkw XIUAyU82Rkjzkl/rwS+1UkIpupms83PAczB++SFgTjO3R3tlEuswuUIBBXbfgP6yf5iv B92w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718647753; x=1719252553; 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=oCGxhidYFjN8ucMyL9eJ0TMCcdlIAovnzu37q6jFdlQmFpvK95SqcDn6wBXTPy8zCa k2EwRGkyJexGlVVF75PB0zMUygqmdsqg4rTxJgbIet0VD2coShu9aIZCTq/UIbb+FMFR eNJUyWd3hfC+5q99HFwYlo3BQXfgJKhN0F+C+C09W32vEsCWwWaS5j2hhPUm+i2+wOZx PkXPlrJKSDF0SxHR62wsaUH2PGYUFF7aBBVxXb+Ue9YKybzoy85hefoWnk1f0jN1KLC2 zDVv/+aFM4Q/h2Zhzcjkiqh3jT5s0oMN06Ffn/6BQca7HYO0WlKabgTj11Nl9YteWDu7 svoA== X-Forwarded-Encrypted: i=1; AJvYcCX3DRN8gfe1y6+ouDQs+xK67u7fgtS0+ugmsagVwKSaZdE8lrd2o0/GWhoTEF2pSJJibA1v/LkdhluOw1ma5sAMaeVRpf4xhMCANT5s X-Gm-Message-State: AOJu0Yy0EiKF5SxNf4gUqbXcYhaoPrZZs7IAfz6DealbeCvPjNa8VYZ8 nSJ1fbPYnP18qh/ApG5SqgN9ti3y+j5N2bgkXN/gP4rYrXYceQRoAr6TDnl++AE= X-Google-Smtp-Source: AGHT+IHroIevk21hjLcbft/c8w4BD7iUbwtag7vsyVE2cExFTsXyvzn4MvDWzC/0dInP64m8SG8xzg== X-Received: by 2002:a05:620a:4410:b0:795:8e7f:8995 with SMTP id af79cd13be357-798d26aa973mr1058999785a.74.1718647752904; Mon, 17 Jun 2024 11:09:12 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:164]) by smtp.gmail.com with ESMTPSA id af79cd13be357-798abe4b45esm448173885a.120.2024.06.17.11.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 11:09:12 -0700 (PDT) Date: Mon, 17 Jun 2024 11:09:09 -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 2/7] net: introduce sk_skb_reason_drop function Message-ID: <5610bfe554a02f92dd279fad839e65503902f710.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" 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 Acked-by: Jesper Dangaard Brouer --- 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 Sun Dec 14 06:33:12 2025 Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.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 831DB1990D1 for ; Mon, 17 Jun 2024 18:09:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647759; cv=none; b=d9DxGTHLXdOMn957DzQiQYqcw+dC3I1hjfx4aj58S+OydoGooyosHn4yF+nM0MfdWndmTSD7B2uwd675Y+kiH7r+HMguoFW0V07GDnGKQQCMq2UvYmwWOSPclT4l4VHKEvdDBpm8TVOYWQmJ7NWcuBQETdKjOkOWZTkQoEiyJrQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647759; c=relaxed/simple; bh=jkzjDY7vnEB8DqdbcGuw7ABHpoGpOOOicO2KkYgqYYM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LgKBq0TfufooDU4qk+Z6bY+FvsFt0V2Soo5dFGN+fBejwbDR1e4D2WF69L7V3NsobMj8ZD6C91qdWhyNoDHSruWC9PrkACVlyxf/66yOE7ej4vHGbPh2X45GNMrGFVIPM3rSHRhrEo6OMX0uLIkgfrvaSifR0xZKyBNkOtIReqM= 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=LcZYx/gn; arc=none smtp.client-ip=209.85.160.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="LcZYx/gn" Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-254e42df409so2951571fac.0 for ; Mon, 17 Jun 2024 11:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718647756; x=1719252556; 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=LcZYx/gnJJsug/Sfl6L0zHhZRKyWVZgwrlhA4zu+CahJizK2gO5QdzMgb+0xsnzQNo evan3dyYTPgNvsA3sPaW8sr+AytInQBktb4lXU2wG38l+esEeyoDurHkJagLp+ojcbbO Gsz5XgS4Q1I62M4OJaS+obs0lQjRYApw6JH0w2twa8T4hCr3dDN8DDMmC67qLXKPPtSZ +mebRKNQ35IQ9khJsw7NSZbIKZGcYGpM1ITbxujiP0YCrvhazv1nAHkQC8TinfZwWzPJ fiJI7LXJB7shJpgWuFRf8NcFOgPrBcY3CApWsdywRl15SMCnvg5avCUtLfK0+DZYCjhJ 12lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718647756; x=1719252556; 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=fufbp13GzF5oGiI+lVi3zVitDoksUrj1TTOfweMuPE/EcGzz4ol8NP1bDjSjuaL52c ADvs32pw5ZtD6PPo4d247sXr8M5EVMlmhlCgoa81Amk/D3tho3XOV+Fb1GP0thow4jUT Z5AzpbouXZxDqApKn6OAbcypaadIV0LFcprqkjplOPgQBEvlgEhydaMeQ/+e/4/WysRu d5CLMuNXTR6h2P7OWpU/12cG41Qwa2AtU9gzj5FJCuTOR3p46+sNntH/yQOknSRNd0iE hCWEZFsrWkWIEEMN83W0ophYYc/Uw4bnY7rwePY1XiTEOQT3KC7ChfBbtvDhdev+hDtp bEiw== X-Forwarded-Encrypted: i=1; AJvYcCXQTxI2/DwO+ezktf4sQcGGNpnibzUkP1Ea51ltdSytJyLgaorlQwiQd7QH9ZR7dp0fon/2mvAa1zHYzBl8BaBL7/iushI8I8kg6M5a X-Gm-Message-State: AOJu0YzqSmeDMBBXsICPZplZgcH9wfmRx6DSHsb+jwxg/XBjCECXVLTA RX25JPW+bSisSpBR9RpMkoPSHsiukV4iMh2iugIL19K7rgDJzwIB1WmBd0wTvTI= X-Google-Smtp-Source: AGHT+IFFC2G/bSVkCKnhdhy6XgDtxqeArS3o3uSF0Inup/+kbVo1ad1TRgDLl5euVpsu7c0aiEjQlw== X-Received: by 2002:a05:6870:584:b0:254:6eb5:ab2f with SMTP id 586e51a60fabf-258428976b3mr12669126fac.6.1718647756618; Mon, 17 Jun 2024 11:09:16 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:164]) by smtp.gmail.com with ESMTPSA id af79cd13be357-798aaecce85sm451625885a.41.2024.06.17.11.09.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 11:09:15 -0700 (PDT) Date: Mon, 17 Jun 2024 11:09:13 -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 3/7] ping: use sk_skb_reason_drop to free rx packets Message-ID: <3b6f00440b880559fa3918504d85521702921e3b.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. Signed-off-by: Yan Zhai Acked-by: Jesper Dangaard Brouer --- 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 Sun Dec 14 06:33:12 2025 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 022861993B7 for ; Mon, 17 Jun 2024 18:09:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647762; cv=none; b=sLcyCwtoOApOoDJ3cMRzkbftuF9wK0hQMQ8YJ5t9odAtQjuIQc1pg/IEKTkdrwX5ubDzSHQOwAMaPjJDmvyl0365x1E4nPb7xkIgdxI4Z01ozN6YqV/f5eOXuaURdMItXnzrAAO6zF2/I//Fmdw+oAN/fryZZGbkjfXd6hzNrPE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647762; c=relaxed/simple; bh=kSyvuVmoawm0A1229Z9cjCnSswrtkKHtT2WgaP8HoEM=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=LNOG6F+2iptEhOXmr+3yPWeTXewecVaoXx2he0hCD1P/5Ju1Ek7niYHseE0neYHoOF+2QUJK/eQZBoNiHCZt0erQmrQvf8ILSwH0mBnDlCVaSt/IccccX9FKsKEOZimVRDlBF5s+XP12wOUoEwTZIOIxp+/kl+Ji49h1sQ7c/lI= 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=Zuj1ZWqr; arc=none smtp.client-ip=209.85.222.180 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="Zuj1ZWqr" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-79767180a15so316493385a.1 for ; Mon, 17 Jun 2024 11:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718647760; x=1719252560; 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=Zuj1ZWqrgc1oKVPzaxNH89GqWcd5rKo/WitGeJdHTtXxv2SpD/uGNAR772DWC97sgH l9+6bpma9ThbDqOWlk9uuyA2tcpJgxEMp00mIZKZJfX6lJCSEU1xRTE5QMXDwScJ1HhY 5JreeDmBoqYURw/NXZC36kacsJmGj3yZQqVGooTwWmlhyqvWVr8F0eD3aFrU4vfX1yzG C8Xyofx1rF8znhAYC26htNv49Svm+UlSBC6aBVB3NPWtEe1Z+StDsXV80w5FM5Vs56kx TGYMN4+e7oXo/lXrjYDKe1RYpX9Z31w3/WxkJfG4v0u++taqN5hb1uW76w3rpCIcJlvd 5bfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718647760; x=1719252560; 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=gtsMhq34uSplOG0fkeDR5zAgdeGl/9DPQ06Orx6+8A7RasV3SesE78fcfkEjR3JDHO RlefMaHMaDy0am8xuSrxBaYRerY8LkOq+93t6yInYYhtk5m9HldNWzZNtz3BsJcNGLMN h3kEEel0iqz7K7Bs1lXdbX0cl8UG6bgkaee6gk9Z50eptqOOcpVKuhu/UYonmsSURFMZ UoMiaASKwiVw7Wu1iFkqRPeq6nKothZK6cyBcKHTLwKwIRo65IIc4q4fsC07ero84vCt OLpJVq1kOvEV3RPtdtF7qSXX3fswFKqmsVIhU8Va8OIilYNa3ljTTLdZ6M6PzNaqtFiV ZSyQ== X-Forwarded-Encrypted: i=1; AJvYcCWRozPWVCGtz6EbzPGCwa20/HabOUDra10axyHT0ernj/lwrvrKTvavy3w5Ok5eTv+rOy+hGgUI89LBwgpE+donH05uQLU8hCBXb0dZ X-Gm-Message-State: AOJu0YwnjHQXByjDycGLMEQVdscpdxv4B/pFIRPdP+OJnM0Skbphbl+h Pm/BiC4bSJSqN+Q24ZtddUHFMlClQtjjYnw04n/MOGzcKFqfGmHhk/CZ+vSQrug= X-Google-Smtp-Source: AGHT+IFt142mv1kQXOxjOXG2zlKr3bAUesSTGPIJ0qabHwch6YJ0EygKVZ1T56BN3wNDO4NEfEIHhA== X-Received: by 2002:a05:620a:179e:b0:79a:2fcb:ed4f with SMTP id af79cd13be357-79a2fcbf663mr1038790485a.13.1718647759840; Mon, 17 Jun 2024 11:09:19 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:164]) by smtp.gmail.com with ESMTPSA id af79cd13be357-798aaecbe5esm450927985a.30.2024.06.17.11.09.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 11:09:19 -0700 (PDT) Date: Mon, 17 Jun 2024 11:09:16 -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 4/7] net: raw: 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 Acked-by: Jesper Dangaard Brouer --- 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 Sun Dec 14 06:33:12 2025 Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (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 41AF7199EA7 for ; Mon, 17 Jun 2024 18:09:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647766; cv=none; b=lQ/URphU8r4x+8DH9zTlENFUhZ3ITgmBL4rqhVhNKoShBvGE6KOS7LRpr+dmrI89r6SpGpoO27qNbrQiVoZh+/0gkWwD0D3eEmimmxfjCD6mnp+abQoATdLBCFeteD1X4z2spcsErh80p+TX7oJ1tmblBW1Ac8FRP0U7sHJfBYQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647766; c=relaxed/simple; bh=deJZMXGB4u9IlWilhC165qOhNKSkcsd0Cq2qS5gJdV8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=UiBh0OKX7PhV28L5yqomQ4Zn5g2JuW+HQsf2PmfdDhVYlhOLDpro2mwnETU3uYxys2i7e9/xoL0JlGTRVydGKsEdZQfzJ8qXVFcHwlZ6UINuu71Ku21LcrBSGDQk3HLUpjpgeSE+dyJ43qmr1ie6FTaHaD6hnLHk6Z8sNiObzX4= 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=IBcDneUW; arc=none smtp.client-ip=209.85.219.44 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="IBcDneUW" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-6b081c675e7so24876566d6.1 for ; Mon, 17 Jun 2024 11:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718647764; x=1719252564; 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=IBcDneUWqEFtafrOY1ZzctM7R4odKc98HMCi9B6YoG2ucYetsPsp8iloXG6r/7Q/B8 DZSL6+jcmMikHyhIgPga3bZ1gAGaMNoQkwpdWR4PDz9LYFX01eQZ8+zWZENhWMdOpohe U67wiMWEA37x/ojkrX3iszcRUhpFVqebtdAyg26n75PqhmIrvta2F5yuKV/i/ta9913t g/y3uP7T52a0PRAGp+RRj+5R9gF3Tp+KtOgVhrs/QHrkPDVxeWpMt47Lw/SO52IBs0zt HErOl1lHHUcMW2QPoqZC6tXxmcYRqKP46xtVfZa63HcjtC3wYuqx+34KrgwX9ERs1Fz0 MCHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718647764; x=1719252564; 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=p3jKoetCJQmBmYQ4l1uwX8+RfkTGiiaYcKdLBqagnFkSygAUy5x5okIyZ0pnhVhGC6 oj/U1zo+FIa3jmKIKRzAUsQwZy6mOl3RL/V4xgffMqfFzPUougVJ1Fvi3S9Vhn6Sdu3i SRelMHMTdUwuFgT23THJMbOIENwp0UCQ4XKGpvSwt1pUa4Nc9NYU649X2ElZudVcouZm SQpakjpj9Ad9iQEyU4NeEqi4wXbJ0xQjEgNru+v+zGRzRgceO5Ss6sKnVPI4vu7vXRxf 0SCXklTHIOrHvwzV2wj37o2a/npSPqEMUHo1Mdo8tyT5ozFvhwlUGFc/2PawQ0GOn7kW R9bw== X-Forwarded-Encrypted: i=1; AJvYcCW/ODEDDuhrVRbbH23Wk9Q0ELv7UG/wPC9OGKFwxeoZmR7q+JsrYDzqZXlLXV8NMUkL27Mu8El/bW4G2UAfmZBr84M/aYO9UdytbM2A X-Gm-Message-State: AOJu0YxSxKLB7nwULxLnl8HmDitjSdbPsfLdJ7UIqapPR2QLgV+k2C4S 4paqFJj/m8XNRinn9BPJs0rsJJvMKmP5EvwhF4MEMs34m+SceAljXow5WqVJiVY= X-Google-Smtp-Source: AGHT+IEMPqHaANmszkkMQXD5A2+Zm8agC4VHhJZqDTiCbUYQGKA8ftZzrDZUOCGNXCLjLvAhNCFwnQ== X-Received: by 2002:a0c:f3cd:0:b0:6b0:72c7:88d8 with SMTP id 6a1803df08f44-6b2afce6bf9mr106926546d6.35.1718647764012; Mon, 17 Jun 2024 11:09:24 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:164]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6b2a5eca9c1sm58246746d6.39.2024.06.17.11.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 11:09:23 -0700 (PDT) Date: Mon, 17 Jun 2024 11:09:20 -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 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 Acked-by: Jesper Dangaard Brouer --- 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 Sun Dec 14 06:33:12 2025 Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (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 6169019922D for ; Mon, 17 Jun 2024 18:09:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647769; cv=none; b=CZDDrNGMwJkJ/htH5wgn4/xwPVVUhBdiC0HJ/bvZ8sL6hd5tcDTp2gwFdYD7VPuYJT8pPJ1terp7w7rV4qam8UtX3Yny4D1eWd3YIRcrGHcsQYPQ0G1r/rRzl5nZ29fHIaxiYCOBNot52CWuyEvKJn66x4rZwf02/BsCfEXYE0M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718647769; 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=hH5cvi+QIIn0CX/jzEnia7TR0bSoTLVL+yFdrSzOBh9AaSb1plIc+zoo5Wdxe0XXOqTf8/OJro4yVeobVc1TJUdEkaPovdQQwXsF9UngpIJw6BTADUrmRMDoIu0iOoMeYH5Imc3qwCwKiqA6XPg2daB2pp+8URwXqkDB1H8BDbY= 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=X7WPN2uL; arc=none smtp.client-ip=209.85.160.181 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="X7WPN2uL" Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-4435f782553so9182901cf.3 for ; Mon, 17 Jun 2024 11:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1718647767; x=1719252567; 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=X7WPN2uL/vNVy4eeiSg36efFoQojPKsHB8z4bIF8Z9ix25Qq6u+R0EkeUFHlQscu/B DhIOl3SzCcgGuFAH4aBV+nhwMyunfxX79WyRIT8CdtTWWkEv7DWxz8WoSuGJwsPAPcqJ S0hjXDT0vDEcXABhTr0LC4ia81cqIpn35zHQkQi37pgykC6PKUfgKVaLBFzkJXnmV542 X6iIMW7Sk2BWV6ajk8+nTAaBPL+op6CYCThpOcivvcIJQYuhPBtaj4FWme6bbDswEPkz 9t6rh+bI8EBH5PuJxpqdti484TOD7NNpX9A1q49X4UDkilEEtrXAbq0UA19hGelcMzWD FoPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718647767; x=1719252567; 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=BupcNkmfOIURfSCEA5p8OpN1z5Pmkst6lvKpQe/X5IBUmf3BHv3ObaIEICc4MsC6pv O8NnnwFHWaLSgAaboC4jzhYv31bAoxoXRWoRtSWyj9PLcKb/LCV7eR0kP7gOnIcZmMO2 Agvx696K1hdCr1EPEZOFf9JpR5VxCV6m6p6S4phy5Mzksc8hQeBB96bpTX+rpu+Nly9L PezBXrDJlAHgNPx7K21gBrFXSEU+373nhodQYANgp7plBiRBfDYnh5uHGrhCWmFTuJIC Q8Ddlk5hFNntAZe8fnxrdlER9IFTZrkwOf24RlLySlP5/tlpE3cVJBpd0dRH6nJVG++H voMQ== X-Forwarded-Encrypted: i=1; AJvYcCV687UACxK31i9D8CYgR6pJfipVC80cnKSw2VKt8mQE1oDQMwBt/dkexVrOp80mEi0PPKL9e1mV8QdDinikw812U4V4CAsqsrI8o/lS X-Gm-Message-State: AOJu0Yz7sU5sv+e1O6bLekEm2r/M+focvWyenQ8w1CExDy7WXfqoZhKc KqNls6yYuDW8o691HHfuhPBtzaGIvLzToRVNEkHam3S958oejP+0ysZAHaOdsxA= X-Google-Smtp-Source: AGHT+IHU20E/vH3tuOoGnMYnwnyFAYZBXpO4X2O5Jq0Lmh9IZlBFVL9nnnRaS0XvmvVLWF79L8T33Q== X-Received: by 2002:a05:622a:588:b0:441:382b:75c with SMTP id d75a77b69052e-4421687bef3mr144055741cf.20.1718647767426; Mon, 17 Jun 2024 11:09:27 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:164]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-441f2ff831bsm48550431cf.80.2024.06.17.11.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 11:09:26 -0700 (PDT) Date: Mon, 17 Jun 2024 11:09: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 net-next v5 6/7] udp: use sk_skb_reason_drop to free rx packets Message-ID: <0dca67a158f2a3bed1a2cee3bc3582b34af70252.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/202406011751.NpVN0sSk-lkp@intel.com/ Signed-off-by: Yan Zhai Acked-by: Jesper Dangaard Brouer --- 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 Sun Dec 14 06:33:12 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