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 3CD13A0A0E for ; Mon, 10 May 2021 18:17:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3318A4003E; Mon, 10 May 2021 18:17:33 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-eopbgr770040.outbound.protection.outlook.com [40.107.77.40]) by mails.dpdk.org (Postfix) with ESMTP id C4115406A3 for ; Mon, 10 May 2021 18:17:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EohVtjUiaAeey40JvwtE1OZ4/NvhmyAcTvRkwv74GRwXaQgENutfp5L4hEEepLTop6ESi22gB396brqXAR7Cxg0gcq9oPKoAIDpM3SMfrrRcEJVxKic96cIwrvYc1DMsAc7GERXNROkTi5r4UG4mrGWgqkfMu33E0g4UY52S0+JQw/Q6Fm8tTdxjVIS1I2HEaelvmfb7Hn4wXbWVdGF1hjOPsbJ66EO6twc4dsgKTozKy7EIEinSq6EittNz9kQhh5aM+i1FBIPTtx3RlGnElvFFeg/2AHagcySs0yLmnRAOoUV5CL6LRe6BYm/Cu5+gOSkh5uTowZ2wG7ryvZNXwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JFaQEgL54lbsuPWDKrxLN6//vLBbAMwteDQi3VdFYRw=; b=dSmbiopRipqPnCqeTAbE5wLCmd9Ho0ocv1aiPcGq7CTOy+A6WJri/Fs5dNfFtbJTliROUeRJSl6Y/rafVSQPg5Des8iYAyNoKuMGoukj4KnrnsURnWvhHaTeg30kWsPNAhcwWOKJaKfLcshLnnStR4u8aeHMOyzMxj9b6yB9Ioo7ivRTeK2lZHDsPSo/288ChEMaX1najPF3tKle7zVXLdV0zqiXjOUJArIig8YJqPwKRv6RiZ1ML5yN8DsLRDO8M4FvK34lHfvF2nz/vuB7cf/O/jRd5HWEyKgQS6ovzP22CITqqmdsfsDRpU5auo33swl8fJZY/3dQvg22Jd2kSQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JFaQEgL54lbsuPWDKrxLN6//vLBbAMwteDQi3VdFYRw=; b=uRTncWrbWf9Th0Bad5XwUt64jTKzfONZLKVKwzwjMS/5DezAAHpfYA2vbUe2vrzGmHadN7sMTS1Bks30ddV+KHYCua+uvITaQzt7NXjkEo9Ve0u7trLV0dWif8e0B7NRsFrQmdux/k8q7armp2jcUZo/GS6msPoLcGMRNyY5s4zoEIbIYgL5bgdb5INYGh1fyS9+A/ghcYF7rl2NCL5bGeebQt8WYPdxfUO96fXdDHVfy6dziuJVCiafd8tXuJMRpAVRD/zPNWCAlwnozzqBifWYJq+fj0Rbne0OKNEBNi24eG1p7oh1Nz57x95G8owePR1+n8LoXJeGPxl+jMErgQ== Received: from DM3PR12CA0065.namprd12.prod.outlook.com (2603:10b6:0:56::33) by BN8PR12MB3473.namprd12.prod.outlook.com (2603:10b6:408:65::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.29; Mon, 10 May 2021 16:17:30 +0000 Received: from DM6NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:0:56:cafe::58) by DM3PR12CA0065.outlook.office365.com (2603:10b6:0:56::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:17:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT027.mail.protection.outlook.com (10.13.172.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:17:29 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:17:27 +0000 From: Xueming Li To: Xiaoyu Min CC: Luca Boccassi , Matan Azrad , "dpdk stable" Date: Tue, 11 May 2021 00:01:34 +0800 Message-ID: <20210510160258.30982-145-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86403c4a-6bd6-4ac8-13d8-08d913cf1c0b X-MS-TrafficTypeDiagnostic: BN8PR12MB3473: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KL8cozFO+81OrS+wi8C3+tBszkuhPljyhPJatZD/DxMwSaO7hkoHn4TEJuKrW5JYgDbNt/SgLx6cFTAFJ1rmhUZ9IKJEzK8NNwaPYzjddCyPVw0VkXHZ07ztw+Rgn4JrMhX05z54UXCp6p1GKx6feht3RXGOfnaRetfyR4Beex09EjYq3jczh08Mf+bFJEjjh7fZ2i6yLQbez4Pf2IYDzHQWsxkeeqxGhDPIhm5TnutqoTe/chfW5Agk34MyRzORn4ie8W4LR8ij//uk3VS7Wu2RJheU89jdSL4/Osme4iwJ5VmRNZFB02LBCTMxJYTkJdRFFMLnScK3AnNNdWuKOr+0GtXIZeDcI9cD2DYdZHmk8QnYppdwPP3j9HjmF3aTHPs5gkTuJ9igaWL6Hqmrc1tlHrwh2zwlgkG0hUp+F2yg32YMsaSdDxiryr3iEx/HfuaI3Q6olpZTTKSFPRMIlh63yfZCN8TDv4dxdc02nCM/tfHILgQIMZxOH+LLot/GHWdIxdeKWF2Mu5/PEV3fulvkrnIEqwqMndhh71nGfgB9pk+2RbrJHiadrEQ6eVoBMmfovQcgArXbUZ0hilh+m/cqVxXyvlUdZmfeXJSV6tuyqrp1AD5x4RZuSAu4g74TvVICRpG6h57vVSq/ru5DWRNWph5vNFQUoYOOx4XS4bOYV0/M9Ja+5XGjAZxtts/3iFOOQrwY9WEhtD4xr4Y1BytPk7DVtKB/x80pjxO6Pkk= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(39860400002)(136003)(376002)(346002)(46966006)(36840700001)(7696005)(86362001)(4326008)(6636002)(8676002)(2906002)(2616005)(6862004)(82310400003)(966005)(478600001)(36756003)(37006003)(1076003)(55016002)(36860700001)(82740400003)(53546011)(7636003)(316002)(26005)(54906003)(6286002)(426003)(47076005)(70586007)(356005)(70206006)(186003)(16526019)(83380400001)(8936002)(336012)(30864003)(5660300002)(6666004)(36906005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:17:29.7073 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86403c4a-6bd6-4ac8-13d8-08d913cf1c0b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3473 Subject: [dpdk-stable] patch 'net/mlx5: fix missing shared RSS hash types' has been queued to stable release 20.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/b52bd28182d1f0de600a322dec7910c4caf44ecb Thanks. Xueming Li --- >From b52bd28182d1f0de600a322dec7910c4caf44ecb Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Fri, 26 Mar 2021 13:20:21 +0800 Subject: [PATCH] net/mlx5: fix missing shared RSS hash types Cc: Luca Boccassi [ upstream commit 212d17b6a65063f3a6d176c539158847d5aee7d5 ] Shared RSS action create all supported RSS hash combination in advance and lookup the right hash TIR when flow is actually applied by comparing hash field value. Unfortunately some hash combination is missed, for example, UDP/TCP dest port only, L3-src-only, etc. This patch add the missing hash combination. In order to reduce the usage of pre-created TIRs and because for one L3+L4 combination only one IBV hash type is possible, for example, either IBV_RX_HASH_SRC_PORT_UDP or IBV_RX_HASH_DST_PORT_UDP or both of them could be set so they can share same slot in mlx5_rss_hash_fields, means only one TIR will be created. Fixes: d2046c09aa64 ("net/mlx5: support shared action for RSS") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.h | 20 +++++ drivers/net/mlx5/mlx5_flow_dv.c | 128 ++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 76c0208a85..293c60f5b4 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -1059,6 +1059,26 @@ struct rte_flow { #define MLX5_RSS_HASH_IPV6_UDP \ (MLX5_RSS_HASH_IPV6 | \ IBV_RX_HASH_SRC_PORT_UDP | IBV_RX_HASH_DST_PORT_UDP) +#define MLX5_RSS_HASH_IPV4_SRC_ONLY IBV_RX_HASH_SRC_IPV4 +#define MLX5_RSS_HASH_IPV4_DST_ONLY IBV_RX_HASH_DST_IPV4 +#define MLX5_RSS_HASH_IPV6_SRC_ONLY IBV_RX_HASH_SRC_IPV6 +#define MLX5_RSS_HASH_IPV6_DST_ONLY IBV_RX_HASH_DST_IPV6 +#define MLX5_RSS_HASH_IPV4_UDP_SRC_ONLY \ + (MLX5_RSS_HASH_IPV4 | IBV_RX_HASH_SRC_PORT_UDP) +#define MLX5_RSS_HASH_IPV4_UDP_DST_ONLY \ + (MLX5_RSS_HASH_IPV4 | IBV_RX_HASH_DST_PORT_UDP) +#define MLX5_RSS_HASH_IPV6_UDP_SRC_ONLY \ + (MLX5_RSS_HASH_IPV6 | IBV_RX_HASH_SRC_PORT_UDP) +#define MLX5_RSS_HASH_IPV6_UDP_DST_ONLY \ + (MLX5_RSS_HASH_IPV6 | IBV_RX_HASH_DST_PORT_UDP) +#define MLX5_RSS_HASH_IPV4_TCP_SRC_ONLY \ + (MLX5_RSS_HASH_IPV4 | IBV_RX_HASH_SRC_PORT_TCP) +#define MLX5_RSS_HASH_IPV4_TCP_DST_ONLY \ + (MLX5_RSS_HASH_IPV4 | IBV_RX_HASH_DST_PORT_TCP) +#define MLX5_RSS_HASH_IPV6_TCP_SRC_ONLY \ + (MLX5_RSS_HASH_IPV6 | IBV_RX_HASH_SRC_PORT_TCP) +#define MLX5_RSS_HASH_IPV6_TCP_DST_ONLY \ + (MLX5_RSS_HASH_IPV6 | IBV_RX_HASH_DST_PORT_TCP) #define MLX5_RSS_HASH_NONE 0ULL /* array of valid combinations of RX Hash fields for RSS */ diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8e64b82e10..94550e5a73 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -10681,21 +10681,45 @@ __flow_dv_action_rss_hrxq_set(struct mlx5_shared_action_rss *action, switch (hash_fields & ~IBV_RX_HASH_INNER) { case MLX5_RSS_HASH_IPV4: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_SRC_ONLY: hrxqs[0] = hrxq_idx; return 0; case MLX5_RSS_HASH_IPV4_TCP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_TCP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_TCP_SRC_ONLY: hrxqs[1] = hrxq_idx; return 0; case MLX5_RSS_HASH_IPV4_UDP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_UDP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_UDP_SRC_ONLY: hrxqs[2] = hrxq_idx; return 0; case MLX5_RSS_HASH_IPV6: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_SRC_ONLY: hrxqs[3] = hrxq_idx; return 0; case MLX5_RSS_HASH_IPV6_TCP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_TCP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_TCP_SRC_ONLY: hrxqs[4] = hrxq_idx; return 0; case MLX5_RSS_HASH_IPV6_UDP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_UDP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_UDP_SRC_ONLY: hrxqs[5] = hrxq_idx; return 0; case MLX5_RSS_HASH_NONE: @@ -10733,22 +10757,47 @@ __flow_dv_action_rss_hrxq_lookup(struct rte_eth_dev *dev, uint32_t idx, switch (hash_fields & ~IBV_RX_HASH_INNER) { case MLX5_RSS_HASH_IPV4: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_SRC_ONLY: return hrxqs[0]; case MLX5_RSS_HASH_IPV4_TCP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_TCP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_TCP_SRC_ONLY: return hrxqs[1]; case MLX5_RSS_HASH_IPV4_UDP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_UDP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV4_UDP_SRC_ONLY: return hrxqs[2]; case MLX5_RSS_HASH_IPV6: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_SRC_ONLY: return hrxqs[3]; case MLX5_RSS_HASH_IPV6_TCP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_TCP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_TCP_SRC_ONLY: return hrxqs[4]; case MLX5_RSS_HASH_IPV6_UDP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_UDP_DST_ONLY: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_UDP_SRC_ONLY: return hrxqs[5]; case MLX5_RSS_HASH_NONE: return hrxqs[6]; default: return 0; } + } /** @@ -11413,6 +11462,84 @@ __flow_dv_action_rss_hrxqs_release(struct rte_eth_dev *dev, return __flow_dv_hrxqs_release(dev, &shared_rss->hrxq); } +/** + * Adjust L3/L4 hash value of pre-created shared RSS hrxq according to + * user input. + * + * Only one hash value is available for one L3+L4 combination: + * for example: + * MLX5_RSS_HASH_IPV4, MLX5_RSS_HASH_IPV4_SRC_ONLY, and + * MLX5_RSS_HASH_IPV4_DST_ONLY are mutually exclusive so they can share + * same slot in mlx5_rss_hash_fields. + * + * @param[in] rss + * Pointer to the shared action RSS conf. + * @param[in, out] hash_field + * hash_field variable needed to be adjusted. + * + * @return + * void + */ +static void +__flow_dv_action_rss_l34_hash_adjust(struct mlx5_shared_action_rss *rss, + uint64_t *hash_field) +{ + uint64_t rss_types = rss->origin.types; + + switch (*hash_field & ~IBV_RX_HASH_INNER) { + case MLX5_RSS_HASH_IPV4: + if (rss_types & MLX5_IPV4_LAYER_TYPES) { + *hash_field &= ~MLX5_RSS_HASH_IPV4; + if (rss_types & ETH_RSS_L3_DST_ONLY) + *hash_field |= IBV_RX_HASH_DST_IPV4; + else if (rss_types & ETH_RSS_L3_SRC_ONLY) + *hash_field |= IBV_RX_HASH_SRC_IPV4; + else + *hash_field |= MLX5_RSS_HASH_IPV4; + } + return; + case MLX5_RSS_HASH_IPV6: + if (rss_types & MLX5_IPV6_LAYER_TYPES) { + *hash_field &= ~MLX5_RSS_HASH_IPV6; + if (rss_types & ETH_RSS_L3_DST_ONLY) + *hash_field |= IBV_RX_HASH_DST_IPV6; + else if (rss_types & ETH_RSS_L3_SRC_ONLY) + *hash_field |= IBV_RX_HASH_SRC_IPV6; + else + *hash_field |= MLX5_RSS_HASH_IPV6; + } + return; + case MLX5_RSS_HASH_IPV4_UDP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_UDP: + if (rss_types & ETH_RSS_UDP) { + *hash_field &= ~MLX5_UDP_IBV_RX_HASH; + if (rss_types & ETH_RSS_L4_DST_ONLY) + *hash_field |= IBV_RX_HASH_DST_PORT_UDP; + else if (rss_types & ETH_RSS_L4_SRC_ONLY) + *hash_field |= IBV_RX_HASH_SRC_PORT_UDP; + else + *hash_field |= MLX5_UDP_IBV_RX_HASH; + } + return; + case MLX5_RSS_HASH_IPV4_TCP: + /* fall-through. */ + case MLX5_RSS_HASH_IPV6_TCP: + if (rss_types & ETH_RSS_TCP) { + *hash_field &= ~MLX5_TCP_IBV_RX_HASH; + if (rss_types & ETH_RSS_L4_DST_ONLY) + *hash_field |= IBV_RX_HASH_DST_PORT_TCP; + else if (rss_types & ETH_RSS_L4_SRC_ONLY) + *hash_field |= IBV_RX_HASH_SRC_PORT_TCP; + else + *hash_field |= MLX5_TCP_IBV_RX_HASH; + } + return; + default: + return; + } +} + /** * Setup shared RSS action. * Prepare set of hash RX queue objects sufficient to handle all valid @@ -11458,6 +11585,7 @@ __flow_dv_action_rss_setup(struct rte_eth_dev *dev, uint64_t hash_fields = mlx5_rss_hash_fields[i]; int tunnel = 0; + __flow_dv_action_rss_l34_hash_adjust(shared_rss, &hash_fields); if (shared_rss->origin.level > 1) { hash_fields |= IBV_RX_HASH_INNER; tunnel = 1; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.349032800 +0800 +++ 0146-net-mlx5-fix-missing-shared-RSS-hash-types.patch 2021-05-10 23:59:26.560000000 +0800 @@ -1 +1 @@ -From 212d17b6a65063f3a6d176c539158847d5aee7d5 Mon Sep 17 00:00:00 2001 +From b52bd28182d1f0de600a322dec7910c4caf44ecb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 212d17b6a65063f3a6d176c539158847d5aee7d5 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org @@ -32 +34 @@ -index 00b6cd97b9..ec673c29ab 100644 +index 76c0208a85..293c60f5b4 100644 @@ -35 +37 @@ -@@ -1106,6 +1106,26 @@ struct rte_flow { +@@ -1059,6 +1059,26 @@ struct rte_flow { @@ -63 +65 @@ -index 264dd69a72..533dadf07b 100644 +index 8e64b82e10..94550e5a73 100644 @@ -66 +68 @@ -@@ -11901,21 +11901,45 @@ __flow_dv_action_rss_hrxq_set(struct mlx5_shared_action_rss *action, +@@ -10681,21 +10681,45 @@ __flow_dv_action_rss_hrxq_set(struct mlx5_shared_action_rss *action, @@ -112 +114 @@ -@@ -11953,22 +11977,47 @@ __flow_dv_action_rss_hrxq_lookup(struct rte_eth_dev *dev, uint32_t idx, +@@ -10733,22 +10757,47 @@ __flow_dv_action_rss_hrxq_lookup(struct rte_eth_dev *dev, uint32_t idx, @@ -160 +162 @@ -@@ -12652,6 +12701,84 @@ __flow_dv_action_rss_hrxqs_release(struct rte_eth_dev *dev, +@@ -11413,6 +11462,84 @@ __flow_dv_action_rss_hrxqs_release(struct rte_eth_dev *dev, @@ -245 +247 @@ -@@ -12697,6 +12824,7 @@ __flow_dv_action_rss_setup(struct rte_eth_dev *dev, +@@ -11458,6 +11585,7 @@ __flow_dv_action_rss_setup(struct rte_eth_dev *dev,