Re: [net PATCH] tuntap: set SOCK_ZEROCOPY flag during open

[Michael S. Tsirkin]

On Sat, Jun 08, 2013 at 02:17:41PM +0800, Jason Wang wrote:
>Cc: smtp.corp.redhat.com@xxxxxxxxxx, davem@xxxxxxxxxxxxx,
>	netdev@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx
>
> 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.
> 
> Cc: Michael S. Tsirkin <mst@xxxxxxxxxx>
> Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx>

One of the addresses in the Cc list (smtp.corp.redhat.com@xxxxxxxxxx)
is clearly a mistake, which probably explains why it didn't
get into patchwork.

I have bounced it to correct addresses, hope this
helps instead of making even more of a mess of it.

For 3.10 and -stable:

Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx>


> ---
>  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 f042b03..d2ddd6d 100644
> --- a/drivers/net/tun.c
> +++ b/drivers/net/tun.c
> @@ -2155,6 +2155,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;
>  }
>  
> -- 
> 1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/