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 1150DA0032 for ; Fri, 18 Feb 2022 13:42:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0CB5040141; Fri, 18 Feb 2022 13:42:35 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 5D70741140 for ; Fri, 18 Feb 2022 13:42:34 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id k127-20020a1ca185000000b0037bc4be8713so8540258wme.3 for ; Fri, 18 Feb 2022 04:42:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5EFnPyQ6c3+XSf3AKZjzVcfhnrTaU/7tHrlu6lSomAw=; b=q6uTjMVFN18gNneDqI6Gve91IBFa54r3jmmwei2wJGrxcB3tHRhIT6W1qw6drFKY5k YcKehwlhO7/yvXNWCdOu1aQ91DarLG4Eo8RBeL6Hd/PBsb97DJNmzs62gqztiCoh+Rpg 6A66IGf7L8lko9GEbK3m/olGOOHlfeaQp+DOfZH+wCOJvMqFENWVB8DXN6ES5TOcA4sU D143mvSpKW/xqLbSQUkVWpIBBaJbguLwJfVwpsjZAsyjky6EdTYMLDExv9/70H4+o8eZ QRBARIORVhw6F2yAY5MiUwO9vS1hyJ34we8cpkl5E5WZbcv8j21hUQvAiPj6YZXbbyoM GQdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5EFnPyQ6c3+XSf3AKZjzVcfhnrTaU/7tHrlu6lSomAw=; b=tn9jUB/xcg66gapsEd52kooMfhVx/KYzrxxwj2bQFks6F1Sg8GHI1J5fKcl+J8fkXw mFkHlcLVP1nhZWfuUDzM6K0E1afqBJWQ6RpYeQ7CYqdCuux2718eC7jctKFtwbjajRxz 0qFN266H9upeZMC0tw4BRISJWu1mAnbhH3rD+avvGeQ5jWgoBoof0NtiWGywskIjPH6E YdpLHhlHZhmPmGzRK9a/E2IrzSUngVeem69XHjVwO514O+sXmWf9xkw2AVZmBQd6/TaV L7ltbsiPBrhUT4+IQT+KCB6lF6FNsPwClx72bgexQaV0DpHga2byZBw1Yya+gma1Fb1U Ib0w== X-Gm-Message-State: AOAM532D9aaZrjqynX+wNTlbB2gS2vE/cqfDNoAvGgOp8v5LSu8Du7wq 1FHDmgS3S4iteD5N+Gn37xw= X-Google-Smtp-Source: ABdhPJxwwmZgRkb7q2XRPLm9uRr8SEeIg/qnZsvEpcNZjC6GFAJH+iefjZBm4pU8tspFxO9rr9gN6Q== X-Received: by 2002:a1c:7712:0:b0:37c:9455:b3fa with SMTP id t18-20020a1c7712000000b0037c9455b3famr10698832wmi.188.1645188154126; Fri, 18 Feb 2022 04:42:34 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id n7sm4087603wmd.30.2022.02.18.04.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:42:33 -0800 (PST) From: luca.boccassi@gmail.com To: Yu Wenjun Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix RSS with early configure' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:27 +0000 Message-Id: <20220218123931.1749595-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/90ada5e388bc8873c465d445d97384a4f796f2bd Thanks. Luca Boccassi --- >From 90ada5e388bc8873c465d445d97384a4f796f2bd Mon Sep 17 00:00:00 2001 From: Yu Wenjun Date: Tue, 18 Jan 2022 17:18:52 +0800 Subject: [PATCH] net/bonding: fix RSS with early configure [ upstream commit 4986aea2b879fb242ae04880eb0ed958f40d199a ] RSS don't work when bond_ethdev_configure called before rte_eth_bond_slave_add. This is because internals->rss_key_len is 0 in bond_ethdev_configure(). If internals->rss_key_len is 0, internals->rss_key can not be set properly. e.g.: doesn't work (examples/bond/main.c): rte_eth_bond_create() rte_eth_dev_configure() rte_eth_bond_slave_add() rte_eth_dev_start() works (testpmd): rte_eth_bond_create() rte_eth_bond_slave_add() rte_eth_dev_configure() rte_eth_dev_start() Fixing by using 'default_rss_key' when 'internals->rss_key_len' is 0. Fixes: 6b1a001ec546 ("net/bonding: fix RSS key length") Signed-off-by: Yu Wenjun Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index be92a5e15a..3962d04b1a 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3511,6 +3511,11 @@ bond_ethdev_configure(struct rte_eth_dev *dev) if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) { struct rte_eth_rss_conf *rss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf; + + if (internals->rss_key_len == 0) { + internals->rss_key_len = sizeof(default_rss_key); + } + if (rss_conf->rss_key != NULL) { if (internals->rss_key_len > rss_conf->rss_key_len) { RTE_BOND_LOG(ERR, "Invalid rss key length(%u)", -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:40.242733986 +0000 +++ 0058-net-bonding-fix-RSS-with-early-configure.patch 2022-02-18 12:37:37.690791920 +0000 @@ -1 +1 @@ -From 4986aea2b879fb242ae04880eb0ed958f40d199a Mon Sep 17 00:00:00 2001 +From 90ada5e388bc8873c465d445d97384a4f796f2bd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4986aea2b879fb242ae04880eb0ed958f40d199a ] + @@ -29 +30,0 @@ -Cc: stable@dpdk.org @@ -38 +39 @@ -index 9607141b39..c72fc64806 100644 +index be92a5e15a..3962d04b1a 100644 @@ -42 +43 @@ - if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) { + if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) {