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 5FA2DA0C47 for ; Tue, 10 Aug 2021 17:43:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 541BE4114F; Tue, 10 Aug 2021 17:43:43 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id D38264014F for ; Tue, 10 Aug 2021 17:43:41 +0200 (CEST) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.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-1.canonical.com (Postfix) with ESMTPS id BBCD13F357 for ; Tue, 10 Aug 2021 15:43:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610221; bh=3LodSEcBnkNCmeVNaw4qMflskQo4XxwpQeEVWFpdktw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=t7peVErWMBbfLI7ZndpVtxc54Xn170SkRJr+JpW0ki0/C1hsTJxSfMMMYkmcx0PJr NwrAhi1KuDOCDwjofXjOiYDXob2KHGZ1NzLnAABvZ8zbaaNJl6c6L3xm3WR0LRRJJn O8E8QHsewTldDYYporxVv9toZ5wZnNBN8eLUtiHS1T3OvMcwocadT5alkbudJcwktE l0O5s/MwY0nXnW7RmIM2naQs1d8I2j0Mi4faFSEKwfh5gMjFlmHDbgR0QZ75tEtta6 RyfusCLAwoPFJ797FT5YBRDJGk/ngsenfwn00BVJZRGe0ouve2PGifbgQOtXco4kiw 98EYsteGS7V/A== Received: by mail-ej1-f71.google.com with SMTP id v19-20020a170906b013b02905b2f1bbf8f3so1680509ejy.6 for ; Tue, 10 Aug 2021 08:43: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=3LodSEcBnkNCmeVNaw4qMflskQo4XxwpQeEVWFpdktw=; b=tK3eXzdIgxu8PnzW/aklJ5oFWR6obNJP+klOrWliyq6fQ4dcc4NYDtSh8JBB6do8XZ 31bVCa5/Xmd34yZAoQ48ruvfnx+MN+D2Pmh8Uw5kA4HDsjlumwxsEzvVazitAC0pXT5Q BapWn2nS7IPd/IaMxNHvG/LknrCIWoYVU9Px2ppROmJBb+NqKQ7UKRpixkXw8DafonDQ 1pf/BbeCJbuDVG6mZ8fjIuJ8z0bKviInL81Jvbfe29E1nJV4O5VfYjjS+KQkWOZYYGCH bwOcp92kXKVZfD5IxOsoyHAYs2+qa2b14gCzpIe9rOPxUQrjpqVammqmhwPcwy0+xZM8 DDqg== X-Gm-Message-State: AOAM532ccGDCtomGdq2138ib2xCOhHVYQBoFwuKbmpFr0lt0M7T6bJvV 6zonQb9fWWBAdy11RPm4m9rKfIrZEVZwdZOC5C304qpaTLfyTFF1667mjtm1/DlN355ZuMpwL2H /yijhGh0UzlZvDAgP3GNBWmJS X-Received: by 2002:a05:6402:5112:: with SMTP id m18mr5648077edd.47.1628610221479; Tue, 10 Aug 2021 08:43:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwP7GxqT0LYfnzK90wJyAFjDlJMCv3U/u3tHbpuB9a+oJ53dSa0vJ999vqk1/fi8Ii3YEg2kQ== X-Received: by 2002:a05:6402:5112:: with SMTP id m18mr5648061edd.47.1628610221317; Tue, 10 Aug 2021 08:43:41 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id dh8sm9664476edb.14.2021.08.10.08.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:43:40 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Martin Havlik Cc: Min Hu , Andrew Rybchenko , dpdk stable Date: Tue, 10 Aug 2021 17:39:42 +0200 Message-Id: <20210810154022.749358-62-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/bonding: fix error message on flow verify' 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/0d201efa284156695782ab65e293ebb8cc39eebf Thanks. Christian Ehrhardt --- >From 0d201efa284156695782ab65e293ebb8cc39eebf 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 56e18bad9e..2ad36f42cf 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1791,12 +1791,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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.437848489 +0200 +++ 0062-net-bonding-fix-error-message-on-flow-verify.patch 2021-08-10 15:11:13.058638389 +0200 @@ -1 +1 @@ -From cb8dc97f9d7e48f6ac0f79587133ec6213ed1d18 Mon Sep 17 00:00:00 2001 +From 0d201efa284156695782ab65e293ebb8cc39eebf 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 56e18bad9e..2ad36f42cf 100644 @@ -24 +25 @@ -@@ -1805,12 +1805,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, +@@ -1791,12 +1791,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,