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 6CB41A0A0C for ; Tue, 3 Aug 2021 14:22:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66E02411A7; Tue, 3 Aug 2021 14:22:24 +0200 (CEST) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id DF364411D5 for ; Tue, 3 Aug 2021 14:22:23 +0200 (CEST) Received: by mail-wm1-f48.google.com with SMTP id x17so6117019wmc.5 for ; Tue, 03 Aug 2021 05:22:23 -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=1f2PSSdF37h+77Ezt90QUspvXWGLHwDdF4iN0Sc1+XU=; b=ib81dIKZxAF+FUHLIxueL+hxi8VjUFml8voaodXlgNytEbXXV2B1LNZkozWRim4tBs jeprXz/EdZkU4f2s0ygoIGQg89GM4T9MqExoTRDa5RCmZQ4sVBEHw1n/ac9W6OtEZd+K 7laPO9vRnjXo7DZwhq+gWD/cYgsxrHMRzGnNEcuQm71mk3OpTQSe8uv8d+Hm+XyioPK5 80Nx8hY5LvI8HG2isoYayu6mcZ02jzJGgOvIcJ9JRvRtuEAAWZ5YEgFA8g5P5RPUAPdh wFaqVKKePm5PyrqSARFCM55DJ3baGayPoYVXvu1IbmC3z3dDeLsEqgCKTz01ogucP7E9 V/VQ== 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=1f2PSSdF37h+77Ezt90QUspvXWGLHwDdF4iN0Sc1+XU=; b=dFxY8PtcTxBpB6ZOuhuYuRldGVabNuTfxp0QJ9Nv+be/lZyLwhOhEz2Stx3ogRq1LE Gi6HRQtCotOlX2dojb7OLv8OjucgJ30UXIZg3QAY7Ms50hiFm0s8+3yPpJxTv9KYS/Nl ipAwC0ZpKDz7reg/QQzGh8JdyCh0RpW1dQmYOikFVaBIsJeuE+IwE0olFlPGWcSUFvNK Xx4VSFsK5kKGPTOptlF2Khi4FxBh24x88YCfJz7qshaHQz3NkhTqHFolAglUU1spSB3c r2c5Jp7DkkS0q3DGyHgq9AdzpYUYshsWXVhVJNtDo2KVQsMgHFN3Ppsn9jT2+SBNdeko pMdg== X-Gm-Message-State: AOAM530yNVXWol/q347lQLakRP08UEvVYNo6LxBRCqGk7g3msMgBRUEx zEPaZZAAcviXuAZMTOjjSBw= X-Google-Smtp-Source: ABdhPJyHBvPJZYSB3gYLL+EQmgFuZKYvLjtmGmbqP8Gxp+TpU3p7BB1mygQUm+4/d8eeAczTpOJXKg== X-Received: by 2002:a1c:2904:: with SMTP id p4mr21589313wmp.178.1627993343696; Tue, 03 Aug 2021 05:22:23 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id j14sm14559445wru.58.2021.08.03.05.22.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 05:22:23 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyun Li Cc: Beilei Xing , dpdk stable Date: Tue, 3 Aug 2021 13:21:54 +0100 Message-Id: <20210803122214.1094992-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210803122214.1094992-1-luca.boccassi@gmail.com> References: <20210726135322.149850-59-luca.boccassi@gmail.com> <20210803122214.1094992-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix Tx threshold check' 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 08/05/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/ad67a31e0aa52d74cf6be335feff169c615dbfc0 Thanks. Luca Boccassi --- >From ad67a31e0aa52d74cf6be335feff169c615dbfc0 Mon Sep 17 00:00:00 2001 From: Xiaoyun Li Date: Thu, 22 Jul 2021 15:56:20 +0800 Subject: [PATCH] net/iavf: fix Tx threshold check [ upstream commit ed21e06e44ad7fe5dfa4b8ed713e29833a474fa9 ] Function check_tx_thresh is called with wrong parameter. If the check fails, tx_queue_setup should return error not keep going. This patch fixes above issues. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Xiaoyun Li Acked-by: Beilei Xing --- drivers/net/iavf/iavf_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index e3206e4fbb..e1108af7a9 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -647,7 +647,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev, tx_conf->tx_rs_thresh : DEFAULT_TX_RS_THRESH); tx_free_thresh = (uint16_t)((tx_conf->tx_free_thresh) ? tx_conf->tx_free_thresh : DEFAULT_TX_FREE_THRESH); - check_tx_thresh(nb_desc, tx_rs_thresh, tx_rs_thresh); + if (check_tx_thresh(nb_desc, tx_rs_thresh, tx_free_thresh) != 0) + return -EINVAL; /* Free memory if needed. */ if (dev->data->tx_queues[queue_idx]) { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-03 12:35:08.433543564 +0100 +++ 0005-net-iavf-fix-Tx-threshold-check.patch 2021-08-03 12:35:08.174817930 +0100 @@ -1 +1 @@ -From ed21e06e44ad7fe5dfa4b8ed713e29833a474fa9 Mon Sep 17 00:00:00 2001 +From ad67a31e0aa52d74cf6be335feff169c615dbfc0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ed21e06e44ad7fe5dfa4b8ed713e29833a474fa9 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d61b32fcee..e33fe4576b 100644 +index e3206e4fbb..e1108af7a9 100644 @@ -23 +24 @@ -@@ -708,7 +708,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev, +@@ -647,7 +647,8 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev,