net: Pass max frags into skb_append_pagefrags()

Pass the maximum number of fragments into skb_append_pagefrags() rather
than using MAX_SKB_FRAGS so that it can be used from code that wants to
specify sysctl_max_skb_frags.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: David Ahern <dsahern@kernel.org>
cc: Jens Axboe <axboe@kernel.dk>
cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 8cff3d817131a201c70ea47ed9c83689bd810594..15011408c47c8bb3994f2ef4674982d1e283530b 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1383,7 +1383,7 @@ static inline int skb_pad(struct sk_buff *skb, int pad)
 #define dev_kfree_skb(a)       consume_skb(a)
 
 int skb_append_pagefrags(struct sk_buff *skb, struct page *page,
-                        int offset, size_t size);
+                        int offset, size_t size, size_t max_frags);
 
 struct skb_seq_state {
        __u32           lower_offset;

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 6724a84ebb097ce0315ab789dda73bd1382f5111..7f53dcb26ad3043543dec8ca602f2991aa9107c9 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4188,13 +4188,13 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
 EXPORT_SYMBOL(skb_find_text);
 
 int skb_append_pagefrags(struct sk_buff *skb, struct page *page,
-                        int offset, size_t size)
+                        int offset, size_t size, size_t max_frags)
 {
        int i = skb_shinfo(skb)->nr_frags;
 
        if (skb_can_coalesce(skb, i, page, offset)) {
                skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], size);
-       } else if (i < MAX_SKB_FRAGS) {
+       } else if (i < max_frags) {
                skb_zcopy_downgrade_managed(skb);
                get_page(page);
                skb_fill_page_desc_noacc(skb, i, page, offset, size);

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 61892268e8a6c3597a034657eee9a00c94061c4a..52fc840898d8ba5579660df774b41a1d30c4aa63 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1450,7 +1450,8 @@ ssize_t   ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
                if (len > size)
                        len = size;
 
-               if (skb_append_pagefrags(skb, page, offset, len)) {
+               if (skb_append_pagefrags(skb, page, offset, len,
+                                        MAX_SKB_FRAGS)) {
                        err = -EMSGSIZE;
                        goto error;
                }

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index cc695c9f09ec24297bf214092ab170646306339b..dd55506b463266e7d20f98b9a666e3d4d1f63226 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2349,7 +2349,7 @@ alloc_skb:
                newskb = NULL;
        }
 
-       if (skb_append_pagefrags(skb, page, offset, size)) {
+       if (skb_append_pagefrags(skb, page, offset, size, MAX_SKB_FRAGS)) {
                tail = skb;
                goto alloc_skb;
        }