From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 90F32A04DD for ; Wed, 28 Oct 2020 11:48:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7EA404C90; Wed, 28 Oct 2020 11:48:24 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by dpdk.org (Postfix) with ESMTP id 77FFA49E0 for ; Wed, 28 Oct 2020 11:48:22 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id l8so2617932wmg.3 for ; Wed, 28 Oct 2020 03:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TrEGWUgaHosC5AyYznXLuJNpgNBgkAVcmokbz8wCKVg=; b=M+Vitm4PDKyRLwE75lZvGofYLaplEvgrBpQDhBTWHK7KMVE+tFpGjmyfErw9/Q9mEA SAaFeAuMJ8WZHm4OsItI3tcPtDZo1inYD7i7BNapax8sClOmxgpGXCUE7YF5tBokOe0q QS/LE7CZ/kF2A3w35gFjiOegOWV+YyIty8vcM1B7hf0b4RcSZaHqO7xM4pQmuT2weLt+ ebgSB/vo7EveRrnJIz2AA9vVLG2WbbsuWiT/pCDz6CqJBFVIoMf1X0UI70pTHZalKuIW 1LyF9t3EF0dcS7OkmuBPYT+3DK+g8/IrSn2RmhlazSLj6mfv2eiw07n+iC2FgQQ9ONvQ ZjDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TrEGWUgaHosC5AyYznXLuJNpgNBgkAVcmokbz8wCKVg=; b=BwC7j6kRWHKlsBfzNQK4qXfqIJ6Ekz02N3bNyTbxiTjS12TwI/E60kFrJUmmKhvHK4 rvFKvTPudjTRdym3HejXZO0ARUJNmjqqQA56cdvVyoOBa2cpKeAsSLfcP23A7mEmoKi+ XQAQyoFBfFnhSH+uhBCDaqHZv0UCRNSJuiA2xNig0/z5KlCY9wBDTXWYgGL2G5+Q6AFc YmQoZEeL8G/ENs9pLjm+1Q4Mr9NvyGV/sujNc7zYt5oqX6naF1hZKASuvUiR0AEp0zVs eleGzGAds22TA3CIbiehKJYBzk1IHugU3B5OXVblDdSt++e9x6ubLek38sSAG9UffiFJ TKbA== X-Gm-Message-State: AOAM530nzjKkaqgyJ7TzfPkf5BeylTJpDk1A8QkICG4+zB/pJOMgIb/R j4YkuhCMuA8LQrGX/GIwlbcI3gai6Ui+oHHG X-Google-Smtp-Source: ABdhPJz0mutsm4cwpT7OQuCvDcy3yFm32kmG6GPK65hH8orXIqeUgOmvsN2JNyhqwYfiwXX7p/H6Bg== X-Received: by 2002:a1c:383:: with SMTP id 125mr7834238wmd.175.1603882102268; Wed, 28 Oct 2020 03:48:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 3sm6032234wmd.19.2020.10.28.03.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:48:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Ting Xu Cc: Qi Zhang , dpdk stable Date: Wed, 28 Oct 2020 10:43:21 +0000 Message-Id: <20201028104606.3504127-42-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix ptype parsing' has been queued to stable release 19.11.6 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 294e71a2e77d47c05925ff316f88d5acc42abdc7 Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Wed, 16 Sep 2020 11:02:28 +0800 Subject: [PATCH] net/ice: fix ptype parsing [ upstream commit 0ff55924712e2a35476c0929235b21d2b77d9f97 ] The ptype mask for flexible descriptor in Rx function ice_recv_pkts_vec has a reversed order, which leads to an incorrect value of the final ptype. This patch fix the mask to parse the correct ptype of RX packets. Fixes: c68a52b8b38c ("net/ice: support vector SSE in Rx") Signed-off-by: Ting Xu Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx_vec_sse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/ice/ice_rxtx_vec_sse.c index 9d5f1f194f..70b43e680b 100644 --- a/drivers/net/ice/ice_rxtx_vec_sse.c +++ b/drivers/net/ice/ice_rxtx_vec_sse.c @@ -188,10 +188,10 @@ static inline void ice_rx_desc_to_ptype_v(__m128i descs[4], struct rte_mbuf **rx_pkts, uint32_t *ptype_tbl) { - const __m128i ptype_mask = _mm_set_epi16(0, ICE_RX_FLEX_DESC_PTYPE_M, - 0, ICE_RX_FLEX_DESC_PTYPE_M, - 0, ICE_RX_FLEX_DESC_PTYPE_M, - 0, ICE_RX_FLEX_DESC_PTYPE_M); + const __m128i ptype_mask = _mm_set_epi16(ICE_RX_FLEX_DESC_PTYPE_M, 0, + ICE_RX_FLEX_DESC_PTYPE_M, 0, + ICE_RX_FLEX_DESC_PTYPE_M, 0, + ICE_RX_FLEX_DESC_PTYPE_M, 0); __m128i ptype_01 = _mm_unpacklo_epi32(descs[0], descs[1]); __m128i ptype_23 = _mm_unpacklo_epi32(descs[2], descs[3]); __m128i ptype_all = _mm_unpacklo_epi64(ptype_01, ptype_23); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.106717229 +0000 +++ 0042-net-ice-fix-ptype-parsing.patch 2020-10-28 10:35:11.504830024 +0000 @@ -1,14 +1,15 @@ -From 0ff55924712e2a35476c0929235b21d2b77d9f97 Mon Sep 17 00:00:00 2001 +From 294e71a2e77d47c05925ff316f88d5acc42abdc7 Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Wed, 16 Sep 2020 11:02:28 +0800 Subject: [PATCH] net/ice: fix ptype parsing +[ upstream commit 0ff55924712e2a35476c0929235b21d2b77d9f97 ] + The ptype mask for flexible descriptor in Rx function ice_recv_pkts_vec has a reversed order, which leads to an incorrect value of the final ptype. This patch fix the mask to parse the correct ptype of RX packets. Fixes: c68a52b8b38c ("net/ice: support vector SSE in Rx") -Cc: stable@dpdk.org Signed-off-by: Ting Xu Acked-by: Qi Zhang @@ -17,10 +18,10 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/ice/ice_rxtx_vec_sse.c -index 965cd8b261..c4c9a91265 100644 +index 9d5f1f194f..70b43e680b 100644 --- a/drivers/net/ice/ice_rxtx_vec_sse.c +++ b/drivers/net/ice/ice_rxtx_vec_sse.c -@@ -237,10 +237,10 @@ static inline void +@@ -188,10 +188,10 @@ static inline void ice_rx_desc_to_ptype_v(__m128i descs[4], struct rte_mbuf **rx_pkts, uint32_t *ptype_tbl) {