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 BD911A09E5; Wed, 19 Oct 2022 18:26:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8277F42BFD; Wed, 19 Oct 2022 18:26:05 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2089.outbound.protection.outlook.com [40.107.244.89]) by mails.dpdk.org (Postfix) with ESMTP id 7BF7042C08 for ; Wed, 19 Oct 2022 18:26:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D0rWiDdZNj/57hwRl+eU3FmRlljV3tYQPnP0/R3x2suHBhF5zsuB168WtrU9tUKXZKkoGk+lI+86Lc61C4zEUR9N446siTDEfZlRAs027QyadMR/V1vmiuh8XEfrPC7Qdqg9WrtvQoEdYY3dbMTNwt5CdmuGVqLDXwdiMB3WITHG1ugemV1mfziWwd6BsFB9YOPAE4uJ5dTdq4yt1qanHXX0HjxyCLt3SFAt0+We4TcghepwHC0RQqwL8gyYzeRn/pXSRPvp3bvArGzdNvStxRCtNvXWOHGwEwRa0sW2KEAzvTjqvIwC0MEzeUIjMkUFavFLBSfDnIqnM8GZ802meg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+SLBflMGXMoJq8TmsGk4kNAosJAQ9Ff0/dMGEMC6/f0=; b=k1jy80C2SDN6dz025avolbloGV1ss1snd84Z26FJ0xuV7d/XTpsRkA7bJhS9v007SfjGLU0fKPmy9QiIC3HD/lqr1baxX8QXOdrPfrd1mEH+cTymnMuGubi5C/ry+3xkE0gidWfljaIgNABPMkpjWJGVTI6r+RC63NbT/tXMPTFNQY1aVKZCoQQiPd4wjQcn+kK65fDqlFWNzBClMFNHi54D4dej6tCUoMkeZtdyy7j5zd4P2BmIvde0iCLAzSOkyKAnrCsTnzzhxRttqYf3aXQ+Yz911ApVtDsR1Wf+ocC1pW0JdgZV1cSSp7ZfemGu97LdG4Dgi+x3kPg5GhjjhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=fail (p=reject sp=reject pct=100) action=oreject 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=+SLBflMGXMoJq8TmsGk4kNAosJAQ9Ff0/dMGEMC6/f0=; b=K3wglB55YtzQQwY2Hbj9gb3bs8lFofndAmwLd0p+EVMa0ASMupc+6wgTD7EoBqmDgm1F8iqBnIxM0/ZTeN2L4cTU0wrPxbcVwhHnKJB+4EdV2Xkilv0YZ+XSCrzLGSuRpxhXiBFzCNVnEqpPYy/G5J1stOZaiT7GnoLyBghXWX+I4dbRNgO81wo2/GQYQUkyyYBufQemp4asl/PPV8BDkEdFOCTTp9vJYCcgzNXz1G8XY7X09U4lxs6ardlcFh3pHVpGLOJvvOwBwcpl/kD+IE9yPCMjmNiWRSV6xloCkVV2oNYQvQdh902R+cJ3GzIkUlXXXRQXPOPXqBHoWUaolQ== Received: from BN9PR03CA0664.namprd03.prod.outlook.com (2603:10b6:408:10e::9) by DM4PR12MB6301.namprd12.prod.outlook.com (2603:10b6:8:a5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.33; Wed, 19 Oct 2022 16:26:01 +0000 Received: from BN8NAM11FT108.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10e:cafe::7b) by BN9PR03CA0664.outlook.office365.com (2603:10b6:408:10e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.34 via Frontend Transport; Wed, 19 Oct 2022 16:26:01 +0000 X-MS-Exchange-Authentication-Results: spf=none (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=nvidia.com; Received-SPF: None (protection.outlook.com: nvidia.com does not designate permitted sender hosts) Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT108.mail.protection.outlook.com (10.13.176.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16 via Frontend Transport; Wed, 19 Oct 2022 16:26:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.26; Wed, 19 Oct 2022 09:25:47 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.29; Wed, 19 Oct 2022 09:25:45 -0700 From: Suanming Mou To: Matan Azrad , Viacheslav Ovsiienko CC: , , Subject: [PATCH v4 02/18] net/mlx5: fix IPv6 and TCP RSS hash fields Date: Wed, 19 Oct 2022 19:25:12 +0300 Message-ID: <20221019162528.11045-3-suanmingm@nvidia.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20221019162528.11045-1-suanmingm@nvidia.com> References: <20220923144334.27736-1-suanmingm@nvidia.com> <20221019162528.11045-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT108:EE_|DM4PR12MB6301:EE_ X-MS-Office365-Filtering-Correlation-Id: 079a6aa5-4230-472f-167e-08dab1ee9cc7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BCg3JVBxml54PMrjAipGB+VRrhQT6HSRogYfmj62NES+5OR99lJC8Sq0tCzowvJpUJX0o8QQYT3O/XG4+v4C93zoY8LwlQol3KcJsGLVOEWQrxYIrZopumz+jO1TPfCb/l3edu+UpifSt5QaQdAviRIzUC/xlJiqy+WRjVR78XxoYatA+g8A/wisGTTbrTQ3/G4m5Cc3FaH8LJoQBfJoKzwlJ9m1wlenqAx45W50kaevAEspcJGqu9TBXJXTgfavK7nENnKVCtcF40XFzqGGwdQ1ZJ538wuMpGhB32y7PidUHwvu3YjXlrucFW0hMn8E5MCRqANZkz/sy0AIoB9IN+RlVNtI1u4jc0k0TNQz104W6WZjanognZoSiAPTQJNn+KeVdAJKMMhdSOclWDmz0y4kDpvqupWCwyyaFqdKwopj4SYM1JGECAwurolKg9JIYNbeskjkxpMxXwqfaoO9bH2ycCs1HHuEVZ5VZl7bi5EHXaNh2xTMWCJVTMmW7055nXMH41LhrSxSOpQyASlOHkXoZvguVWPTuqBchSeLb2wDAApFFSeNjacFdGTTvRreAJbIxwwY1VsFt+sNg/HpTTCg5v3aRZBF5P7gnSLQq8C2jb4q0zO3e6kvLoothCoTXs9jD+eaZcUCMeoey7ZTKMuNVQ3o0OmQh19rXtWL8JCq/hJBCdw4ohvfrInMnywl47RbOyST/CfiQla13HXWSqNIFmRDxwbe0zFaRdYCH2ehv7ui2TvmZwNbpPqK5nVk/3cuzTtcLZ10haDGWLXEqQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(39860400002)(396003)(136003)(451199015)(46966006)(36840700001)(40470700004)(6666004)(107886003)(41300700001)(8936002)(110136005)(478600001)(4326008)(54906003)(8676002)(36860700001)(36756003)(7696005)(7636003)(316002)(356005)(40460700003)(55016003)(186003)(82740400003)(86362001)(426003)(2616005)(40480700001)(1076003)(16526019)(336012)(6286002)(70206006)(26005)(83380400001)(6636002)(47076005)(82310400005)(2906002)(70586007)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2022 16:26:01.4785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 079a6aa5-4230-472f-167e-08dab1ee9cc7 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT108.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6301 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org In the flow_dv_hashfields_set() function, while item_flags was 0, the code went directly to the first if and the else case would never have chance be checked. This caused the IPv6 and TCP hash fileds in the else case would never be set. This commit adds the dedicate HW steering hash field set function to generate the RSS hash fields. Fixes: 6540da0b93b5 ("net/mlx5: fix RSS scaling issue") Signed-off-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_dv.c | 12 +++---- drivers/net/mlx5/mlx5_flow_hw.c | 59 ++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 0cf757898d..29d7bf7049 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -11274,8 +11274,7 @@ flow_dv_hashfields_set(uint64_t item_flags, rss_inner = 1; #endif if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L3_IPV4)) || - (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L3_IPV4)) || - !items) { + (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L3_IPV4))) { if (rss_types & MLX5_IPV4_LAYER_TYPES) { if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY) fields |= IBV_RX_HASH_SRC_IPV4; @@ -11285,8 +11284,7 @@ flow_dv_hashfields_set(uint64_t item_flags, fields |= MLX5_IPV4_IBV_RX_HASH; } } else if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L3_IPV6)) || - (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L3_IPV6)) || - !items) { + (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L3_IPV6))) { if (rss_types & MLX5_IPV6_LAYER_TYPES) { if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY) fields |= IBV_RX_HASH_SRC_IPV6; @@ -11309,8 +11307,7 @@ flow_dv_hashfields_set(uint64_t item_flags, return; } if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L4_UDP)) || - (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L4_UDP)) || - !items) { + (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L4_UDP))) { if (rss_types & RTE_ETH_RSS_UDP) { if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY) fields |= IBV_RX_HASH_SRC_PORT_UDP; @@ -11320,8 +11317,7 @@ flow_dv_hashfields_set(uint64_t item_flags, fields |= MLX5_UDP_IBV_RX_HASH; } } else if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L4_TCP)) || - (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L4_TCP)) || - !items) { + (!rss_inner && (items & MLX5_FLOW_LAYER_OUTER_L4_TCP))) { if (rss_types & RTE_ETH_RSS_TCP) { if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY) fields |= IBV_RX_HASH_SRC_PORT_TCP; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index fecf28c1ca..d46e4c6769 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -62,6 +62,63 @@ flow_hw_rxq_flag_set(struct rte_eth_dev *dev, bool enable) priv->mark_enabled = enable; } +/** + * Set the hash fields according to the @p rss_desc information. + * + * @param[in] rss_desc + * Pointer to the mlx5_flow_rss_desc. + * @param[out] hash_fields + * Pointer to the RSS hash fields. + */ +static void +flow_hw_hashfields_set(struct mlx5_flow_rss_desc *rss_desc, + uint64_t *hash_fields) +{ + uint64_t fields = 0; + int rss_inner = 0; + uint64_t rss_types = rte_eth_rss_hf_refine(rss_desc->types); + +#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT + if (rss_desc->level >= 2) + rss_inner = 1; +#endif + if (rss_types & MLX5_IPV4_LAYER_TYPES) { + if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY) + fields |= IBV_RX_HASH_SRC_IPV4; + else if (rss_types & RTE_ETH_RSS_L3_DST_ONLY) + fields |= IBV_RX_HASH_DST_IPV4; + else + fields |= MLX5_IPV4_IBV_RX_HASH; + } else if (rss_types & MLX5_IPV6_LAYER_TYPES) { + if (rss_types & RTE_ETH_RSS_L3_SRC_ONLY) + fields |= IBV_RX_HASH_SRC_IPV6; + else if (rss_types & RTE_ETH_RSS_L3_DST_ONLY) + fields |= IBV_RX_HASH_DST_IPV6; + else + fields |= MLX5_IPV6_IBV_RX_HASH; + } + if (rss_types & RTE_ETH_RSS_UDP) { + if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY) + fields |= IBV_RX_HASH_SRC_PORT_UDP; + else if (rss_types & RTE_ETH_RSS_L4_DST_ONLY) + fields |= IBV_RX_HASH_DST_PORT_UDP; + else + fields |= MLX5_UDP_IBV_RX_HASH; + } else if (rss_types & RTE_ETH_RSS_TCP) { + if (rss_types & RTE_ETH_RSS_L4_SRC_ONLY) + fields |= IBV_RX_HASH_SRC_PORT_TCP; + else if (rss_types & RTE_ETH_RSS_L4_DST_ONLY) + fields |= IBV_RX_HASH_DST_PORT_TCP; + else + fields |= MLX5_TCP_IBV_RX_HASH; + } + if (rss_types & RTE_ETH_RSS_ESP) + fields |= IBV_RX_HASH_IPSEC_SPI; + if (rss_inner) + fields |= IBV_RX_HASH_INNER; + *hash_fields = fields; +} + /** * Generate the pattern item flags. * Will be used for shared RSS action. @@ -225,7 +282,7 @@ flow_hw_tir_action_register(struct rte_eth_dev *dev, MLX5_RSS_HASH_KEY_LEN); rss_desc.key_len = MLX5_RSS_HASH_KEY_LEN; rss_desc.types = !rss->types ? RTE_ETH_RSS_IP : rss->types; - flow_dv_hashfields_set(0, &rss_desc, &rss_desc.hash_fields); + flow_hw_hashfields_set(&rss_desc, &rss_desc.hash_fields); flow_dv_action_rss_l34_hash_adjust(rss->types, &rss_desc.hash_fields); if (rss->level > 1) { -- 2.25.1