From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 225372D13 for ; Thu, 1 Feb 2018 10:49:12 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id D1BC220BA3; Thu, 1 Feb 2018 04:49:11 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Thu, 01 Feb 2018 04:49:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=2/tbfPEI3r4CmY8WZ TTBg1qd4NBLdc8DujeLHOM1fDQ=; b=YLsW5S/kIekqMEyZHtMQCosmbtAEaT42r eDBcM6ybH+jNM8B8o17k87UDmhsqY1L3/ZCsZzm3qQMtwU/2zqJTyKgnCdiamr6/ 4GIjHRgTfoQxt1o1/gdK6Mt5fq93c8uk1qTF/fraeQrj7uLgg+OCEDx/c5OQLmHe psvRI8VXRhVAlE0qQiGlnXHhhM8lVl0XKF+ficRDQMW4gKRpHxCzfXFqK6LZQQXS kXs4QvolqUTJjiBQ9RTUyY8mCNVuMmOBsYY3e6g50XIZvENdUdtyqos53pivRmmH QHcfL0MQ4ra7cIkilW+lp3Hdl93Lfket7w3YSt22FrERrY7kR4RTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=2/tbfPEI3r4CmY8WZTTBg1qd4NBLdc8DujeLHOM1fDQ=; b=qInWSuAF YzZ3doAFJXruzdRJ+0y/URHwTr7/dpu5rL6ehxUfV1FAEcMAol8Lk6wDpqgkMTLj +niQ11mEYIe5ONdErCve2e9O5hjqLVTtx0gQ5HFBVOYjzf9YBk3oujNTFumqWWgB 6WnNU5B3yYoZlyigNFLWsS7XPH6fSjRVmYX/cY56C9iB/MJxjDn81d7ebiAbOYtK FPvHZNw5mQxRiDZJphFVEJ7FVyITAX0TIS+CVCh9cOW+aQHtlAxn3AMAqz9/lsIE ogM+HKHOJLO0pWeN3fZDVi7VuoFBov2ZVcposvv2ZF59TllSzC/xoPL0VXGvhEuL RbqKFSs83ElmLg== X-ME-Sender: Received: from yliu-mob.mtl.com (unknown [115.150.27.200]) by mail.messagingengine.com (Postfix) with ESMTPA id EFC06240B6; Thu, 1 Feb 2018 04:49:09 -0500 (EST) From: Yuanhan Liu To: Olivier Matz Cc: Yuanhan Liu , dpdk stable Date: Thu, 1 Feb 2018 17:47:39 +0800 Message-Id: <1517478479-12417-25-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517478479-12417-1-git-send-email-yliu@fridaylinux.org> References: <1517478479-12417-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/virtio: fix queue flushing with vector Rx enabled' has been queued to LTS release 17.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 09:49:12 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/03/18. So please shout if anyone has objections. Thanks. --yliu --- >>From cdf245dd9a63747e62905c2fff5ac37baa5a39fb Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 23 Jan 2018 16:54:40 +0100 Subject: [PATCH] net/virtio: fix queue flushing with vector Rx enabled [ upstream commit e67ae1e27e27b0fce9974dbf1b5bc6adff27a213 ] When using vector Rx mode (use_simple_rx = 1), vq->vq_descx[] is not kept up to date. To properly detach the mbufs in this case, browse sw_ring[] instead, as it's done in virtqueue_rxvq_flush(). Since we need virtio_get_queue_type(), also move this function in virtqueue.h as a static inline. Fixes: fc3d66212fed ("virtio: add vector Rx") Signed-off-by: Olivier Matz Acked-by: Yuanhan Liu --- drivers/net/virtio/virtio_ethdev.c | 11 ----------- drivers/net/virtio/virtqueue.c | 28 +++++++++++++++++++++++++--- drivers/net/virtio/virtqueue.h | 11 +++++++++++ 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index bfb9dab..74e3c24 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -294,17 +294,6 @@ virtio_dev_queue_release(void *queue __rte_unused) /* do nothing */ } -static int -virtio_get_queue_type(struct virtio_hw *hw, uint16_t vtpci_queue_idx) -{ - if (vtpci_queue_idx == hw->max_queue_pairs * 2) - return VTNET_CQ; - else if (vtpci_queue_idx % 2 == 0) - return VTNET_RQ; - else - return VTNET_TQ; -} - static uint16_t virtio_get_nr_vq(struct virtio_hw *hw) { diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c index 696d0e4..7f5e996 100644 --- a/drivers/net/virtio/virtqueue.c +++ b/drivers/net/virtio/virtqueue.c @@ -48,16 +48,38 @@ struct rte_mbuf * virtqueue_detatch_unused(struct virtqueue *vq) { struct rte_mbuf *cookie; - int idx; + struct virtio_hw *hw; + uint16_t start, end; + int type, idx; - if (vq != NULL) - for (idx = 0; idx < vq->vq_nentries; idx++) { + if (vq == NULL) + return NULL; + + hw = vq->hw; + type = virtio_get_queue_type(hw, vq->vq_queue_index); + start = vq->vq_avail_idx & (vq->vq_nentries - 1); + end = (vq->vq_avail_idx + vq->vq_free_cnt) & (vq->vq_nentries - 1); + + for (idx = 0; idx < vq->vq_nentries; idx++) { + if (hw->use_simple_rx && type == VTNET_RQ) { + if (start <= end && idx >= start && idx < end) + continue; + if (start > end && (idx >= start || idx < end)) + continue; + cookie = vq->sw_ring[idx]; + if (cookie != NULL) { + vq->sw_ring[idx] = NULL; + return cookie; + } + } else { cookie = vq->vq_descx[idx].cookie; if (cookie != NULL) { vq->vq_descx[idx].cookie = NULL; return cookie; } } + } + return NULL; } diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h index ab466c2..788d04d 100644 --- a/drivers/net/virtio/virtqueue.h +++ b/drivers/net/virtio/virtqueue.h @@ -312,6 +312,17 @@ virtqueue_full(const struct virtqueue *vq) return vq->vq_free_cnt == 0; } +static inline int +virtio_get_queue_type(struct virtio_hw *hw, uint16_t vtpci_queue_idx) +{ + if (vtpci_queue_idx == hw->max_queue_pairs * 2) + return VTNET_CQ; + else if (vtpci_queue_idx % 2 == 0) + return VTNET_RQ; + else + return VTNET_TQ; +} + #define VIRTQUEUE_NUSED(vq) ((uint16_t)((vq)->vq_ring.used->idx - (vq)->vq_used_cons_idx)) void vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx); -- 2.7.4