From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 74B04A0524 for ; Fri, 5 Feb 2021 12:37:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6EDBB188A46; Fri, 5 Feb 2021 12:37:57 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 65F68188A46 for ; Fri, 5 Feb 2021 12:37:56 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id 190so5768952wmz.0 for ; Fri, 05 Feb 2021 03:37:56 -0800 (PST) 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=SeAcus9Ld9wugJSFBW8K+k5PLf93Qfyrzr8styr445o=; b=fAjfXGmeMjWPfy0Q9FTvK7YM//qTQcm7yxWYgD+bOARLASvOgfndH1ug75uObpvOqd SRQhZoEKOV1ipf817qChCAXBtVK4roacKDX72y2AT6CCJq1OQAbevD3kg0nfifKMSrYA 7UN7M/ggW0n0AyeSwBll0W1Gzb9ofWW1NzSn7ObgO8f8zxUc8N2rYT1/yP/sKuDxzBCh Jcw60vBknCo94OU2T3X0wwHcHaBz3KpmQXKlJN3xCyBGV4AZBRwpTOJuBt55JHaPmXCW UYV9x5EerPLiHE5R5YS6YhZUNTmcEWIbPN3h+eG4U+Y9X4LXeOJ7rBGWpTcx2U2aPEum 9BwQ== 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=SeAcus9Ld9wugJSFBW8K+k5PLf93Qfyrzr8styr445o=; b=QZVnVBL6pTxtjZP9XNzJum4KEz2kNVeE6Y3AdCUoT5jq1VxMVeaeoFrmwY9aw0k5vB RlWrYJk1NCrqBF7FMkQib2vMwx3nYMGtZDpB4uYscB8TJX1eexejo/xPVJuTsfaZp3oy O0Wo1zOqhdjMq56vaotnO4uHZroOZPdPHYoOHR8PZ9XhyjeNjUGZmDNorui1/XaSf3N/ DGjXn+0uojruoeGz0rw+2nNgU9eqda/f3vY6Pk26MlVTkClCi2sTNT9aoZQO1XTNjzbu nDfpizUXq1xzx7XXZXzD+xJOgUIjoP/m43ZegZCuO2Y4rbLqvHYd25qeCrdk6g21rI0w NNCQ== X-Gm-Message-State: AOAM531571tr9SJpNmdtZhWOKiqsi0V6xyw2acAg50UFTaXOsLS1zTM+ 91NHOlcH1D0orHLWi9PvOR0= X-Google-Smtp-Source: ABdhPJwVqjJAX/MZctOwaUcblGxhz23+hRMPuTTjQU/ADpdZ/IVMUfnJ/maBPWs6eYoCG1z+o0w7Vw== X-Received: by 2002:a05:600c:354c:: with SMTP id i12mr3255050wmq.51.1612525076185; Fri, 05 Feb 2021 03:37:56 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i7sm18025717wmq.2.2021.02.05.03.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:37:55 -0800 (PST) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Date: Fri, 5 Feb 2021 11:18:44 +0000 Message-Id: <20210205111920.1272063-238-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix flow tag decompression' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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/07/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/094f59d02aa07cd555084025f0cebc113443f645 Thanks. Luca Boccassi --- >From 094f59d02aa07cd555084025f0cebc113443f645 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 14 Jan 2021 21:32:19 +0000 Subject: [PATCH] net/mlx5: fix flow tag decompression [ upstream commit bd0940a5c4df6a79595adac39959ab8b578ec3a9 ] Packets can get a wrong Flow Tag on x86 architecture with the Flow Tag compression format (rxq_cqe_comp_en=2) enabled inside the SSE Rx burst. The shuffle mask that extracts a Flow Tag from the pair of compressed CQEs is reversed. This leads to the wrong Flow Tag assignment. Correct the shuffle mask to get proper bytes for a Flow Tag from miniCQEs. Fixes: 54c2d46b160f ("net/mlx5: support flow tag and packet header miniCQEs") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index d4df9816aa..0b3f240e10 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -197,8 +197,8 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, const __m128i flow_mark_adj = _mm_set_epi32(-1, -1, -1, -1); const __m128i flow_mark_shuf = - _mm_set_epi8(-1, 1, 0, 4, - -1, 9, 8, 12, + _mm_set_epi8(-1, 9, 8, 12, + -1, 1, 0, 4, -1, -1, -1, -1, -1, -1, -1, -1); const __m128i ft_mask = -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:39.678341077 +0000 +++ 0238-net-mlx5-fix-flow-tag-decompression.patch 2021-02-05 11:18:29.238699337 +0000 @@ -1 +1 @@ -From bd0940a5c4df6a79595adac39959ab8b578ec3a9 Mon Sep 17 00:00:00 2001 +From 094f59d02aa07cd555084025f0cebc113443f645 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bd0940a5c4df6a79595adac39959ab8b578ec3a9 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org