From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2EF918D38 for ; Tue, 24 Nov 2015 08:43:30 +0100 (CET) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 5E5B4C0F1CF6; Tue, 24 Nov 2015 07:43:29 +0000 (UTC) Received: from redhat.com (vpn-200-209.tlv.redhat.com [10.35.200.209]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id tAO7hR6P031981; Tue, 24 Nov 2015 02:43:28 -0500 Date: Tue, 24 Nov 2015 09:43:26 +0200 From: Victor Kaplansky To: Yuanhan Liu Message-ID: <20151124094106-mutt-send-email-victork@redhat.com> References: <1448026465-27460-1-git-send-email-victork@redhat.com> <1448349935-1935-1-git-send-email-yuanhan.liu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1448349935-1935-1-git-send-email-yuanhan.liu@linux.intel.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Cc: dev@dpdk.org Subject: Re: [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:43:30 -0000 Yuanhan, looks fine. Thanks for handling this. -- Victor On Tue, Nov 24, 2015 at 03:25:35PM +0800, Yuanhan Liu wrote: > 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