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 1590B43E57 for ; Sat, 13 Apr 2024 14:53:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C77640294; Sat, 13 Apr 2024 14:53:05 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) by mails.dpdk.org (Postfix) with ESMTP id 928A7400D6 for ; Sat, 13 Apr 2024 14:53:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bce1TwFzR24kVDKhy4H06as9rlSt00IOmEc/oeTmlOAoKRd4FeQQLmf/zNNg1V02kzz+dfuAZAF9KBayEPiQrQJuEW6kLoQ3fJ7jJ84e+F40Igh+8/kQXjIcRyiXy1iydvOJVAqtFrB+lY1xAXo3tTeaA23sUAPM/Y0m7eGindYrvUK72J4CmNXOIlDUQRz0JcjiG9gkkQyjMDTxVDTpQcq0uSqaF/iVWOEFCKWVd4kxa18ZCULsC4b3hhqqTp9jMZO5hMPFpHfVBS4E5OKVVXqwZtPjlNRI8lrBc0BINXYUE7NmyP1bBKX3sbee+4BtBAX/P34INtetoKTmeeuRlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q6qLxiu2qdHcMlciwKJsZhMBhcAbbTxMvXhsIur2yVI=; b=ZVnELOi/0Mgl0FIfXE+RiUuu4YGaHymt8F3wRjUdQ0rh69c5O14lOmKmBYCIZMxHb7BDBNBlAkRTUbnziyV5WQTF0T+8TrBRTZqOOOnSMR1fxiQQi6dq3mNAcxlwvhot1Qm+ju96OCBgP1QJOwlqMv/bAe3rGpCKvr6BvXEkgl2Qd5BtxzEX7RyMAZdI0zbliMMmbCC9cbm0uiWmYwj8PPmjE/WWbe0krgjyWqXc4Otyxam0V/4ZzS+RI5jkAH5Clq3t4I+2JN6lvZ6FezcWli0DyJXS6LBmJNuKoZHmjRybey7T/9i6cZNT0C2zL1Jgrruqdk8lwWW9VUGzx7oQVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q6qLxiu2qdHcMlciwKJsZhMBhcAbbTxMvXhsIur2yVI=; b=LuqlD6A+OHqjqptfGwUdHb76BjWXKM4YsoJ4Nj3NHSbf8q2YRNhAebLem/Eumb4nsbxOPAoMio++NsenLiiYGtbZp5KbBP0VtM0uBTSQCBOe4zZVX08xfhP39daCUmqCDnvGknlXLsB+0uyHoqbPNKnvnkTTWjLSnkG5TJ1VWTrQd7r4fzq9LjgJiUYjWvPIKZxT3jR4ryTPr7j852TVy3lLqmf7h4JRG39wPIR6px9tMFEANfT2FbW8PDqpa+WdtdOV9H2EBBH5OEXTXnNQCYm3Ei5U91F3apGqJRJcyilin/s8bL1mBr3LZGMjt8DtWbD1HOPXjt8IHhzzy1OoUw== Received: from SJ2PR07CA0007.namprd07.prod.outlook.com (2603:10b6:a03:505::12) by SA1PR12MB6896.namprd12.prod.outlook.com (2603:10b6:806:24f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:52:59 +0000 Received: from SJ1PEPF00001CE2.namprd05.prod.outlook.com (2603:10b6:a03:505:cafe::2b) by SJ2PR07CA0007.outlook.office365.com (2603:10b6:a03:505::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.31 via Frontend Transport; Sat, 13 Apr 2024 12:52:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00001CE2.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:52:59 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:52:41 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 05:52:40 -0700 From: Xueming Li To: Bruce Richardson CC: Anatoly Burakov , dpdk stable Subject: patch 'net/ice: remove incorrect 16B descriptor read block' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:48:27 +0800 Message-ID: <20240413125005.725659-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE2:EE_|SA1PR12MB6896:EE_ X-MS-Office365-Filtering-Correlation-Id: ee013670-4bf8-468b-ee4a-08dc5bb8a5d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QhNkrIPAG69U/9EwYFbT9+BgJaHPPlvX9dOczrGYHTfclsRPkTWgL7YoqWCGc1rZy+keu3RHWujZa7hudl4CBV81xwOZJmRw+apGEEtMSIj0j+ISJ62nKqsjhjJht0d2KyKBrFi7oqNp78q07TyzVcn5GsDvFyuYS+PKFlvTqMzJpPkoNTQLs0QS15bJZS2pl3Wtj3Nj33pXMngTb0lhEkzeL+NXFkj6yukKqK0hqKVCQNqLnpW2jYjgljAda3iOllJO4q2oAmWDnDCbsJIu4qwrJPRAcXFfj26dogv1XhjSFkg7ex78qvboij1Ns1V8JqMZg51uF55ENbVb3wc6s1fOHd/4kbcqpHI3wwmk92C24vpx/mUUOssnHnwS7c2n4RTA1jpNDne6x+dYrzuRpjsRDqH/LBpvW0KmPA0lLOgAbRljAUcklRviAi1ruPpc/bRFgEx8q387pSPHlratKaZE9UpuY6DfIdE8iIwMsGiC/ayRedZEputV2mWJqej8bbyi0icMq3+0RiLv5U9ouqsqDduXfAHkag02Dd7Ls5tsrRwqN3gr1n0NG/bGKI8vCF+9JwWdUPZszFJ8fYFxeaoJnLlSSaq69+i6t4a3g2EXOdrbMeWAYvkhC2r9/+km8ydjS0DXYU4YQ4wpPvYw54l1ihhl/9L3QC0SmeudoxOz8bhUcbY1x0bJ3xniUNDWXDT0NGETsFqjSix6SXcSqPmus9t018o/JkKMgl7dJC81AtmC8dbvsKLPDdvZIv9l X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(82310400014)(1800799015)(36860700004)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:52:59.3186 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee013670-4bf8-468b-ee4a-08dc5bb8a5d0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6896 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 23.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 04/15/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=dbdcd8bb8532fb04458d131adc335cfbda7c70da Thanks. Xueming Li --- >From dbdcd8bb8532fb04458d131adc335cfbda7c70da Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 23 Jan 2024 11:40:52 +0000 Subject: [PATCH] net/ice: remove incorrect 16B descriptor read block Cc: Xueming Li [ upstream commit 9aee908eddeb6e8f3de402ac5661bca5161809a6 ] By default, the driver works with 32B descriptors, but has a separate descriptor read block for reading two descriptors at a time when using 16B descriptors. However, the 32B reads used are not guaranteed to be atomic, which will cause issues if that is not the case on a system, since the descriptors may be read in an undefined order. Remove the block, to avoid issues, and just use the regular descriptor reading path for 16B descriptors, if that support is enabled at build time. Fixes: ae60d3c9b227 ("net/ice: support Rx AVX2 vector") Signed-off-by: Bruce Richardson Acked-by: Anatoly Burakov --- drivers/net/ice/ice_rxtx_vec_avx2.c | 80 +++++++++-------------------- 1 file changed, 24 insertions(+), 56 deletions(-) diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c index 6f6d790967..d6e88dbb29 100644 --- a/drivers/net/ice/ice_rxtx_vec_avx2.c +++ b/drivers/net/ice/ice_rxtx_vec_avx2.c @@ -254,62 +254,30 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, _mm256_loadu_si256((void *)&sw_ring[i + 4])); #endif - __m256i raw_desc0_1, raw_desc2_3, raw_desc4_5, raw_desc6_7; -#ifdef RTE_LIBRTE_ICE_16BYTE_RX_DESC - /* for AVX we need alignment otherwise loads are not atomic */ - if (avx_aligned) { - /* load in descriptors, 2 at a time, in reverse order */ - raw_desc6_7 = _mm256_load_si256((void *)(rxdp + 6)); - rte_compiler_barrier(); - raw_desc4_5 = _mm256_load_si256((void *)(rxdp + 4)); - rte_compiler_barrier(); - raw_desc2_3 = _mm256_load_si256((void *)(rxdp + 2)); - rte_compiler_barrier(); - raw_desc0_1 = _mm256_load_si256((void *)(rxdp + 0)); - } else -#endif - { - const __m128i raw_desc7 = - _mm_load_si128((void *)(rxdp + 7)); - rte_compiler_barrier(); - const __m128i raw_desc6 = - _mm_load_si128((void *)(rxdp + 6)); - rte_compiler_barrier(); - const __m128i raw_desc5 = - _mm_load_si128((void *)(rxdp + 5)); - rte_compiler_barrier(); - const __m128i raw_desc4 = - _mm_load_si128((void *)(rxdp + 4)); - rte_compiler_barrier(); - const __m128i raw_desc3 = - _mm_load_si128((void *)(rxdp + 3)); - rte_compiler_barrier(); - const __m128i raw_desc2 = - _mm_load_si128((void *)(rxdp + 2)); - rte_compiler_barrier(); - const __m128i raw_desc1 = - _mm_load_si128((void *)(rxdp + 1)); - rte_compiler_barrier(); - const __m128i raw_desc0 = - _mm_load_si128((void *)(rxdp + 0)); - - raw_desc6_7 = - _mm256_inserti128_si256 - (_mm256_castsi128_si256(raw_desc6), - raw_desc7, 1); - raw_desc4_5 = - _mm256_inserti128_si256 - (_mm256_castsi128_si256(raw_desc4), - raw_desc5, 1); - raw_desc2_3 = - _mm256_inserti128_si256 - (_mm256_castsi128_si256(raw_desc2), - raw_desc3, 1); - raw_desc0_1 = - _mm256_inserti128_si256 - (_mm256_castsi128_si256(raw_desc0), - raw_desc1, 1); - } + const __m128i raw_desc7 = _mm_load_si128((void *)(rxdp + 7)); + rte_compiler_barrier(); + const __m128i raw_desc6 = _mm_load_si128((void *)(rxdp + 6)); + rte_compiler_barrier(); + const __m128i raw_desc5 = _mm_load_si128((void *)(rxdp + 5)); + rte_compiler_barrier(); + const __m128i raw_desc4 = _mm_load_si128((void *)(rxdp + 4)); + rte_compiler_barrier(); + const __m128i raw_desc3 = _mm_load_si128((void *)(rxdp + 3)); + rte_compiler_barrier(); + const __m128i raw_desc2 = _mm_load_si128((void *)(rxdp + 2)); + rte_compiler_barrier(); + const __m128i raw_desc1 = _mm_load_si128((void *)(rxdp + 1)); + rte_compiler_barrier(); + const __m128i raw_desc0 = _mm_load_si128((void *)(rxdp + 0)); + + const __m256i raw_desc6_7 = + _mm256_inserti128_si256(_mm256_castsi128_si256(raw_desc6), raw_desc7, 1); + const __m256i raw_desc4_5 = + _mm256_inserti128_si256(_mm256_castsi128_si256(raw_desc4), raw_desc5, 1); + const __m256i raw_desc2_3 = + _mm256_inserti128_si256(_mm256_castsi128_si256(raw_desc2), raw_desc3, 1); + const __m256i raw_desc0_1 = + _mm256_inserti128_si256(_mm256_castsi128_si256(raw_desc0), raw_desc1, 1); if (split_packet) { int j; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:05.962044072 +0800 +++ 0027-net-ice-remove-incorrect-16B-descriptor-read-block.patch 2024-04-13 20:43:04.937754010 +0800 @@ -1 +1 @@ -From 9aee908eddeb6e8f3de402ac5661bca5161809a6 Mon Sep 17 00:00:00 2001 +From dbdcd8bb8532fb04458d131adc335cfbda7c70da Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9aee908eddeb6e8f3de402ac5661bca5161809a6 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org