net: allow better page reuse in splice(sock -> pipe)
authorEric Dumazet <edumazet@google.com>
Thu, 19 Apr 2012 09:38:17 +0000 (09:38 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 21 Apr 2012 20:36:42 +0000 (16:36 -0400)
splice() from socket to pipe needs linear_to_page() helper to transfert
skb header to part of page.

We can reset the offset in the current sk->sk_sndmsg_page if we are the
last user of the page.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index 43c490d52df63f5f959c04cb210d164b0eb43959..bf257de95d2682b99abf7f95544f0062405473b3 100644 (file)
@@ -1565,6 +1565,9 @@ new_page:
        } else {
                unsigned int mlen;
 
+               /* If we are the only user of the page, we can reset offset */
+               if (page_count(p) == 1)
+                       sk->sk_sndmsg_off = 0;
                off = sk->sk_sndmsg_off;
                mlen = PAGE_SIZE - off;
                if (mlen < 64 && mlen < *len) {