1 files changed, 22 insertions, 1 deletions

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 827a3f5ff3bb..7df04d20a91f 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1245,6 +1245,7 @@ static int __ip6_append_data(struct sock *sk,
 {
         struct sk_buff *skb, *skb_prev = NULL;
         unsigned int maxfraglen, fragheaderlen, mtu, orig_mtu, pmtu;
+        struct ubuf_info *uarg = NULL;
         int exthdrlen = 0;
         int dst_exthdrlen = 0;
         int hh_len;
@@ -1322,6 +1323,19 @@ emsgsize:
             rt->dst.dev->features & (NETIF_F_IPV6_CSUM | NETIF_F_HW_CSUM))
                 csummode = CHECKSUM_PARTIAL;
 
+        if (flags & MSG_ZEROCOPY && length && sock_flag(sk, SOCK_ZEROCOPY)) {
+                uarg = sock_zerocopy_realloc(sk, length, skb_zcopy(skb));
+                if (!uarg)
+                        return -ENOBUFS;
+                if (rt->dst.dev->features & NETIF_F_SG &&
+                    csummode == CHECKSUM_PARTIAL) {
+                        paged = true;
+                } else {
+                        uarg->zerocopy = 0;
+                        skb_zcopy_set(skb, uarg);
+                }
+        }
+
         /*
          * Let's try using as much space as possible.
          * Use MTU if total length of the message fits into the MTU.
@@ -1445,6 +1459,7 @@ alloc_new_skb:
                         cork->tx_flags = 0;
                         skb_shinfo(skb)->tskey = tskey;
                         tskey = 0;
+                        skb_zcopy_set(skb, uarg);
 
                         /*
                          *      Find where to start putting bytes
@@ -1506,7 +1521,7 @@ alloc_new_skb:
                                 err = -EFAULT;
                                 goto error;
                         }
-                } else {
+                } else if (!uarg || !uarg->zerocopy) {
                         int i = skb_shinfo(skb)->nr_frags;
 
                         err = -ENOMEM;
@@ -1536,6 +1551,10 @@ alloc_new_skb:
                         skb->data_len += copy;
                         skb->truesize += copy;
                         wmem_alloc_delta += copy;
+                } else {
+                        err = skb_zerocopy_iter_dgram(skb, from, copy);
+                        if (err < 0)
+                                goto error;
                 }
                 offset += copy;
                 length -= copy;
@@ -1543,11 +1562,13 @@ alloc_new_skb:
 
         if (wmem_alloc_delta)
                 refcount_add(wmem_alloc_delta, &sk->sk_wmem_alloc);
+        sock_zerocopy_put(uarg);
         return 0;
 
 error_efault:
         err = -EFAULT;
 error:
+        sock_zerocopy_put_abort(uarg);
         cork->length -= length;
         IP6_INC_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUTDISCARDS);
         refcount_add(wmem_alloc_delta, &sk->sk_wmem_alloc);