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 386B1A0524 for ; Fri, 5 Feb 2021 12:34:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 32F4740682; Fri, 5 Feb 2021 12:34:26 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id C4402188A12 for ; Fri, 5 Feb 2021 12:34:24 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id p15so7275238wrq.8 for ; Fri, 05 Feb 2021 03:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gLqpjpFijcKIkMaTh1AYPxw3ZnFEnqUseo6OvrYBjf0=; b=YdEM1/muVI00tMfaPKO+O2PAlNRldyhhzsHc2UL/2xi4tQTq37ncJe1KjmHpn15pYx 9LCEmKdwki9PzCVBHBQdVASLMys1Dnw0tRbJsvpRhsNRsM11b1ZH4AjGFssZiVKBx7WE QrDHHnRgFVBNzBjPJ37t0P5W7neu/gjPk6LHu37tSt8WHOP6Aws44U/SRZ+MDSl9hE0H T+npaQLtBU0MQ+qJH9ibKkk3sxREo3MnkCm40j8ub3z51TYz7t2Yn+QR7bHy765ERV1J ViNFiauqKMVNdT0ovvU8ahm29S/HhaSt+bjd3XalSO87JECmaMWadibaUf23ujiSJ84E kaew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gLqpjpFijcKIkMaTh1AYPxw3ZnFEnqUseo6OvrYBjf0=; b=nkPnUyISAXniA62+YKXFf/9xNY3Mi/jU8nOw8YCFXTr8BDbOGQp7jqExzFzKHvHFkx HR/WuAx3diP8E2Gyhd3jcqLqQG8nupz0vbtBjKGk0rt8r00F+cK/x1KUNIIZmezmp2I+ dqnsTiJmJPN1MeQWvrVzHoWIVVS1znOK5Q5AdeDJrWMOCeeuxUkUYLLcSA/aj50llsg8 oHPdKIYHm/eF7vkqqnfvRwwLgn4G7mUgviQ8CNuXhZePoVzT/Md+qOE2lhiewYrqzP/n k/8pdX91DAxkJlOh2cFoLedsyOOTsdG8KpIdQ8WBRwRnLwASG58qBo51QABzQ65YFKFY R0UQ== X-Gm-Message-State: AOAM530emMNAHObdo0A4HM1+/mwrpaPKZavh27OI+D2BnJ249gz5KfLm wfn2A1bnFcdPn52c4RluFLs= X-Google-Smtp-Source: ABdhPJy8c45nP+eJevlKfkQ9mFzXKzcbh2+FXx1Qy+0sjinNrrgLsk3H+C6a4RZrjZ90L7WEtn3orQ== X-Received: by 2002:adf:81e4:: with SMTP id 91mr4616379wra.161.1612524864606; Fri, 05 Feb 2021 03:34:24 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c18sm22951465wmk.0.2021.02.05.03.34.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:34:23 -0800 (PST) From: luca.boccassi@gmail.com To: Jiawei Wang Cc: Viacheslav Ovsiienko , dpdk stable Date: Fri, 5 Feb 2021 11:17:41 +0000 Message-Id: <20210205111920.1272063-175-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix unnecessary checking for RSS action' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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/07/21. 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/27250328c7b66146b45f997831dfdce2ce3f10be Thanks. Luca Boccassi --- >From 27250328c7b66146b45f997831dfdce2ce3f10be Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Thu, 14 Jan 2021 09:24:46 +0200 Subject: [PATCH] net/mlx5: fix unnecessary checking for RSS action [ upstream commit 6c2a3a90496527affc566bda518b8c33908b00d2 ] RSS action is valid only in NIC-RX domain, this fix bypass the function that getting RSS action from the flow action list under no NIC-RX domain. Fixes: e745f900072e ("net/mlx5: optimize flow RSS struct") Signed-off-by: Jiawei Wang Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index bceecdb902..ba9a90210f 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5268,7 +5268,7 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list, struct mlx5_priv *priv = dev->data->dev_private; struct rte_flow *flow = NULL; struct mlx5_flow *dev_flow; - const struct rte_flow_action_rss *rss; + const struct rte_flow_action_rss *rss = NULL; struct mlx5_translated_shared_action shared_actions[MLX5_MAX_SHARED_ACTIONS]; int shared_actions_n = MLX5_MAX_SHARED_ACTIONS; @@ -5346,7 +5346,9 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list, MLX5_ASSERT(flow->drv_type > MLX5_FLOW_TYPE_MIN && flow->drv_type < MLX5_FLOW_TYPE_MAX); memset(rss_desc, 0, offsetof(struct mlx5_flow_rss_desc, queue)); - rss = flow_get_rss_action(p_actions_rx); + /* RSS Action only works on NIC RX domain */ + if (attr->ingress && !attr->transfer) + rss = flow_get_rss_action(p_actions_rx); if (rss) { if (flow_rss_workspace_adjust(wks, rss_desc, rss->queue_num)) return 0; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:37.074307884 +0000 +++ 0175-net-mlx5-fix-unnecessary-checking-for-RSS-action.patch 2021-02-05 11:18:29.138697432 +0000 @@ -1 +1 @@ -From 6c2a3a90496527affc566bda518b8c33908b00d2 Mon Sep 17 00:00:00 2001 +From 27250328c7b66146b45f997831dfdce2ce3f10be Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6c2a3a90496527affc566bda518b8c33908b00d2 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 3c4ef6d7d2..e656ad6cd6 100644 +index bceecdb902..ba9a90210f 100644 @@ -23 +24 @@ -@@ -5416,7 +5416,7 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list, +@@ -5268,7 +5268,7 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list, @@ -32 +33 @@ -@@ -5494,7 +5494,9 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list, +@@ -5346,7 +5346,9 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list,