From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id B139E237 for ; Tue, 21 Nov 2017 14:24:05 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 52BBA20CC8; Tue, 21 Nov 2017 08:24:05 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:24:05 -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=fm1; bh=6/t3feEqi3+aPsSKy joEx4TC/JysrneDATuqsNye9eA=; b=DuEnk/UFxLnjL6J2UmE80UxgMWzrZZvU9 i744W19vBKPLHbb88yu5uRjiF1oiXM0fyIv94UT4CO967cnsOS/olRmdJ3/a4zCT uHPNjmkk25unLcDTzuMNTuwTE3af7pApYF9DnIbYHhzGG1edFYptJCW1TpbRjJTI 0EcGx6SvCqFT2zGlNr2bQd10DCT2jTx1AMtkcC6GRtgB3FJsbPuugfXT5CZXnHQP c9bfmGUx9n8m1UaNKJzcEVgsrbNN74gWvFqIB1ewEeEwkxdyvot1ERJjDa9Zquiu F2Hs0a5DEC5I1zlD06/WciPmoYKURx/SRXbTVEtzUaims8/ivYlLQ== 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=6/t3feEqi3+aPsSKyjoEx4TC/JysrneDATuqsNye9eA=; b=d4ckrIcp 9JqQXvJCW8MNobFnjquoDc+olOvK0zI+zzu8s0pDpu5OqEpW71Wuex6NLCWmrhiq FjkZKb6k5YzAfAQzWHZ0knLNYhNF1tm4q0thokfOVUyK4tTnvM3/170V1MecJSjq iDOw6+dkb7vaEL9Dt1vCy26JiD3iFCeeq6DKvqueiK3aqASD7XUOfI2wefmG0McN 1/WSqNLf4TQLvQmGP55Rp9JNsIjcDDqcNkNtAN8Qd/DRWQZiaqtscXn7gpV1xhgK poodApHkKG7H0bOe6IL0pEkoX2QYE0xtLV3f5noTFZfx52opV3RMow8wVBdgxI+H SXjmAk+HJ/kuqA== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 02E6724810; Tue, 21 Nov 2017 08:24:02 -0500 (EST) From: Yuanhan Liu To: Yongseok Koh Cc: Martin Weiser , dpdk stable Date: Tue, 21 Nov 2017 21:16:54 +0800 Message-Id: <1511270333-31002-72-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/mlx5: fix overflow of Rx SW ring' has been queued to stable release 17.08.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: Tue, 21 Nov 2017 13:24:06 -0000 Hi, FYI, your patch has been queued to stable release 17.08.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 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From f29ef55dd26f9c00818258ef1d6b47a3b50726fd Mon Sep 17 00:00:00 2001 From: Yongseok Koh Date: Thu, 5 Oct 2017 14:37:29 -0700 Subject: [PATCH] net/mlx5: fix overflow of Rx SW ring [ upstream commit fc048bd52cb7e3382da86629a5aef89f1377aca8 ] If vectorized Rx burst is short of mbufs in replenishment, Rx SW ring can overflow as the Rx burst handles 4 packets in a loop. This is because the function fills SW ring and its mbufs first and checks validity of each completion later. So, there should be some buffer slots at the tail of the ring to protect mbufs which are already owned by application. Fixes: 6cb559d67b83 ("net/mlx5: add vectorized Rx/Tx burst for x86") Reported-by: Martin Weiser Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx_vec_sse.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.c b/drivers/net/mlx5/mlx5_rxtx_vec_sse.c index 6f4e1e8..b5a7657 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.c +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.c @@ -642,6 +642,13 @@ rxq_cq_decompress_v(struct rxq *rxq, RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, hash) != offsetof(struct rte_mbuf, rx_descriptor_fields1) + 12); /* + * Not to overflow elts array. Decompress next time after mbuf + * replenishment. + */ + if (unlikely(mcqe_n + MLX5_VPMD_DESCS_PER_LOOP > + (uint16_t)(rxq->rq_ci - rxq->cq_ci))) + return; + /* * A. load mCQEs into a 128bit register. * B. store rearm data to mbuf. * C. combine data from mCQEs with rx_descriptor_fields1. @@ -1031,8 +1038,10 @@ rxq_burst_v(struct rxq *rxq, struct rte_mbuf **pkts, uint16_t pkts_n) } elts_idx = rxq->rq_pi & q_mask; elts = &(*rxq->elts)[elts_idx]; - /* Not to overflow pkts array. */ - pkts_n = RTE_ALIGN_FLOOR(pkts_n - rcvd_pkt, MLX5_VPMD_DESCS_PER_LOOP); + pkts_n = RTE_MIN(pkts_n - rcvd_pkt, + (uint16_t)(rxq->rq_ci - rxq->cq_ci)); + /* Not to overflow pkts/elts array. */ + pkts_n = RTE_ALIGN_FLOOR(pkts_n, MLX5_VPMD_DESCS_PER_LOOP); /* Not to cross queue end. */ pkts_n = RTE_MIN(pkts_n, q_n - elts_idx); if (!pkts_n) -- 2.7.4