From nobody Wed Oct 8 21:36:50 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 6945128F533; Tue, 24 Jun 2025 09:54:40 +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=1750758881; cv=none; b=ohlDVcoNa+bzOja/kKIJ9A2lp0M0/gPXn5EDa40sYErGclFk4QqTxppYtPjkaboC5ia3QnUUbcKmioRTMv27b/jxcxcyA2W/uVyhvEwGzvr+qe5ig6ZeLWQ7VQ4U79HgJQlf7UERHhZY/wlD/vVGwuT4o/kzC9NIXpjW+2V5FYI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750758881; c=relaxed/simple; bh=Rt3SdjfeRFOWaAIBveiyEHR2/z5Og0yrqZBGpP6Y7Jw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Yf3gO/nTJzrF18yrPkw7UQ5X9nFmIqYerUFKL13lpc4sEN9we7JJ4hNNMeUdnyF29cAJibIh/GRK8ZYThyygoneSgAA2niW0H8AaPxJ/jFbkzOS5QTvQY2jtqKuiw+8lnUmVqMQrIXzhlIeUu5/wsng+UXMxR22yGnfEMWxCDGg= 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=WhPFZlcP; 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="WhPFZlcP" Received: from mailtransmit02.runbox ([10.9.9.162] 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 1uU0MD-00AXbP-Mt; Tue, 24 Jun 2025 11:54:25 +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=yh+wgCONewBgg0HYVBK74vPz+B6SDKm5RD1XJlT5iN0=; b=WhPFZlcP2GPjpQ6zQQYQObfXy7 dZu8YNKBVdyS++rUUjLZ4rU9bmfVTM/8LWpWSL2ZrGmNmASaGkD1zyCaS7BIBMMjvdtjYjFEemB8g iAMadzx45U/ufo7HBDBOiFJxRBkKfTqKOdTWj74lwe6/HUqJ1DRnXuRG11be99uNN32DvbPkr2hfz dOQFPloQw1gGTV/+LExNyKC4nhiN42wXGs1F6wcS2Vr5oOFGbuI+jZ+0YkjpFGANewkXhVVUI731y ojWmvvMHOx/XNUP5JQu8uBmpAHASchsCgdT/S1/ABcmMmenFPyR5cFf9K4srnyow0hRIUhL6PG0oH 6k8WXRRw==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uU0MD-0002ZW-CH; Tue, 24 Jun 2025 11:54:25 +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 1uU0Lj-00FYQf-B5; Tue, 24 Jun 2025 11:53:55 +0200 From: Michal Luczaj Date: Tue, 24 Jun 2025 11:53:48 +0200 Subject: [PATCH net-next 1/7] 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: <20250624-splice-drop-unused-v1-1-cf641a676d04@rbox.co> References: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> In-Reply-To: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@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. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- 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 21:36:50 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 6CE1F27BF99; Tue, 24 Jun 2025 09:54:34 +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=1750758876; cv=none; b=LWcXK/TJqV6jp+zxJExf1nSjEcVQujleoyTsHc+U1vTcKMeUHAe7AhSr8zjnMBl9/qv9FghkBH03gBJmUm/LRcouFrQaaCU4IHhtUEAFI2mWBciehpabjKB8/xHmKOjldcUBf4v5wbMAjDFOMtu7ssYq7zT9AmFaTZvEX1sy0qo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750758876; c=relaxed/simple; bh=NtVtPSnfmcqyvPXKHdJgJTnAm+CocfkvUDIpNBmxqGc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FK+w9rbsQO5m1JBO0AfWpb4WuKk+4Ho3eja7Uw0JfxlMrkna4b9YM0vlFZTD31Ibqil5bNQsaTe/0NoeEJfZMFobemmtiUH20+Xd9RpyOGhmYf7H8RQiWZlX4uQroF0AaOU12obS0bKTJvTk8ueltJ5VdPrTkImaFrUZj4SOZ1I= 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=bYS8kWIn; 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="bYS8kWIn" 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 1uU0MC-00AvZZ-2L; Tue, 24 Jun 2025 11:54:24 +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=e7/5TI5d9YvE+jrVsgk09V5daUExdC5vGTySPclMLNo=; b=bYS8kWInn7m4YCIfocC0CAWHFt izIIDT8HmJWIx3R9fkh2r7OTEUReBtTK2HHn9OrOvyxHZYK5TmpNWacR3GHFRoC5Wig8dwdqc58ZF CoP6/5rwYRonL4Mdl9H5k8gur8ut+SqzARpC/LDaYrzn/R7fx90qH9zYAeL9ptGCgI0JH3RNRLJus ZYcOXuGweAIGk7f3Lp+1P8mKwqhoBupIWA7V8Vy8nYr8rp6fZE62gTxcdm96AQ8TR9OqKlLxliGws Jiut3lvSIY4crRwfVMJAGq6QxYwXgcCxp9ve9slwdROm+dg/9UYOzirOfAPnM4yWjKYvR812V5vMc fcrG0ObQ==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uU0MB-0002ZL-Kd; Tue, 24 Jun 2025 11:54:23 +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 1uU0Lk-00FYQf-0J; Tue, 24 Jun 2025 11:53:56 +0200 From: Michal Luczaj Date: Tue, 24 Jun 2025 11:53:49 +0200 Subject: [PATCH net-next 2/7] net: splice: Drop unused @flags 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: <20250624-splice-drop-unused-v1-2-cf641a676d04@rbox.co> References: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> In-Reply-To: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since commit 79fddc4efd5d ("new helper: add_to_pipe()") which removed `spd->flags` check in splice_to_pipe(), skb_splice_bits() does not use the @flags argument. Remove it and adapt callers. No functional change intended. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- include/linux/skbuff.h | 3 +-- net/core/skbuff.c | 3 +-- net/ipv4/tcp.c | 2 +- net/kcm/kcmsock.c | 2 +- net/tls/tls_sw.c | 2 +- net/unix/af_unix.c | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 4f6dcb37bae8ada524a1e8f8de44c259cfac695b..5b6f460c69b277124e788cfa059= 9486522e62c9c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -4157,8 +4157,7 @@ int skb_store_bits(struct sk_buff *skb, int offset, c= onst void *from, int len); __wsum skb_copy_and_csum_bits(const struct sk_buff *skb, int offset, u8 *t= o, int len); int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int off= set, - struct pipe_inode_info *pipe, unsigned int len, - unsigned int flags); + struct pipe_inode_info *pipe, unsigned int len); int skb_send_sock_locked(struct sock *sk, struct sk_buff *skb, int offset, int len); int skb_send_sock_locked_with_flags(struct sock *sk, struct sk_buff *skb, diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ae0f1aae3c91d914020c64e0703732b9c6cd8511..02ead44a82bb71d30d294a69319= 43d07cf7c7177 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3181,8 +3181,7 @@ static bool __skb_splice_bits(struct sk_buff *skb, st= ruct pipe_inode_info *pipe, * the fragments, and the frag list. */ int skb_splice_bits(struct sk_buff *skb, struct sock *sk, unsigned int off= set, - struct pipe_inode_info *pipe, unsigned int tlen, - unsigned int flags) + struct pipe_inode_info *pipe, unsigned int tlen) { struct partial_page partial[MAX_SKB_FRAGS]; struct page *pages[MAX_SKB_FRAGS]; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8a3c99246d2ed32ba45849b56830bf128e265763..46997793d87ab40dcd1e1dd041e= 4641e287e1b7e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -766,7 +766,7 @@ static int tcp_splice_data_recv(read_descriptor_t *rd_d= esc, struct sk_buff *skb, int ret; =20 ret =3D skb_splice_bits(skb, skb->sk, offset, tss->pipe, - min(rd_desc->count, len), tss->flags); + min(rd_desc->count, len)); if (ret > 0) rd_desc->count -=3D ret; return ret; diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 24aec295a51cf737912f1aefe81556bd9f23331e..8140c9c9cc2cb7aa71eaceab8a0= 19d882bc454aa 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1043,7 +1043,7 @@ static ssize_t kcm_splice_read(struct socket *sock, l= off_t *ppos, if (len > stm->full_len) len =3D stm->full_len; =20 - copied =3D skb_splice_bits(skb, sk, stm->offset, pipe, len, flags); + copied =3D skb_splice_bits(skb, sk, stm->offset, pipe, len); if (copied < 0) { err =3D copied; goto err_out; diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index fc88e34b7f33fefed8aa3c26e1f6eed07cd20853..5bca6cfce749aa9fd64da764b2a= 0d6a4c936efac 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -2266,7 +2266,7 @@ ssize_t tls_sw_splice_read(struct socket *sock, loff= _t *ppos, } =20 chunk =3D min_t(unsigned int, rxm->full_len, len); - copied =3D skb_splice_bits(skb, sk, rxm->offset, pipe, chunk, flags); + copied =3D skb_splice_bits(skb, sk, rxm->offset, pipe, chunk); if (copied < 0) goto splice_requeue; =20 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 1e320f89168d1cd4b5e8fa56565cce9f008ab857..235319a045a1238cf27791dfefa= 9e61b4a593551 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -3070,7 +3070,7 @@ static int unix_stream_splice_actor(struct sk_buff *s= kb, { return skb_splice_bits(skb, state->socket->sk, UNIXCB(skb).consumed + skip, - state->pipe, chunk, state->splice_flags); + state->pipe, chunk); } =20 static ssize_t unix_stream_splice_read(struct socket *sock, loff_t *ppos, --=20 2.49.0 From nobody Wed Oct 8 21:36:50 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 54DB727AC28 for ; Tue, 24 Jun 2025 09:54:33 +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=1750758874; cv=none; b=JP/UgLOS2UIebg2KNB5r+y6tFi0aY0mJOLyuGtH89H5sQjSFkah/mI8EncMseFKNntU7k0+cX1ogzvHTsKCptE3V89vQ2LuFIYVYvM5f7H9AVFBZdiMjkKBwtdnY/aJHAXSm/KV3dfYYzQ3jLWTbfFYD8qStblSR99cEdw+Fcsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750758874; c=relaxed/simple; bh=uqkz9n3cXeZ8dWR3V7k1mqJrp/VlUn32LAcNLj9u9Qs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EDdcwwy45JBVMtsGncXV/73Ay1OiWPOm0MTBZ3CV+riqXvLO/uTNwq9PcuIm0ArA+eSl4qVPyD3zG8FaJS/S4UBABU8zHfeU21CLo0KUY9InNUHbNn9qCM+4ghHzEf2quheq6diLhQCbBtCwJmD7y/HjdAXj2Ai7m0ics13hJao= 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=rwF9Q1CT; 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="rwF9Q1CT" 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 1uU0MA-00AvZN-UV; Tue, 24 Jun 2025 11:54:22 +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=mb24HdoCl0957wtvOLAlFVXDR/MMgGHlQT3zT4JrkPk=; b=rwF9Q1CTjfwpBGkV52UOkUhx5m 7c+srA+xERSbc5QOrn6LO/ZDaAYZOtEbzyG7XTCiCN51Kcq+ZykOOSdm8Z7HKQ+H6qzLbWdzZXkC0 HJBbN0J7cUpTmp2FMU0vgQCwu9KCoO/8Rs/e+m4JKLZvGHdYOUH31ijI1i9X4DwE//s/wNtqQlp1O W6vKznZZcVlAaaVR5MFA3vsFXCzdMdi7N+KKMEKgQn6fqnE6/9c0WL2JN9s5NIBrRXxde0fLP29xL O0CMZbnh80GVDcZ8Cm2FTgDMzY1d5nng/rhQ9gZYOR/BD+41FAUPzEA4SkJ5luwFD8edcheeXijJM l/nM9+hA==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uU0MA-0002ZF-JM; Tue, 24 Jun 2025 11:54:22 +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 1uU0Lk-00FYQf-LG; Tue, 24 Jun 2025 11:53:56 +0200 From: Michal Luczaj Date: Tue, 24 Jun 2025 11:53:50 +0200 Subject: [PATCH net-next 3/7] tcp: Drop tcp_splice_state::flags 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: <20250624-splice-drop-unused-v1-3-cf641a676d04@rbox.co> References: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> In-Reply-To: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since skb_splice_bits() does not accept @flags anymore, struct's field became unused. Remove it. No functional change indented. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- net/ipv4/tcp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 46997793d87ab40dcd1e1dd041e4641e287e1b7e..b6285fb1369d32541b9f7d660ca= 33389b7e4da61 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -324,7 +324,6 @@ EXPORT_IPV6_MOD(tcp_sockets_allocated); struct tcp_splice_state { struct pipe_inode_info *pipe; size_t len; - unsigned int flags; }; =20 /* @@ -803,7 +802,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, struct tcp_splice_state tss =3D { .pipe =3D pipe, .len =3D len, - .flags =3D flags, }; long timeo; ssize_t spliced; --=20 2.49.0 From nobody Wed Oct 8 21:36:50 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 DD3F72222CC; Tue, 24 Jun 2025 09:54:23 +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=1750758868; cv=none; b=cEiwos+yau4iXokweKnYGF89xlmtXU1ZHnn30Zk/zkvmS0V0Kf9YvqqQdIkiaiDmshokzdG6QMQ2KuG1p5O3mSu7a0n8MzTZ29rLVly/J48UeOLFg+BWv2XsgtJs44lZR4oPMoCjIX1hikzMQNRO30hCyj8nME5iSA13re3i+Qw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750758868; c=relaxed/simple; bh=EBCJmKKlcL53r2vnhfAzxVBoMGSYOIFwr1YN1MhJRjI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SbSRjvFyD3BKHJrzm6DPpBEKKpUJYI0kHQ/4a+4Hws92HxDWcBTBJRux+ypmUkII9JSveulLy5inRVmzvQ6m8bJKZwoDBOSEXBHP3hxsElINmXGrnEzisPJPhWrrMU5vJjSF6PE/uqdH721SEzBqfV8xXfs+dR11EE6loYRp8pw= 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=OWiHZi6Y; 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="OWiHZi6Y" 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 1uU0M3-00AvYO-Ih; Tue, 24 Jun 2025 11:54:15 +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=kf2/hDBT9aaBOd6ouZwDBEBoZykD658FhkvJs68qzvg=; b=OWiHZi6YqeS50b26RTNEq6EbPo +gLx8hTwOD7SX8Nx0Dc63pzD7ADMao/0Fe56nuJV2wWA25VLWItHaIgc/YVDqu6NAm6deX0uv/bqQ jX0obP4gDxcwrJy+c+dISKcXBtr68kmo2E5wuqXaKcthJcRnmnNNBbU3XACSN5wuQSQZVvrXLibH6 q5MhrQ8oBXlnoh5Amy//3PvjPIUg1kyPKpFLJZyYL4tpMZ6XovXHfaSDreHuTpr7yVyMpPgWpRPLB IvZIX+wqQpQk5xB9mHs9LllhygTXcY2XBrXXBS/WJjX19LOdUV1muSSUnSti91uHRXHyAKEom2NEi wZ58VouA==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uU0M2-0005uR-JA; Tue, 24 Jun 2025 11:54:14 +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 1uU0Ll-00FYQf-9n; Tue, 24 Jun 2025 11:53:57 +0200 From: Michal Luczaj Date: Tue, 24 Jun 2025 11:53:51 +0200 Subject: [PATCH net-next 4/7] af_unix: Drop unix_stream_read_state::splice_flags 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: <20250624-splice-drop-unused-v1-4-cf641a676d04@rbox.co> References: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> In-Reply-To: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 Since skb_splice_bits() does not accept the @flags argument anymore, struct's field became unused. Remove it. No functional change indented. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- net/unix/af_unix.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 235319a045a1238cf27791dfefa9e61b4a593551..1e3a4db1a96a57c84c199e30c16= 4f66409b04be4 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2674,7 +2674,6 @@ struct unix_stream_read_state { struct pipe_inode_info *pipe; size_t size; int flags; - unsigned int splice_flags; }; =20 #if IS_ENABLED(CONFIG_AF_UNIX_OOB) @@ -3082,7 +3081,6 @@ static ssize_t unix_stream_splice_read(struct socket = *sock, loff_t *ppos, .socket =3D sock, .pipe =3D pipe, .size =3D size, - .splice_flags =3D flags, }; =20 if (unlikely(*ppos)) --=20 2.49.0 From nobody Wed Oct 8 21:36:50 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 81E8E27C154 for ; Tue, 24 Jun 2025 09:54:25 +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=1750758867; cv=none; b=STKwptuTao3g4BOeNoiN44yZdNb6sc3z/d1eokf6ohbOyyfW9GZVNwJYbXXuPpIiz9X1qs5ofI7gCnABsuVX3X+Cif9hNIHzLR5YZrpulkLzu3G90L4JYam8YoeIAZjy9gONpBGDwS+pkokiX+4WoAmXbLX+e89C9bO0KCP7xgE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750758867; c=relaxed/simple; bh=YkSJAchSnplblmjmNW1QuIBtZ+gkx1rwgG4dfph7N8c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nAwWM8yRsITpFgISKWYtvYpe0WFb9z9rfr2kvt5KXss83UMw92ssYscUwqqOx++5LVpjYIRytnfwGxkXtfSHlZnmqaT5tbQlwlmvdSVgzPWl/Pl95jNJ7Y2wNFQ7YeeEQqZdSu9lUVg7RgJXV1K54rsKmMCExCaH2fkCOnrPtuc= 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=xt71S8gt; 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="xt71S8gt" 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 1uU0M4-00AvYR-N6; Tue, 24 Jun 2025 11:54:16 +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=CtUXrOvQS+uOEQrz+hc+DMhDAzJ1ls9rbIP6D6uIV+8=; b=xt71S8gtFAvwQRksx9PcG5dgJE 45E49OWXJSEhzCGNwd+RCsFBu8qp7oYshEmLbtvPxsSAaP6L5QAz0d+10sRVIUboEvxzj1kJV/h7z eL/Ao2hQcDgEfhJ2dq+nuDAhXQeNbqzWZHf1asBjrHFOpMO+zmDOVDklJd8HW1MBVU0yWiFq1k5KQ zXKeJJ2ghqX4LzQwfQPsrcvq6BTYYXrJuUJq60M8p2kbuKTZOAXhN8jFcWQ3caFTtNCdtbh3p2A5a pmCY/Mg2hstHAguDM7us07xXWU9VF2gm8qTPuX36FcnZerjFR6sE/rT2azJUEf6R2hmy8Brvi9K1w bESxyKMw==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uU0M4-0005uX-CI; Tue, 24 Jun 2025 11:54:16 +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 1uU0Ll-00FYQf-W3; Tue, 24 Jun 2025 11:53:58 +0200 From: Michal Luczaj Date: Tue, 24 Jun 2025 11:53:52 +0200 Subject: [PATCH net-next 5/7] 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: <20250624-splice-drop-unused-v1-5-cf641a676d04@rbox.co> References: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> In-Reply-To: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@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. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- 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 5b6f460c69b277124e788cfa0599486522e62c9c..4952a6991c720a5001477a77d25= 2567aa2c15ac2 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -5264,7 +5264,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 02ead44a82bb71d30d294a6931943d07cf7c7177..c381a097aa6e087d1b5934f2d19= 3a896a255bf83 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -7229,7 +7229,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 @@ -7240,7 +7239,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 b6285fb1369d32541b9f7d660ca33389b7e4da61..9d41113e3a68455f3cc7e067d72= f3aa2485a21f2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1295,8 +1295,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 8140c9c9cc2cb7aa71eaceab8a019d882bc454aa..71fedf9cfac85b7cbcd8fd3dbac= d74440fa556f4 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 1e3a4db1a96a57c84c199e30c164f66409b04be4..c2d1a547b14650b53d16c18f239= aeb7c5f50cc96 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2377,8 +2377,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 21:36:50 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 0722D27E7FD for ; Tue, 24 Jun 2025 09:54:35 +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=1750758877; cv=none; b=uadhD/jCPfZklfTM66aaVbzvTSW5uk/sBj7SsygHW8v5Zmgge48GWNu44fWfffjDWPJlGsIsL7nqfgMAbnONwKxvksYfe4nN2SSECcTH8CUS6SH/s4BO/gL3XmbD0VoAalGZtetpOwHTaqGi6Xfrq0pbhnldQgbqslebeMX1h2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750758877; c=relaxed/simple; bh=tlJRnEEZgM8wikV+kuti8475GoBki3tuqWhJS+hQBU0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SQYh33X0r7bd/WLA57vkmvj5okN8tC8nVqke1Fr72V/3xdcSlHttKLY2iV1wJFaRNRfV8jywdNNEMXjuMgY93cfzH8gAbyQ8LINtLBTjxw5jaqgw16CfnxmK53ERSuwyRLHr/9zvoAyjbHI70KqMicenpV4gq95gVZVKWBtkWJM= 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=zlVTveOa; 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="zlVTveOa" 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 1uU0M9-00AvYy-1D; Tue, 24 Jun 2025 11:54:21 +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=xj6kXLXwTDoVKtPP/s0jXoxPWGgGCda8M6HRmlI59d8=; b=zlVTveOa6g2e6AbnZ/Bi3KaXsP 31umJe3UG6IY9nTSiU6FIQnAFizcFmuiatruUP09TIBfNobcQOOgv5+nuQk5mknw/6z4sOnYIg+hI xWc8k8dt0XIsRndfnA5oOo6JWQVGPXPMmNA7D4mx8G1ihHvmp3oabaxrT8X3qnqiNkFo0h9htCk1j Naq+hiIGxC5Wm5Mgj0rIzbGFoz+sXGVsAIncKdl2myq3ZGvuiEHkMGtfLrOq+9hZJTTkjUtA1ajkI vOmzxQtlJBuIPGvaySLEWspIG79pedG3Uj+BDAdi8te6yjFxaUsRhAHDma/sVU3FmoG1Rhs/sGUKS 1JaufY8g==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uU0M8-0005ut-N6; Tue, 24 Jun 2025 11:54:20 +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 1uU0Lm-00FYQf-O5; Tue, 24 Jun 2025 11:53:58 +0200 From: Michal Luczaj Date: Tue, 24 Jun 2025 11:53:53 +0200 Subject: [PATCH net-next 6/7] 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: <20250624-splice-drop-unused-v1-6-cf641a676d04@rbox.co> References: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> In-Reply-To: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Luczaj X-Mailer: b4 0.14.2 splice_pipe_desc::nr_pages_max was initialized unnecessary 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. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- Probably the same thing in net/smc/smc_rx.c:smc_rx_splice()? --- net/core/skbuff.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c381a097aa6e087d1b5934f2d193a896a255bf83..b4f7843430a3f8f84aed387bf41= ae761d97687ad 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3188,7 +3188,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 21:36:50 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 DD4A52571A2 for ; Tue, 24 Jun 2025 09:54:23 +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=1750758868; cv=none; b=kJvaBww2f91Ob1iwaJMhtQzWkWjSDaPTLL6lou5Pr14VNDlkg7knmRHvKd7pVnhYWY0rnGCYjiQ0rWRKMaxT307ZEW5J5ZUjyto8PjolQ//FWgcQC9AswK+mhzmsO2qPWrFdOwecytJKBU+rZIJy0Pub+xkq3D/JYhmVBI/8viY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750758868; c=relaxed/simple; bh=aVicvWb2z9asxVyGNaHwfqwI/PWtxFm6n16ZTbYiSFY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KhQ/ARc09iRwy5bxheS6Pz5QhQqK8BHbSCU6OH6clcPBpLyPdjfq4sBCA5ech9OTAuosFEgPOFwBnYLr3afaMb+j5iyh1CfSFMy0yS/gAa+WtybbbS2F06w7YeM9xXsuL+mca4IDATgbaREK+Uu0YI/8eSgKGPfgwZ/yEQ2a8pQ= 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=tV7kDYan; 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="tV7kDYan" 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 1uU0M5-00AvYY-Sa; Tue, 24 Jun 2025 11:54:17 +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=30g1ZM1uCabAJyCAmaZGsFvTePUdMNQ+ZO3xiXDVNWM=; b=tV7kDYansE5dJeC9l3H5LGVRtz zzUC1jD0tHscxG8lMf93xoOHVTLd8MmANZMFlVwufdZjaTFRgo7NnVn8Dyer2tyX6nQtHMhmbqoGP WztFccTUf+d9BbXaCOBCbpRnG9pLVKxyXy9mQBAWh6nUeq6sb/E+ORiSl4JURBudHTuJ3x+jOnvzy o5Xm0T/QD+c7xz3MBwKXf1TbISPtsGAInFCfj/AE+cZnHSarZ9yKf/kwmtY1ZBsl7RvqcC/n0d09q +ODhylckE70EuxbauE0HcnAwDjZzlszZHkH1MjcgDCpXJ0B/D8ewMFM/7x6QwFxnImv1Y2RorB++w MxQYfV4w==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uU0M5-0002Yk-Hg; Tue, 24 Jun 2025 11:54:17 +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 1uU0Ln-00FYQf-Ew; Tue, 24 Jun 2025 11:53:59 +0200 From: Michal Luczaj Date: Tue, 24 Jun 2025 11:53:54 +0200 Subject: [PATCH net-next 7/7] 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: <20250624-splice-drop-unused-v1-7-cf641a676d04@rbox.co> References: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> In-Reply-To: <20250624-splice-drop-unused-v1-0-cf641a676d04@rbox.co> To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Boris Pismenny , John Fastabend , Ayush Sawal , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@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. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- 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 b4f7843430a3f8f84aed387bf41ae761d97687ad..b5f685b6611c177c199f70bb16f= d3940bce8cded 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