From nobody Fri Feb 13 01:40:14 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 0820214EC53 for ; Tue, 4 Jun 2024 21:47:56 +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=1717537678; cv=none; b=OMtKG41o9OFWX0fi7uZWmmQinTypjsbFJfFu5t/0N/4X3T91l+4Oovu9aF8qZWlqgyBMI1cXjsJc6sZTCJPxIt0IFpSu+lYYNHLAjjVedMru+HI8pU7WJh0wPhlnWSGBmH9YC0iwynliuUXLOamnXZWUpnX81Rcnj41X/My+Zl0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717537678; c=relaxed/simple; bh=deJZMXGB4u9IlWilhC165qOhNKSkcsd0Cq2qS5gJdV8=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=dSMcwrrXKsQjCGTsiU0NV0Ew9RErHWTEAvigH1JT8N+TDLPlJuAA62VhN8rFCiwRwdql8fZKgJg4GTu1vH22PfyrQWxX+wuuoAtYFpd77qKoHcgNSIEtEPQahd2pOpgNHAeO01iyTsMzAN+Sfw5BWIaaely9mb9UL42S286w/wU= 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=QnPQgeOY; 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="QnPQgeOY" Received: by mail-qt1-f173.google.com with SMTP id d75a77b69052e-44027277ebdso4491261cf.1 for ; Tue, 04 Jun 2024 14:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1717537676; x=1718142476; 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=QnPQgeOY+IG1YqMKbFsChU+kc7M0QSIOMYZWS6y/PQq3/7YiU+PhUy3Z6PonXTblI2 zXo2WX30YZM1+TxOgOZ3aCTDs19syALPvQfMnIdLW47vvY5v21fsMBR9Nv7cTLfSRoMh jsgn6r0dtvSu1grydCNqFlGD2idqmi/+3g6YH/oLGRf/7FJdc1gPzrYf22V1H1FlEbXb az4pn56TOU3O9OqqPubdQ97mk2vVu+i5aCLXQ1GZlVgo361o5DxrN42XoUhdGLYu56Zj T04KmLCoCyO/nsU/wMdDmKDDij/fZ1jDkgKDR8opmwAN8PiyFK+oQGyHVc+sYH/oAUGZ FcOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717537676; x=1718142476; 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=DsdeGSFfWQkE14oUCAv4VzWJkiDSlNrmZTOWjlOgP1XPRVfuUu8b6Jac0iB6M5zcXf O/9+fGCJhVilGKKqhJ2p9OW6UI0gAz2zfwCP6XMKQ5gHqkNSHhRnb7z5fgROgQ/gUWU7 j8VkkY5SKdy0KjALkPp2oBAt6XKVpX3rG72Q4qBuWlh7JrJA4IwK2IWrLkmt9Hkrxmx+ 8zyTYx5oHyNzOGvLvwltwYUh+zOlXgXCQ7azo5vwWyAemUQy5bodmF623kVONmInl13h ixfTHNRF1ALQ0LF5QE/4LjrEh8s4daPynwi4GP2o/8XkoG2OIk/vJPOty5Jmu8VBaMq4 Rqrw== X-Forwarded-Encrypted: i=1; AJvYcCUhnUX4ifHZ6MGQydmI0r7bDm+cfCcaqot71rmQ/O0D7Hw0cATaYBMVay/OLf3uOiMONMhycMTS/O67GXPQDlnkuJHdlLHjsFKDWiW4 X-Gm-Message-State: AOJu0YwMvewQDShLbZ8rea26DEy+KXcWc4mc0p3LYXBuoKBJNHQvFptG q3k8VHOD9jZTq3+7rdfT3a1U+Qc+9iT5osfecu3qwN18LRuB4Pmg2SkQ6BR0ZpE= X-Google-Smtp-Source: AGHT+IF6wYK2vSs0tnZLGeGleWFepuv42H+1iOxWPaTWSUI1YgoUnJSfAYdRv3oVvyAhsuPNnOPBfQ== X-Received: by 2002:a05:622a:452:b0:43e:e6e:21dd with SMTP id d75a77b69052e-4402b58ac7emr6655911cf.12.1717537675459; Tue, 04 Jun 2024 14:47:55 -0700 (PDT) Received: from debian.debian ([2a09:bac5:7a49:f9b::18e:1c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43ff35dfd56sm51508081cf.21.2024.06.04.14.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jun 2024 14:47:54 -0700 (PDT) Date: Tue, 4 Jun 2024 14:47:52 -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: [RFC v3 net-next 5/7] tcp: use sk_skb_reason_drop to free rx packets Message-ID: <350a9309892d44cf45eff3ba84df4cfe0fa7a5b6.1717529533.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/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