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 BD13BA0543 for ; Sat, 5 Nov 2022 18:12:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B83C440151; Sat, 5 Nov 2022 18:12:32 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 047EB400D5 for ; Sat, 5 Nov 2022 18:12:31 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id ay14-20020a05600c1e0e00b003cf6ab34b61so7209815wmb.2 for ; Sat, 05 Nov 2022 10:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ExHwOIoibme/VHCeQXJMlpGCwhxaGEL5A5f2JJENjc0=; b=ige9aiy55Du4nCy5TpWonXKt4WrCc1piQeYyeFwzZ6sciBiTOlGmHnshE1DuPFR6D2 P+msFxwmVG+x5wLbxjCQFyVd7XvtTLDecqNbkLXCHJsiYjJvy6EitkHJCpb144O5e8dR H3XJ2EFbflDTVHs/Xir8gNgznlmo4NVgQwOOJDWOwDjuuVaKqBxCV3IvxaV7nEZ0yaVB Y1EnaafNcSPJIF0nOU746wdQ+TpmwTPdPBLE0eRLA6iE2DMB6Nt3eYfx2X5GK/HmtNPL QHYuHe6uazr8txpUDQbJC0R4g9yTtzxRrGYKdDYvonASPMKCjoNyUO7Mu8/PzLUh3oQm iHxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ExHwOIoibme/VHCeQXJMlpGCwhxaGEL5A5f2JJENjc0=; b=zh5B7oUHOKGoJGZP+GGkqmw82+sJsOHQJV+Ui99W83kjJhelK9AeEPUQAnyJlujMOn NlY861Wfb/FTgVWfMrgfBCphzL5FtMHr6pSF/V9aH8mRIBt8wmmwpAeKycb9QpR+iewg FEW+2o2VITYNn09ZLtsIXr1WuMGUS4prbknOkxVajdJSIrM3Q+fkfeVgZ/rZ5ipNryfs YIp3j1a52o4rMWxt76W6OdA4OkG2PieJdz4dSXimhFNKTAQgbdZL9QzR7gYPvJlr3Iix +LckkhOVOaO1V3YcZCi3laDTUc1BfuRf0V+GPeBSeAFeM76VZA5P5ij37eUIctASTik9 J75w== X-Gm-Message-State: ACrzQf18BUBRN8ELdhGKHL9x7GVLq3AbdiDUvgQFGuO3V+OU82y2RLD4 BB1OnVSmrfjFPskXUSCZcN9LWV/M2C0= X-Google-Smtp-Source: AMsMyM6ge8nByD9KkP6H5GKXPX6p03i+CdVy6BefZcOE/KCoM3PxyDhxEyMRKofnp+WyZ0wRVgRwaQ== X-Received: by 2002:a1c:2b07:0:b0:3cf:a1cd:648b with SMTP id r7-20020a1c2b07000000b003cfa1cd648bmr2129979wmr.70.1667668350651; Sat, 05 Nov 2022 10:12:30 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id bh2-20020a05600005c200b002366d1cc198sm2615909wrb.41.2022.11.05.10.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 10:12:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Usman Tanveer Cc: Chas Williams <3chas3@gmail.com>, dpdk stable Subject: patch 'net/bonding: fix mode 4 with dedicated queues' has been queued to stable release 20.11.7 Date: Sat, 5 Nov 2022 17:11:14 +0000 Message-Id: <20221105171146.1520039-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221105171146.1520039-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-100-luca.boccassi@gmail.com> <20221105171146.1520039-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/07/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/cc57fef023f3b14674e735a441967f3ea4211923 Thanks. Luca Boccassi --- >From cc57fef023f3b14674e735a441967f3ea4211923 Mon Sep 17 00:00:00 2001 From: Usman Tanveer Date: Thu, 29 Sep 2022 09:05:51 +0500 Subject: [PATCH] net/bonding: fix mode 4 with dedicated queues [ upstream commit f66323717edbfbb037317fc012ea0fe13e48db98 ] When dedicated queues are enable with bonding mode 4 (mlx5), the application sets the flow, which cannot be set if the device is not started. This fixed the issue by starting the device just before setting the flow. Because device should be started to set the flow. Also it does not effect other driver codes (I have tried on ixgbe). Bugzilla ID: 759 Signed-off-by: Usman Tanveer Acked-by: Chas Williams <3chas3@gmail.com> --- drivers/net/bonding/rte_eth_bond_pmd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index a73d5bd497..8efd3a8a79 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1817,15 +1817,6 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, rte_flow_destroy(slave_eth_dev->data->port_id, internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id], &flow_error); - - errval = bond_ethdev_8023ad_flow_set(bonded_eth_dev, - slave_eth_dev->data->port_id); - if (errval != 0) { - RTE_BOND_LOG(ERR, - "bond_ethdev_8023ad_flow_set: port=%d, err (%d)", - slave_eth_dev->data->port_id, errval); - return errval; - } } /* Start device */ @@ -1836,6 +1827,18 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, return -1; } + if (internals->mode == BONDING_MODE_8023AD && + internals->mode4.dedicated_queues.enabled == 1) { + errval = bond_ethdev_8023ad_flow_set(bonded_eth_dev, + slave_eth_dev->data->port_id); + if (errval != 0) { + RTE_BOND_LOG(ERR, + "bond_ethdev_8023ad_flow_set: port=%d, err (%d)", + slave_eth_dev->data->port_id, errval); + return errval; + } + } + /* If RSS is enabled for bonding, synchronize RETA */ if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) { int i; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-05 17:11:10.005319538 +0000 +++ 0015-net-bonding-fix-mode-4-with-dedicated-queues.patch 2022-11-05 17:11:08.614941354 +0000 @@ -1 +1 @@ -From f66323717edbfbb037317fc012ea0fe13e48db98 Mon Sep 17 00:00:00 2001 +From cc57fef023f3b14674e735a441967f3ea4211923 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f66323717edbfbb037317fc012ea0fe13e48db98 ] + @@ -21 +23 @@ -index 82db206eb8..aee9e60d40 100644 +index a73d5bd497..8efd3a8a79 100644 @@ -24,4 +26,4 @@ -@@ -1830,15 +1830,6 @@ slave_start(struct rte_eth_dev *bonded_eth_dev, - RTE_BOND_LOG(ERR, "bond_ethdev_8023ad_flow_destroy: port=%d, err (%d)", - slave_eth_dev->data->port_id, errval); - } +@@ -1817,15 +1817,6 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, + rte_flow_destroy(slave_eth_dev->data->port_id, + internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id], + &flow_error); @@ -40 +42 @@ -@@ -1849,6 +1840,18 @@ slave_start(struct rte_eth_dev *bonded_eth_dev, +@@ -1836,6 +1827,18 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, @@ -57 +59 @@ - if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) { + if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) {