linux-toradex.git/drivers/vhost/net.c, branch v3.10.2

vhost: fix ubuf_info cleanup

2013-06-11T09:46:21+00:00

vhost_net_clear_ubuf_info didn't clear ubuf_info
after kfree, this could trigger double free.
Fix this and simplify this code to make it more robust: make sure
ubuf info is always freed through vhost_net_clear_ubuf_info.

Reported-by: Tommi Rantala 
Signed-off-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

vhost: check owner before we overwrite ubuf_info

2013-06-11T09:46:21+00:00

If device has an owner, we shouldn't touch ubuf_info
since it might be in use.

Signed-off-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

vhost_net: clear msg.control for non-zerocopy case during tx

2013-06-10T21:31:45+00:00

When we decide not use zero-copy, msg.control should be set to NULL otherwise
macvtap/tap may set zerocopy callbacks which may decrease the kref of ubufs
wrongly.

Bug were introduced by commit cedb9bdce099206290a2bdd02ce47a7b253b6a84
(vhost-net: skip head management if no outstanding).

This solves the following warnings:

WARNING: at include/linux/kref.h:47 handle_tx+0x477/0x4b0 [vhost_net]()
Modules linked in: vhost_net macvtap macvlan tun nfsd exportfs bridge stp llc openvswitch kvm_amd kvm bnx2 megaraid_sas [last unloaded: tun]
CPU: 5 PID: 8670 Comm: vhost-8668 Not tainted 3.10.0-rc2+ #1566
Hardware name: Dell Inc. PowerEdge R715/00XHKG, BIOS 1.5.2 04/19/2011
ffffffffa0198323 ffff88007c9ebd08 ffffffff81796b73 ffff88007c9ebd48
ffffffff8103d66b 000000007b773e20 ffff8800779f0000 ffff8800779f43f0
ffff8800779f8418 000000000000015c 0000000000000062 ffff88007c9ebd58
Call Trace:
[] dump_stack+0x19/0x1e
[] warn_slowpath_common+0x6b/0xa0
[] warn_slowpath_null+0x15/0x20
[] handle_tx+0x477/0x4b0 [vhost_net]
[] handle_tx_kick+0x10/0x20 [vhost_net]
[] vhost_worker+0xfe/0x1a0 [vhost_net]
[] ? vhost_attach_cgroups_work+0x30/0x30 [vhost_net]
[] ? vhost_attach_cgroups_work+0x30/0x30 [vhost_net]
[] kthread+0xc6/0xd0
[] ? kthread_freezable_should_stop+0x70/0x70
[] ret_from_fork+0x7c/0xb0
[] ? kthread_freezable_should_stop+0x70/0x70

Signed-off-by: Jason Wang 
Acked-by: Michael S. Tsirkin 
Signed-off-by: David S. Miller

vhost-net: Cleanup vhost_ubuf and vhost_zcopy

2013-05-06T10:25:47+00:00

- Rename vhost_ubuf to vhost_net_ubuf
- Rename vhost_zcopy_mask to vhost_net_zcopy_mask
- Make funcs static

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost: Move VHOST_NET_FEATURES to net.c

2013-05-06T10:21:00+00:00

vhost.h should not depend on device specific marcos like
VHOST_NET_F_VIRTIO_NET_HDR and VIRTIO_NET_F_MRG_RXBUF.

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost-net: Free ubuf when vhost_dev_set_owner fails

2013-05-06T09:57:54+00:00

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost: fix error handling in RESET_OWNER ioctl

2013-05-01T07:02:54+00:00

RESET_OWNER ioctl would leave the fd in a bad state if
memory allocation failed: device is stopped
but owner is not reset. Make state changes
after allocating memory, such that a failed
ioctl has no effect.

Signed-off-by: Michael S. Tsirkin

vhost: move per-vq net specific fields out to net

2013-05-01T07:02:53+00:00

This will remove the need for vhost scsi to pull
in virtio-net.h.

Signed-off-by: Michael S. Tsirkin

vhost: move vhost-net zerocopy fields to net.c

2013-05-01T07:02:52+00:00

On top of 'vhost: Allow device specific fields per vq', we can move device
specific fields to device virt queue from vhost virt queue.

Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin

vhost: Allow device specific fields per vq

2013-05-01T07:02:45+00:00

This is useful for any device who wants device specific fields per vq.
For example, tcm_vhost wants a per vq field to track requests which are
in flight on the vq. Also, on top of this we can add patches to move
things like ubufs from vhost.h out to net.c.

Signed-off-by: Michael S. Tsirkin 
Signed-off-by: Asias He 
Signed-off-by: Michael S. Tsirkin