From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id A5B7B568A for ; Tue, 24 Nov 2015 08:23:38 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 23 Nov 2015 23:23:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,338,1444719600"; d="scan'208";a="606167401" Received: from yliu-dev.sh.intel.com ([10.239.66.49]) by FMSMGA003.fm.intel.com with ESMTP; 23 Nov 2015 23:23:36 -0800 From: Yuanhan Liu To: dev@dpdk.org Date: Tue, 24 Nov 2015 15:25:35 +0800 Message-Id: <1448349935-1935-1-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1448026465-27460-1-git-send-email-victork@redhat.com> References: <1448026465-27460-1-git-send-email-victork@redhat.com> Cc: Victor Kaplansky Subject: [dpdk-dev] [PATCH v2] vhost-user: fix enabling of queue pair X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2015 07:23:39 -0000 From: Victor Kaplansky The VHOST_USER_SET_VRING_ENABLE request was sent for each queue-pair. However, it's changed to be sent per queue in the queue-pair by QEMU commit dc3db6ad ("vhost-user: start/stop all rings"). The change is reasonable, as we send all other request per queue, instead of queue-pair. Hence we should do proper changes to adapt to the QEMU change here. Otherwise, a segfault will be triggered when last TX queue was enabled. [ commit log reword -- Yuanhan Liu ] Signed-off-by: Victor Kaplansky Acked-by: Yuanhan Liu --- v2: invoke vring_state_changed() callback per-vring as well This fixes a fatal issue, without that MQ will not work properly. Seems that Victor is busy at something else (or out of office so far), hence I sent v2 on behalf of him. --- lib/librte_vhost/vhost_user/virtio-net-user.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c index d07452a..b2ada9f 100644 --- a/lib/librte_vhost/vhost_user/virtio-net-user.c +++ b/lib/librte_vhost/vhost_user/virtio-net-user.c @@ -317,7 +317,6 @@ user_set_vring_enable(struct vhost_device_ctx ctx, struct vhost_vring_state *state) { struct virtio_net *dev = get_device(ctx); - uint16_t base_idx = state->index; int enable = (int)state->num; RTE_LOG(INFO, VHOST_CONFIG, @@ -325,12 +324,10 @@ user_set_vring_enable(struct vhost_device_ctx ctx, enable, state->index); if (notify_ops->vring_state_changed) { - notify_ops->vring_state_changed(dev, base_idx / VIRTIO_QNUM, - enable); + notify_ops->vring_state_changed(dev, state->index, enable); } - dev->virtqueue[base_idx + VIRTIO_RXQ]->enabled = enable; - dev->virtqueue[base_idx + VIRTIO_TXQ]->enabled = enable; + dev->virtqueue[state->index]->enabled = enable; return 0; } -- 1.9.3