Commit 25489a4f authored by Michal Luczaj's avatar Michal Luczaj Committed by Jakub Kicinski
Browse files

net: splice: Drop unused @gfp 



Since its introduction in commit 2e910b95 ("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: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarMichal Luczaj <mhal@rbox.co>
Link: https://patch.msgid.link/20250702-splice-drop-unused-v3-2-55f68b60d2b7@rbox.co


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1024f120

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c

+1 −2
Original line number Diff line number Diff line
@@ -1096,8 +1096,7 @@ int chtls_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) 
			copy = size;



		if (msg->msg_flags & MSG_SPLICE_PAGES) {

			err = skb_splice_from_iter(skb, &msg->msg_iter, copy,

						   sk->sk_allocation);

			err = skb_splice_from_iter(skb, &msg->msg_iter, copy);

			if (err < 0) {

				if (err == -EMSGSIZE)

					goto new_buf;

include/linux/skbuff.h

+1 −1
Original line number Diff line number Diff line
@@ -5265,7 +5265,7 @@ static inline void skb_mark_for_recycle(struct sk_buff *skb) 
}



ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter,

			     ssize_t maxsize, gfp_t gfp);

			     ssize_t maxsize);



#endif	/* __KERNEL__ */

#endif	/* _LINUX_SKBUFF_H */

net/core/skbuff.c

+1 −2
Original line number Diff line number Diff line
@@ -7230,7 +7230,6 @@ static void skb_splice_csum_page(struct sk_buff *skb, struct page *page, 
 * @skb: The buffer to add pages to

 * @iter: Iterator representing the pages to be added

 * @maxsize: Maximum amount of pages to be added

 * @gfp: Allocation flags

 *

 * This is a common helper function for supporting MSG_SPLICE_PAGES.  It

 * extracts pages from an iterator and adds them to the socket buffer if
@@ -7241,7 +7240,7 @@ static void skb_splice_csum_page(struct sk_buff *skb, struct page *page, 
 * insufficient space in the buffer to transfer anything.

 */

ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter,

			     ssize_t maxsize, gfp_t gfp)

			     ssize_t maxsize)

{

	size_t frag_limit = READ_ONCE(net_hotdata.sysctl_max_skb_frags);

	struct page *pages[8], **ppages = pages;

net/ipv4/ip_output.c

+1 −2
Original line number Diff line number Diff line
@@ -1222,8 +1222,7 @@ static int __ip_append_data(struct sock *sk, 
			if (WARN_ON_ONCE(copy > msg->msg_iter.count))

				goto error;



			err = skb_splice_from_iter(skb, &msg->msg_iter, copy,

						   sk->sk_allocation);

			err = skb_splice_from_iter(skb, &msg->msg_iter, copy);

			if (err < 0)

				goto error;

			copy = err;

net/ipv4/tcp.c

+1 −2
Original line number Diff line number Diff line
@@ -1295,8 +1295,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
			if (!copy)

				goto wait_for_space;



			err = skb_splice_from_iter(skb, &msg->msg_iter, copy,

						   sk->sk_allocation);

			err = skb_splice_from_iter(skb, &msg->msg_iter, copy);

			if (err < 0) {

				if (err == -EMSGSIZE) {

					tcp_mark_push(tp, skb);