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 40FD8A0C47 for ; Tue, 10 Aug 2021 17:44:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30EE34014F; Tue, 10 Aug 2021 17:44:42 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 82F844014F for ; Tue, 10 Aug 2021 17:44:41 +0200 (CEST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (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-canonical-0.canonical.com (Postfix) with ESMTPS id 5F9913F0AA for ; Tue, 10 Aug 2021 15:44:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610281; bh=S6d56svGmemg+nMDUX7brlOlHKVYz54sP3S9IwuCN0o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=drEunraJIee64H2yspv7AfOWHGpefxGTjSz1qYk8AF30c6CJ2JEGlM/hwo+mMt76p l29xHOlzePDjggqzkVTG1+LZ/m4EsLLkiMLz4AFC207OBZk8LCKR61QvaSoGk6zN6/ x/XNh6fCpnFp/CxeYhck8kxYAuuPZcRyG5h8rI3kB8fLzn37kS38J1uwTVym/ivpN9 mredRx0qx9wdrrY/EMiT7J/uzh/kiV5sXF09OwgcvFZ8o+l+H5nQQV3SiMggYv/xyw oEN1mAe9F3LHobBtFcOUYpPpbhW62XRk+1WeoGe9+qHmcNQjE/i0EpFdj/o3wxScCq f4DAa7SbWtGnA== Received: by mail-ed1-f71.google.com with SMTP id a23-20020a50ff170000b02903b85a16b672so10962832edu.1 for ; Tue, 10 Aug 2021 08:44:41 -0700 (PDT) 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=S6d56svGmemg+nMDUX7brlOlHKVYz54sP3S9IwuCN0o=; b=g2ydlKkDJWEaCRfGw47qwNKsNvvVzUnR9a69IbE0/GZeeflqh7hDsABKhSouC5/7n5 VnjuvqERAlgJJL6UMGo7UlRP/iPEwfuInk2Bi0VoUkZeuCT04hgVZYWA53hUyqp/MvyK qCV/oXH5bPVw2M1Uq8dJXlr3bm/jCh1yzQ3m3Ks4RC3dHJgJP538YNr5tfkH+0m6S6b6 QC5S0cTpS+JcnGIR6MscxYDGH5OlyiUMtoCJNx2KL9T2JRcc18eCbl0g8iqPAQgERoHK fnPGNenodx0LrA1h7iYiqHqaSsKvGbvqBLLsdKYPf7SarFUxImTK5y4ttoN+sXp25ny6 b9eQ== X-Gm-Message-State: AOAM531R+Aw4RBPuw0SAEjeBhsAdvLpb2liNmhWrIEeZohIst10UcMo/ ArDlQqN1zpBJs1ezhuA8zItBgBXKbEJSOgI+Xf+IeNuT1C6Kf0kEjinODa1ulcwLvW2VAGwDWzV wWSg1dQBDoE95Jkqc81HzPEaI X-Received: by 2002:a05:6402:408:: with SMTP id q8mr5700660edv.13.1628610281068; Tue, 10 Aug 2021 08:44:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgawmJ1FgDSHFxQ141TPflDaUzAQJmxrg4S3jRKy3kD4xlMdWB5jkAsCoaEjl4ZzAMoqyfZg== X-Received: by 2002:a05:6402:408:: with SMTP id q8mr5700643edv.13.1628610280905; Tue, 10 Aug 2021 08:44:40 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id a2sm415889edm.72.2021.08.10.08.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:40 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , dpdk stable Date: Tue, 10 Aug 2021 17:40:01 +0200 Message-Id: <20210810154022.749358-81-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.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 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/6bac8ed1b29535c07b3413e22409f0a147543cbb Thanks. Christian Ehrhardt --- >From 6bac8ed1b29535c07b3413e22409f0a147543cbb 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 7f24edf960..bc1806c0e7 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2432,6 +2432,6 @@ 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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:16.139490189 +0200 +++ 0081-net-hns3-fix-Tx-prepare-after-stop.patch 2021-08-10 15:11:13.094638647 +0200 @@ -1 +1 @@ -From 1cc574c41a8e4a901b822aad9c85a07e98a7b661 Mon Sep 17 00:00:00 2001 +From 6bac8ed1b29535c07b3413e22409f0a147543cbb 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 7f24edf960..bc1806c0e7 100644 @@ -28 +29 @@ -@@ -4386,7 +4386,7 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev) +@@ -2432,6 +2432,6 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev) @@ -36 +36,0 @@ -