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 D4BB4A0C47 for ; Mon, 26 Jul 2021 15:53:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5E0740DDA; Mon, 26 Jul 2021 15:53:37 +0200 (CEST) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id F0C4640DDA for ; Mon, 26 Jul 2021 15:53:36 +0200 (CEST) Received: by mail-wr1-f46.google.com with SMTP id l18so3523246wrv.5 for ; Mon, 26 Jul 2021 06:53:36 -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=zerukOrQe1A9DXu5Zi+88bGiSrnvz3pIYpF87q+itZw=; b=OvrOArZipvs/pynsgZJJmU50IIUOxZvInlRswWpgYWg2bazRyZ2c0iXD+tdeVbxpOL J6FrmE/quLwdOGTFzNOOLp4qpWFsUlL530/hUbiRUk2R1d2J7/ACEurJ8xgT+8U4jA5Y D1ncjr5fuOt910IZEPzTI257nRUFqBZj/NF/eko+Cz4OslIDwB3LlgFPt2TtLAZWRuvt b10N3plysuqdJ1Jc/mjbzQ690rMWrH8wJoeermrpCz/NtBdArDQpAfSSKNwYQqkeXUES VV35yorzycXMTeNZ98xFSLh1AxWZIO8zO85hOb0iF3bCMz47qxe9nPVXtCDWm54bfDQH kSXg== 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=zerukOrQe1A9DXu5Zi+88bGiSrnvz3pIYpF87q+itZw=; b=odf59SiTwkJUmi5I4DzUgKDO4k9TsjG5n5x3eAF2OtTmy9phUPM0s3kpIJsGRcvbEf 8Z2MY4o0+LxjlaCm7LpVKUHDugSvayXCJCKJCB/Dp0s7KSD6XTMeB+OxNA2XO7T+pTf0 XCE0AUQXTldmvkkG7Kk/sOsz2AyVqSdDdl5tvUGSCX2eGV2SDsAr3R/ql8NMAbiPvIag cqTHbqJuRDwy0trWsHa1DHdJ/zMz/j9Qx32TOC32S1HCOdozTnvbzCNZI8eWtbNA+4dD tl6Ot2ksGTQfYncRBZ2AhgQyPbK6tz5wd7UGj/AbMYAbnd6WqhvL6PTw7wZqMgx77B8k ZZJg== X-Gm-Message-State: AOAM531hxvb4iYB7fPHHBztquhqoup5+5R9XUBWp6i+YmEL6vQ3jen01 epMkT9noNjLLJQgnI6gP6Zo= X-Google-Smtp-Source: ABdhPJx13qCKvnSYd5cbERJkT7JX9r5N2p2hE2MlwtYlZ5TAOJRoKaaJllx0YKJxKgIlQ+NZ6hZczw== X-Received: by 2002:a5d:5142:: with SMTP id u2mr19004632wrt.314.1627307616699; Mon, 26 Jul 2021 06:53:36 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id q17sm36687945wrv.47.2021.07.26.06.53.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:53:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Martin Havlik Cc: Min Hu , Andrew Rybchenko , dpdk stable Date: Mon, 26 Jul 2021 14:52:24 +0100 Message-Id: <20210726135322.149850-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix error message on flow verify' 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/2b916ad7eb7bba9a43d356749779ac6af60ce5cc Thanks. Luca Boccassi --- >From 2b916ad7eb7bba9a43d356749779ac6af60ce5cc Mon Sep 17 00:00:00 2001 From: Martin Havlik Date: Tue, 22 Jun 2021 11:25:28 +0200 Subject: [PATCH] net/bonding: fix error message on flow verify [ upstream commit cb8dc97f9d7e48f6ac0f79587133ec6213ed1d18 ] Return value is now saved to errval and log message on error reports correct function name, doesn't use q_id which was out of context, and uses up-to-date errval. Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control") Signed-off-by: Martin Havlik Acked-by: Min Hu (Connor) Reviewed-by: Andrew Rybchenko --- drivers/net/bonding/rte_eth_bond_pmd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index ec7db3dcd3..8abb25a920 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1794,12 +1794,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, != 0) return errval; - if (bond_ethdev_8023ad_flow_verify(bonded_eth_dev, - slave_eth_dev->data->port_id) != 0) { + errval = bond_ethdev_8023ad_flow_verify(bonded_eth_dev, + slave_eth_dev->data->port_id); + if (errval != 0) { RTE_BOND_LOG(ERR, - "rte_eth_tx_queue_setup: port=%d queue_id %d, err (%d)", - slave_eth_dev->data->port_id, q_id, errval); - return -1; + "bond_ethdev_8023ad_flow_verify: port=%d, err (%d)", + slave_eth_dev->data->port_id, errval); + return errval; } if (internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id] != NULL) -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:16.034848077 +0100 +++ 0001-net-bonding-fix-error-message-on-flow-verify.patch 2021-07-26 13:53:15.765290857 +0100 @@ -1 +1 @@ -From cb8dc97f9d7e48f6ac0f79587133ec6213ed1d18 Mon Sep 17 00:00:00 2001 +From 2b916ad7eb7bba9a43d356749779ac6af60ce5cc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cb8dc97f9d7e48f6ac0f79587133ec6213ed1d18 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index b01ef003e6..4c43bf9166 100644 +index ec7db3dcd3..8abb25a920 100644 @@ -24 +25 @@ -@@ -1805,12 +1805,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, +@@ -1794,12 +1794,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,