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 379FA428F8 for ; Sun, 9 Apr 2023 17:32:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3130640EDE; Sun, 9 Apr 2023 17:32:44 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2077.outbound.protection.outlook.com [40.107.220.77]) by mails.dpdk.org (Postfix) with ESMTP id 400F640141 for ; Sun, 9 Apr 2023 17:32:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOkXRsGJTcc2ogbSogShoqY9urQL48dfSmNtL+2SY5fiHwLAQ0dX5hx0naoyM0wKvTZ0jchFztH/sKZgspw8qtmhJsppFpMVluJVqX9v0WXfnFIjoFOpIgRtQoHaLvltalMwwJRvTg8wFVVPln670mqFYAkGvtw+mFvh5Nmm9w9NToCKKS/ZU16FnR/3AkuS1gFHf0VyNLn3D1fQNG4fGORTV9dZ5w3SUe97g1M06jKW60jXZSuNLFidMbFg2Eeg6BFgKeKXmmLylfetR8qY0nFPazfnVnKVWJSdz2X9k5bxihmBUsFyQa/qzDH1vC/kvahS0itcjyGbPCY8OmOeKg== 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=8AZT+8WoG3V1oT2iDw7FBGluBc+x/CgH64bfu+BSM2k=; b=HOZZnpd05/4j/ZFcmIVjWmtpfz+/hh8VH5fWgKy/1sPVOo8hnz2VARTHRcvEQ4ijyTtWkGFdBhIBsPWK4OAsfaiCBI33C8IzIa0nIDsmIYsg1FLBLBP4PC3zOik/iyUrSHIUDqrNcCWwEYxt0bswjSOaeeCm2AzknkdFEcXER0TNWcOgfLAqicjHTQQrm6Jjsm4SBqzOvrO6m2aeReLM+amlXsGMQJH41weC5mf83W017mbC5ylDfDYpgwbV7xM/06rmLtgU8FcaC1MrBboML35fWCofiD1hqnqSXmMUQ3iITamZYNJpof0eOQsr6NSa2be2dAD3rpWB9eBIhq/wtQ== 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=8AZT+8WoG3V1oT2iDw7FBGluBc+x/CgH64bfu+BSM2k=; b=Q+Wy3gjSkxRFXoiMScSU1CBagcBEaNu/rFZMKdemsBCYgSBwSNERC5NVPuHv34tBlNgzkw4JpPf62G0jemVSrSEKCClWwZjpOcUXfjJltChUYw+/7k5SuWwengeQR6OSrFqjXZYa6cQwGKO+nzoxaDTOiba4x7pEV45WyfLZAazErLBhcMg/KDUc9gM12I1+2nTSTDD79StyPn6tpw1N3ttrCDXpOt30o40yo2XjTO0+rdiLjNX2IZLz52em8e+Eg4xDffYzug6BzSTMHhWC8L//22cOFNrlVXq/tCBANqSiyO1DghqtJ66dbDpXv6MGxz1fuIUSRlbhV/aPtFdE7w== Received: from MW4PR04CA0279.namprd04.prod.outlook.com (2603:10b6:303:89::14) by IA1PR12MB7688.namprd12.prod.outlook.com (2603:10b6:208:420::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.34; Sun, 9 Apr 2023 15:32:39 +0000 Received: from CO1NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:303:89:cafe::3e) by MW4PR04CA0279.outlook.office365.com (2603:10b6:303:89::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35 via Frontend Transport; Sun, 9 Apr 2023 15:32:39 +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 CO1NAM11FT048.mail.protection.outlook.com (10.13.175.148) 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:32:38 +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:32:34 -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:32:32 -0700 From: Xueming Li To: Huisong Li CC: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: separate setting RSS types' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:28 +0800 Message-ID: <20230409152529.5308-81-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: CO1NAM11FT048:EE_|IA1PR12MB7688:EE_ X-MS-Office365-Filtering-Correlation-Id: 0c3f0939-2867-42aa-f61f-08db390fa687 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2GN1fjjNibIOpYl3zvGns/H+GYT9IZ+WbXuf/UBJAaTWjVEqWloo3Dttl0YafvwoojQ7sn1T3D1gw8furAn5mtkwSIXZmV8BbXf7B94PdRvPWMMy2SVKwiQRHf6IFCUKTmxJJH5HRQNIqpC+NCHA+GxArbegzi53Gx5sqxiGlvD08MDxVHk5VysUXLVfRe97kFupM04gddhqk5PLSxus1enTwy+TXNpaghDWuiMzDpCym+hIOh813Ia+HM+GHfkvF/2VD9pjk5AwkLkSjWqjc0Hiy2LyfFJ2XIE2gNafFWcpuQByVPVLbD2qDgQPBu7W5aJpM8UDN+rk28cxxvm15sufjmW7BvQJ4cmsg7uFAd1PZtuSWb2IUTHFpLrYqydohTckwEZzi5g47XBZUXU5Y3JgMqYGf29LBX7/nNvCcyCfq+FWSS1M9i+9xLtPOGDwKZ7Tz/les12kw8T5td1P8oaUVmPzSwXnZ173AHRHth+1d6hN/Fuk+HDFNrIAZpPKM3fxVwBXZ/kFHrWf/uoiHi077Pv+yPFUzE0SBKZCd7mnES9acKBdQRllhgVZj4yjTxHaWXMPfL910PXOWBikbvWo0RL5EeAN85zUDrQsWpH3rqqEoyjuN4cT2UUm6RkAgWSMRmLK+sH7+i1j/i6CSJ/O7w047iV9IKMfEJVzb62vB9CAevknDq+yUQsf14aXNXUorXKIylGlItfdW4pj5NOxjtejyBiCcajgziPxmmIYpKRTIFlV7eppGitg1AR2fqNL4H74Cg1Bfig/P0ixt6SJb7G22Xv0EFvvzkBavkW/660R6OngmKNDEsxO5Hy3T68eX4ryr700Zay5AWC4jQ== 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)(136003)(396003)(39860400002)(346002)(376002)(451199021)(36840700001)(40470700004)(46966006)(40460700003)(70206006)(8676002)(6916009)(966005)(4326008)(54906003)(478600001)(7696005)(70586007)(41300700001)(316002)(86362001)(36756003)(83380400001)(47076005)(2616005)(426003)(336012)(1076003)(26005)(6666004)(53546011)(8936002)(2906002)(5660300002)(82310400005)(55016003)(40480700001)(82740400003)(356005)(7636003)(186003)(6286002)(16526019)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:32:38.3340 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c3f0939-2867-42aa-f61f-08db390fa687 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: CO1NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7688 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/679028a2ee4dc7c491d0129986d5e2bafc0277ca Thanks. Xueming Li --- >From 679028a2ee4dc7c491d0129986d5e2bafc0277ca Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 10 Mar 2023 17:35:11 +0800 Subject: [PATCH] net/hns3: separate setting RSS types Cc: Xueming Li [ upstream commit 791e56935e488b8154a83daaf3952e1901ed7552 ] The settings of RSS types comes from the ethdev ops (like, dev_configure and rss_hash_update) and rte_flow API. For the ethdev ops, driver has to save it so as to it can be restored when reset is triggered. While rte_flow API no need to maintain this field, it can be restored by the saved rule. Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_flow.c | 3 ++- drivers/net/hns3/hns3_rss.c | 22 ++++++++++++++-------- drivers/net/hns3/hns3_rss.h | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index 875c0eec11..9e51891bd9 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -1433,6 +1433,7 @@ hns3_disable_rss(struct hns3_hw *hw) ret = hns3_set_rss_tuple_by_rss_hf(hw, 0); if (ret) return ret; + hw->rss_info.rss_hf = 0; return 0; } @@ -1580,7 +1581,7 @@ hns3_config_rss_filter(struct hns3_hw *hw, /* Filter the unsupported flow types */ flow_types = conf->conf.types ? rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT : - hw->rss_info.conf.types; + hw->rss_info.rss_hf; if (flow_types != rss_flow_conf.types) hns3_warn(hw, "modified RSS types based on hardware support," " requested:0x%" PRIx64 " configured:0x%" PRIx64, diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 751033d98f..f51d70a8e5 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -628,9 +628,6 @@ hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf) return ret; } - /* Update supported flow types when set tuple success */ - hw->rss_info.conf.types = rss_hf; - return 0; } @@ -648,7 +645,7 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf) { struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private); - uint64_t rss_hf_bk = hw->rss_info.conf.types; + uint64_t rss_hf_bk = hw->rss_info.rss_hf; uint8_t key_len = rss_conf->rss_key_len; uint64_t rss_hf = rss_conf->rss_hf; uint8_t *key = rss_conf->rss_key; @@ -673,6 +670,7 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev, /* Update the shadow RSS key with user specified */ memcpy(hw->rss_info.key, key, hw->rss_key_size); } + hw->rss_info.rss_hf = rss_hf; rte_spinlock_unlock(&hw->lock); return 0; @@ -1030,6 +1028,7 @@ hns3_rss_set_default_args(struct hns3_hw *hw) /* Default hash algorithm */ rss_cfg->hash_algo = HNS3_RSS_HASH_ALGO_TOEPLITZ; + hw->rss_info.rss_hf = 0; memcpy(rss_cfg->key, hns3_hash_key, RTE_MIN(sizeof(hns3_hash_key), hw->rss_key_size)); @@ -1067,15 +1066,22 @@ hns3_config_rss(struct hns3_adapter *hns) return ret; /* - * When muli-queue RSS mode flag is not set or unsupported tuples are + * When multi-queue RSS mode flag is not set or unsupported tuples are * set, disable all tuples. */ - rss_hf = hw->rss_info.conf.types; + rss_hf = hw->rss_info.rss_hf; if (!((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) || !(rss_hf & HNS3_ETH_RSS_SUPPORT)) rss_hf = 0; - return hns3_set_rss_tuple_by_rss_hf(hw, rss_hf); + ret = hns3_set_rss_tuple_by_rss_hf(hw, rss_hf); + if (ret != 0) { + hns3_err(hw, "set RSS tuples failed, ret = %d.", ret); + return ret; + } + hw->rss_info.rss_hf = rss_hf; + + return 0; } /* @@ -1093,5 +1099,5 @@ hns3_rss_uninit(struct hns3_adapter *hns) return; /* Disable RSS */ - hw->rss_info.conf.types = 0; + hw->rss_info.rss_hf = 0; } diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index 6e679b709b..21b90789d0 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -41,6 +41,7 @@ struct hns3_rss_conf { /* RSS parameters :algorithm, flow_types, key, queue */ struct rte_flow_action_rss conf; + uint64_t rss_hf; uint8_t hash_algo; /* hash function type defined by hardware */ uint8_t rte_flow_hash_algo; uint8_t key[HNS3_RSS_KEY_SIZE_MAX]; /* Hash key */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.826818000 +0800 +++ 0080-net-hns3-separate-setting-RSS-types.patch 2023-04-09 21:45:38.699042200 +0800 @@ -1 +1 @@ -From 791e56935e488b8154a83daaf3952e1901ed7552 Mon Sep 17 00:00:00 2001 +From 679028a2ee4dc7c491d0129986d5e2bafc0277ca Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 791e56935e488b8154a83daaf3952e1901ed7552 ] @@ -12,2 +14,0 @@ -Cc: stable@dpdk.org - @@ -23 +24 @@ -index d5db09a263..21e00e515e 100644 +index 875c0eec11..9e51891bd9 100644