From: Victor Kaplansky <victork@redhat.com>
To: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] vhost-user: fix enabling of queue pair
Date: Tue, 24 Nov 2015 09:43:26 +0200 [thread overview]
Message-ID: <20151124094106-mutt-send-email-victork@redhat.com> (raw)
In-Reply-To: <1448349935-1935-1-git-send-email-yuanhan.liu@linux.intel.com>
Yuanhan, looks fine. Thanks for handling this.
-- Victor
On Tue, Nov 24, 2015 at 03:25:35PM +0800, Yuanhan Liu wrote:
> From: Victor Kaplansky <victork@redhat.com>
>
> 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 <victork@redhat.com>
> Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
> ---
>
> 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
next prev parent reply other threads:[~2015-11-24 7:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 13:45 [dpdk-dev] [PATCH] " Victor Kaplansky
2015-11-20 15:17 ` Victor Kaplansky
2015-11-23 3:22 ` Yuanhan Liu
2015-11-24 7:25 ` [dpdk-dev] [PATCH v2] " Yuanhan Liu
2015-11-24 7:43 ` Victor Kaplansky [this message]
2015-11-24 20:29 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151124094106-mutt-send-email-victork@redhat.com \
--to=victork@redhat.com \
--cc=dev@dpdk.org \
--cc=yuanhan.liu@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).