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 D8A1143CAD for ; Thu, 14 Mar 2024 01:11:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD80A42E4C; Thu, 14 Mar 2024 01:11:12 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 352924021E for ; Thu, 14 Mar 2024 01:11:11 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-33e8b957a89so254418f8f.0 for ; Wed, 13 Mar 2024 17:11:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375071; x=1710979871; 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=5fnvCdhnOknjoSyyr8NsuIKraIqrfQG4ectiPgNHYAY=; b=R4Aio9dhvFvvJDeV7FL9y1BgOS35GpgcCTvjx3x3P4qwOjbbS1dAPe7Y5AHXGmqtwj 3pkAI08uTYuJrlh8f0YQHflEOd/m1bMPVS00D22gXAO6mIDhnXjNct5+Ruj6iqx23VhT CiaaQuMxyu5E+kCX65CC+tK+8VqYQfVRqcHmB5DWW8FPl/Y5YKHm35gvks7kRDTaSrp5 AxXnnd5DsiPrYIb4XF2QjAwkS1VkY3SErNQo2myzCxpDVt1WMm4fqxUNGz9FI7l5rfr9 9cC69aRN65uNaAYkSFEzcbEQBxr5lM4WSkZanq9y986Md3ktsYsztS4c8NedbL/3SSyy uedA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375071; x=1710979871; 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=5fnvCdhnOknjoSyyr8NsuIKraIqrfQG4ectiPgNHYAY=; b=Xum2o2MBXiTZzK2U+gwmBmeRtGSznK8PPedl+MSJHbaINYl2RI0mb9+ydWCjidSBWr IK9+JsNiB+AcsIdbQlYu5rFvYp9b7sRHcBll2eBvXk2JLDplzvfnXTDcnWemxUaNgmVY 3NdxA7yXv88ODSWawDwIm+c+rAeJRyz5Kwoa9D4mCKHXjHdUzaiHcJxyW0lS7kBEHjqw /8L3C6pdrkMUy0LzLSTN9qGXbo8fH5dztsacyHrzSGX8lQAtXbp1xOEJ3cYFDsDPPdVc S3lCELwACm5P0zy6uskMq7hvNoG7AcfLbXa2qImuAdmZLTKyoOzROoSzxtH0ENv6AmXY +7RA== X-Forwarded-Encrypted: i=1; AJvYcCUJyRG8FP8rS8Gt/OENif1k/fXDyrJgkuEhDpzg88RxptGn9cjVvTxkLZR4gig2w8WHUROqHLrMQiifjGVFguI= X-Gm-Message-State: AOJu0YzEg7kOfZ3vdHiZFkk0ewXmOCWyOnulPF8utYi/Vhw5py3XDk4P Tmdv6bUQ7+u6S9ZlSc8llsAwv534dQ7DzxVRL4hl3kITQj3qqqTx X-Google-Smtp-Source: AGHT+IEEwkVIljSTY3i4r+cbvJ9dfvC4QGMfLCMvf01S1XEJHpX/KC2NXLvVmV7co7Qda3W5WfRqiQ== X-Received: by 2002:a05:6000:d49:b0:33e:9ddd:e6fa with SMTP id du9-20020a0560000d4900b0033e9ddde6famr76411wrb.48.1710375070803; Wed, 13 Mar 2024 17:11:10 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id k18-20020a05600c1c9200b00413011933e6sm602430wms.39.2024.03.13.17.11.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/iavf: remove incorrect 16B descriptor read block' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:20 +0000 Message-Id: <20240314000957.2810803-24-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/0d2f5b4ca1273de6110a936d5418f766f965d6ce Thanks. Luca Boccassi --- >From 0d2f5b4ca1273de6110a936d5418f766f965d6ce Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 23 Jan 2024 11:40:50 +0000 Subject: [PATCH] net/iavf: remove incorrect 16B descriptor read block [ upstream commit d4ade5d02d188fcbe51871c5a5d66ef075ca0f86 ] 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: af0c246a3800 ("net/iavf: enable AVX2 for iavf") Signed-off-by: Bruce Richardson Acked-by: Anatoly Burakov --- drivers/net/iavf/iavf_rxtx_vec_avx2.c | 78 ++++++++------------------- 1 file changed, 23 insertions(+), 55 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx_vec_avx2.c b/drivers/net/iavf/iavf_rxtx_vec_avx2.c index b4ebac9d34..7bf22d5c0d 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_avx2.c +++ b/drivers/net/iavf/iavf_rxtx_vec_avx2.c @@ -192,62 +192,30 @@ _iavf_recv_raw_pkts_vec_avx2(struct iavf_rx_queue *rxq, _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_IAVF_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)); + 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 __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.850972499 +0000 +++ 0024-net-iavf-remove-incorrect-16B-descriptor-read-block.patch 2024-03-14 00:09:20.601614983 +0000 @@ -1 +1 @@ -From d4ade5d02d188fcbe51871c5a5d66ef075ca0f86 Mon Sep 17 00:00:00 2001 +From 0d2f5b4ca1273de6110a936d5418f766f965d6ce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d4ade5d02d188fcbe51871c5a5d66ef075ca0f86 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 510b4d8f1c..49d41af953 100644 +index b4ebac9d34..7bf22d5c0d 100644 @@ -27 +28 @@ -@@ -193,62 +193,30 @@ _iavf_recv_raw_pkts_vec_avx2(struct iavf_rx_queue *rxq, +@@ -192,62 +192,30 @@ _iavf_recv_raw_pkts_vec_avx2(struct iavf_rx_queue *rxq,