From patchwork Thu Jul 23 13:08:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 74683 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2E86BA0521; Thu, 23 Jul 2020 15:09:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 886CA1BFBA; Thu, 23 Jul 2020 15:09:19 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id DD0EC2C6E for ; Thu, 23 Jul 2020 15:09:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595509757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Mm3mUOBk9yuUlONurHkE5muYsEHddyUtTXkitBruczs=; b=CDmWF2qP0/nGMF92BQTPmhsZCTwaNse8NdtlxSbo5ifuJHOk3xeBfj4UvPY38unh5EW6c6 p5pErnLseW2ja/CTdg5l4PVN5yxe4QFQe8zmDBeYYc+T53oERnIBL5scjSmazw6QU+8K1f 7soQU59uqwS0S71YyxGkJtjmjhEqV6w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-92-0U1BY-rCPoWpey1eIRJhBg-1; Thu, 23 Jul 2020 09:09:13 -0400 X-MC-Unique: 0U1BY-rCPoWpey1eIRJhBg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C023791270; Thu, 23 Jul 2020 13:09:11 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.110.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AC7161983; Thu, 23 Jul 2020 13:09:08 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, matan@mellanox.com, chenbo.xia@intel.com, yong.liu@intel.com, yinan.wang@intel.com Cc: thomas@monjalon.net, ferruh.yigit@intel.com, david.marchand@redhat.com, Maxime Coquelin Date: Thu, 23 Jul 2020 15:08:53 +0200 Message-Id: <20200723130854.322771-2-maxime.coquelin@redhat.com> In-Reply-To: <20200723130854.322771-1-maxime.coquelin@redhat.com> References: <20200723130854.322771-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 1/2] vhost: fix guest notification setting X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If rte_vhost_enable_guest_notification is called before the virtqueue is ready, the configuration is lost. This patch fixes this by saving the guest notification enablement value requested by the application, and apply it before the virtqueue is made ready to the application. Fixes: 604052ae5395 ("net/vhost: support queue update") Reported-by: Yinan Wang Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia --- lib/librte_vhost/vhost.c | 24 ++++++++++++++++++++---- lib/librte_vhost/vhost.h | 5 +++++ lib/librte_vhost/vhost_user.c | 11 ++++++++--- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index 14b3e253e8..8f20a0818f 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -534,6 +534,7 @@ init_vring_queue(struct virtio_net *dev, uint32_t vring_idx) vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD; vq->callfd = VIRTIO_UNINITIALIZED_EVENTFD; + vq->notif_enable = VIRTIO_UNINITIALIZED_NOTIF; vhost_user_iotlb_init(dev, vring_idx); /* Backends are set to -1 indicating an inactive device. */ @@ -1311,6 +1312,23 @@ vhost_enable_notify_packed(struct virtio_net *dev, return 0; } +int +vhost_enable_guest_notification(struct virtio_net *dev, + struct vhost_virtqueue *vq, int enable) +{ + /* + * If the virtqueue is not ready yet, it will be applied + * when it will become ready. + */ + if (!vq->ready) + return 0; + + if (vq_is_packed(dev)) + return vhost_enable_notify_packed(dev, vq, enable); + else + return vhost_enable_notify_split(dev, vq, enable); +} + int rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) { @@ -1325,10 +1343,8 @@ rte_vhost_enable_guest_notification(int vid, uint16_t queue_id, int enable) rte_spinlock_lock(&vq->access_lock); - if (vq_is_packed(dev)) - ret = vhost_enable_notify_packed(dev, vq, enable); - else - ret = vhost_enable_notify_split(dev, vq, enable); + vq->notif_enable = enable; + ret = vhost_enable_guest_notification(dev, vq, enable); rte_spinlock_unlock(&vq->access_lock); diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 0f7212f888..a29c6638e2 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -164,6 +164,9 @@ struct vhost_virtqueue { int enabled; int access_ok; int ready; + int notif_enable; +#define VIRTIO_UNINITIALIZED_NOTIF (-1) + rte_spinlock_t access_lock; /* Used to notify the guest (trigger interrupt) */ @@ -668,6 +671,8 @@ void vhost_enable_dequeue_zero_copy(int vid); void vhost_set_builtin_virtio_net(int vid, bool enable); void vhost_enable_extbuf(int vid); void vhost_enable_linearbuf(int vid); +int vhost_enable_guest_notification(struct virtio_net *dev, + struct vhost_virtqueue *vq, int enable); struct vhost_device_ops const *vhost_driver_callback_get(const char *path); diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 9ddeae3622..c3c924faec 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -235,6 +235,11 @@ vhost_user_notify_queue_state(struct virtio_net *dev, uint16_t index, int enable) { struct rte_vdpa_device *vdpa_dev = dev->vdpa_dev; + struct vhost_virtqueue *vq = dev->virtqueue[index]; + + /* Configure guest notifications on enable */ + if (enable && vq->notif_enable != VIRTIO_UNINITIALIZED_NOTIF) + vhost_enable_guest_notification(dev, vq, vq->notif_enable); if (vdpa_dev && vdpa_dev->ops->set_vring_state) vdpa_dev->ops->set_vring_state(dev->vid, index, enable); @@ -1640,8 +1645,8 @@ vhost_user_set_vring_call(struct virtio_net **pdev, struct VhostUserMsg *msg, vq = dev->virtqueue[file.index]; if (vq->ready) { - vhost_user_notify_queue_state(dev, file.index, 0); vq->ready = 0; + vhost_user_notify_queue_state(dev, file.index, 0); } if (vq->callfd >= 0) @@ -1903,8 +1908,8 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg, } if (vq->ready) { - vhost_user_notify_queue_state(dev, file.index, 0); vq->ready = 0; + vhost_user_notify_queue_state(dev, file.index, 0); } if (vq->kickfd >= 0) @@ -2917,8 +2922,8 @@ vhost_user_msg_handler(int vid, int fd) bool cur_ready = vq_is_ready(dev, vq); if (cur_ready != (vq && vq->ready)) { - vhost_user_notify_queue_state(dev, i, cur_ready); vq->ready = cur_ready; + vhost_user_notify_queue_state(dev, i, cur_ready); } } From patchwork Thu Jul 23 13:08:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 74685 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A7C5EA0521; Thu, 23 Jul 2020 15:10:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8D56A1C00E; Thu, 23 Jul 2020 15:10:04 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 3EC2D1BFBA for ; Thu, 23 Jul 2020 15:10:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595509802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6NgCCbL+XQcL9wfhlyBK2y/w0LwSaXHW27otRr9R8ds=; b=g0hVlO1h8QT1XZk4r2mrqXoGbF3dOckmSx8Pe2zpWv3W5YsWo/EozCvvf9GoSxyNoU5ff4 TV3opiAdGDxo3/Md7KBCZWwhR0f59hxJ2vRW6V0RhplDDplZ09lAb2yQId2kHqF23lZkld 81jKR+Sliy75cxplITZb/KG1/makgKM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-7-8Q4VMI5WN8WEQ4mRIbFjNw-1; Thu, 23 Jul 2020 09:09:15 -0400 X-MC-Unique: 8Q4VMI5WN8WEQ4mRIbFjNw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D5E218C63C1; Thu, 23 Jul 2020 13:09:14 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.110.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1990561983; Thu, 23 Jul 2020 13:09:11 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, matan@mellanox.com, chenbo.xia@intel.com, yong.liu@intel.com, yinan.wang@intel.com Cc: thomas@monjalon.net, ferruh.yigit@intel.com, david.marchand@redhat.com, Maxime Coquelin Date: Thu, 23 Jul 2020 15:08:54 +0200 Message-Id: <20200723130854.322771-3-maxime.coquelin@redhat.com> In-Reply-To: <20200723130854.322771-1-maxime.coquelin@redhat.com> References: <20200723130854.322771-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH 2/2] net/vhost: fix queue update X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Now that the vhost library saves the guest notifications enablement value in its virtqueues metadata, it is not necessary to do it in the vring_state_changed callback. One effect of the patch is also to prevent possible deadlock happening in vhost library. Fixes: 604052ae5395 ("net/vhost: support queue update") Reported-by: Yinan Wang Signed-off-by: Maxime Coquelin --- drivers/net/vhost/rte_eth_vhost.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index bbf79b2c0e..14b7b59f67 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -94,7 +94,6 @@ struct vhost_queue { struct rte_mempool *mb_pool; uint16_t port; uint16_t virtqueue_id; - bool intr_en; struct vhost_stats stats; }; @@ -547,8 +546,6 @@ eth_rxq_intr_enable(struct rte_eth_dev *dev, uint16_t qid) rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 1); rte_wmb(); - vq->intr_en = true; - return ret; } @@ -574,8 +571,6 @@ eth_rxq_intr_disable(struct rte_eth_dev *dev, uint16_t qid) rte_vhost_enable_guest_notification(vq->vid, (qid << 1) + 1, 0); rte_wmb(); - vq->intr_en = false; - return 0; } @@ -841,7 +836,6 @@ vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id) struct rte_eth_conf *dev_conf = ð_dev->data->dev_conf; struct pmd_internal *internal = eth_dev->data->dev_private; struct rte_vhost_vring vring; - struct vhost_queue *vq; int rx_idx = vring_id % 2 ? (vring_id - 1) >> 1 : -1; int ret = 0; @@ -853,21 +847,14 @@ vring_conf_update(int vid, struct rte_eth_dev *eth_dev, uint16_t vring_id) rte_atomic32_read(&internal->dev_attached) && rte_atomic32_read(&internal->started) && dev_conf->intr_conf.rxq) { - vq = eth_dev->data->rx_queues[rx_idx]; ret = rte_vhost_get_vhost_vring(vid, vring_id, &vring); - if (!ret) { - if (vring.kickfd != - eth_dev->intr_handle->efds[rx_idx]) { - VHOST_LOG(INFO, - "kickfd for rxq-%d was changed.\n", - rx_idx); - eth_dev->intr_handle->efds[rx_idx] = - vring.kickfd; - } + if (ret) + return ret; - rte_vhost_enable_guest_notification(vid, vring_id, - vq->intr_en); - rte_wmb(); + if (vring.kickfd != eth_dev->intr_handle->efds[rx_idx]) { + VHOST_LOG(INFO, "kickfd for rxq-%d was changed.\n", + rx_idx); + eth_dev->intr_handle->efds[rx_idx] = vring.kickfd; } }