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 2556BA00C2; Sun, 30 Oct 2022 17:12:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CDDCF40693; Sun, 30 Oct 2022 17:12:24 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2061.outbound.protection.outlook.com [40.107.223.61]) by mails.dpdk.org (Postfix) with ESMTP id 38A5B40151 for ; Sun, 30 Oct 2022 17:12:23 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HBOaPSCqu5OTNqOyeGKAv9kf87M3h+iiS6dgR/a9eLriCgOC13TFfOqwISpMfZMiYdJ0vRGZh8j0yxxo4Bhw2kZkSq+zGWoAITOtBhpmfD6248TzXImWgZiCFJWStO8EyHFlgF1kj5sNnU70IbnnQg56Ykkdi0WrdlUtU2vdbiOMMfEM3QrSWSQwQFI/W5r9JgWlACy/FpiwhIfX5RlHifSDMUw840BxRSXhqgQOmysce47CvX+2uhwJ1yIQjTTa8Iheq7oYTpc6YSEhwq4aLApSlTmvt65AIRAt0keu8FOIhyxNV9XZLNzORz/FKyDYntfY2NtjZX346E8LN04H2w== 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=3f8byhd2YNL85MK6H0FwDys3nfEG9bemN7uX17gHvzY=; b=eXznfXAVI/8RbyZBJp391Z5xyNJEME/tnWizEdX+oWdogjnpRT7OeeHYYCUhgOrtPHmszKG9wLIknelaLamSOdkydt4P5NqSKga/gD9KWsdKeJIRm7xgXgquVBl5HiEQ5KZ9ylEFAjkT8S5XVTZrNEDlAe9fH8GPXqhleD4IOR0rlKb1+HIP3ybzEdBS3BbKkvpSJmSmsTyCuRQteFDCtUW7O02DhF/sDICWrIOWW/MR+Zjq/iSu7aVDHs4DlwqChaB1iGI4nEKCyzI+WtF/3zN0uKNhVhkF4GMG5vfj13n2xtzCDTJG/M9VaPGdZ75h+Z9UEba/eSjk7pOInegNuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=monjalon.net 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=3f8byhd2YNL85MK6H0FwDys3nfEG9bemN7uX17gHvzY=; b=RMgAm60pqhnOU49J/1dRthYu4+mh1irQuX10epa6kwiYt0eKbOZSXKMCMfBCTvAgeiTsJbL4A9u+UKkOlb5Sdtd/rXXbB+k6eC7j4LHTtAwIID8oFi8s7j8Py7uuOhGgSGFqEkiVuhekgdl7Y53hU8pwvXpQpmzBnXypwYlveQNbkNc50dPeGuicg7zhGMF8HK8FmSV41qL6vWaP+61nxGWrhRoJF+HGCrQA3tX3Rh3l2XVmvuJG5owA9aEh+1YnSL2dcz7JwvV3joFsxsICxVUesYZXrf0lXNbDQQQ83Po+51esj5baOfxR26EeVnpYpcYGlCt1Jmcuj0urOAe79w== Received: from BN9PR03CA0305.namprd03.prod.outlook.com (2603:10b6:408:112::10) by BL1PR12MB5032.namprd12.prod.outlook.com (2603:10b6:208:30a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.19; Sun, 30 Oct 2022 16:12:21 +0000 Received: from BN8NAM11FT084.eop-nam11.prod.protection.outlook.com (2603:10b6:408:112:cafe::f1) by BN9PR03CA0305.outlook.office365.com (2603:10b6:408:112::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.16 via Frontend Transport; Sun, 30 Oct 2022 16:12:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT084.mail.protection.outlook.com (10.13.176.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.14 via Frontend Transport; Sun, 30 Oct 2022 16:12:20 +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; Sun, 30 Oct 2022 09:12:18 -0700 Received: from nvidia.com (10.126.231.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; Sun, 30 Oct 2022 09:12:15 -0700 From: Alex Vesker To: , , , , Matan Azrad CC: , Subject: [PATCH] net/mlx5/hws: remove deprecated rte_atomic Date: Sun, 30 Oct 2022 18:11:59 +0200 Message-ID: <20221030161200.32662-1-valex@nvidia.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT084:EE_|BL1PR12MB5032:EE_ X-MS-Office365-Filtering-Correlation-Id: fbf05a0a-74e3-4633-4292-08daba91861e X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yFL4Po16UFEAcAns3fqAhcYk2tjCA2jHJzc5TzTq/RGj5KCxufbFDI61++kZT6HCix5CUC21w9GFY+xHebkNAZ8N28V3s9xAYjeg40NNhedPt0H4/Rw4p/CS+VgloXPF2Y0h3M8fomZJiOgBEegaQ0Uhh98g1OtsltW8HrzakaXowamHZY4ItWwDMgiP8jXTq/ijK4h5lrlCBXyvVQH6qWkgJdVCl7IQpgoAWg6yD6iBumBH31Xxy58SRPAnAJD2gvAZDYeieUny188CZxyEJuwzFYc/WE06/CjOdKgFSocmoh+Ujnn7zWxbcG5r2T/nX0ZXJgkmyPEl92LIcyP6tZ5KOqxVpwyEvcEeiBFa/QIcGnwfotWDdEaajBFwYRfSt+O3s953caXk2Gt3ZQTNhrIvKV8Ta6yieuUxpWcm60HS5eAtC1Y1dKFtDa+kXkv8pGf5MgQPt/JyvGDtbKQ92j3ICLB/1nYwbNfFU+XyqG5lK6eXAfcTBLyBADNUgttt9N9w4NsQRY9+rugUu5LnfyH+87xrYQTmPXtfKTGE42ocjErMYi7U8wG4T1k5BmhQJteZTsI1nn9gkUdBjg536ZMSO+ztC17cj4VDGqf593yY0gXAFGPsevUFfaEeg4iDFRpqKH3Dt+0Evs9hD0ssyvB2BCWUSSV8pTjysQNk/QlgHpAMfAIy5pVzo6cBp5rHZAB486nZl+ERF0ZgRlBxv/BQLMJt57AG4jNgVFMtzUlfdx4FLmIhBTA4034XdS/kNhvtwM1eMVutzYufCkI/mg== 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)(136003)(396003)(376002)(346002)(39860400002)(451199015)(36840700001)(46966006)(40470700004)(478600001)(82310400005)(82740400003)(110136005)(356005)(7636003)(6636002)(54906003)(316002)(2616005)(40460700003)(36756003)(83380400001)(8936002)(16526019)(86362001)(6666004)(107886003)(336012)(2906002)(1076003)(186003)(7696005)(5660300002)(36860700001)(55016003)(4326008)(426003)(47076005)(70586007)(70206006)(40480700001)(8676002)(26005)(6286002)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2022 16:12:20.7313 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fbf05a0a-74e3-4633-4292-08daba91861e 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: BN8NAM11FT084.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5032 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 The use of rte_atomic functions is deprecated and is not required in HWS code. HWS refcounts are used only during control and always under lock. Fixes: f8c8a6d8440d ("net/mlx5/hws: add action object") Signed-off-by: Alex Vesker --- drivers/net/mlx5/hws/mlx5dr_action.c | 8 +++----- drivers/net/mlx5/hws/mlx5dr_action.h | 2 +- drivers/net/mlx5/hws/mlx5dr_pat_arg.c | 8 +++----- drivers/net/mlx5/hws/mlx5dr_pat_arg.h | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_action.c b/drivers/net/mlx5/hws/mlx5dr_action.c index 755d5d09cf..a9e12aa1f5 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.c +++ b/drivers/net/mlx5/hws/mlx5dr_action.c @@ -83,7 +83,7 @@ static int mlx5dr_action_get_shared_stc_nic(struct mlx5dr_context *ctx, pthread_spin_lock(&ctx->ctrl_lock); if (ctx->common_res[tbl_type].shared_stc[stc_type]) { - rte_atomic32_add(&ctx->common_res[tbl_type].shared_stc[stc_type]->refcount, 1); + ctx->common_res[tbl_type].shared_stc[stc_type]->refcount++; pthread_spin_unlock(&ctx->ctrl_lock); return 0; } @@ -123,9 +123,7 @@ static int mlx5dr_action_get_shared_stc_nic(struct mlx5dr_context *ctx, } ctx->common_res[tbl_type].shared_stc[stc_type] = shared_stc; - - rte_atomic32_init(&ctx->common_res[tbl_type].shared_stc[stc_type]->refcount); - rte_atomic32_set(&ctx->common_res[tbl_type].shared_stc[stc_type]->refcount, 1); + ctx->common_res[tbl_type].shared_stc[stc_type]->refcount = 1; pthread_spin_unlock(&ctx->ctrl_lock); @@ -145,7 +143,7 @@ static void mlx5dr_action_put_shared_stc_nic(struct mlx5dr_context *ctx, struct mlx5dr_action_shared_stc *shared_stc; pthread_spin_lock(&ctx->ctrl_lock); - if (!rte_atomic32_dec_and_test(&ctx->common_res[tbl_type].shared_stc[stc_type]->refcount)) { + if (--ctx->common_res[tbl_type].shared_stc[stc_type]->refcount) { pthread_spin_unlock(&ctx->ctrl_lock); return; } diff --git a/drivers/net/mlx5/hws/mlx5dr_action.h b/drivers/net/mlx5/hws/mlx5dr_action.h index f14d91f994..3b31ffc90e 100644 --- a/drivers/net/mlx5/hws/mlx5dr_action.h +++ b/drivers/net/mlx5/hws/mlx5dr_action.h @@ -70,7 +70,7 @@ struct mlx5dr_action_default_stc { struct mlx5dr_action_shared_stc { struct mlx5dr_pool_chunk remove_header; - rte_atomic32_t refcount; + uint32_t refcount; }; struct mlx5dr_actions_apply_data { diff --git a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c index 46fdc8ce68..df451f1ae0 100644 --- a/drivers/net/mlx5/hws/mlx5dr_pat_arg.c +++ b/drivers/net/mlx5/hws/mlx5dr_pat_arg.c @@ -128,7 +128,7 @@ mlx5dr_pat_get_existing_cached_pattern(struct mlx5dr_pattern_cache *cache, /* LRU: move it to be first in the list */ LIST_REMOVE(cached_pattern, next); LIST_INSERT_HEAD(&cache->head, cached_pattern, next); - rte_atomic32_add(&cached_pattern->refcount, 1); + cached_pattern->refcount++; } return cached_pattern; @@ -179,9 +179,7 @@ mlx5dr_pat_add_pattern_to_cache(struct mlx5dr_pattern_cache *cache, num_of_actions * MLX5DR_MODIFY_ACTION_SIZE); LIST_INSERT_HEAD(&cache->head, cached_pattern, next); - - rte_atomic32_init(&cached_pattern->refcount); - rte_atomic32_set(&cached_pattern->refcount, 1); + cached_pattern->refcount = 1; return cached_pattern; @@ -212,7 +210,7 @@ mlx5dr_pat_put_pattern(struct mlx5dr_pattern_cache *cache, goto out; } - if (!rte_atomic32_dec_and_test(&cached_pattern->refcount)) + if (--cached_pattern->refcount) goto out; mlx5dr_pat_remove_pattern(cached_pattern); diff --git a/drivers/net/mlx5/hws/mlx5dr_pat_arg.h b/drivers/net/mlx5/hws/mlx5dr_pat_arg.h index 8a4670427f..d9353e9a3e 100644 --- a/drivers/net/mlx5/hws/mlx5dr_pat_arg.h +++ b/drivers/net/mlx5/hws/mlx5dr_pat_arg.h @@ -35,7 +35,7 @@ struct mlx5dr_pat_cached_pattern { uint8_t *data; uint16_t num_of_actions; } mh_data; - rte_atomic32_t refcount; + uint32_t refcount; LIST_ENTRY(mlx5dr_pat_cached_pattern) next; }; -- 2.18.1