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 8AE1EA0350 for ; Mon, 21 Feb 2022 16:39:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85A414013F; Mon, 21 Feb 2022 16:39:56 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 74FD0410F2 for ; Mon, 21 Feb 2022 16:39:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=el6CPiFLQuk8ulEeXkrB0bx6Gb/5EtuLdO+cR5Jk+z0=; b=NR6+c3PAv2dz7FElay2xf52sr/VCJ73Ul7CX9jzGDDPq6pNcoryEyhi8Vmu0PtS4N0y4l+ E0F+pdmD9lGhbIU9j8p8134Ui9zttDqfLWM9Fc0yIhhofeDS2nrEMpiG4P9kc3EScotb7O 9bT9aXa6FlzIfLjmaaYPXRqW2MB5nQM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-493-aLT6McOXMEeu1SaL10vcuA-1; Mon, 21 Feb 2022 10:39:51 -0500 X-MC-Unique: aLT6McOXMEeu1SaL10vcuA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3823915745; Mon, 21 Feb 2022 15:39:49 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AD487E131; Mon, 21 Feb 2022 15:39:46 +0000 (UTC) From: Kevin Traynor To: Yu Wenjun Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix RSS with early configure' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:53 +0000 Message-Id: <20220221153625.152324-104-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/26/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/961922eb71e253dfb1ed0a2fb8e2ad012df49672 Thanks. Kevin --- >From 961922eb71e253dfb1ed0a2fb8e2ad012df49672 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 9607141b39..c72fc64806 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3512,4 +3512,9 @@ bond_ethdev_configure(struct rte_eth_dev *dev) 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) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.868743570 +0000 +++ 0104-net-bonding-fix-RSS-with-early-configure.patch 2022-02-21 15:22:44.210704394 +0000 @@ -1 +1 @@ -From 4986aea2b879fb242ae04880eb0ed958f40d199a Mon Sep 17 00:00:00 2001 +From 961922eb71e253dfb1ed0a2fb8e2ad012df49672 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4986aea2b879fb242ae04880eb0ed958f40d199a ] + @@ -29 +30,0 @@ -Cc: stable@dpdk.org