net: splice: Drop unused @gfp

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 <horms@kernel.org>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Link: https://patch.msgid.link/20250702-splice-drop-unused-v3-2-55f68b60d2b7@rbox.co
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

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..465fa807796439b90c949f54e203a798f06acf1f 100644 (file)
--- 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 @@ new_buf:
                        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;

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 4f6dcb37bae8ada524a1e8f8de44c259cfac695b..b8b06e71b73ea3fb5210239f585f4ba714395fd7 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -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 */

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ae0f1aae3c91d914020c64e0703732b9c6cd8511..a34fe37cf7a508c8380e35522d9cde266aa440f9 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -7230,7 +7230,6 @@ static void skb_splice_csum_page(struct sk_buff *skb, struct page *page,
  * @skb: The buffer to add pages to
  * @iter: Iterator representing the pages to be added
  * @maxsize: Maximum amount of pages to be added
- * @gfp: Allocation flags
  *
  * This is a common helper function for supporting MSG_SPLICE_PAGES.  It
  * extracts pages from an iterator and adds them to the socket buffer if
@@ -7241,7 +7240,7 @@ static void skb_splice_csum_page(struct sk_buff *skb, struct page *page,
  * insufficient space in the buffer to transfer anything.
  */
 ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter,
-                            ssize_t maxsize, gfp_t gfp)
+                            ssize_t maxsize)
 {
        size_t frag_limit = READ_ONCE(net_hotdata.sysctl_max_skb_frags);
        struct page *pages[8], **ppages = pages;

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 414b47a0d513fd4a8acfe1a101b91fad8efcc4d4..10a1d182fd848f0d2348f65fde269383f9c07baa 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1222,8 +1222,7 @@ alloc_new_skb:
                        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;

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 925b2c572ca23b3f2eba48a38820f6553a2724f4..860223c6f1242832a603948aba238ab7061ed03d 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1295,8 +1295,7 @@ new_segment:
                        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);

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 877bee7ffee9284cf88cb13a79e8bf777b470bb9..fcc20c7250eb03077882e97bc0273b42f5b57aaf 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1762,8 +1762,7 @@ alloc_new_skb:
                        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;

diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index 24aec295a51cf737912f1aefe81556bd9f23331e..a0be3896a9340c2a9120bb2692e9deec84d138c6 100644 (file)
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -835,8 +835,7 @@ start:
                        if (!sk_wmem_schedule(sk, copy))
                                goto wait_for_memory;
 
-                       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 wait_for_memory;

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 564c970d97fffe9fd264e0d02c5670026314ac57..cd0d582bc7d48fbf9cd917c72e1fe4e88232916e 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2388,8 +2388,7 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg,
 
                if (unlikely(msg->msg_flags & MSG_SPLICE_PAGES)) {
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
-                       err = skb_splice_from_iter(skb, &msg->msg_iter, size,
-                                                  sk->sk_allocation);
+                       err = skb_splice_from_iter(skb, &msg->msg_iter, size);
                        if (err < 0)
                                goto out_free;