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 28736A0C41 for ; Tue, 30 Nov 2021 17:36:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 47F01411CB; Tue, 30 Nov 2021 17:36:22 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id C0FB1410F7 for ; Tue, 30 Nov 2021 17:36:21 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 998F03F1B1 for ; Tue, 30 Nov 2021 16:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290181; bh=d3Ey0orO66v4vic2MKdP1Gf4VjZJ8rKlkjmjT4B34Kw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Unl8f2CUAZjzwsUfPd4PI3I/UDHmhMd3rcgOBIgyLlCBaWzw9EJSwXtx6Gz+b4+I4 jEoaMh18Z+/LfpS6Vwk2s6vSpK2r56h3rCGBXax8Lf2kXMrYIGsgzMm8Bo00E8sk1e 5Jr7Wq65egX3sa5XN2KuN2N5ejU/RyPbx3ul6BQXaAxRxnULsdCKRuiT9lHwkts4Xp oCe0tOK5TnivkCesfYY3C5ATCHS0z0t3uGhehQuoR2ccH9StF2V+Gmm6Hsz0jdKpfh RnNTg1nx94XNcgefpMe0XdfetCNG3tc/hTiNHIEbprEbn7T1QcV+1FBud3Isc52hhV /4ys/60acTZSw== Received: by mail-ed1-f72.google.com with SMTP id n11-20020aa7c68b000000b003e7d68e9874so17465105edq.8 for ; Tue, 30 Nov 2021 08:36:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d3Ey0orO66v4vic2MKdP1Gf4VjZJ8rKlkjmjT4B34Kw=; b=HxnA1DRsK42+6MgSZdLK0cdZdzLgjhskIzrmzVAu6KAE/GU0Ikszydg94FTqFVzIED ZjuD16ApszZABVAC7H4cJVOkHprWl14glmWTK543fzJDE84g1v06RjiM5kbRWfuzKWMv SG1HZzZfdKjHcDWFe2xVBaOe2lJ3zka88nymd5QT1cWpkgjg+HGQA+eYDNOZlqFUEZNf +CM389b/XcFCsS7AndCsLQTwFuhZ9vzAJiD5jrWAxiar4xlz9bcgQS5OlezbKSv1jDmt 3SytkIPgvxbMvhEfzxNd//KNipoIAJvcym1OkByaLWs3for5rtj6xKXblgUuoG4jGej4 p1YA== X-Gm-Message-State: AOAM532ia7AXYbvLWxaYeqi1FLv53NLEzFCwUi5Lg2fzz4Az4Fh3pzpa gdDEq8ykgNdLO37SvbdXitfYwPZXfxlNa1jciWLYbk9Ld4lq5JDIwdu7TI071hy+TTeRNprUPWE bQlR6uXEgOvzKYAojkNdqiBCH X-Received: by 2002:a05:6402:d05:: with SMTP id eb5mr83546541edb.345.1638290180964; Tue, 30 Nov 2021 08:36:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKxzlxhtiy0WOTEfghk3cxo6SgF6AVLI9VsfcktVfP+loJMya+ptY4E4fYfyQQX1oof7g20w== X-Received: by 2002:a05:6402:d05:: with SMTP id eb5mr83546521edb.345.1638290180807; Tue, 30 Nov 2021 08:36:20 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id e1sm8859798ejy.82.2021.11.30.08.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:36:20 -0800 (PST) From: christian.ehrhardt@canonical.com To: Feifei Wang Cc: Ruifeng Wang , dpdk stable Subject: patch 'drivers/net: fix typo in vector Rx comment' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:28 +0100 Message-Id: <20211130163605.2460997-4-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a5aaa4d87b9a4dbabf2978d6e56717be9d05f414 Thanks. Christian Ehrhardt --- >From a5aaa4d87b9a4dbabf2978d6e56717be9d05f414 Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Fri, 23 Jul 2021 11:10:46 +0800 Subject: [PATCH] drivers/net: fix typo in vector Rx comment [ upstream commit 635a9373fa99158c69b3fb5b19315f7b9d4cdecd ] In Rx vec path, for extracting and recording EOP bit, comment has redundant "count" word, removing it. Fixes: 7092be8437bd ("fm10k: add vector Rx") Fixes: c3def6a8724c ("net/i40e: implement vector PMD for altivec") Fixes: ae0eb310f253 ("net/i40e: implement vector PMD for ARM") Fixes: 9ed94e5bb04e ("i40e: add vector Rx") Fixes: 319c421f3890 ("net/avf: enable SSE Rx Tx") Fixes: 1162f5a0ef31 ("net/iavf: support flexible Rx descriptor in SSE path") Fixes: c68a52b8b38c ("net/ice: support vector SSE in Rx") Fixes: cf4b4708a88a ("ixgbe: improve slow-path perf with vector scattered Rx") Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang --- drivers/net/fm10k/fm10k_rxtx_vec.c | 2 +- drivers/net/i40e/i40e_rxtx_vec_altivec.c | 2 +- drivers/net/i40e/i40e_rxtx_vec_neon.c | 2 +- drivers/net/i40e/i40e_rxtx_vec_sse.c | 2 +- drivers/net/iavf/iavf_rxtx_vec_sse.c | 2 +- drivers/net/ice/ice_rxtx_vec_sse.c | 2 +- drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c index 1194251396..ab7c515e9c 100644 --- a/drivers/net/fm10k/fm10k_rxtx_vec.c +++ b/drivers/net/fm10k/fm10k_rxtx_vec.c @@ -544,7 +544,7 @@ fm10k_recv_raw_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, /* and with mask to extract bits, flipping 1-0 */ __m128i eop_bits = _mm_andnot_si128(staterr, eop_check); /* the staterr values are not in order, as the count - * count of dd bits doesn't care. However, for end of + * of dd bits doesn't care. However, for end of * packet tracking, we do care, so shuffle. This also * compresses the 32-bit values to 8-bit */ diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/i40e/i40e_rxtx_vec_altivec.c index 39f4d60ca8..e912ab02bc 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c +++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c @@ -398,7 +398,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, (vector unsigned char)vec_nor(staterr, staterr), (vector unsigned char)eop_check); /* the staterr values are not in order, as the count - * count of dd bits doesn't care. However, for end of + * of dd bits doesn't care. However, for end of * packet tracking, we do care, so shuffle. This also * compresses the 32-bit values to 8-bit */ diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c index 695c5e362e..d279cd3a9b 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c @@ -386,7 +386,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, eop_bits = vmvnq_u8(vreinterpretq_u8_u16(staterr)); eop_bits = vandq_u8(eop_bits, eop_check); /* the staterr values are not in order, as the count - * count of dd bits doesn't care. However, for end of + * of dd bits doesn't care. However, for end of * packet tracking, we do care, so shuffle. This also * compresses the 32-bit values to 8-bit */ diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c index b5c5fdb0a2..8c17f2d27f 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_sse.c +++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c @@ -557,7 +557,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* and with mask to extract bits, flipping 1-0 */ __m128i eop_bits = _mm_andnot_si128(staterr, eop_check); /* the staterr values are not in order, as the count - * count of dd bits doesn't care. However, for end of + * of dd bits doesn't care. However, for end of * packet tracking, we do care, so shuffle. This also * compresses the 32-bit values to 8-bit */ diff --git a/drivers/net/iavf/iavf_rxtx_vec_sse.c b/drivers/net/iavf/iavf_rxtx_vec_sse.c index 458730e089..8237a8180a 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_sse.c +++ b/drivers/net/iavf/iavf_rxtx_vec_sse.c @@ -437,7 +437,7 @@ _recv_raw_pkts_vec(struct iavf_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* and with mask to extract bits, flipping 1-0 */ __m128i eop_bits = _mm_andnot_si128(staterr, eop_check); /* the staterr values are not in order, as the count - * count of dd bits doesn't care. However, for end of + * of dd bits doesn't care. However, for end of * packet tracking, we do care, so shuffle. This also * compresses the 32-bit values to 8-bit */ diff --git a/drivers/net/ice/ice_rxtx_vec_sse.c b/drivers/net/ice/ice_rxtx_vec_sse.c index 4e6b0a0aa8..b6bcca6d19 100644 --- a/drivers/net/ice/ice_rxtx_vec_sse.c +++ b/drivers/net/ice/ice_rxtx_vec_sse.c @@ -439,7 +439,7 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* and with mask to extract bits, flipping 1-0 */ __m128i eop_bits = _mm_andnot_si128(staterr, eop_check); /* the staterr values are not in order, as the count - * count of dd bits doesn't care. However, for end of + * of dd bits doesn't care. However, for end of * packet tracking, we do care, so shuffle. This also * compresses the 32-bit values to 8-bit */ diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c index 4b658605bf..e9b101a486 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c @@ -540,7 +540,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* and with mask to extract bits, flipping 1-0 */ __m128i eop_bits = _mm_andnot_si128(staterr, eop_check); /* the staterr values are not in order, as the count - * count of dd bits doesn't care. However, for end of + * of dd bits doesn't care. However, for end of * packet tracking, we do care, so shuffle. This also * compresses the 32-bit values to 8-bit */ -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:06.430162413 +0100 +++ 0004-drivers-net-fix-typo-in-vector-Rx-comment.patch 2021-11-30 16:50:05.498871387 +0100 @@ -1 +1 @@ -From 635a9373fa99158c69b3fb5b19315f7b9d4cdecd Mon Sep 17 00:00:00 2001 +From a5aaa4d87b9a4dbabf2978d6e56717be9d05f414 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 635a9373fa99158c69b3fb5b19315f7b9d4cdecd ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ - drivers/net/iavf/iavf_rxtx_vec_sse.c | 4 ++-- + drivers/net/iavf/iavf_rxtx_vec_sse.c | 2 +- @@ -29 +30 @@ - 7 files changed, 8 insertions(+), 8 deletions(-) + 7 files changed, 7 insertions(+), 7 deletions(-) @@ -32 +33 @@ -index 39e3cdac1f..cae5322d48 100644 +index 1194251396..ab7c515e9c 100644 @@ -45 +46 @@ -index 1ad74646d6..edaa462ac8 100644 +index 39f4d60ca8..e912ab02bc 100644 @@ -58 +59 @@ -index 1f5539bda8..32336fdb80 100644 +index 695c5e362e..d279cd3a9b 100644 @@ -61 +62 @@ -@@ -387,7 +387,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, +@@ -386,7 +386,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, @@ -71 +72 @@ -index bfa5aff48d..03a0320353 100644 +index b5c5fdb0a2..8c17f2d27f 100644 @@ -84 +85 @@ -index bf87696fa4..b813d96ef4 100644 +index 458730e089..8237a8180a 100644 @@ -87,10 +88 @@ -@@ -590,7 +590,7 @@ _recv_raw_pkts_vec(struct iavf_rx_queue *rxq, struct rte_mbuf **rx_pkts, - /* and with mask to extract bits, flipping 1-0 */ - __m128i eop_bits = _mm_andnot_si128(staterr, eop_check); - /* the staterr values are not in order, as the count -- * count of dd bits doesn't care. However, for end of -+ * of dd bits doesn't care. However, for end of - * packet tracking, we do care, so shuffle. This also - * compresses the 32-bit values to 8-bit - */ -@@ -884,7 +884,7 @@ _recv_raw_pkts_vec_flex_rxd(struct iavf_rx_queue *rxq, +@@ -437,7 +437,7 @@ _recv_raw_pkts_vec(struct iavf_rx_queue *rxq, struct rte_mbuf **rx_pkts, @@ -106 +98 @@ -index 673e44a243..5f7e13ee39 100644 +index 4e6b0a0aa8..b6bcca6d19 100644 @@ -109 +101 @@ -@@ -545,7 +545,7 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, +@@ -439,7 +439,7 @@ _ice_recv_raw_pkts_vec(struct ice_rx_queue *rxq, struct rte_mbuf **rx_pkts, @@ -119 +111 @@ -index 7610fd93db..3a3ef51172 100644 +index 4b658605bf..e9b101a486 100644