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 F18C842ECF for ; Thu, 20 Jul 2023 17:24:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE0B540685; Thu, 20 Jul 2023 17:24:18 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AC556400D6 for ; Thu, 20 Jul 2023 17:24:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cWxQVICgx+3wHscVIr4rJQFZn6kQ8AzM4m3FYn0NCLo=; b=cfRSEzBMyj9w4BF17WRy2eny8b+aMW/WZ6uzQy6S1us4PGuGixGPIPJe14opmWxpg8TK5o bYuzNIhSXa/UQ9NprWAIxn6rpROK/luV+bjqGr7j7NEMAjm2Sw/jroEdR98Qb5+NWl0pJf nlYKTlx8j7WSEcs5uDiEhAGTotobGPc= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-427-9AnPZZAGPgCWTJaTTYOnyQ-1; Thu, 20 Jul 2023 11:23:19 -0400 X-MC-Unique: 9AnPZZAGPgCWTJaTTYOnyQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED5F3830DC2; Thu, 20 Jul 2023 15:22:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id B99A74A9004; Thu, 20 Jul 2023 15:22:38 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: Ali Alnubani , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix risk in NEON Rx descriptor read' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:56 +0100 Message-ID: <20230720151942.262154-105-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/660055f3627bbdf86f2803bb8488875bb3efd683 Thanks. Kevin --- >From 660055f3627bbdf86f2803bb8488875bb3efd683 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Tue, 30 May 2023 13:48:04 +0800 Subject: [PATCH] net/mlx5: fix risk in NEON Rx descriptor read [ upstream commit 7ac7450b20d1e11a20c138707663867918b39403 ] In NEON vector PMD, vector load loads two contiguous 8B of descriptor data into vector register. Given vector load ensures no 16B atomicity, read of the word that includes op_own field could be reordered after read of other words. In this case, some words could contain invalid data. Reloaded qword0 after read barrier to update vector register. This ensures that the fetched data is correct. Testpmd single core test on N1SDP/ThunderX2 showed no performance drop. Fixes: 1742c2d9fab0 ("net/mlx5: fix synchronization on polling Rx completions") Signed-off-by: Ruifeng Wang Tested-by: Ali Alnubani Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 41b9cf5444..6d3c594e56 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -648,4 +648,12 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, /* Synchronize for loading the rest of blocks. */ rte_io_rmb(); + /* B.0 (CQE 3) reload lower half of the block. */ + c3 = vld1q_lane_u64((uint64_t *)(p3 + 48), c3, 0); + /* B.0 (CQE 2) reload lower half of the block. */ + c2 = vld1q_lane_u64((uint64_t *)(p2 + 48), c2, 0); + /* B.0 (CQE 1) reload lower half of the block. */ + c1 = vld1q_lane_u64((uint64_t *)(p1 + 48), c1, 0); + /* B.0 (CQE 0) reload lower half of the block. */ + c0 = vld1q_lane_u64((uint64_t *)(p0 + 48), c0, 0); /* Prefetch next 4 CQEs. */ if (pkts_n - pos >= 2 * MLX5_VPMD_DESCS_PER_LOOP) { -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:07.840291874 +0100 +++ 0105-net-mlx5-fix-risk-in-NEON-Rx-descriptor-read.patch 2023-07-20 16:17:55.074752195 +0100 @@ -1 +1 @@ -From 7ac7450b20d1e11a20c138707663867918b39403 Mon Sep 17 00:00:00 2001 +From 660055f3627bbdf86f2803bb8488875bb3efd683 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7ac7450b20d1e11a20c138707663867918b39403 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 91c85bec6d..3ed688191f 100644 +index 41b9cf5444..6d3c594e56 100644 @@ -31 +32 @@ -@@ -676,4 +676,12 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, +@@ -648,4 +648,12 @@ rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,