From mboxrd@z Thu Jan 1 00:00:00 1970 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 AE4CD155A39 for ; Tue, 11 Jun 2024 20:11:45 +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=1718136707; cv=none; b=L7Jr9aO1nx4ik1GPrCCGNyLkmlhq8B1Zs19ACGU/2Y5F1kwyeBBkwgkwBH60WaGGQUza9+GODDgBKTgdvi50IvouFuBRWOKQ4fxw5LxfNhPCijpI033mzEyF+D8ukYcbWJyxAztaEdBw047f7Jfd/BK6b2i1ycP9Sg+JXIRUbow= 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=W1Ws6HtN; 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="W1Ws6HtN" Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-6b0624d3626so25783476d6.2 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=1718136704; x=1718741504; 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=W1Ws6HtNEBVQLRiYeTS8Acy/Bl7JEKewgJD6Oi34NU8O4ZrPN8sVpfZdmnFV1MRIYN mzik9n2298YSYm9HcnUfx/cYxJNb6sCf+Jo2jxSIGH87G79sm3KL+eV7rhhbW675jUGc vMD4DU7vJAO+pIu40ww4aB8vNa7Vl38KmjzxO5EjGBmMMMBQJJEdfaNnH2hbNdYCy5QL vbiaBQKZTPqYHb0kfErSDizskz1HVRBK8JqL8ioY7niSxviAiTPTzRSpfWV98ARGiiyt a7mIso2l4R0yaTpat+WnfS9hWe0Pi3GA8QuNfNsz0u2ha6+pDawmfGasDUVrUb5xMles EmbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718136704; x=1718741504; 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=Ay2wRdQE1SJVJZuAbHRF3R0kAoCEOuuUxdPpsxKFxDyT+7+zS0zAzRsmvLJcXCx3u2 ptwNiLLap/2qFcAS8EBsZYAIiCSJ6j/ztOSqpAQa8jiyYuAFEDAyC8Ml0eXN/q1ABHTK PGGr+AP+abxXWgyvz1AeeNjJHuWcQGB+YjDPmtHViXsPWPRhml0iaqvf75q3/VTyhwaQ 62rPiZiW6csy9YwYhooPpVXsTtU0DRw/578zVaynjOWvJ9watSOthS/XZnfHpRQ9Wv4e N2BJnJ7oOYqnWMZZISfpuDmh2ZnQfKwkbT5qPAIQga2Kz0KqnD1Su3f833MRHFxJJn5J 7TeQ== X-Forwarded-Encrypted: i=1; AJvYcCUyfTLL0XdmXCJ8IouNKITEbs6z/SYjy1rBO8Kwocq0NGP4onD1oed2vRdPZIc/JKwtOjYWIQP0TtGzY3m4TUuYF/afsTO4ljL9tJOthJ0Db7Gn X-Gm-Message-State: AOJu0Yz+ggNEOMLl4jkrze4oY7GoEvFrCHC87iBILHa5H6McSkN5z/B7 Z15OrY8NZD3BGjViBOzwH9dT5WWX6nDuXaI9MmX57Slx/D6Ub9m+XOlC1fO1ibw= 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-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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, struct 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; } @@ -2196,7 +2196,7 @@ static int udp_queue_rcv_one_skb(struct sock *sk, struct 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; } @@ -2383,7 +2383,7 @@ static int udp_unicast_rcv_skb(struct sock *sk, struct sk_buff *skb, int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, int proto) { - struct sock *sk; + struct sock *sk = NULL; struct udphdr *uh; unsigned short ulen; struct rtable *rt = skb_rtable(skb); @@ -2460,7 +2460,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *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; short_packet: @@ -2485,7 +2485,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, __UDP_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE); drop: __UDP_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE); - kfree_skb_reason(skb, drop_reason); + sk_skb_reason_drop(sk, skb, drop_reason); return 0; } 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, struct 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; } @@ -776,7 +776,7 @@ static int udpv6_queue_rcv_one_skb(struct sock *sk, struct 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; } @@ -940,8 +940,8 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, enum skb_drop_reason reason = SKB_DROP_REASON_NOT_SPECIFIED; const struct in6_addr *saddr, *daddr; struct net *net = dev_net(skb->dev); + struct sock *sk = NULL; struct udphdr *uh; - struct sock *sk; bool refcounted; u32 ulen = 0; @@ -1033,7 +1033,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, __UDP6_INC_STATS(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0); - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return 0; short_packet: @@ -1054,7 +1054,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, __UDP6_INC_STATS(net, UDP_MIB_CSUMERRORS, proto == IPPROTO_UDPLITE); discard: __UDP6_INC_STATS(net, UDP_MIB_INERRORS, proto == IPPROTO_UDPLITE); - kfree_skb_reason(skb, reason); + sk_skb_reason_drop(sk, skb, reason); return 0; } -- 2.30.2