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 25A4D43CAD for ; Thu, 14 Mar 2024 01:11:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B8BF40297; Thu, 14 Mar 2024 01:11:15 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 6003340297 for ; Thu, 14 Mar 2024 01:11:12 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-33e672e10cfso194585f8f.0 for ; Wed, 13 Mar 2024 17:11:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375072; x=1710979872; 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=HeWCOIJcA0A+YTp3dlh0v6Crpy1wjJkLCftgdMTB5Ws=; b=IwM7kTFDURCFqe+9SfEjaFIOwltvOPjmdH5Df+I8p6Us1mP5JJnWCT9qKuFArLzttH asPOmSEMjrUFsgukP9UNADhr6xuS4czz/hE1VB4BA4ooAg6t2s40UAdeqMTbH6bkMfE+ 9/dY2Ov/kKrpj5Tcu8By0xwdw2mR/ZW8EPKTkTc8NqcBk3cI5oPhWxkvPbS5/zBopKJs rd25WmaIhS0e2BjqqzeK6QfuZ9DKh0qSHB5pdOj3HVAq7WWE8tcmdfUNEoKqJjEro1qg 1kniOigqC9DUry8s0xacs0eWKAwLpwuGsx6XgPkoI/uzW4hg2yjG/0l9EERC5iFrx4Oc WeNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375072; x=1710979872; 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=HeWCOIJcA0A+YTp3dlh0v6Crpy1wjJkLCftgdMTB5Ws=; b=nIIxksAOJqvhrR2JswNLSvzvMz2OI5VKINxk+39b2+lypwz/E1LXHsY33uE3hYYI5m ps6sd2wS4vjXa3WddyG7/XxfsZLBoMWuLRqD3D5Wdcd178slO8vqPJF0LzZ74LLJJLd8 SMbbX+PobBbduYWVgRARTmWUyPSEWT6HBsLh9BCd42GXeV5YOdVf2we66/JBJ9J1tftf V+H5IDw5410WrLPi5H+yrxZ8FxGkXjVS5ApDdCHYlOgIJHF7lpzKccp6ww0AlffVpkkY A4fwl3AxGzWdKdQkmqY/07j5l9a0oQe81667kikze4NOskwIjIRyRKA5ANCGD3TDrrnN MMNw== X-Forwarded-Encrypted: i=1; AJvYcCUDa4evjk2ffu+2ToTUQ1jakIl3rsclQ/eu5kQPRFLKxb/y/8E8klb/61IPw29qyqN9H079ObO5NkBj6DZgDMQ= X-Gm-Message-State: AOJu0Yw4JuCmIH0TLaphe7R7d5xL77zstc7twAd1MfEu4CgtCBn4Sc7w 8SMJCffafl5grBmQ0PanXqxy6PURR/aPn/G3bYMXMh1Iyrc3JFYH4ivNvdP0 X-Google-Smtp-Source: AGHT+IFSFGZu3Q95ovSelkK6GM8LbqQ9g8hUYKa4qt+yijskmxc2MwmtqzKNPRW1MeAepWeNBJr3+A== X-Received: by 2002:adf:ab19:0:b0:33e:7b77:b319 with SMTP id q25-20020adfab19000000b0033e7b77b319mr60110wrc.60.1710375072045; Wed, 13 Mar 2024 17:11:12 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id d30-20020adfa35e000000b0033e033898c5sm296338wrb.20.2024.03.13.17.11.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:11:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/ice: remove incorrect 16B descriptor read block' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:21 +0000 Message-Id: <20240314000957.2810803-25-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/4e873a75e2688cefdfba60f5a644de0f9c871b40 Thanks. Luca Boccassi --- >From 4e873a75e2688cefdfba60f5a644de0f9c871b40 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 [ 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 | 78 +++++++++-------------------- 1 file changed, 23 insertions(+), 55 deletions(-) diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c b/drivers/net/ice/ice_rxtx_vec_avx2.c index 31d6af42fd..5d591f9834 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)); + 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.892694431 +0000 +++ 0025-net-ice-remove-incorrect-16B-descriptor-read-block.patch 2024-03-14 00:09:20.605615062 +0000 @@ -1 +1 @@ -From 9aee908eddeb6e8f3de402ac5661bca5161809a6 Mon Sep 17 00:00:00 2001 +From 4e873a75e2688cefdfba60f5a644de0f9c871b40 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9aee908eddeb6e8f3de402ac5661bca5161809a6 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 6f6d790967..d6e88dbb29 100644 +index 31d6af42fd..5d591f9834 100644