diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-06-11 09:26:41 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-06-11 09:27:34 -0400 |
| commit | 07ed46419431dd5bacf15e98a186b8958c750b0a (patch) | |
| tree | ef965091dc58a336450ab26d1d51386be1c3f59a /vhost_net-clear-msg.control-for-non-zerocopy-case-during-tx.patch | |
| parent | fff0cd2bfdd1a2c7288e5bcfe96e1f2a5a3c750e (diff) | |
| download | kernel-07ed46419431dd5bacf15e98a186b8958c750b0a.tar.gz kernel-07ed46419431dd5bacf15e98a186b8958c750b0a.tar.xz kernel-07ed46419431dd5bacf15e98a186b8958c750b0a.zip | |
Add two patches to fix issues with vhost_net and macvlan (rhbz 954181)
Diffstat (limited to 'vhost_net-clear-msg.control-for-non-zerocopy-case-during-tx.patch')
| -rw-r--r-- | vhost_net-clear-msg.control-for-non-zerocopy-case-during-tx.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/vhost_net-clear-msg.control-for-non-zerocopy-case-during-tx.patch b/vhost_net-clear-msg.control-for-non-zerocopy-case-during-tx.patch new file mode 100644 index 000000000..4455bbc0b --- /dev/null +++ b/vhost_net-clear-msg.control-for-non-zerocopy-case-during-tx.patch @@ -0,0 +1,60 @@ +From 3add6ae9e1b854a9ddbe0dc17ff4ec48a2dac9fe Mon Sep 17 00:00:00 2001 +From: Jason Wang <jasowang@redhat.com> +Date: Wed, 5 Jun 2013 07:40:46 +0000 +Subject: [PATCH] vhost_net: clear msg.control for non-zerocopy case during tx + +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: +[<ffffffff81796b73>] dump_stack+0x19/0x1e +[<ffffffff8103d66b>] warn_slowpath_common+0x6b/0xa0 +[<ffffffff8103d6b5>] warn_slowpath_null+0x15/0x20 +[<ffffffffa0197627>] handle_tx+0x477/0x4b0 [vhost_net] +[<ffffffffa0197690>] handle_tx_kick+0x10/0x20 [vhost_net] +[<ffffffffa019541e>] vhost_worker+0xfe/0x1a0 [vhost_net] +[<ffffffffa0195320>] ? vhost_attach_cgroups_work+0x30/0x30 [vhost_net] +[<ffffffffa0195320>] ? vhost_attach_cgroups_work+0x30/0x30 [vhost_net] +[<ffffffff81061f46>] kthread+0xc6/0xd0 +[<ffffffff81061e80>] ? kthread_freezable_should_stop+0x70/0x70 +[<ffffffff817a1aec>] ret_from_fork+0x7c/0xb0 +[<ffffffff81061e80>] ? kthread_freezable_should_stop+0x70/0x70 + +Signed-off-by: Jason Wang <jasowang@redhat.com> +Acked-by: Michael S. Tsirkin <mst@redhat.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/vhost/net.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c +index ec6fb3f..3980e66 100644 +--- a/drivers/vhost/net.c ++++ b/drivers/vhost/net.c +@@ -353,7 +353,9 @@ static void handle_tx(struct vhost_net *net) + kref_get(&ubufs->kref); + } + vq->upend_idx = (vq->upend_idx + 1) % UIO_MAXIOV; +- } ++ } else ++ msg.msg_control = NULL; ++ + /* TODO: Check specific error and bomb out unless ENOBUFS? */ + err = sock->ops->sendmsg(NULL, sock, &msg, len); + if (unlikely(err < 0)) { +-- +1.8.1.4 + |