From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 99BD7A0C45;
Wed, 22 Sep 2021 11:07:25 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 2C425411C6;
Wed, 22 Sep 2021 11:07:25 +0200 (CEST)
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
by mails.dpdk.org (Postfix) with ESMTP id BA92C411C4
for <dev@dpdk.org>; Wed, 22 Sep 2021 11:07:20 +0200 (CEST)
X-IronPort-AV: E=McAfee;i="6200,9189,10114"; a="210631445"
X-IronPort-AV: E=Sophos;i="5.85,313,1624345200"; d="scan'208";a="210631445"
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
22 Sep 2021 02:07:20 -0700
X-IronPort-AV: E=Sophos;i="5.85,313,1624345200"; d="scan'208";a="550174095"
Received: from unknown (HELO localhost.localdomain) ([10.240.183.50])
by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
22 Sep 2021 02:07:16 -0700
From: Yuan Wang <yuanx.wang@intel.com>
To: dev@dpdk.org
Cc: maxime.coquelin@redhat.com, chenbo.xia@intel.com, jiayu.hu@intel.com,
xuan.ding@intel.com, cheng1.jiang@intel.com, wenwux.ma@intel.com,
yvonnex.yang@intel.com, sunil.pai.g@intel.com
Date: Wed, 22 Sep 2021 08:55:45 +0000
Message-Id: <20210922085546.54758-2-yuanx.wang@intel.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210922085546.54758-1-yuanx.wang@intel.com>
References: <20210909065807.812145-1-yuanx.wang@intel.com>
<20210922085546.54758-1-yuanx.wang@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v3 1/2] vhost: support to clear in-flight packets
for async dequeue
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
rte_vhost_clear_queue_thread_unsafe() supports to clear
in-flight packets for async enqueue only. But after
supporting async dequeue, this API should support async dequeue too.
Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
---
lib/vhost/virtio_net.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index 39399d2d31..21afcd1854 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -27,6 +27,11 @@
#define VHOST_ASYNC_BATCH_THRESHOLD 32
+static __rte_always_inline uint16_t
+async_poll_dequeue_completed_split(struct virtio_net *dev,
+ struct vhost_virtqueue *vq, uint16_t queue_id,
+ struct rte_mbuf **pkts, uint16_t count, bool legacy_ol_flags);
+
static __rte_always_inline bool
rxvq_is_mergeable(struct virtio_net *dev)
{
@@ -2120,7 +2125,7 @@ rte_vhost_clear_queue_thread_unsafe(int vid, uint16_t queue_id,
return 0;
VHOST_LOG_DATA(DEBUG, "(%d) %s\n", dev->vid, __func__);
- if (unlikely(!is_valid_virt_queue_idx(queue_id, 0, dev->nr_vring))) {
+ if (unlikely(queue_id >= dev->nr_vring)) {
VHOST_LOG_DATA(ERR, "(%d) %s: invalid virtqueue idx %d.\n",
dev->vid, __func__, queue_id);
return 0;
@@ -2134,7 +2139,17 @@ rte_vhost_clear_queue_thread_unsafe(int vid, uint16_t queue_id,
return 0;
}
- n_pkts_cpl = vhost_poll_enqueue_completed(dev, queue_id, pkts, count);
+ if (queue_id % 2 == 0)
+ n_pkts_cpl = vhost_poll_enqueue_completed(dev, queue_id, pkts, count);
+ else {
+ if (unlikely(vq_is_packed(dev)))
+ VHOST_LOG_DATA(ERR,
+ "(%d) %s: async dequeue does not support packed ring.\n",
+ dev->vid, __func__);
+ else
+ n_pkts_cpl = async_poll_dequeue_completed_split(dev, vq, queue_id, pkts,
+ count, dev->flags & VIRTIO_DEV_LEGACY_OL_FLAGS);
+ }
return n_pkts_cpl;
}
--
2.25.1