From nobody Wed Oct 8 15:58:31 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 4C9D22BD004 for ; Thu, 26 Jun 2025 08:34:29 +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=1750926870; cv=none; b=EL6f9njwtF6H0wYUIZi0kEWyzLlEo1oa6v0mDgZ23arlL808DPh1px6+0jEFJbkIMSwWfn8iwlYIMBnTLtiio+lPgwuFQvLClpGN4p4YbFoLZOb2gKHs51K89ZxW2xGTi1QQawsOGY3k8JK7hwBnQcgUd4N6OTbI88lBbkF+4AE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926870; c=relaxed/simple; bh=I5NwMU/UkVWamqyeUyAIs0m2ELLcQVTl3pqCth/6nic=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oTVtEk9/e9bOMUCf3U7pgSdAag/Za76GgRKs1WPvPdFniB1gZ5Ux3O+Xm4a9LNa4Xw8Umb71CJkArczzE6LKbBS9PMm2MmDMevIpzbekj+FkQ3suDx4/SrdvqpOk7OEdzofzQ73LWowsgdkUP86SzJQ48wzvsakMjZybugKX8QQ= 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=Mc14B1Vy; 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="Mc14B1Vy" 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 1uUi3s-00GFiw-Gu; Thu, 26 Jun 2025 10:34: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=PfnmbZl5iKr6rFeTS80a4NnfW2jlSVKr3NNDNbGzVI0=; b=Mc14B1Vyr3b42PbsywcyYWVoQD XSK/D+nCe5WuismACds54L4v9+VqnIY2ORtk0BHj9y/1QHMCZ/4oGBNYAUWhBDsSjTI0Rvnpuvp9P 6i/eSBbxXl8n+GOeMDgAj0+lqkPsM3wwhCInKZO94s6M8gHqDaz5RQhwmeYKR3lfC3oDjlGNqjX3y ARo36zzKcEfG1JxKbIn5e0qhmcjgZbFSoruWNqWp6P1gtgJej5aAr/nfiMVdRGV/p1MR7jiNEYnco /XgxgJiBgoEn+sZd/v8TP4J+lsIUQNK3qsaGCaBOcwSVMSyDeWqUP6SAijZe2P14ClCVEsiVtRBKc TQT+ChgQ==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3s-0002Hs-1g; Thu, 26 Jun 2025 10:34:24 +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 1uUi3L-009Fh5-9r; Thu, 26 Jun 2025 10:33:51 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:34 +0200 Subject: [PATCH net-next v2 1/9] 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: <20250626-splice-drop-unused-v2-1-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 15:58:31 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 0BF64290BCD for ; Thu, 26 Jun 2025 08:34:18 +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=1750926861; cv=none; b=mQZM2aD2VBI+DO7xOgWfafPyw7bUgyq8JhJ7lqjcJaaWy1GNypDGxBc2JhkzNIBGvvbqVaMmaTFhMO5aSWz20JaY9D28aXLHcjBznyQFJXL0xZfSKH5uK6hy105uSC/ScyX7zW7NI+MFNAo6mk3f5X3hSzXgkk2l+2gq50YD1uA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926861; c=relaxed/simple; bh=oM4yrZkbORnoOSwRB4HpJVAkPbjUun1Zygh9bwacyAE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=U+fwaegoG/1QAkmMme+3oN7lNnlLRZbN+sSxjZDPf6gW5RTVvFqacEEJQtafpoOjeOk2MdToCCUexaBrN2FFzcIWyhaFJLAJLvcw5C9o6vA/cfZBcRo21EeDwA3wpeS4EQMZlK+B0Dxj7oYMqPeOPKWw6q4EyczaJtRn5eJ7w3E= 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=J3fCOu0w; 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="J3fCOu0w" 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 1uUi3j-00GFi5-S8; Thu, 26 Jun 2025 10:34: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=TiexokGz9ho1xFBdymbZXth9LTl3BCafcUWpixfwpJ8=; b=J3fCOu0wlqdEm0BwUrVEAQTMKT FVAtjl0uAAkGKoIJ8Dlgw3bM5X1M6orTODQdV6vi6XKhZKniIgyT6YGjJqKnFE/3w+ggF5+H+ZoXH Q/dOQD0Eka57vSlRgIqHvGjg2KM+mkfyexmzs5OeZas6U6LdENMvhNiZDrW9EMVGEaGbbGUsguti5 Gv0PfhwU5t4orWocSsBaaWzVnyvJFxwxY+msOEMohEI9tDYczpI3ttMM/OdyqMGxhCsnKvJ7EDvsH taLT0Z+acIcfUCCxQKUKZOvP8SIQnUdLPGRZVjxaVNtLBAKcdcDOAeS2XDPyRB2hb/DJOf/uWmhTq dCeokVsw==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3j-0004qF-Hs; Thu, 26 Jun 2025 10:34:15 +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 1uUi3M-009Fh5-9H; Thu, 26 Jun 2025 10:33:52 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:35 +0200 Subject: [PATCH net-next v2 2/9] 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: <20250626-splice-drop-unused-v2-2-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 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. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- 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 15:58:32 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 28D0F294A0A; Thu, 26 Jun 2025 08:34:30 +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=1750926872; cv=none; b=qc4TBlen43LrOn60pO0QXZeWqwPzb3QabPcQHponyFd6K0c8XeAIh/RYtHPNfP1j5JBzOoCg50bJwnc2GA+85rZAtOBLocCTybSEhgnFhkFTsSyr8hkromfEn9x2tz6eqGZLlYHNoURSGDt4Lz2i1FzwTKLzbhEiDtchtWkvIHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926872; c=relaxed/simple; bh=k9kLg0my+SBsSInDXplaBISLqMsAK7HUk3GpJuDl9K0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Tq+PuT2FVmXXRnureGkcYkVYy1R23MX355ecOSNiaN5raYF3juBo9QZ8WZvkBm78/OkVF/JmTU+Ic0KYxdv/n53WrUudfvQGd/2S04Y/ATO0pHxoj+0sjYxwr23hlJjuNcyNgPPlgYccSKPe/7YTiRRNtyNp7/16H7eiMhivl8w= 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=UO5XhiNE; 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="UO5XhiNE" 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 1uUi3t-00GFj2-OC; Thu, 26 Jun 2025 10:34: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=SCfBbusasJKzDLebDsTeT38r5oZHC/MzfWn9UUtl8yU=; b=UO5XhiNEgg+aosti5hbqtkXzXJ 6y6vRo19fKIpEbfQffGTuwXurrKbk/9VjIOIPEJnhHddahpT2fAPtatd+jPdKanx/kpACB5gie+Hv 2as5aq/uCbQndjiQtmxPq19FGUnJm4R/c+VcQljooyR7ApxO/9DfuVZqk7vPNCuqZ6hqR8+AjIoBz VYfMhaAvufjnn8qGJEcPV33BeCJtYVqxXqyJNGLO40hcIm54YSiI5CwIFQJmJeEXlzqh3+qENU++I s/Gc9B8J7znk20ipsnEzim9aIgI8bRIxPkzebqyYX3REVSTZvX0bXcs5AsfRXHa6ABUz0OU1Gax9O piKRICjQ==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3t-0002I1-9K; Thu, 26 Jun 2025 10:34: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 1uUi3N-009Fh5-9S; Thu, 26 Jun 2025 10:33:53 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:36 +0200 Subject: [PATCH net-next v2 3/9] 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: <20250626-splice-drop-unused-v2-3-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 skb_splice_bits() does not accept @flags anymore, struct's field became unused. Remove it. No functional change indented. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- 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 15:58:32 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 4E32E1A254E; Thu, 26 Jun 2025 08:34:09 +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=1750926857; cv=none; b=oamwLHI6bXVi2NFXqnBo0LZ1mnVVWlfSjyKYlkxzSNkz3sEmcFed0ZvpGq07j3SYH8GIeg/zgj5DrHVdQnbaPHFYuQ6Kdl02Vb5MMAqk/wrzxR6yGwvF0iAkI1qc/KWOtXOSi8kSgXdNqt3t3ln7jLNfkFVeSANy8nyN1vdvRBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926857; c=relaxed/simple; bh=fhLUUYVAyb1uDBHiiFLUBKdkZ0mPXVVyAvNzmr4SGO0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R5XRjaBF7trPAyLlS+brv56uLA7QLIEYbi2nHPV9uWUwpTlV8CRw+T0w+xQmVOLoD0ZuWsW/i+vkof6AuI2Vblni4pH7lcvJRXw5oafqybAAIxBEc1kvcFtHNGOjm6InCZcM/ymYtfMcgC7KJxyxlHc01wncP01tlMJ+5aUGaO4= 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=up9is5AR; 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="up9is5AR" 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 1uUi3X-00GFhb-OU; Thu, 26 Jun 2025 10:34:03 +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=k/l0z57m3ZEaN2DhDCC8Xr3psOdIVksIU8zRLih/bxY=; b=up9is5ARxksILixaAI6Lh3hlTr wbDXGEfPUcS0QfVyR+qXwyD7LrDfZD6gC4sAmbL4cF95uwGIQaN4s65AXkrfisnhZhFw98qIMCLCJ HPajsm3Hh8NdZLPRZlsSvbEe2MnKA+Prgla4oz1LxUbPDz54OEEcbnQkH79ZkUiOcRjhnqasdeZSb ZCWPCR7sAUseSSUCQfhYMmm2zkDK3g6uA1h6upzsBeOrb/QuKFqRX1RQFeOmU7Ts0UcHvTqUWI8JJ agxBtXvcc6PNMbZWVgRzCTXGz5XC5AWlL4dm3+6k6yZYAbl0BwWG7I8ixLNgNBTbYXUHwVigLvdKi n999ofUA==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3W-0004pt-2f; Thu, 26 Jun 2025 10:34:02 +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 1uUi3O-009Fh5-9n; Thu, 26 Jun 2025 10:33:54 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:37 +0200 Subject: [PATCH net-next v2 4/9] 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: <20250626-splice-drop-unused-v2-4-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 skb_splice_bits() does not accept the @flags argument anymore, struct's field became unused. Remove it. No functional change indented. Reviewed-by: Simon Horman Signed-off-by: Michal Luczaj --- 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 15:58:32 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 824D729DB96 for ; Thu, 26 Jun 2025 08:34:25 +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=1750926867; cv=none; b=RldtyR0kUQ5M/B9mg9HlFyJkkZkiJxoI3zLOWtzX0GrgRyWQqqM2FvhWmQzdVNnDKs/ZqTfELSDWpgBUD90uw29V7XYNVIoQ/dSdbNEwWovsqkUVgW3Wm7i7LP8XAo9+1IZA5GwWrpDdDnwWAgNaxIYo40FWPB1HYMLBluqW0F0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926867; c=relaxed/simple; bh=Rnaj2PFCa68bxXv5wt1CtX7Z49GHdcxC1ZFTpzR5ZfQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qPDmJ4cmLK0HKeNdUXsZ7SaquS0h2ZpsiHizCTPxMFCN0g9fLwzmsTtHi3pdnirHyxEtHx51aXWVfKOlDlpx+snmlvyFa02W1mj/MHsJE0GyJs7M/XZolvic9czLD8/4aMRajpLSwHB9mT4VxzE9UoOCNKUxL1vkdMrNGfY7esQ= 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=YLz891FW; 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="YLz891FW" 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 1uUi3q-00GFia-8R; Thu, 26 Jun 2025 10:34: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=w3M0ONjlTeiHEYSZyu+REn2BAtSk5b88mwbjWDKB3yg=; b=YLz891FWNU0bAgUpDo3sbxvp4Q L97fbhpuOBDZX/ibQDA1Sy1AtNKy5iFRiK46ZMId0sLOKl2O6/p+CSMBxbxlxvI5dDoeTyfTtxDMB M3BNDALwW5Y0SgUNhhgoA+ucNPSPTbdTTsN0N9XsoFT4cYUxgDBSuyItypFfAZqsXpFmifhztKG05 SuByf7PljVmtG1REMnVyGbD+nMyWuIOwiEt9s4x/+bSv7mb+0KBPCJHfKvYANHBRJaKrzPvqzCPaC qo6Cs54nBHsYdB65o7xbiGBvB/hPzpnAuZ/uGZUM2tvP8ekZxfLKdv6w9So7AchJVoZJQqkBIofXA 2dijDbBg==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3p-0002He-Sv; Thu, 26 Jun 2025 10:34: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 1uUi3P-009Fh5-9n; Thu, 26 Jun 2025 10:33:55 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:38 +0200 Subject: [PATCH net-next v2 5/9] 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: <20250626-splice-drop-unused-v2-5-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 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 15:58:32 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 549882D3EC5; Thu, 26 Jun 2025 08:34:35 +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=1750926876; cv=none; b=BzLa2hJ7TqR+ehfzIr7ygxQBAW0Ylp8Ga9MBgGIHid1sNpvwkV5niZth9jjd/SLxsiQVO3LBylol8/lWps+Bk9rmEzw4GP+Ro4a8Fq5EKe6L37v/EInF0q0A2Ywj3um/jI+vZG4C7xNbQe7y/Naf2hUX0SrItCeIXoTL0hQNFEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926876; c=relaxed/simple; bh=6M3+Kejjthb9PzX8o0duukEZx4ujkx8KuJdBNeQc0eo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ek4fQpMrbS/9dRt1/NT3J0idCcWUvRxwj4Aj84wXIAcYgXo+XAfWV/sXovoc2CI9ZNP0xIiRd2mOm4gGWFovZBL6bNpHTXg+f0rClmjd1U3bq2nHzxKE8awL3id4euUWT65oVTt0N9YnFrASUDwVTnw8q82Iu8HnwJ+3UhO2nX0= 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=cw0cTVwd; 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="cw0cTVwd" 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 1uUi3z-00GFjz-VI; Thu, 26 Jun 2025 10:34:32 +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=AEEm1mh2ODaRsVEx0hztjw2fokITpGel2veEExfQMHw=; b=cw0cTVwdCvr1QBtD58GX26soss g+sG2dTmF+JBrCEHwqfr0J4Ik9g2/kYUZLkbsWJZcTLchBryeJBL+nn04tnw5rb3JGTURk+/jp8tH S+n1vKEuMJkfRk1SlX5wVoBJmUfxQ4GtNohG4SdWM3Gcqj/4kyNQ1Dw4KJYWocEwMwobbOFqwyyDY t+VoOrKf7L7R7NZgWSk1BumtA5rIO7m2X6ru/e/DMG1/wobAhhJOa6bhOmSZZvSni301x35B4ODJ6 jOVbsdsjpdDWT9Z+myEFXJfFs/GxdAGqlUDC9Q4H1tdrw4rBYtmCcICC8IAdWs312S1JvW8lJZfME aaReF7gA==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3x-0002K1-BP; Thu, 26 Jun 2025 10:34:30 +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 1uUi3Q-009Fh5-AL; Thu, 26 Jun 2025 10:33:56 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:39 +0200 Subject: [PATCH net-next v2 6/9] 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: <20250626-splice-drop-unused-v2-6-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 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 15:58:32 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 0BE6F2BFC65; Thu, 26 Jun 2025 08:34:32 +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=1750926874; cv=none; b=N+rMK5ON5c8I28tRkWrWgP0EPcsYehrhb4tbnJDp6p4t7y+VY+38BEETwXOqFjE57Qfvn9rjFkP3tUgkTYSxW3sL+hJfxc+xQg4iAn7dRQbRmY3y6ZPhddL2BJo6eqC0hKOf+UVTFhnvspYqSfKgIlCzObf/XboP2RieLkPHLo8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926874; c=relaxed/simple; bh=iIcOqxh36MlIjbCh3lXRjInonBMTOM+CdRCsU2ecnRE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eMjOYD/PdSK2xItDBm5jdnn1r8S3ZirDDC+CB1Vzl9DQykeItnLvUAkcH3ci6hWZ3SdT2Zp4u8u3nlLsaUomgV4+faTaqRpHmQdVTTctBoU40L+Kq6b/ZW/qPlH08X2xwm7DFeERrRLNxkJdtSUsDxdQy5tKpXMc2U2pJdggHBE= 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=l5ygA6g2; 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="l5ygA6g2" 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 1uUi3y-00GFjT-DD; Thu, 26 Jun 2025 10:34:30 +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=K9csgMrzkQzumdDMFSj0XkVwfFmUy6WQ+scu2JDE5Vs=; b=l5ygA6g2+iaG9Gff8/MltMhoeN 9OdFm6h7tOcWplXvWX8e4GwssSAG89koLcqoBHJegiCw04on96Fg0uh5emvu4iWZ+JXMr7AHe2Xuv jg0dju8Jyr5KNYDn50V5eQYG3MG9gz3htTiRhloCPRfjY/s8aWYva7IjIopm4GrSpKVoxL0LhcujI VWptib+CfKO49+DbUDYWUG0Vh8LxqADOV/LtFcGTvB7z1lSIUoduFi1gwGcx1ovF+v9KyfoBuDK6F IGaG6GWvX7lvamy8LfB9Ro+EKB5ImBfAprkkCLw47bH5yfpUoFPBTeAqfottJvCIf4lg8cqWFdY8z KMjlG1dQ==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3x-0002Jy-3H; Thu, 26 Jun 2025 10:34:29 +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 1uUi3R-009Fh5-Af; Thu, 26 Jun 2025 10:33:57 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:40 +0200 Subject: [PATCH net-next v2 7/9] 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: <20250626-splice-drop-unused-v2-7-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 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 Signed-off-by: Michal Luczaj Reviewed-by: Dust Li Reviewed-by: Sidraya Jayagond Reviewed-by: Simon Horman --- 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 15:58:32 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 EA744294A0C; Thu, 26 Jun 2025 08:34:31 +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=1750926873; cv=none; b=S8uugIQP+Fe/yo7EXoTddvFPU/5rJZBbLwsRxRd7Umr9NLJ3gdn/Ut18qktw45Cfo2OR9jarMINFbWGefcoKrBzK955qIfFE8CYBeF/qOfM40rWlC5iDWpRC9QiiFU6jRIC8m0hUSApXUs9IxKRIX5atGVGZ6Z13IoGSrbORIEY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926873; c=relaxed/simple; bh=KoLoukJP9Wdf7d/xGVHRq8r0xufqBPjo9boP/ddJ+Dk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ii7o5PMBGng+i3MkfecX8EnNqA0j+mnWi9FUaExqULl31alwk8Wrmt2KaOZOSJCa21GneQBV3QWctDqPenwvYB2D9yduiO6GBWVPjeLc0cl1Q10UTsbB7GqwLTre0nMj5yDgmhyZRncaLwcO8lWwMZPYkcbl5qI+MZogiVvTk9c= 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=wvCkAu4u; 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="wvCkAu4u" 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 1uUi3r-00GFih-BW; Thu, 26 Jun 2025 10:34:23 +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=zBfuN6N3HY8iGusk+SEa2crM2b4w1ff2SIeD8NcQqzk=; b=wvCkAu4u5c2KM/Ot0YAwzlocGC K7lUgafppOq5IYmj1xh2jSRkkSO++kri3BpPHZXpIIMPWzX0AGwL8Xn4ACbYquP0YCNqmrMhIWpZJ mJ2AjhZOvVOdTPnqxOnxx2PKXwDOVy1U+yk/8cpAy25RwAHicLPlOUX1jHyKwGL0LxIAyqxv0psmd GqIcslFm/MsdxY/LA+DDaMwG50GYphGg8XKn95g16RMVjrB5TG4W28FxKhTejTfwTQIIwIIROnDRb hIIDEDKzUfS/Bb4XQJiGW2jGwDpDOzkgADyLzXXjMaN0VYXCkoAq7Dvap3h0+pnyEIOBU38vrDBHV yNnr1IcA==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi3q-0002Hk-VG; Thu, 26 Jun 2025 10:34: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 1uUi3S-009Fh5-A7; Thu, 26 Jun 2025 10:33:58 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:41 +0200 Subject: [PATCH net-next v2 8/9] 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: <20250626-splice-drop-unused-v2-8-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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 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 From nobody Wed Oct 8 15:58:32 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 C80F22957A7; Thu, 26 Jun 2025 08:34:40 +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=1750926882; cv=none; b=UpIOsSHKjed5+JOvO5Z+eM/qk47Wx7sxKTcPJn7OHEERfpKk1rcEg3CQtHus1PuuBJxABbMWRYn7wU8oFgY3dhA6wVUpzid+o+vOIR9Uvv+MJtNOKksJAJAV++K6yf+iHU9naR037pkZ4/XwMkRZ+E+60Fq9q9LgjH6jI2GcCNE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750926882; c=relaxed/simple; bh=7h+/r7ZtMJq1dvKCjGhVatzMhyp/ApkTbFKk+cSkUPk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NS//RILFmFB36VNM3CgRDL3hb/0zpYaqRvh/xvtshCTuP0//37vlQtH824U8A/JMgd8pBMeWpVmD1ZN6zvM6egkZmw1J9LmymternFVJVGAcaPW/wtXdeeQ2YOHlwrN+1HRwZXSAB27bdbq8IVaz3rNjZZQX9uLw5xjutcrTE84= 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=jHRd3wtQ; 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="jHRd3wtQ" 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 1uUi42-00GcIE-HJ; Thu, 26 Jun 2025 10:34: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=+2QJ2vK3aC9RmVaDqJqvoTd0vBNxxH4J4lY+mVdjibA=; b=jHRd3wtQoqHYsQcE5sg03XYmYi QDKRMIK/Me3iH+8BurUMVt4whIybimNQP8R/VhBHY79zK3AX4GsGP0Dgj5Gc2ds0SCdDmRG1EdDRs dfTLySNVofxPciNZrcLa2dIjQkkr1M1tify/2MeX8vsCW+qw4XpbWKQkfNokWWjE/0fLDUbNd9uMw l6heAg8atTSfANajnruOOPrn9HszxzkfYw24y52aHM0rzo479kS26fZDdNdOEEPdW6+o389sGUXeP jSEnr5vU1PuOxUHW5anrCl1EDKcv3YDg9VAQ5r+wHSB4ySGkjjZ066r5XTRtADnFmY4kLI68A2PBf /v6CFrtg==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1uUi42-0002Kq-6U; Thu, 26 Jun 2025 10:34: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 1uUi3T-009Fh5-9i; Thu, 26 Jun 2025 10:33:59 +0200 From: Michal Luczaj Date: Thu, 26 Jun 2025 10:33:42 +0200 Subject: [PATCH net-next v2 9/9] 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: <20250626-splice-drop-unused-v2-9-3268fac1af89@rbox.co> References: <20250626-splice-drop-unused-v2-0-3268fac1af89@rbox.co> In-Reply-To: <20250626-splice-drop-unused-v2-0-3268fac1af89@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 , 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. Signed-off-by: Michal Luczaj Reviewed-by: Simon Horman --- 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 b5f685b6611c177c199f70bb16fd3940bce8cded..f8553c674fe5052e7c1ea53022e= 252a54a9d6c72 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -6756,8 +6756,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; @@ -6862,7 +6861,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