sock: make static tls function alloc_sg generic sock helper

The TLS ULP module builds scatterlists from a sock using
page_frag_refill(). This is going to be useful for other ULPs
so move it into sock file for more general use.

In the process remove useless goto at end of while loop.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/include/net/sock.h b/include/net/sock.h
index b9624581d639ff7f1f9466d7e7cd50c6b87cabf5..447150c51feb1685d826a692fe5ce9943b187b50 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2141,6 +2141,10 @@ static inline struct page_frag *sk_page_frag(struct sock *sk)
 
 bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag);
 
+int sk_alloc_sg(struct sock *sk, int len, struct scatterlist *sg,
+               int *sg_num_elem, unsigned int *sg_size,
+               int first_coalesce);
+
 /*
  *     Default write policy as shown to user space via poll/select/SIGIO
  */

diff --git a/net/core/sock.c b/net/core/sock.c
index 27f218bba43fcf27bc6e42f018beec12d39c1930..f68dff0d7bc40ea0fb113a934f89f54972d6d9f9 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2239,6 +2239,62 @@ bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag)
 }
 EXPORT_SYMBOL(sk_page_frag_refill);
 
+int sk_alloc_sg(struct sock *sk, int len, struct scatterlist *sg,
+               int *sg_num_elem, unsigned int *sg_size,
+               int first_coalesce)
+{
+       struct page_frag *pfrag;
+       unsigned int size = *sg_size;
+       int num_elem = *sg_num_elem, use = 0, rc = 0;
+       struct scatterlist *sge;
+       unsigned int orig_offset;
+
+       len -= size;
+       pfrag = sk_page_frag(sk);
+
+       while (len > 0) {
+               if (!sk_page_frag_refill(sk, pfrag)) {
+                       rc = -ENOMEM;
+                       goto out;
+               }
+
+               use = min_t(int, len, pfrag->size - pfrag->offset);
+
+               if (!sk_wmem_schedule(sk, use)) {
+                       rc = -ENOMEM;
+                       goto out;
+               }
+
+               sk_mem_charge(sk, use);
+               size += use;
+               orig_offset = pfrag->offset;
+               pfrag->offset += use;
+
+               sge = sg + num_elem - 1;
+               if (num_elem > first_coalesce && sg_page(sg) == pfrag->page &&
+                   sg->offset + sg->length == orig_offset) {
+                       sg->length += use;
+               } else {
+                       sge++;
+                       sg_unmark_end(sge);
+                       sg_set_page(sge, pfrag->page, use, orig_offset);
+                       get_page(pfrag->page);
+                       ++num_elem;
+                       if (num_elem == MAX_SKB_FRAGS) {
+                               rc = -ENOSPC;
+                               break;
+                       }
+               }
+
+               len -= use;
+       }
+out:
+       *sg_size = size;
+       *sg_num_elem = num_elem;
+       return rc;
+}
+EXPORT_SYMBOL(sk_alloc_sg);
+
 static void __lock_sock(struct sock *sk)
        __releases(&sk->sk_lock.slock)
        __acquires(&sk->sk_lock.slock)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index f26376e954aeccadc0162a74b3c37af2d4ab0051..0fc8a24c64737531d4e2c0d050eba23519d07fdf 100644 (file)
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -87,71 +87,16 @@ static void trim_both_sgl(struct sock *sk, int target_size)
                target_size);
 }
 
-static int alloc_sg(struct sock *sk, int len, struct scatterlist *sg,
-                   int *sg_num_elem, unsigned int *sg_size,
-                   int first_coalesce)
-{
-       struct page_frag *pfrag;
-       unsigned int size = *sg_size;
-       int num_elem = *sg_num_elem, use = 0, rc = 0;
-       struct scatterlist *sge;
-       unsigned int orig_offset;
-
-       len -= size;
-       pfrag = sk_page_frag(sk);
-
-       while (len > 0) {
-               if (!sk_page_frag_refill(sk, pfrag)) {
-                       rc = -ENOMEM;
-                       goto out;
-               }
-
-               use = min_t(int, len, pfrag->size - pfrag->offset);
-
-               if (!sk_wmem_schedule(sk, use)) {
-                       rc = -ENOMEM;
-                       goto out;
-               }
-
-               sk_mem_charge(sk, use);
-               size += use;
-               orig_offset = pfrag->offset;
-               pfrag->offset += use;
-
-               sge = sg + num_elem - 1;
-               if (num_elem > first_coalesce && sg_page(sg) == pfrag->page &&
-                   sg->offset + sg->length == orig_offset) {
-                       sg->length += use;
-               } else {
-                       sge++;
-                       sg_unmark_end(sge);
-                       sg_set_page(sge, pfrag->page, use, orig_offset);
-                       get_page(pfrag->page);
-                       ++num_elem;
-                       if (num_elem == MAX_SKB_FRAGS) {
-                               rc = -ENOSPC;
-                               break;
-                       }
-               }
-
-               len -= use;
-       }
-       goto out;
-
-out:
-       *sg_size = size;
-       *sg_num_elem = num_elem;
-       return rc;
-}
-
 static int alloc_encrypted_sg(struct sock *sk, int len)
 {
        struct tls_context *tls_ctx = tls_get_ctx(sk);
        struct tls_sw_context *ctx = tls_sw_ctx(tls_ctx);
        int rc = 0;
 
-       rc = alloc_sg(sk, len, ctx->sg_encrypted_data,
-                     &ctx->sg_encrypted_num_elem, &ctx->sg_encrypted_size, 0);
+       rc = sk_alloc_sg(sk, len,
+                        ctx->sg_encrypted_data,
+                        &ctx->sg_encrypted_num_elem,
+                        &ctx->sg_encrypted_size, 0);
 
        return rc;
 }
@@ -162,9 +107,9 @@ static int alloc_plaintext_sg(struct sock *sk, int len)
        struct tls_sw_context *ctx = tls_sw_ctx(tls_ctx);
        int rc = 0;
 
-       rc = alloc_sg(sk, len, ctx->sg_plaintext_data,
-                     &ctx->sg_plaintext_num_elem, &ctx->sg_plaintext_size,
-                     tls_ctx->pending_open_record_frags);
+       rc = sk_alloc_sg(sk, len, ctx->sg_plaintext_data,
+                        &ctx->sg_plaintext_num_elem, &ctx->sg_plaintext_size,
+                        tls_ctx->pending_open_record_frags);
 
        return rc;
 }