From nobody Wed Oct 8 04:06:43 2025 Received: from mailtransmit04.runbox.com (mailtransmit04.runbox.com [185.226.149.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79A26280303; Wed, 2 Jul 2025 13:38:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.37 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463527; cv=none; b=AzdQ9FXXnSvbc2aPRUEMsgXwrDUNGt5ewpF5TOqh60HPNfr6E8gUj4qVH5rz6OO1jKk+8mWKMbazBRgBW2flUBt19CAGcN3DPh5Zk7vsrFBIKVGwmGWE99Wdad6c1Ns6cS7owCgXQ683nhPAiMhCPMMNkgnr8qKUWVGgSXl9IIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463527; c=relaxed/simple; bh=I5NwMU/UkVWamqyeUyAIs0m2ELLcQVTl3pqCth/6nic=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PrxnwqNgquYzjr3pLZOohQfl7zULSLezTUK4pEcr7tpDWiDC5Z7BOL+Ep9eTNl9krCGV6IVcerWFJT5kPg7ONGuw7SoJsS8qCa9XUEuiuTh5tGPw5amEeXl2berMmzVl/h5EofGbhQbN78nIbttBmwKAUT4f5rhQTSStN1Knfr8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=IkbAyxGU; arc=none smtp.client-ip=185.226.149.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="IkbAyxGU" Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uWxfZ-00GcJa-O0; Wed, 02 Jul 2025 15:38:37 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector2; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=PfnmbZl5iKr6rFeTS80a4NnfW2jlSVKr3NNDNbGzVI0=; b=IkbAyxGUjd7jXvlmFAItytXDdn s+jsvj17ly2lUQBwkk4zXoqkDzTfgSR19GLz+yiDd4I/o/7uEw9MjhjkKaIffz8N/hwqJhj+eHNGF LEkp1n3gObJXZZ64k6DMwXSuNCeY15c1drHNRb3r0IieqhKLDPea6D7+nK81bMGeNZEuVSwcjJuAd DBP6GcoQ9e0A3k9nflTPlvOmycqFKI7Cfxd1It79d3zCHLiRuBXbErXx7Dbb7j6EurC0+t6rN4CSv UbcyUNU6LtH8dl9E7bq8lDs+uYSTpbJN7534f/UWAvEg/F1bnR/L+cJbQZyMbfXXw4JR0GkRHA5xb oLq+IZ6g==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uWxfZ-0005H0-A7; Wed, 02 Jul 2025 15:38:37 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uWxfD-009LCR-GI; Wed, 02 Jul 2025 15:38:15 +0200 From: Michal Luczaj Date: Wed, 02 Jul 2025 15:38:07 +0200 Subject: [PATCH net-next v3 1/6] net: splice: Drop unused @pipe Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-splice-drop-unused-v3-1-55f68b60d2b7@rbox.co> References: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> In-Reply-To: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Ayush Sawal , Andrew Lunn , David Ahern , Neal Cardwell , Kuniyuki Iwashima , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since commit 41c73a0d44c9 ("net: speedup skb_splice_bits()"), __splice_segment() and spd_fill_page() do not use the @pipe argument. Drop it. While adapting the callers, move one line to enforce reverse xmas tree order. No functional change intended. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- net/core/skbuff.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d6420b74ea9c6a9c53a7c16634cce82a1cd1bbd3..ae0f1aae3c91d914020c64e0703= 732b9c6cd8511 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3060,10 +3060,8 @@ static bool spd_can_coalesce(const struct splice_pip= e_desc *spd, /* * Fill page/offset/length into spd, if it can hold more pages. */ -static bool spd_fill_page(struct splice_pipe_desc *spd, - struct pipe_inode_info *pipe, struct page *page, - unsigned int *len, unsigned int offset, - bool linear, +static bool spd_fill_page(struct splice_pipe_desc *spd, struct page *page, + unsigned int *len, unsigned int offset, bool linear, struct sock *sk) { if (unlikely(spd->nr_pages =3D=3D MAX_SKB_FRAGS)) @@ -3091,8 +3089,7 @@ static bool __splice_segment(struct page *page, unsig= ned int poff, unsigned int plen, unsigned int *off, unsigned int *len, struct splice_pipe_desc *spd, bool linear, - struct sock *sk, - struct pipe_inode_info *pipe) + struct sock *sk) { if (!*len) return true; @@ -3111,8 +3108,7 @@ static bool __splice_segment(struct page *page, unsig= ned int poff, do { unsigned int flen =3D min(*len, plen); =20 - if (spd_fill_page(spd, pipe, page, &flen, poff, - linear, sk)) + if (spd_fill_page(spd, page, &flen, poff, linear, sk)) return true; poff +=3D flen; plen -=3D flen; @@ -3130,8 +3126,8 @@ static bool __skb_splice_bits(struct sk_buff *skb, st= ruct pipe_inode_info *pipe, unsigned int *offset, unsigned int *len, struct splice_pipe_desc *spd, struct sock *sk) { - int seg; struct sk_buff *iter; + int seg; =20 /* map the linear part : * If skb->head_frag is set, this 'linear' part is backed by a @@ -3143,7 +3139,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, st= ruct pipe_inode_info *pipe, skb_headlen(skb), offset, len, spd, skb_head_is_locked(skb), - sk, pipe)) + sk)) return true; =20 /* @@ -3160,7 +3156,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, st= ruct pipe_inode_info *pipe, =20 if (__splice_segment(skb_frag_page(f), skb_frag_off(f), skb_frag_size(f), - offset, len, spd, false, sk, pipe)) + offset, len, spd, false, sk)) return true; } =20 --=20 2.49.0 From nobody Wed Oct 8 04:06:43 2025 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16745280A52; Wed, 2 Jul 2025 13:38:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463527; cv=none; b=fK5QHMnQiq5OiLCz4MiJB8rDxOXSZV/7/zf1PFBdg2PyBGK/WT5eY8w2RluW7dX3iJujkrI6pptGrUu+rG5jFelzV3vZNZTh+fBcU0it+AuzuFZXKNyKC6HxSp8Q4oylXu27fZFLJnY/wb/DWGL3tEJ5o9EVi5AJc6hKB82aUMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463527; c=relaxed/simple; bh=NtoEfjaZEuPCqmgqs0u5ddR2LNw9LS1q/CRzG1/Tg8o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FeKde2Hr87FJJQaxWS3MGFYNaUkdYqAeDqXchT068pteP+oR6CHu6mbwrbkqUrO1C1G/kHuHRDha7APNvbhH+yPq5URDz4ChPDLa6UWMBuw9pqHPhbS1eRPxQ4mAAtps+P1psbWA49ne5g3p7gTs871ym8qhe2iumT0txcN7VH0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=RLG2HGSQ; arc=none smtp.client-ip=185.226.149.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="RLG2HGSQ" Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uWxfc-00GxPq-4f; Wed, 02 Jul 2025 15:38:40 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector2; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=T1VNZPfSFFoTbfg+4n7CjX3vldxe4ACI57UyodET+ps=; b=RLG2HGSQGDUF2RsA5TDKBPTW2B hrfgLhD+v5kLGXLjy9rCHTPc3Ftu9eylUo9PFfRpCzcOcy8b0MxkD94CGJJRVpKc37ObdCSAF5x1z AnV2P6UdnqCvxSbhhU4bK91GQDQqxyYNfQLHRINR8BNYUfSRXEYlPcAJGyw72iumMCCOxYVzExUzn cUMY0h6NNhfrWDr8NzF6YWTDMeXBK76ntCOxHswo7HRjmYz1ZnRxwKNZj/UD12oqrJJHwiwNLUoga egCCO+ADgyTSzrqAyFl+I0fAqNtgm9uBeKkvQnx/utqwwqYoQ9ql+80tlELdAvg6qMPO9gquQ4fiI S9a5wgcg==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uWxfb-0005H6-O6; Wed, 02 Jul 2025 15:38:39 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uWxfE-009LCR-AX; Wed, 02 Jul 2025 15:38:16 +0200 From: Michal Luczaj Date: Wed, 02 Jul 2025 15:38:08 +0200 Subject: [PATCH net-next v3 2/6] net: splice: Drop unused @gfp Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-splice-drop-unused-v3-2-55f68b60d2b7@rbox.co> References: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> In-Reply-To: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Ayush Sawal , Andrew Lunn , David Ahern , Neal Cardwell , Kuniyuki Iwashima , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since its introduction in commit 2e910b95329c ("net: Add a function to splice pages into an skbuff for MSG_SPLICE_PAGES"), skb_splice_from_iter() never used the @gfp argument. Remove it and adapt callers. No functional change intended. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c | 3 +-- include/linux/skbuff.h | 2 +- net/core/skbuff.c | 3 +-- net/ipv4/ip_output.c | 3 +-- net/ipv4/tcp.c | 3 +-- net/ipv6/ip6_output.c | 3 +-- net/kcm/kcmsock.c | 3 +-- net/unix/af_unix.c | 3 +-- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c b/= drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c index d567e42e176011d42b9549d0cc6292a06126d61d..465fa807796439b90c949f54e20= 3a798f06acf1f 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c @@ -1096,8 +1096,7 @@ int chtls_sendmsg(struct sock *sk, struct msghdr *msg= , size_t size) copy =3D size; =20 if (msg->msg_flags & MSG_SPLICE_PAGES) { - err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy, - sk->sk_allocation); + err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy); if (err < 0) { if (err =3D=3D -EMSGSIZE) goto new_buf; diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 4f6dcb37bae8ada524a1e8f8de44c259cfac695b..b8b06e71b73ea3fb5210239f585= f4ba714395fd7 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -5265,7 +5265,7 @@ static inline void skb_mark_for_recycle(struct sk_buf= f *skb) } =20 ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter, - ssize_t maxsize, gfp_t gfp); + ssize_t maxsize); =20 #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */ diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ae0f1aae3c91d914020c64e0703732b9c6cd8511..a34fe37cf7a508c8380e35522d9= cde266aa440f9 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -7230,7 +7230,6 @@ static void skb_splice_csum_page(struct sk_buff *skb,= struct page *page, * @skb: The buffer to add pages to * @iter: Iterator representing the pages to be added * @maxsize: Maximum amount of pages to be added - * @gfp: Allocation flags * * This is a common helper function for supporting MSG_SPLICE_PAGES. It * extracts pages from an iterator and adds them to the socket buffer if @@ -7241,7 +7240,7 @@ static void skb_splice_csum_page(struct sk_buff *skb,= struct page *page, * insufficient space in the buffer to transfer anything. */ ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter, - ssize_t maxsize, gfp_t gfp) + ssize_t maxsize) { size_t frag_limit =3D READ_ONCE(net_hotdata.sysctl_max_skb_frags); struct page *pages[8], **ppages =3D pages; diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index a2705d454fd645b442b2901833afa51b26512512..5d75d60efcf361ed9c3b34eaa98= 2f6c667c716f6 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1222,8 +1222,7 @@ static int __ip_append_data(struct sock *sk, if (WARN_ON_ONCE(copy > msg->msg_iter.count)) goto error; =20 - err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy, - sk->sk_allocation); + err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy); if (err < 0) goto error; copy =3D err; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8a3c99246d2ed32ba45849b56830bf128e265763..039fffd7a594409a3a08546503c= 8c3d91a79b455 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1297,8 +1297,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr= *msg, size_t size) if (!copy) goto wait_for_space; =20 - err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy, - sk->sk_allocation); + err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy); if (err < 0) { if (err =3D=3D -EMSGSIZE) { tcp_mark_push(tp, skb); diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 7bd29a9ff0db8d74c79f50afa5c693231e0f82d5..618ed7d72b28f43ab6d7a02e5f8= f53a4d22de87a 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1760,8 +1760,7 @@ static int __ip6_append_data(struct sock *sk, if (WARN_ON_ONCE(copy > msg->msg_iter.count)) goto error; =20 - err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy, - sk->sk_allocation); + err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy); if (err < 0) goto error; copy =3D err; diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 24aec295a51cf737912f1aefe81556bd9f23331e..a0be3896a9340c2a9120bb2692e= 9deec84d138c6 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -835,8 +835,7 @@ static int kcm_sendmsg(struct socket *sock, struct msgh= dr *msg, size_t len) if (!sk_wmem_schedule(sk, copy)) goto wait_for_memory; =20 - err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy, - sk->sk_allocation); + err =3D skb_splice_from_iter(skb, &msg->msg_iter, copy); if (err < 0) { if (err =3D=3D -EMSGSIZE) goto wait_for_memory; diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 564c970d97fffe9fd264e0d02c5670026314ac57..cd0d582bc7d48fbf9cd917c72e1= fe4e88232916e 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2388,8 +2388,7 @@ static int unix_stream_sendmsg(struct socket *sock, s= truct msghdr *msg, =20 if (unlikely(msg->msg_flags & MSG_SPLICE_PAGES)) { skb->ip_summed =3D CHECKSUM_UNNECESSARY; - err =3D skb_splice_from_iter(skb, &msg->msg_iter, size, - sk->sk_allocation); + err =3D skb_splice_from_iter(skb, &msg->msg_iter, size); if (err < 0) goto out_free; =20 --=20 2.49.0 From nobody Wed Oct 8 04:06:43 2025 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 099FD280309; Wed, 2 Jul 2025 13:38:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463532; cv=none; b=uIWxXOzePsr+rgues2wKO+Ke6HmD+WIkj93PFEFESjzzFR8E8iL6tK0CsFNysu8RrCJpo1JC2YLMERGubLWyISe9W2seCEGe9lakZbYUX71FL1Q5zbpbCM+0X3LUgpzwMrmSTjoph7hpXDs0DE+Wy7WE8NVRfD8kcfSLS55qGYE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463532; c=relaxed/simple; bh=0eezVt/aGVbqRb2X6TVgbQGZVA1y28V3T+nWy0kU7RY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bbKm/cFRGbpCCdh3tnpDmCCDdCubmzmfDo35Zejvr+MQJE5dJLVwZmgRnGmAJB3hn5voGOugDoSN5hHYnXdZVgyDEDIgX7AblR5JvtwDAyKmO2nJozpZvF1wuUF2QZWs6XKNPg1L5P31gzyixv7q1S4GkwfdXkMKJbbvKzJ5LO4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=OaZXxfJu; arc=none smtp.client-ip=185.226.149.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="OaZXxfJu" Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uWxfe-00GxQR-Cc; Wed, 02 Jul 2025 15:38:42 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector2; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=vFYjW9Cjsjs34VZC5pCoDTbgDzAbHmFDVo/jHajaWgU=; b=OaZXxfJufB9Re57GF6OfRUFJYE cHLRqSG8ebIGp0OWlyLO15x8WJs4IHYH7DlJ91CNAPvLpPis1+hVEfHukB3uk7K5IHhMchwkyi9Kc ZVZwAavLkdRTlb/6Dg0713WqGimY9eb5RQlOi7e7IHOX3ARjl9nWqPa3SZ7GVr0eUZ1jC39gtKtbb +ILBpSUw1t4+GsimtLdkARBgeWoJBo8Mh6xa1uQ9xBzmqwFv2nm1d8Fcki99ZA05Lo3XtJn62JIxM F202h89xIhAJ73qHD105U1Fh+/lTdj4w1gba4barFxLtgYa6Qe68WG94xK7yuXOjXTfUsK9iIeFdW Htei6tjw==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uWxfd-0006FI-Ov; Wed, 02 Jul 2025 15:38:42 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uWxfF-009LCR-5B; Wed, 02 Jul 2025 15:38:17 +0200 From: Michal Luczaj Date: Wed, 02 Jul 2025 15:38:09 +0200 Subject: [PATCH net-next v3 3/6] net: splice: Drop nr_pages_max initialization Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-splice-drop-unused-v3-3-55f68b60d2b7@rbox.co> References: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> In-Reply-To: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Ayush Sawal , Andrew Lunn , David Ahern , Neal Cardwell , Kuniyuki Iwashima , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 splice_pipe_desc::nr_pages_max was initialized unnecessarily in commit 41c73a0d44c9 ("net: speedup skb_splice_bits()"). spd_fill_page() compares spd->nr_pages against a constant MAX_SKB_FRAGS, which makes setting nr_pages_max redundant. Remove the assignment. No functional change intended. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- net/core/skbuff.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index a34fe37cf7a508c8380e35522d9cde266aa440f9..3041f7a3560d58270dffdf92382= 5758f274c8511 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3189,7 +3189,6 @@ int skb_splice_bits(struct sk_buff *skb, struct sock = *sk, unsigned int offset, struct splice_pipe_desc spd =3D { .pages =3D pages, .partial =3D partial, - .nr_pages_max =3D MAX_SKB_FRAGS, .ops =3D &nosteal_pipe_buf_ops, .spd_release =3D sock_spd_release, }; --=20 2.49.0 From nobody Wed Oct 8 04:06:43 2025 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C594A2820A0; Wed, 2 Jul 2025 13:38:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463530; cv=none; b=IyOfix887Wuyj7t0oM+qAiXFcwLLaRIE2+CNpLrNW/emdhq4jBISOINWa/lNxwwYB5ieXb1uzR4VgBnnibnUIzDc4BFuwAMpzvpChmTELGdPDyBhHJ7+F8ilp4YA3annpo77cq8WVXjaSDZulnyDOtHlYpQr3ojcZUUU+JtVtIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463530; c=relaxed/simple; bh=8R94xR6ywX8zi8DpzNLXc8nXc/KWdO8qaX7Bl2FN4Tw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uVEBC06/9Sswg6lPL1bd8PJ8S8VZjjdgtzqUkGQJUOr5abUYMuG7Ubm/mFQJisIv5B59dQDIED1UiomwpA/tGQcjQe8o4JVCp2rcr20+ASBkYwr8zzWNoYd02WPH47/DpPB+knNoGJXCaZBH6OAgnxIpyi0Hl9bnnYiIe75xyOk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=ocbLthwZ; arc=none smtp.client-ip=185.226.149.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="ocbLthwZ" Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uWxfV-00GxOr-Ik; Wed, 02 Jul 2025 15:38:33 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector2; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=0+sqAtVYy6ujOD9J5/0Ld0QUGlNJqgikFRG6V5SJvFU=; b=ocbLthwZ3WvAfsAoRevTvAq6Om eU6JCUy9lWbirNXAxK/XS4XK62scLwzv3GIemA9z7tqDZLzmGc4e7aHbymeoaFulG3b5hTwUynM6t Qh4ukIW9Mx8o+/h7VSPuT1fKtIa78kICyTF+EF/IwqKonR3OFxGDmCJ2TyaJT2Kcp1XIqBTuien2p Nwny/S+/S8TKHUG8J8UGnaPMgZZ+w40jEZQumGCPIZdWO68tN6rE3hjKLw5Of9kZktd6NSmGmMmqt ey//7BNg3TIx2ACBS6YEJ5ZgFWunnk5jJQC7F3wJwOa0v+R/WiGaV1fcuPSBukGhFr9vI4jAP7k0n on7yb4bA==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uWxfV-0006Ef-2W; Wed, 02 Jul 2025 15:38:33 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uWxfG-009LCR-1h; Wed, 02 Jul 2025 15:38:18 +0200 From: Michal Luczaj Date: Wed, 02 Jul 2025 15:38:10 +0200 Subject: [PATCH net-next v3 4/6] net/smc: Drop nr_pages_max initialization Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-splice-drop-unused-v3-4-55f68b60d2b7@rbox.co> References: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> In-Reply-To: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Ayush Sawal , Andrew Lunn , David Ahern , Neal Cardwell , Kuniyuki Iwashima , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, Michal Luczaj , Sidraya Jayagond , Dust Li X-Mailer: b4 0.14.2 splice_pipe_desc::nr_pages_max was initialized unnecessarily in commit b8d199451c99 ("net/smc: Allow virtually contiguous sndbufs or RMBs for SMC-R"). Struct's field is unused in this context. Remove the assignment. No functional change intended. Suggested-by: Simon Horman Reviewed-by: Sidraya Jayagond Reviewed-by: Dust Li Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- net/smc/smc_rx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c index e7f1134453ef40dd81a9574d6df4ead95acd8ae5..bbba5d4dc7eb0dbb31a9800023b= 0caab33e87842 100644 --- a/net/smc/smc_rx.c +++ b/net/smc/smc_rx.c @@ -202,7 +202,6 @@ static int smc_rx_splice(struct pipe_inode_info *pipe, = char *src, size_t len, offset =3D 0; } } - spd.nr_pages_max =3D nr_pages; spd.nr_pages =3D nr_pages; spd.pages =3D pages; spd.partial =3D partial; --=20 2.49.0 From nobody Wed Oct 8 04:06:43 2025 Received: from mailtransmit04.runbox.com (mailtransmit04.runbox.com [185.226.149.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7D5428030C; Wed, 2 Jul 2025 13:38:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.37 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463528; cv=none; b=gRxfcSajwxoY862aW/mgXtwI7urpzxD6Lq0i99dkDZ/mrL+4gOm8rV4FjWb1JbjAgkA4qYQ2jaxU4vliDgrqSqFcGHuF+5ItB0Z4GcZdefBUMm0Bth4hemQdHcthNVLP1VUWw9r3Rjk1OzFcJwYeV1SSJB4A42rSDiAIpSIKKTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463528; c=relaxed/simple; bh=6JXOJDpQtNZ8zItGvQx8hpOPdmVU4HwAecRO1928Ajg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=epl7fZTgZuEBEYWfYsCqyRupzZYQ0llSmL/jJBSEF2/tz0sShDLvBBB+ENX2Yv5MmSnOrihnKTRWjomqIAgrsBJx+/9nfX7zMCS/vf51kCgxQ1nde+LOSYuINqu1opx2BKFcRDjDx4Hyk881s8DbKag2yo5YMr4QkvROx2r6S14= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=HKhubmMf; arc=none smtp.client-ip=185.226.149.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="HKhubmMf" Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uWxfW-00GcGn-RV; Wed, 02 Jul 2025 15:38:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector2; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=sM+ZIkYQgoYjSyImGT5nQfsb+zR5DT3P9YWgOgmGZQE=; b=HKhubmMfKL7U9cqp0dMh0WOd9s RWjfsza+e4mH8JywvaeQzPnYVqQv3dzd/wQyvfxWx2eJWqQP6SEX2oUDPXy6XtBzo+MqsXlwwBCxV dpgvUlCS9GN6zAZVn1VQqEdhuAcbCYCXfUPgGCh6FMO/J28BhIRNxOcCaXPQ+3cbRVnPuu7BYD4UL 2dJZaZoVXuDxga3x1L+GsliVxqc+shcoLiKq92ud65zbkoJH2blEU7juEnomvDgE0xVlmGO6E0yMh HVy7/0x998XfTHqTdOuCKMa9zs5lWqYOpw5ymTGfaPX3Lx243ga6KKqTE0f5RsXpjEjsJTfWyRdev Yv3/dGtg==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uWxfW-0005Gl-8M; Wed, 02 Jul 2025 15:38:34 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uWxfG-009LCR-SI; Wed, 02 Jul 2025 15:38:18 +0200 From: Michal Luczaj Date: Wed, 02 Jul 2025 15:38:11 +0200 Subject: [PATCH net-next v3 5/6] net: skbuff: Drop unused @skb Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-splice-drop-unused-v3-5-55f68b60d2b7@rbox.co> References: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> In-Reply-To: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Ayush Sawal , Andrew Lunn , David Ahern , Neal Cardwell , Kuniyuki Iwashima , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since its introduction in commit ce098da1497c ("skbuff: Introduce slab_build_skb()"), __slab_build_skb() never used the @skb argument. Remove it and adapt both callers. No functional change intended. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- net/core/skbuff.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3041f7a3560d58270dffdf923825758f274c8511..4893350bc80a105e0a2870f0de0= 3a687c1117217 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -384,8 +384,7 @@ static inline void __finalize_skb_around(struct sk_buff= *skb, void *data, skb_set_kcov_handle(skb, kcov_common_handle()); } =20 -static inline void *__slab_build_skb(struct sk_buff *skb, void *data, - unsigned int *size) +static inline void *__slab_build_skb(void *data, unsigned int *size) { void *resized; =20 @@ -418,7 +417,7 @@ struct sk_buff *slab_build_skb(void *data) return NULL; =20 memset(skb, 0, offsetof(struct sk_buff, tail)); - data =3D __slab_build_skb(skb, data, &size); + data =3D __slab_build_skb(data, &size); __finalize_skb_around(skb, data, size); =20 return skb; @@ -435,7 +434,7 @@ static void __build_skb_around(struct sk_buff *skb, voi= d *data, * using slab buffer should use slab_build_skb() instead. */ if (WARN_ONCE(size =3D=3D 0, "Use slab_build_skb() instead")) - data =3D __slab_build_skb(skb, data, &size); + data =3D __slab_build_skb(data, &size); =20 __finalize_skb_around(skb, data, size); } --=20 2.49.0 From nobody Wed Oct 8 04:06:43 2025 Received: from mailtransmit05.runbox.com (mailtransmit05.runbox.com [185.226.149.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA193210FB; Wed, 2 Jul 2025 13:38:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.226.149.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463530; cv=none; b=IBYvuGIC0fDpm5yclox19uSizCe24GXTRIsrsUktCdvFM+P5gzTYF0Am212eVy2M8EVqiO9VBxR9YU5SysZtQwEM4Kj5227hr/5yBiuJ16yldRQwkyHg0Inlu8jtrgJvZNzJjGjgJpFgEfa3D/UKEbQmKN4g/Vlz8YWNh7KWXaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751463530; c=relaxed/simple; bh=4eLuzgj8qf2LZev2QCAZV8vLiljlN4KMGlGZep1Hp+8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JBnvjh87tsT0jUqynnTFsWLzc4VIxhj0N32TqyQl/BHEtGyqF2tzBhKN5eLA6v4zw6oH6cTM0JYaOAadnuLB2mSrmYhFf1MX8J/dU8ldJmhZexXscneVPG0xqT767OzNF7O/L11Lxq04kH2WJs6UdatkQbDdHQEMC63WkXgSPv0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co; spf=pass smtp.mailfrom=rbox.co; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b=CzThAC6a; arc=none smtp.client-ip=185.226.149.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rbox.co Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rbox.co Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rbox.co header.i=@rbox.co header.b="CzThAC6a" Received: from mailtransmit02.runbox ([10.9.9.162] helo=aibo.runbox.com) by mailtransmit05.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1uWxfX-00GxP8-Ma; Wed, 02 Jul 2025 15:38:35 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rbox.co; s=selector2; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From; bh=tVBIAHVRa1NySUmQqjHQ9VogQkHm52MnGmsms6t9xMo=; b=CzThAC6a8leYxWNj+S+aNDZeuJ QbbNLOSvfrlowi/FYvdbHJ026K6XDtU+RsnGdmUsTFpsq0V5zXk0oMWC6KqYAodF/0IkhFX0vxccF kQavhrIkW9yt67fGGT/J2i1U1LUiMBH4osId+yeIah15IU6fApwaHLTgy4uqYGaZem1/uAm1dPaJv YjNsi0evghn9Kj/o5iABaiOEZfD6ifQ5Zq6WVh4C0ninfrB4sAG1GSjXgtApwRjAoX4TU+qTDLsop JwsCqcdf2TXnJ40xK+LeDyT8EdYe83Xc6sfrcDCtbOt0+7vySVTXivlTRYWXfMpsJ3yGD3tTl/rK0 w4NJFYNw==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uWxfX-0006En-D4; Wed, 02 Jul 2025 15:38:35 +0200 Received: by submission02.runbox with esmtpsa [Authenticated ID (604044)] (TLS1.2:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) id 1uWxfH-009LCR-MU; Wed, 02 Jul 2025 15:38:19 +0200 From: Michal Luczaj Date: Wed, 02 Jul 2025 15:38:12 +0200 Subject: [PATCH net-next v3 6/6] net: skbuff: Drop unused @skb Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250702-splice-drop-unused-v3-6-55f68b60d2b7@rbox.co> References: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> In-Reply-To: <20250702-splice-drop-unused-v3-0-55f68b60d2b7@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Ayush Sawal , Andrew Lunn , David Ahern , Neal Cardwell , Kuniyuki Iwashima , Wenjia Zhang , Jan Karcher , "D. Wythe" , Tony Lu , Wen Gu Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, linux-s390@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since its introduction in commit 6fa01ccd8830 ("skbuff: Add pskb_extract() helper function"), pskb_carve_frag_list() never used the argument @skb. Drop it and adapt the only caller. No functional change intended. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- net/core/skbuff.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4893350bc80a105e0a2870f0de03a687c1117217..277f7d0666691bd54d6e005c84a= 2166175455490 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -6757,8 +6757,7 @@ static int pskb_carve(struct sk_buff *skb, const u32 = off, gfp_t gfp); /* carve out the first eat bytes from skb's frag_list. May recurse into * pskb_carve() */ -static int pskb_carve_frag_list(struct sk_buff *skb, - struct skb_shared_info *shinfo, int eat, +static int pskb_carve_frag_list(struct skb_shared_info *shinfo, int eat, gfp_t gfp_mask) { struct sk_buff *list =3D shinfo->frag_list; @@ -6863,7 +6862,7 @@ static int pskb_carve_inside_nonlinear(struct sk_buff= *skb, const u32 off, skb_clone_fraglist(skb); =20 /* split line is in frag list */ - if (k =3D=3D 0 && pskb_carve_frag_list(skb, shinfo, off - pos, gfp_mask))= { + if (k =3D=3D 0 && pskb_carve_frag_list(shinfo, off - pos, gfp_mask)) { /* skb_frag_unref() is not needed here as shinfo->nr_frags =3D 0. */ if (skb_has_frag_list(skb)) kfree_skb_list(skb_shinfo(skb)->frag_list); --=20 2.49.0