From patchwork Tue Oct 27 07:51:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 8041 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 34A6A6A80; Tue, 27 Oct 2015 08:52:05 +0100 (CET) Received: from mail-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by dpdk.org (Postfix) with ESMTP id CF5706787 for ; Tue, 27 Oct 2015 08:52:03 +0100 (CET) Received: by pasz6 with SMTP id z6so214644338pas.2 for ; Tue, 27 Oct 2015 00:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel_co_jp.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=cE1R078v41IQJ5c2VZKD/ls6B+iZ/XJYDtNmMyvaKho=; b=hhYpANspDIwTtO3I/ZR2+e7/xNwUjpe37KxU4+Y3rMSImKHv8SUerirmhVgBofUy/W PYgzG2VSuryBJ9UWuQiFW2RGlXjRd4ik1+rZOiKlm/X+NctjPZgbXwUN9wONPqAJwMRe vIN8KFBmS2jGA/9jEu1OiCtFAt9cSpRuBxBoohtrVcrtiixtykml8jrfKiRCRLuv9cVY 0zoKsIw+S02FY3L1EMh+Wukag68EN0hXxIgcEQoE9iacFdJPzio0/09k/EHssugwxaBC UOJcPyz+31zPq42UlfxNWCsWkH2dqeusrFZHsgyhHSGo7BB1oy54a8g/B0AQfhUZvhKF 4Lyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cE1R078v41IQJ5c2VZKD/ls6B+iZ/XJYDtNmMyvaKho=; b=aWGqgj4Oq0L+f7RclyZs5sbdFg+xWlkWBQw4oZTcun5P5BkY2bLYoqrfoy69e3vivQ S7+qO4JHVbyuVE8RUE0JJjIopFc+hHyNjzz5ZEnFhwgZt0yleRe6djdt+2uSEqKnNbTd zs83MJQf773xGl0idDL8tmTXFyt+5SLBC6lwGOtkv5YPDf8wZg2Xba10n0a4JiguAx1d Bhvip5cM8O1d/tkOiR+KQguXHXrs0E1dty2Uu7WVZ25pFHqIKc+Qbmvs2coGe1fUzO9w R7aT09+2AoGvLBLV37HjcogCu8sgsV6VXxWvylF2bwPIz9y+BOEvqWImYQim8+b6pJpE mfpg== X-Gm-Message-State: ALoCoQmA26we2HVplzwgBdvS+DxvPIGxlJZxq/eiNuUI/bzpoc6dbZHLQH3r3tekFsPo7by8lANb X-Received: by 10.68.131.36 with SMTP id oj4mr26485558pbb.141.1445932323205; Tue, 27 Oct 2015 00:52:03 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id kp4sm37921916pbc.34.2015.10.27.00.52.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Oct 2015 00:52:02 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 27 Oct 2015 16:51:46 +0900 Message-Id: <1445932306-11880-1-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 2.1.4 Cc: ann.zhuangyanying@huawei.com Subject: [dpdk-dev] [PATCH] vhost: Fix wrong handling of virtqueue array index 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The patch fixes wrong handling of virtqueue array index when GET_VRING_BASE message comes. The vhost backend will receive the message per virtqueue. Also we should call a destroy callback handler when both RXQ and TXQ receives the message. Signed-off-by: Tetsuya Mukawa Acked-by: Yuanhan Liu --- lib/librte_vhost/vhost_user/virtio-net-user.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c index a998ad8..99c075f 100644 --- a/lib/librte_vhost/vhost_user/virtio-net-user.c +++ b/lib/librte_vhost/vhost_user/virtio-net-user.c @@ -283,12 +283,10 @@ user_get_vring_base(struct vhost_device_ctx ctx, struct vhost_vring_state *state) { struct virtio_net *dev = get_device(ctx); + uint16_t base_idx = state->index / VIRTIO_QNUM * VIRTIO_QNUM; if (dev == NULL) return -1; - /* We have to stop the queue (virtio) if it is running. */ - if (dev->flags & VIRTIO_DEV_RUNNING) - notify_ops->destroy_device(dev); /* Here we are safe to get the last used index */ ops->get_vring_base(ctx, state->index, state); @@ -300,15 +298,17 @@ user_get_vring_base(struct vhost_device_ctx ctx, * sent and only sent in vhost_vring_stop. * TODO: cleanup the vring, it isn't usable since here. */ - if (dev->virtqueue[state->index + VIRTIO_RXQ]->kickfd >= 0) { - close(dev->virtqueue[state->index + VIRTIO_RXQ]->kickfd); - dev->virtqueue[state->index + VIRTIO_RXQ]->kickfd = -1; - } - if (dev->virtqueue[state->index + VIRTIO_TXQ]->kickfd >= 0) { - close(dev->virtqueue[state->index + VIRTIO_TXQ]->kickfd); - dev->virtqueue[state->index + VIRTIO_TXQ]->kickfd = -1; + if (dev->virtqueue[state->index]->kickfd >= 0) { + close(dev->virtqueue[state->index]->kickfd); + dev->virtqueue[state->index]->kickfd = -1; } + /* We have to stop the queue (virtio) if it is running. */ + if ((dev->flags & VIRTIO_DEV_RUNNING) && + (dev->virtqueue[base_idx + VIRTIO_RXQ]->kickfd == -1) && + (dev->virtqueue[base_idx + VIRTIO_TXQ]->kickfd == -1)) + notify_ops->destroy_device(dev); + return 0; }