clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-05 13:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: fix vhost interaction with ctrl vq

Browse Source 
We broke networking using vhost with the introduction of a ctrl vq,
make sure that that queue get treated like a special case.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Sasha Levin
2015-06-01 16:39:54 +01:00
committed by Will Deacon
parent 643f6c0857
commit 9e56ec1413
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
virtio/net.c
+12 -5
View File
@@ -357,6 +357,11 @@ static void set_guest_features(struct kvm *kvm, void *dev, u32 features)
ndev->features = features;
}
static bool is_ctrl_vq(struct net_dev *ndev, u32 vq)
{
return vq == (u32)(ndev->queue_pairs * 2);
}
static int init_vq(struct kvm *kvm, void *dev, u32 vq, u32 page_size, u32 align,
u32 pfn)
{
@@ -377,10 +382,12 @@ static int init_vq(struct kvm *kvm, void *dev, u32 vq, u32 page_size, u32 align,
mutex_init(&ndev->io_lock[vq]);
pthread_cond_init(&ndev->io_cond[vq], NULL);
if (ndev->vhost_fd == 0) {
if (vq == (u32)(ndev->queue_pairs * 2))
pthread_create(&ndev->io_thread[vq], NULL, virtio_net_ctrl_thread, ndev);
else if (vq & 1)
if (is_ctrl_vq(ndev, vq)) {
pthread_create(&ndev->io_thread[vq], NULL, virtio_net_ctrl_thread, ndev);
return 0;
} else if (ndev->vhost_fd == 0 ) {
if (vq & 1)
pthread_create(&ndev->io_thread[vq], NULL, virtio_net_tx_thread, ndev);
else
pthread_create(&ndev->io_thread[vq], NULL, virtio_net_rx_thread, ndev);
@@ -453,7 +460,7 @@ static void notify_vq_eventfd(struct kvm *kvm, void *dev, u32 vq, u32 efd)
};
int r;
if (ndev->vhost_fd == 0)
if (ndev->vhost_fd == 0 || is_ctrl_vq(ndev, vq))
return;
r = ioctl(ndev->vhost_fd, VHOST_SET_VRING_KICK, &file);