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 9C11443CAD for ; Thu, 14 Mar 2024 01:11:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 928484021E; Thu, 14 Mar 2024 01:11:11 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id CD0864021E for ; Thu, 14 Mar 2024 01:11:09 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-33e8b957a89so254410f8f.0 for ; Wed, 13 Mar 2024 17:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375069; x=1710979869; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AIYbg5INxaVqXwRRcxXt4qbFBHAtBXqllih4xjxNGCw=; b=JTonl824f4lQHRNy4nm9noR7l4LOQBnTEI/XGFKyWpxOEgQK4Pdhxg/cwnlFZn10r0 BMLw8XSzpJYlsV2sKQuN9MRnW8qN5+nKlF5NUvPD3ZstjhS8eHfnyVwjIng2DjVT9Qj4 7Lz4Wu29KJLmnqNEQ/izaNyPgGPGuaAJ0hmOU7MBSWGFhJchOAmBYOOUTKOrIqh5Ptiq jZEl0BsXwTZYtxbQtkZszyzdb4RH3xrE7xoQFB5S/gByGAjaqmjqPLCgN4CVCjOPlqri KmiLZXk2eiqmFAxYJdK4uUB0yiNNlFQ/sEi3u7qWH0Fl5iJpdFp1QMiJr3B5q31lfAk1 uTdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375069; x=1710979869; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AIYbg5INxaVqXwRRcxXt4qbFBHAtBXqllih4xjxNGCw=; b=LMwQU1L16DsH9Si1DqAnHi3w5BsfdfQYlBNOQuOcuj4xqRt0K1OPoKXvSW2F8xDh49 FDVPjXdrzTuHijkHKEYLexqS0lAB1TOu7Bvn3cAZ6WsPHdly/KzSzvsZlIMdJixz2OiD jLExMOK/SQ45ucaGywgzfSd59nZPqbxaSo/BOjHrP8g9QOeLcWQ+nzScjNDhDHUw90gW M0YXDTsSwfifuoPxPDYhbR6m4ROSBkMqKDCNXqF5NhTH1L5dqM9+/LwcN+6Y5Xc8EsdB NbNc4XRG5beC/Yt+ITInCI0RwLr7YXL9QLRtSezNGqQYCW3b3QjNe6b4zafm71EozSP1 rmUA== X-Forwarded-Encrypted: i=1; AJvYcCUI/zMhhEbhIdID/RMNC3nndNbnHumfcdKmoBFA6rTztZnPSviS/w6Pnx9SQdnXkWzllx+Md4jwb4MHKqAsCYE= X-Gm-Message-State: AOJu0YxFeycNmq/Pv0kN2/yIy71Ix29KW9pXECZ80zXpLX3I1B2oWFbT 7vMhim1OXdnWhn+lUeCULcZSqlas1j67KMOe3vo+Z6IMwncfGsxQhmC9Mqdo X-Google-Smtp-Source: AGHT+IHyTQOIVXxX/9ZSuvhQstjVhSLhrcOR12Z9hfiT2pbdf/4hTdZrpDxy1aq6TYyf7oSEr9R3cg== X-Received: by 2002:adf:ff87:0:b0:33d:409b:5738 with SMTP id j7-20020adfff87000000b0033d409b5738mr105846wrr.26.1710375069490; Wed, 13 Mar 2024 17:11:09 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id w21-20020adf8bd5000000b0033e72e104c5sm297081wra.34.2024.03.13.17.11.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/i40e: remove incorrect 16B descriptor read block' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:19 +0000 Message-Id: <20240314000957.2810803-23-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.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 03/16/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/614a3bf8e098e347a3168d928dd6b55bafb76e9b Thanks. Luca Boccassi --- >From 614a3bf8e098e347a3168d928dd6b55bafb76e9b Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 23 Jan 2024 11:40:48 +0000 Subject: [PATCH] net/i40e: remove incorrect 16B descriptor read block [ upstream commit b527d9585d9cd0446d6bfa39d3a8e896c87883e5 ] 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: dafadd73762e ("net/i40e: add AVX2 Rx function") Signed-off-by: Bruce Richardson Acked-by: Anatoly Burakov --- drivers/net/i40e/i40e_rxtx_vec_avx2.c | 62 ++++++++++----------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c index 761edb9d20..60baff7970 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c +++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c @@ -276,46 +276,30 @@ _recv_raw_pkts_vec_avx2(struct i40e_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_I40E_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 - do { - 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 __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); - } while (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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:21.809495996 +0000 +++ 0023-net-i40e-remove-incorrect-16B-descriptor-read-block.patch 2024-03-14 00:09:20.601614983 +0000 @@ -1 +1 @@ -From b527d9585d9cd0446d6bfa39d3a8e896c87883e5 Mon Sep 17 00:00:00 2001 +From 614a3bf8e098e347a3168d928dd6b55bafb76e9b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b527d9585d9cd0446d6bfa39d3a8e896c87883e5 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index f468c1fd90..19cf0ac718 100644 +index 761edb9d20..60baff7970 100644