From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EDB25A04A3 for ; Fri, 5 Jun 2020 20:26:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E49B21D52B; Fri, 5 Jun 2020 20:26:09 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 71B7F1D52B for ; Fri, 5 Jun 2020 20:26:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381567; 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=+BDBLU+sOy0qHdduPMQ6p/xmpW8UDbO+gBE9rMOK6BQ=; b=IZqpt0+qt883U3xSRcDPIbQNR05gPq9mMCcpg06D6K/Ll1r0Y0tjbm213TKeLxr0JBq+Mp bpBOqavi3N7fBdVfvuJwEBvbSNqLG4S2v12Q/eXpDy2ApeGNBhXFGFFHfePkhsqol70omQ b05pMChqJbwafhaB4GuIlYvH/sbMLIg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-463-OixJyqejNOGmd3iKeo-qAA-1; Fri, 05 Jun 2020 14:26:05 -0400 X-MC-Unique: OixJyqejNOGmd3iKeo-qAA-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 C863A1883600; Fri, 5 Jun 2020 18:26:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9D44610F2; Fri, 5 Jun 2020 18:26:02 +0000 (UTC) From: Kevin Traynor To: Xiaoyu Min Cc: Viacheslav Ovsiienko , Matan Azrad , dpdk stable Date: Fri, 5 Jun 2020 19:24:13 +0100 Message-Id: <20200605182525.22483-16-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix RSS enablement' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/02200202f5ea01c97c851395a0431b24025dcd28 Thanks. Kevin. --- >From 02200202f5ea01c97c851395a0431b24025dcd28 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Wed, 29 Apr 2020 16:00:42 +0300 Subject: [PATCH] net/mlx5: fix RSS enablement [ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ] PMD create some default control rules with RSS action if it's not isolated mode. However whether default control rules need to do RSS or not should be controlled by device configuration, the mq_mode of rxmode configuration in specific. In another word, only when mq_mode is configured with ETH_MQ_RX_RSS_FLAG set, then RSS is needed for default rules. Fixes: c64ccc0eca2f ("mlx5: fix overwritten RSS configuration") Signed-off-by: Xiaoyu Min Signed-off-by: Viacheslav Ovsiienko Acked-by: Viacheslav Ovsiienko Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 0a0cd1be53..7a6760154a 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2346,4 +2346,6 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev, return -rte_errno; } + if (!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)) + action_rss.types = 0; for (i = 0; i != priv->reta_idx_n; ++i) queue[i] = (*priv->reta_idx)[i]; -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:51.810077100 +0100 +++ 0016-net-mlx5-fix-RSS-enablement.patch 2020-06-05 19:20:50.735042517 +0100 @@ -1 +1 @@ -From 0afac6dcca44dea15f23e93851b6e52f014a98e4 Mon Sep 17 00:00:00 2001 +From 02200202f5ea01c97c851395a0431b24025dcd28 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index e9ae2f782c..cb593c9449 100644 +index 0a0cd1be53..7a6760154a 100644 @@ -31,2 +32,2 @@ -@@ -4913,4 +4913,6 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev, - return 0; +@@ -2346,4 +2346,6 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev, + return -rte_errno;