From patchwork Wed May 5 06:49:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 92823 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9840A0524; Wed, 5 May 2021 08:52:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7871041127; Wed, 5 May 2021 08:51:26 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.56]) by mails.dpdk.org (Postfix) with ESMTP id CE3BA410F9 for ; Wed, 5 May 2021 08:51:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iEQFyMYO34f4CY/3xce30saRMk4kLdHaRMcjWdrBbbNb1m732ODuEQSJm/lKXgRvdTEECQKdev6XcGRhEHGGoLdVvjHc2FeLS5yO2kGB3bhvryt1jh//Rb1FhYyaTdIO4TPN3Of8olBSTu+qm+1G18cTI4HAxm/16cdVM5mvighvOoDmEbEsi/8MtZnG5FyXXdsDha1rmPv3yEtwQMeDM91YiYZgMPcKbOis0gp5ae7bXEbber3NejT8CXuAkWcIfqG82OlJ0bMTVNl5pwiSFhQjR9GsVnzABseIH7A06nKNq5iY5qu9dQvpMX9zf4kNxZifdc1h9qr71Pkk6ZbA/g== 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=z+r14AzkxTe9cKCzjkckKU0FYt9Bu1R+ILwPKWW5yrk=; b=FOwPuhUMAdtXTJCOEBCJPCMfMG76L4WnKIFrwpvB06OopO8Vbd+6AocSnMTrVb2Ol5zWTAEIWXaexk828NTzNI8PBC22ciwNZOlOdzqOZR2vU05okmJDlWLzu7lLVF2cxd3QPD88DJldd9fjaHgVofpSV9kpgufW4yonbiz/AfxivpNOeaAicoTD+OlqOP7R0VH14cHtV99iVhSe3W6yM6whCh2vGL4re9pf8C0A+7CMMaRhdEFt8cWc+Waxzs4NwYYjmeIY3OJDG90lwwCcEhu3N/9EiYx7edoHkEkR6p3bNZKLqr3MF9MLghCr+x8NmkOofsJlRmRBWpzGQgjUqw== 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=z+r14AzkxTe9cKCzjkckKU0FYt9Bu1R+ILwPKWW5yrk=; b=YZERudDiFQWqVrUgB4pqezcT+CQWZMp1dHWtB6gGKpUlt0h5opswGD9VqIr18Xuj+1pr7itW5v6vm/3FmZNQ6F8Hwdxn/LPR3gb497MijEAOnzvoJnSiobO/SsPMuqvsupXiOpwSSL94GpUEzAwCxsUHQWN4b9ZjEfQbbfEvkF2LmCw3eCLwRYYVsWGzg9FRdf85rCHA1NBQkIXiBCEM2V0wut3HUpKZC01V/P/noFJ9twZskEH6b3a5riOjYc3HqO2H4jFLuERWXF27AVsuSam8d6kp7q8otXr+uS/c+kZDpessKn6NWN566UU3bJ6GOW6V9q4dON3gxQbKOzgNqg== Received: from BN6PR16CA0031.namprd16.prod.outlook.com (2603:10b6:405:14::17) by CH2PR12MB4039.namprd12.prod.outlook.com (2603:10b6:610:a8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Wed, 5 May 2021 06:51:16 +0000 Received: from BN8NAM11FT046.eop-nam11.prod.protection.outlook.com (2603:10b6:405:14:cafe::dd) by BN6PR16CA0031.outlook.office365.com (2603:10b6:405:14::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Wed, 5 May 2021 06:51:16 +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 BN8NAM11FT046.mail.protection.outlook.com (10.13.177.127) 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 06:51:16 +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 06:51:02 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 09:49:59 +0300 Message-ID: <20210505065008.30680-9-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210505065008.30680-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505065008.30680-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 51ac3c8f-6bd1-43a2-7ebd-08d90f922e4a X-MS-TrafficTypeDiagnostic: CH2PR12MB4039: 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: GG48fJm7fyRYHCPLPJlboqHD5cDVf1bYbsr6H/KG7VIYz0pG8wlIPsvvD/c82lizdllifaKqHkA7E3LhsEt7nefRbE3SXi2TpEp/iaNLz2XCnlJScWbZOmPIpXc9slDTNDWHTKknbtCoFvxp39B7EZvBiXEkb/E9XAggahXsygRzF4tUFt5avAJmmo1D4eN/5E+dm2TkigvgPoKa9nNwE7qowkfPN2BKJudJKf5vgjVbhsFX40GdrUnmekBroheP6mzBl0A7AZmYzdgUBnrglDIqFEzwXW8somwjL4JoYQbr039nlGAD8+D0iXL/0RyXESjCvlIo0u9Xa4t3BZSy4rf6OVO0xQ0BMmtLaLf5sCokidsdFKP8hlyumMsYfmzZqM9ATot+w8YH1Gx5gG7jJLI3nNWb4QL5kgQ4RHE+N//+ZbymU3iUiWV0k0sUSHFvJNTKentTBBeRUdFCACH8hXVKaU+g5hJVSDieX94pyqlZ1293I1i0pieeCyLDqlvU5ZNQtaAxPDxyVn2r9VWVucYm4P3AnSDM6PhvlABNEdvLXfs2intqntyTZ2ckfrd7+NJJCxJyRM2z7M9uVN0ddPvUsdKZWlxRMhxwH7hwxSnxXCGVQu5a1Ui3ZtdJ3xa0bKPT3v+W+kARJFA35XPJe4duA34KLm0k0Bbca99uwCs= 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)(376002)(346002)(396003)(136003)(39860400002)(36840700001)(46966006)(110136005)(83380400001)(86362001)(2616005)(16526019)(26005)(186003)(54906003)(55016002)(8936002)(8676002)(6666004)(356005)(36860700001)(70586007)(4326008)(70206006)(7636003)(6286002)(107886003)(47076005)(36756003)(82740400003)(316002)(478600001)(2906002)(5660300002)(82310400003)(1076003)(426003)(7696005)(36906005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 06:51:16.4252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51ac3c8f-6bd1-43a2-7ebd-08d90f922e4a 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: BN8NAM11FT046.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4039 Subject: [dpdk-dev] [PATCH v3 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 86dbe6d573..d563da109a 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -706,6 +706,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. * @@ -1508,6 +1562,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 0ff19e6171..3c2350a6b8 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;