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 0FC0DA0C47 for ; Mon, 26 Jul 2021 15:55:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0470D40DDA; Mon, 26 Jul 2021 15:55:42 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 89C6A40DDA for ; Mon, 26 Jul 2021 15:55:38 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id z7so11139714wrn.11 for ; Mon, 26 Jul 2021 06:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=auqAiBoyhnHiGQe+lWy7ObnvsplpwnmyMmT7wP/ypFs=; b=fIZtW0jEn/gmPJtRKa79Zm8rHMzDexN+MAlDKdFAr//7IAQ/s/B18SM5hdAGz5aToD VypUXqjsFMFvvJQnXWh/yc2i2Zy+ueOa9fM2QymV0bwXI59iV9bijAI0qiTgEFOTJl9q vEmsYV2JVa7/GpFyEB4/emXxrkHazobklrwk+B9GHnV1VOmsgbPAQHdwL8CeBZTTlrYx nl3wSn+X288d7Bambgyg6dhD2xPLj3oloXqA7do1coH73XpovYZJC9oqOTTYtAvDWRcK 2s/SODLtNEBDs7mzLNz2IuTzw98OLEJ4oBIVibjm4+3u6jXdiAc8UtFotwuMXjgkv0fh 7RMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=auqAiBoyhnHiGQe+lWy7ObnvsplpwnmyMmT7wP/ypFs=; b=C16SyUIrnwOg3WquHkMdAPqKPUQbBzWAmU5fa9oUM2i/CMcg16BBay3F3v1IQiB0KV zoW5Qa800CUZP/r3S3FL4sl1rcgf+UmyGq9Sb/StcEf+Ov++T2idKVLYEuKQ9yayW8AP mQZDHSew6uCZYVKJs69UYNYnVlV/cYaLeANTE+hKxSargD2wFlBhKJ1slruyc6ykQ+yp C+7Vs8nqb1bEFKwyWhObm/mLO3yV/ilygIoBSge0CF0gR8lpp7C2K5lAvY+kWhwPnhqn HSI9mVSk+A/OKyWP+YKpr53tBD8ITtsAlwNVchGSMv/PkpcK3j4mVZNSJ66itvZQOQO2 VRPQ== X-Gm-Message-State: AOAM533cKQvkIgAOv1Yv1EVpbnleBshAr/MXd8aHeRbAYuKVpV/WGo+6 v+Swra8YFEHC++ptSD44MtM= X-Google-Smtp-Source: ABdhPJzYsZkIh4BqlexBrjBX5M8Hv3pc6MGw/T81DCONFeCCa6aqBT0ibCaSXUdb3FPw+ROzJUhGeQ== X-Received: by 2002:a5d:4348:: with SMTP id u8mr16297137wrr.28.1627307738371; Mon, 26 Jul 2021 06:55:38 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id p4sm43491763wrt.23.2021.07.26.06.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:55:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Huisong Li Cc: Min Hu , dpdk stable Date: Mon, 26 Jul 2021 14:53:07 +0100 Message-Id: <20210726135322.149850-44-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix Tx prepare after stop' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 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/28/21. 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/4e210bb1419f3dd6d88037a50f48f0c8515e8492 Thanks. Luca Boccassi --- >From 4e210bb1419f3dd6d88037a50f48f0c8515e8492 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 17 Jul 2021 10:02:56 +0800 Subject: [PATCH] net/hns3: fix Tx prepare after stop [ upstream commit 1cc574c41a8e4a901b822aad9c85a07e98a7b661 ] In some special scenarios, such as TSO scenarios, the user layer may need to call the tx_pkt_prepare(), and then call tx_pkt_burst() to send packets. If the return value of tx_pkt_parepare() isn't equal to the numbers of packets requested to send, warning message may be printed at the user layer. Currently, tx_pkt_prepare() is assigned to dummy function when dev_stop() is called in hns3 PMD. At this moment, if user layer continues to send packets, the warning message will always be printed. So this patch modifies the address to NULL. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 2a92b1cf49..ad9ead47cc 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -3918,7 +3918,7 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev) } else { eth_dev->rx_pkt_burst = hns3_dummy_rxtx_burst; eth_dev->tx_pkt_burst = hns3_dummy_rxtx_burst; - eth_dev->tx_pkt_prepare = hns3_dummy_rxtx_burst; + eth_dev->tx_pkt_prepare = NULL; } } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:18.294919232 +0100 +++ 0044-net-hns3-fix-Tx-prepare-after-stop.patch 2021-07-26 13:53:15.933294388 +0100 @@ -1 +1 @@ -From 1cc574c41a8e4a901b822aad9c85a07e98a7b661 Mon Sep 17 00:00:00 2001 +From 4e210bb1419f3dd6d88037a50f48f0c8515e8492 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1cc574c41a8e4a901b822aad9c85a07e98a7b661 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index a86e105fbc..d3fbe082e6 100644 +index 2a92b1cf49..ad9ead47cc 100644 @@ -28 +29 @@ -@@ -4386,7 +4386,7 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev) +@@ -3918,7 +3918,7 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)