diff options
| author | Jason Wang <jasowang@redhat.com> | 2013-06-08 14:17:41 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-27 10:39:05 -0700 |
| commit | b26c93c46a3dec25ed236d4ba6107eb4ed5d9401 (patch) | |
| tree | 7c437db21aeb91b9f1bfbe2dbc199c2d5d2e7a44 | |
| parent | 724a0863028eeb06607ed32972d12666c495becb (diff) | |
| download | lwn-b26c93c46a3dec25ed236d4ba6107eb4ed5d9401.tar.gz lwn-b26c93c46a3dec25ed236d4ba6107eb4ed5d9401.zip | |
tuntap: set SOCK_ZEROCOPY flag during open
[ Upstream commit 19a6afb23e5d323e1245baa4e62755492b2f1200 ]
Commit 54f968d6efdbf7dec36faa44fc11f01b0e4d1990
(tuntap: move socket to tun_file) forgets to set SOCK_ZEROCOPY flag, which will
prevent vhost_net from doing zercopy w/ tap. This patch fixes this by setting
it during file open.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 11807cecd759..722f11debcdf 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2154,6 +2154,8 @@ static int tun_chr_open(struct inode *inode, struct file * file) set_bit(SOCK_EXTERNALLY_ALLOCATED, &tfile->socket.flags); INIT_LIST_HEAD(&tfile->next); + sock_set_flag(&tfile->sk, SOCK_ZEROCOPY); + return 0; } |