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 C9BDB42EDA for ; Fri, 21 Jul 2023 15:35:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90F0040E2D; Fri, 21 Jul 2023 15:35:25 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 29EB140DDC for ; Fri, 21 Jul 2023 15:35:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689946523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2TeJ1oKQGENaJQD+4o29ORZ0cUt3p6OjtTuh7iBf8ms=; b=JPLCO6VP5+YSISWiUtlqtEdpHu5d2F6XS39A3qc5udbBmOQMCfqGtGdZMVn7BecxIJYQDU +f1ugn//vK48tuuhnKPF8oQ1/B2PILefZuOcqOibm2/WT8C4T3qSRmss/2Y4UL60kQue/t RjGStd2+Qhxs+Vmr5P9YQsBU4cae2bs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-607-9OxOaScDPZKEadovI3XFsQ-1; Fri, 21 Jul 2023 09:35:22 -0400 X-MC-Unique: 9OxOaScDPZKEadovI3XFsQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE3F6185A78B; Fri, 21 Jul 2023 13:35:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC9C4140E949; Fri, 21 Jul 2023 13:35:20 +0000 (UTC) From: Kevin Traynor To: Jieqiang Wang Cc: Ruifeng Wang , dpdk stable Subject: patch 'net/i40e: fix comments' has been queued to stable release 21.11.5 Date: Fri, 21 Jul 2023 14:34:57 +0100 Message-ID: <20230721133509.348959-2-ktraynor@redhat.com> In-Reply-To: <20230721133509.348959-1-ktraynor@redhat.com> References: <20230721133509.348959-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.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 07/25/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/54b7e8bf5fc017d54841c8ac088056c022bc3f04 Thanks. Kevin --- >From 54b7e8bf5fc017d54841c8ac088056c022bc3f04 Mon Sep 17 00:00:00 2001 From: Jieqiang Wang Date: Wed, 12 Jul 2023 18:07:32 +0800 Subject: [PATCH] net/i40e: fix comments [ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ] The limitation of burst size in i40e vector rx has been removed, but the comment lines have not been updated to reflect the code changes. Remove those lines to avoid confusion. Additionally, fix a typo in i40e_tx_queue. Fixes: 9e27f00f3a61 ("net/i40e: fix vector Rx") Signed-off-by: Jieqiang Wang Reviewed-by: Ruifeng Wang --- .mailmap | 1 + drivers/net/i40e/i40e_rxtx.h | 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 -- 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 12f6084945..2b254e64ef 100644 --- a/.mailmap +++ b/.mailmap @@ -611,4 +611,5 @@ Jie Pan Jie Wang Jie Zhou +Jieqiang Wang Jijiang Liu Jilei Chen diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h index 0376c219be..a8686224e5 100644 --- a/drivers/net/i40e/i40e_rxtx.h +++ b/drivers/net/i40e/i40e_rxtx.h @@ -170,5 +170,5 @@ struct i40e_tx_queue { bool tx_deferred_start; /**< don't start this queue in dev start */ uint8_t dcb_tc; /**< Traffic class of tx queue */ - uint64_t offloads; /**< Tx offload flags of RTE_ETH_RX_OFFLOAD_* */ + uint64_t offloads; /**< Tx offload flags of RTE_ETH_TX_OFFLOAD_* */ const struct rte_memzone *mz; }; diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/i40e/i40e_rxtx_vec_altivec.c index 00a015013e..3d2cbe03fb 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c +++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c @@ -449,6 +449,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, /* Notice: * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet - * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST - * numbers of DD bits */ uint16_t diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c index 507468531f..f274af2c6a 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c @@ -437,6 +437,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, * Notice: * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet - * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST - * numbers of DD bits */ uint16_t diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c index 3782e8052f..63806a723d 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_sse.c +++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c @@ -596,6 +596,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, * Notice: * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet - * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST - * numbers of DD bits */ uint16_t -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-21 14:33:59.069163728 +0100 +++ 0002-net-i40e-fix-comments.patch 2023-07-21 14:33:58.994253178 +0100 @@ -1 +1 @@ -From 5267a2ae78e873d3a7e175944dcedffdadab6483 Mon Sep 17 00:00:00 2001 +From 54b7e8bf5fc017d54841c8ac088056c022bc3f04 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 6eccf0c555..670d312f84 100644 +index 12f6084945..2b254e64ef 100644 @@ -28 +29 @@ -@@ -629,4 +629,5 @@ Jie Pan +@@ -611,4 +611,5 @@ Jie Pan @@ -46 +47 @@ -index 8672ad1c41..4cd78f4e58 100644 +index 00a015013e..3d2cbe03fb 100644 @@ -49 +50 @@ -@@ -450,6 +450,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, +@@ -449,6 +449,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, @@ -57 +58 @@ -index 49391fe4c7..d873e30972 100644 +index 507468531f..f274af2c6a 100644 @@ -60 +61 @@ -@@ -575,6 +575,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, +@@ -437,6 +437,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, @@ -68 +69 @@ -index baf83cb3df..b94c37cbb8 100644 +index 3782e8052f..63806a723d 100644 @@ -71 +72 @@ -@@ -597,6 +597,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts, +@@ -596,6 +596,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,