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 70845A0524; Wed, 5 May 2021 11:51:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C0DE410FD; Wed, 5 May 2021 11:50:46 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750057.outbound.protection.outlook.com [40.107.75.57]) by mails.dpdk.org (Postfix) with ESMTP id D024C4112A for ; Wed, 5 May 2021 11:50:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H4wvIP+shYqSpiqA2VAfP3/wE8i8BGWVFvBZJMNcT9y0o3v8kUx8mn6XNHJitk2Kh3ip4Mx1flhMf6fxSkSOtsf1i2iOiNtSQD4ZwcbMXf7xqe66ETxHJPrBIb96LySQSXESV6d1TCCEoA8bmAQt4IDhSVu2zHp4zGyvFmiX/PDADQRMQwnxpNvwF0mACuQYwSgMVdOjouey4C44qjU+rQvoeTXbZa6vGqItIa5MoMIZHJMnlNxM0j2wuVWIO4e9ibSgsPeOFiv/8y4DamL5iCPKXmVFuGn2X9UIhNV/1V/8Ta1WulGwMg+51x/ab3n2VxF0uoELpCJR9+V/yQbs8w== 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=Na+ZE0pcXIhKkApUVMCnX0oMHHrYTDnNR7u4ko0B/8E=; b=Jy21uZ81O5zPc4bCogAiPvWVGOzzlkqA/T/TblMM0Ol+yPgqG/YvVI5sEMvQdZJXhicLik15mf+AJKGw1GDsI9YSJh0wfgImBok79h4PmXvoSKEp/sURK0jy1enhRGY1f80wR+LJShZCtp6rIhGkr/cfih27L4ye0jb7baSVSRuk9kI7uF4199pepOcx2tETn/QInb6m+LdIHAJ+h46SOfXY2FPI0S0bDQc0b/avXfw9/hgS/ad4oI/HqvVxIMVGC7o776e1pN7cab/49ewZ3qCERmAdIgI9QRFlGVuMavJ3esjRfikvHW9Df3OzUUXxtNC1llDH8jHFnw9k8DbfVw== 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=Na+ZE0pcXIhKkApUVMCnX0oMHHrYTDnNR7u4ko0B/8E=; b=IQUQQJZAhYGbYBWgfngapwz+vh/Z1IrXfCD/zZ1I30SzzCEZTqTBC+lp612u89DKj45RXIexW0YPUzTmWCaILPmt3bEFf/EJag4she/0NJeuddlN1vIvGvtrf1kXJ3oH9RRO860fIYz05dFlN9b+/KuN46LBdc9CjXc9pUccLMfsDcnUaVsEptLxmbM612j46dfWjVO4CvuBO99Tprxiae5/N8cFZpf1KhGKSFo139SckOjTUrh4Azc+z8F22tY8VPmBgIcfjTZ9w2YxaWCmKHr1DQ0iQ2XxaFK2OYC7HMbn/Wj+CdTAH3u6sPXKTkZjKBZ19VdOSnn1kr2V06Kirg== Received: from BN9PR03CA0520.namprd03.prod.outlook.com (2603:10b6:408:131::15) by DM6PR12MB3561.namprd12.prod.outlook.com (2603:10b6:5:3e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.38; Wed, 5 May 2021 09:50:43 +0000 Received: from BN8NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:408:131:cafe::5) by BN9PR03CA0520.outlook.office365.com (2603:10b6:408:131::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Wed, 5 May 2021 09:50:43 +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 BN8NAM11FT067.mail.protection.outlook.com (10.13.177.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Wed, 5 May 2021 09:50:43 +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; Wed, 5 May 2021 09:50:40 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 12:50:00 +0300 Message-ID: <20210505095009.40250-9-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210505095009.40250-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505095009.40250-1-bingz@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: 61a225ef-38c4-40d9-0ad2-08d90fab3ffc X-MS-TrafficTypeDiagnostic: DM6PR12MB3561: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1169; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x7foQZ3IqOl+Ibg1S6lqULjwDyA9CnBz4OOaT0UBgpD22k7mGMV8AI+vIuCnsK65tt/O3cte+kBmEsSWIkN/wXgGWNp/cZ+6RQfPX3XfAtXvlcgwETIz/6cWISnPnSDPlIN38S5JXhOLRJqPbXoCdbzmWUi0cDp7RPOCmQghA+lp3LDfmAoFi8qVR+yAwGcBEGMkL0znP09DrvoEhjNJNYWJ0Un6v/Jyw7nsJ2eP5IppyARwNp5vzkVt5LA+wZDid0e+0jVHv+wiZBmsPQI9kl7CJJXJNbw05rTiXH3Ssgb9q+AKyp1BK/RHhbAB7PpbKCBULGm/bkpqMPvvx27ucaEvmByfh39BdfCTsRGHHvgcQ8kIpGOTbD844wiPL7pT5ncTNauOMQ6tQy4NVCSL7tlVNHHRqXXVAazFvr4mq2CGtM2A7KGgsMjuvLTzAk+AxQrpvV5AXn3rk8xvhmVLq4SNnojhaYfwSqp2gkj3FPbET5YW5Zs3QJGDeiJt6A75cZKusuJSjp8GnR2li8Lu2QJXppURpCL1ASuNMABwQTA7T9SuTZJ2cCrjtlFhyoh3g+OeeOuxKU/icqwDTLv9jTBwmWtdtNs+1x6+33rp3FMPxpUcFhIHOhx/PArKXDslszPqVRH3SW3hUF6WR+iUEB0/VUQUZkeUr0u3vpcvPJg= 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)(136003)(376002)(346002)(39860400002)(396003)(46966006)(36840700001)(4326008)(5660300002)(70586007)(36756003)(426003)(7696005)(2906002)(70206006)(316002)(82740400003)(26005)(2616005)(82310400003)(54906003)(336012)(55016002)(83380400001)(110136005)(186003)(6286002)(16526019)(47076005)(8676002)(6666004)(36906005)(1076003)(107886003)(478600001)(86362001)(356005)(36860700001)(8936002)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 09:50:43.5173 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 61a225ef-38c4-40d9-0ad2-08d90fab3ffc 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: BN8NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3561 Subject: [dpdk-dev] [PATCH v6 08/17] net/mlx5: close CT management structure 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 Sender: "dev" When freeing the IB shared context during stopping a device, the ASO connection tracking management structure should also be cleaned up. All the DR actions created should be destroyed. The structures need to be freed and ASO CT QP should be released. In the meanwhile, the allocated and registered memory region for query should also be deregistered and then freed. Signed-off-by: Bing Zhao --- drivers/net/mlx5/mlx5.c | 56 ++++++++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_flow_aso.c | 4 +++ 2 files changed, 60 insertions(+) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 7e83d09fec..b610f29a66 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -708,6 +708,60 @@ mlx5_flow_aso_ct_mng_init(struct mlx5_dev_ctx_shared *sh) return 0; } +/* + * Close and release all the resources of the + * ASO connection tracking management structure. + * + * @param[in] sh + * Pointer to mlx5_dev_ctx_shared object to free. + */ +static void +mlx5_flow_aso_ct_mng_close(struct mlx5_dev_ctx_shared *sh) +{ + struct mlx5_aso_ct_pools_mng *mng = sh->ct_mng; + struct mlx5_aso_ct_pool *ct_pool; + struct mlx5_aso_ct_action *ct; + uint32_t idx; + uint32_t val; + uint32_t cnt; + int i; + + mlx5_aso_queue_uninit(sh, ASO_OPC_MOD_CONNECTION_TRACKING); + idx = mng->next; + while (idx--) { + cnt = 0; + ct_pool = mng->pools[idx]; + for (i = 0; i < MLX5_ASO_CT_ACTIONS_PER_POOL; i++) { + ct = &ct_pool->actions[i]; + val = __atomic_fetch_sub(&ct->refcnt, 1, + __ATOMIC_RELAXED); + MLX5_ASSERT(val == 1); + if (val > 1) + cnt++; +#ifdef HAVE_MLX5_DR_ACTION_ASO_CT + if (ct->dr_action_orig) + claim_zero(mlx5_glue->destroy_flow_action + (ct->dr_action_orig)); + if (ct->dr_action_rply) + claim_zero(mlx5_glue->destroy_flow_action + (ct->dr_action_rply)); +#endif + } + claim_zero(mlx5_devx_cmd_destroy(ct_pool->devx_obj)); + if (cnt) { + DRV_LOG(DEBUG, "%u ASO CT objects are being used in the pool %u", + cnt, i); + } + mlx5_free(ct_pool); + /* in case of failure. */ + mng->next--; + } + mlx5_free(mng->pools); + mlx5_free(mng); + /* Management structure must be cleared to 0s during allocation. */ + sh->ct_mng = NULL; +} + /** * Initialize the flow resources' indexed mempool. * @@ -1510,6 +1564,8 @@ mlx5_dev_close(struct rte_eth_dev *dev) if (priv->mreg_cp_tbl) mlx5_hlist_destroy(priv->mreg_cp_tbl); mlx5_mprq_free_mp(dev); + if (priv->sh->ct_mng) + mlx5_flow_aso_ct_mng_close(priv->sh); mlx5_os_free_shared_dr(priv); if (priv->rss_conf.rss_key != NULL) mlx5_free(priv->rss_conf.rss_key); diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c index fbf6e5ef38..37cb43147a 100644 --- a/drivers/net/mlx5/mlx5_flow_aso.c +++ b/drivers/net/mlx5/mlx5_flow_aso.c @@ -372,6 +372,10 @@ mlx5_aso_queue_uninit(struct mlx5_dev_ctx_shared *sh, case ASO_OPC_MOD_POLICER: sq = &sh->mtrmng->pools_mng.sq; break; + case ASO_OPC_MOD_CONNECTION_TRACKING: + mlx5_aso_dereg_mr(sh, &sh->ct_mng->aso_sq.mr); + sq = &sh->ct_mng->aso_sq; + break; default: DRV_LOG(ERR, "Unknown ASO operation mode"); return; -- 2.27.0