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 B8075428F8 for ; Sun, 9 Apr 2023 17:31:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B27B042D0E; Sun, 9 Apr 2023 17:31:58 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2089.outbound.protection.outlook.com [40.107.220.89]) by mails.dpdk.org (Postfix) with ESMTP id 7F6D642C24 for ; Sun, 9 Apr 2023 17:31:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M11vWLGF/j5W1lizi4bppw/qqkYxfmVnzMSqYEPwPjW2xZO0NFjsNpqrll8Ks6zS2OntnuFRQM23YV3L/MWZgZl/cTa63zQQvutuITEGKu+9rsRc0omyM00bJJgr+NKsMd4Dlnr0Z+cpCm1IMycfLm137WTZd4dOLLiGbkF5dwY4zYrApLl6D8QTottspRuQ6+n9NO8Rs63RpiY9M+cezpfTj2nUQxhPM7LvQVvjOeWmqDxoCJt88RPrEEcbZIRhs9Z1CEPQ63qmBOC8uvoKbRgNz0jQ+USLH9WcosJvwKUnzy45njfIvoUgffwbiGFtEA5cJedKURjo2GKIpyt24Q== 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=5pbPbaNWOFCK8iFgljs98Q7U3YLb27xYcnYsliL0BGc=; b=Ohwl/HkMGOLt/j/B2V5HZ0SPhCxd67HNQaxlSfZTkZ5eRzcOhmnJ6S3bIc7IPjDbMs1Ho6FqMFMXNx0LhI9RbBit5vSwjBV45svY5fLUQM9SSj6Fq3zw8moD1B+LDvDraRTkWJbEnMP77CyNlTbM+u3oLf+WYgf06TEiTkgvduWSXRrQ2aeIBxx+Qhr+FGNCdEQVApiFTsTIJlngH65IArc023q3p1xMynrSFXgDWw1+D3q3ewzswMImlkkPcuHbSqJZXCKEnscWAq/hLsjsveoWJ/8zZ+l+Q+UhhzgeQAMKHHep9O16kzjKpJQAI6BcuevTHSkidNyDGnuk/m98Iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=5pbPbaNWOFCK8iFgljs98Q7U3YLb27xYcnYsliL0BGc=; b=YXLRGwY3zOjhnzKWAdp1xlWd1qbyixcJkk1X/pfhQGupJeN3NAU1y/aTpGuq54Pc2mA8JOPQaWARLe5GR0JeO2XV66TFd5FOJ8NxPhX91k/lTNzhPVA4dBKAwiQAoiR3eFLp8ilw6d8MOjCachvmaQPcA2nhfQU2jTiUGtR16x9LKbtCaftA5hizF4/HRi8AwzwsAo+X9c1ZchlfK7YeQmuGXBMW4Rmdny/4Q0yTiSR8wiY77rWvu5jkVs01nYXJqcZhBsvz/PwT+4Nr1J/WxuolOzn+G26gXKHw1h7gbfYYxzCMLRRt8zg3sN92dUY25A/Kw03i2SCGjTTEyyeG1Q== Received: from BN9PR03CA0986.namprd03.prod.outlook.com (2603:10b6:408:109::31) by DM4PR12MB8557.namprd12.prod.outlook.com (2603:10b6:8:18b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:31:55 +0000 Received: from BN8NAM11FT076.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::d7) by BN9PR03CA0986.outlook.office365.com (2603:10b6:408:109::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:31:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT076.mail.protection.outlook.com (10.13.176.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:31:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:31:48 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 9 Apr 2023 08:31:47 -0700 From: Xueming Li To: Huisong Li CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: use hardware config to report hash key' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:22 +0800 Message-ID: <20230409152529.5308-75-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT076:EE_|DM4PR12MB8557:EE_ X-MS-Office365-Filtering-Correlation-Id: 151b0215-9161-4e11-9780-08db390f8ce9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yL23K5yuVXxgvauOv1TpL8Wkv5cC90xbR5RHh/5LX8wQ9sht4wrG4r2TqSaegJsb4ChjjkDbo08cTA3FHvT9PunFiaxiOoD1qpnSpkqM+g8e3TI4TTInIddHqrePawTBzeQMEdGZ05yo/8JYGZzZ9SGXgzZZB6r9c+9ZAEubZjG3a8mmD0qrOBFPvL9geJoL3bSUEbMqfqxLgAz+984OL1iW+aKEBEthHF9PAkpZHwYr5cDEGYD9TZpLSJgUrB7BEuBUbM7W25GQjCDZQfuxNxg1e7KlADjZPe0mvO7H/2gll3oU0uvmHCeIaZN8hRM0prLBmjeinGmVGZfFSQBctmH3VKlCaKdanKm92Gwugmk8UuEMLkoKO0o6tlk/6fkS/4Jxmk84TXVkwThZ6ovbcHx9TXgXmoM+3j1rjQsvAqw0Kop6hA9wOLE6I/E8cs+JyrJkAtgBpVsHy1zMnxkebRROLMmKKZriLal/YvTFDra7XrfMB1LL/RrilFChswB0wzw1erz8jv5dHEdSeeF8HuEddK25ByqXDK7Qa7w8P3rj3l5q775scxvG5Oomo6E39DSsQwwPzPj0QB5hELswbzwe9xkBx4iWINzfpVWKXxCKF0EwTquKZdoqztIiXu5M5P7tcGVm0kd5DV5+RPgQwoHyWjlxawLzxQEjU0z6cKCyBl/+9MQcU507Smwgu4Cbqa/EXYbIzqYIhnC2lUBQ5nNCJbaSgfM09HETvder9KYfOWQr80pH/X1qoqlW5Kp65J2gkD77MDvumCY4bHdmaFENs8cBDXFOxTxGPPP3NB4wxWKeIn/KHkp1uZeZw4jK+HC/wHdHM1dPHG5suZTOiA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(136003)(39860400002)(376002)(346002)(451199021)(36840700001)(40470700004)(46966006)(53546011)(70586007)(70206006)(86362001)(26005)(1076003)(316002)(6916009)(4326008)(6286002)(186003)(40460700003)(16526019)(36756003)(6666004)(966005)(7696005)(54906003)(82310400005)(40480700001)(55016003)(478600001)(36860700001)(8676002)(8936002)(2616005)(5660300002)(356005)(41300700001)(7636003)(47076005)(2906002)(83380400001)(336012)(426003)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:31:55.2437 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 151b0215-9161-4e11-9780-08db390f8ce9 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT076.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8557 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 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/68da0b3986cc3f7be8cdad3b43effedd605d1fb4 Thanks. Xueming Li --- >From 68da0b3986cc3f7be8cdad3b43effedd605d1fb4 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 10 Mar 2023 17:35:05 +0800 Subject: [PATCH] net/hns3: use hardware config to report hash key Cc: Xueming Li [ upstream commit 7da415d27d8872a45a2d0cf9b5e66a8027c8f53c ] Currently, hns3_dev_rss_hash_conf_get() interface reports RSS key from the key maintained by driver. It's better to report the key from hardware, which is more realistic. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rss.c | 53 ++++++++++++++++++++++++++++++++++++- drivers/net/hns3/hns3_rss.h | 3 ++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index ed397587b5..a8ea5150ab 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -321,6 +321,48 @@ hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo, return 0; } +int +hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t *hash_algo, + uint8_t *key, uint8_t key_len) +{ + struct hns3_rss_generic_config_cmd *req; + struct hns3_cmd_desc desc; + uint16_t cur_key_size; + uint16_t max_bd_num; + uint8_t *cur_key; + uint16_t idx; + int ret; + + req = (struct hns3_rss_generic_config_cmd *)desc.data; + max_bd_num = DIV_ROUND_UP(key_len, HNS3_RSS_HASH_KEY_NUM); + for (idx = 0; idx < max_bd_num; idx++) { + hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_GENERIC_CONFIG, + true); + + req->hash_config |= (idx << HNS3_RSS_HASH_KEY_OFFSET_B); + ret = hns3_cmd_send(hw, &desc, 1); + if (ret) { + hns3_err(hw, "fail to obtain RSS algo and key from firmware, ret = %d", + ret); + return ret; + } + + if (idx == 0) + *hash_algo = req->hash_config & HNS3_RSS_HASH_ALGO_MASK; + + if (idx == max_bd_num - 1 && + (key_len % HNS3_RSS_HASH_KEY_NUM) != 0) + cur_key_size = key_len % HNS3_RSS_HASH_KEY_NUM; + else + cur_key_size = HNS3_RSS_HASH_KEY_NUM; + + cur_key = key + idx * HNS3_RSS_HASH_KEY_NUM; + memcpy(cur_key, req->hash_key, cur_key_size); + } + + return 0; +} + /* * rss_indirection_table command function, opcode:0x0D07. * Used to configure the indirection table of rss. @@ -550,13 +592,22 @@ hns3_dev_rss_hash_conf_get(struct rte_eth_dev *dev, struct hns3_adapter *hns = dev->data->dev_private; struct hns3_hw *hw = &hns->hw; struct hns3_rss_conf *rss_cfg = &hw->rss_info; + uint8_t hash_algo; + int ret; rte_spinlock_lock(&hw->lock); rss_conf->rss_hf = rss_cfg->conf.types; /* Get the RSS Key required by the user */ if (rss_conf->rss_key && rss_conf->rss_key_len >= hw->rss_key_size) { - memcpy(rss_conf->rss_key, rss_cfg->key, hw->rss_key_size); + ret = hns3_rss_get_algo_key(hw, &hash_algo, rss_conf->rss_key, + hw->rss_key_size); + if (ret != 0) { + rte_spinlock_unlock(&hw->lock); + hns3_err(hw, "obtain hash algo and key failed, ret = %d", + ret); + return ret; + } rss_conf->rss_key_len = hw->rss_key_size; } rte_spinlock_unlock(&hw->lock); diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index d6f81996f4..be0141f602 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -112,6 +112,7 @@ void hns3_rss_uninit(struct hns3_adapter *hns); int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf); int hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo, const uint8_t *key, uint8_t key_len); - +int hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t *hash_algo, + uint8_t *key, uint8_t key_len); #endif /* HNS3_RSS_H */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.678319800 +0800 +++ 0074-net-hns3-use-hardware-config-to-report-hash-key.patch 2023-04-09 21:45:38.689042200 +0800 @@ -1 +1 @@ -From 7da415d27d8872a45a2d0cf9b5e66a8027c8f53c Mon Sep 17 00:00:00 2001 +From 68da0b3986cc3f7be8cdad3b43effedd605d1fb4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7da415d27d8872a45a2d0cf9b5e66a8027c8f53c ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org