From nobody Wed Oct 8 17:31:56 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