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 38394A0C41 for ; Tue, 30 Nov 2021 17:42:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 329C7410F7; Tue, 30 Nov 2021 17:42:00 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 359294118F for ; Tue, 30 Nov 2021 17:41:59 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (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-internal-1.canonical.com (Postfix) with ESMTPS id F010D3F044 for ; Tue, 30 Nov 2021 16:41:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290518; bh=fI5yNyl07NYUmTXcRIYsWZPNcS/5CWJIF3L8tS97O8c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V8nmuW8n1FxCEp4XWhJLVaC+NMHHkJK8sBFEKBJtBUaLw2T707KwvzLmioTCooUW0 kPpvZRPVzPQdaT34oi9ZBJ69cVzkBAGQ/SnmImX3iHoHbjcE2pvXP+RTDqDzKST0Cf Vtfg+iPNeaShuxWLbmFwtXz4mdB8toLE/f38DYDTjTWKte8qFZuLpQW7KvK2vTeAhM djpYz29CoRDgugCsxjQ3L3Bh3tWXOCKzOdY3uFoYqljUYMtRkxLqzl/yER3DiT+Wc0 L5Ln22IX1/7ju51TV+0GOXfVT5G7LYdTSGnMG/joRaL1f8qPIPkeGDtj4Fu+ReVJJm p3DamipqLH8lw== Received: by mail-ed1-f70.google.com with SMTP id i19-20020a05640242d300b003e7d13ebeedso17453027edc.7 for ; Tue, 30 Nov 2021 08:41:58 -0800 (PST) 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=fI5yNyl07NYUmTXcRIYsWZPNcS/5CWJIF3L8tS97O8c=; b=GktD+AKpGnn8u3fJzT1dVct6jcR91ignyi3eh7aGcnSRspL0LqRabzTdXz9sgzyeW1 BeT1bYZYs48lu+4ulFeWhaSjBnZOdESFMnwewiwb8VKihy+FkY1r9UbF2i0EHQhPix+W P6SMoMeDNnF2rjXJrfxCZNIpqZ+c2aLQlWmbghAlskHKBNxTuutfAY4JELl6RixY0XpG CGLfhlOOPt/oC03sXGjnbtA2vmGv1kPqtANN9qy9Tp0DFjckZF+hxkVOLyMKxYlDBxzL B21qV2fsIkUJ3SHyu/YUOlwCNydsmjj0Un+5uykV8vH0OyZlK6uW8SOAjJvFrLN9Rc2X 86dQ== X-Gm-Message-State: AOAM533yQZz7dG/kFR8s59hQIZWILJO8g8M1ofUq8K7+UHZ58qkFQUly WleP0snh7fjwWuQ778dT8MV5pMow6RulCpTHNu9vdBF9sTh4xVL7aKGDJcCVPjYcHpbhzO3K0Yk jmZCT06CepA6aH5ekX3BP8GP3 X-Received: by 2002:a17:906:3545:: with SMTP id s5mr204592eja.239.1638290517827; Tue, 30 Nov 2021 08:41:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVIh5dnK2lEysdVqDJffGnFpSGbRQiVdPokSzsIkTQBZijQ0wg087JJJMG4gh79YERD0pWWA== X-Received: by 2002:a17:906:3545:: with SMTP id s5mr204570eja.239.1638290517679; Tue, 30 Nov 2021 08:41:57 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id ds17sm9708918ejc.45.2021.11.30.08.41.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:41:57 -0800 (PST) From: christian.ehrhardt@canonical.com To: Maxime Coquelin Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix RSS RETA update' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:17 +0100 Message-Id: <20211130163605.2460997-113-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/2fb2e78780789ca313ee313a4e036e71477c331e Thanks. Christian Ehrhardt --- >From 2fb2e78780789ca313ee313a4e036e71477c331e Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Wed, 27 Oct 2021 16:22:12 +0200 Subject: [PATCH] net/mlx5: fix RSS RETA update [ upstream commit 5aeb7fab59fef7b9cb01ec58ef32d1068923b6d3 ] This patch fixes RETA updating for entries above 64. Without that, these entries are never updated as calculated mask value will always be 0. Fixes: 634efbc2c8c0 ("mlx5: support RETA query and update") Signed-off-by: Maxime Coquelin Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c index 170005a7af..a0daafe81d 100644 --- a/drivers/net/mlx5/mlx5_rss.c +++ b/drivers/net/mlx5/mlx5_rss.c @@ -216,7 +216,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, for (idx = 0, i = 0; (i != reta_size); ++i) { idx = i / RTE_RETA_GROUP_SIZE; pos = i % RTE_RETA_GROUP_SIZE; - if (((reta_conf[idx].mask >> i) & 0x1) == 0) + if (((reta_conf[idx].mask >> pos) & 0x1) == 0) continue; assert(reta_conf[idx].reta[pos] < priv->rxqs_n); (*priv->reta_idx)[i] = reta_conf[idx].reta[pos]; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:12.359929813 +0100 +++ 0113-net-mlx5-fix-RSS-RETA-update.patch 2021-11-30 16:50:05.926874528 +0100 @@ -1 +1 @@ -From 5aeb7fab59fef7b9cb01ec58ef32d1068923b6d3 Mon Sep 17 00:00:00 2001 +From 2fb2e78780789ca313ee313a4e036e71477c331e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5aeb7fab59fef7b9cb01ec58ef32d1068923b6d3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index a4f690039e..a04e22398d 100644 +index 170005a7af..a0daafe81d 100644 @@ -23 +24 @@ -@@ -211,7 +211,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, +@@ -216,7 +216,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev, @@ -25,2 +26,2 @@ - idx = i / RTE_ETH_RETA_GROUP_SIZE; - pos = i % RTE_ETH_RETA_GROUP_SIZE; + idx = i / RTE_RETA_GROUP_SIZE; + pos = i % RTE_RETA_GROUP_SIZE; @@ -30 +31 @@ - MLX5_ASSERT(reta_conf[idx].reta[pos] < priv->rxqs_n); + assert(reta_conf[idx].reta[pos] < priv->rxqs_n);