From nobody Sun Dec 14 12:11:03 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