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 29FF9A034F; Wed, 5 May 2021 06:21:38 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9F6D41126; Wed, 5 May 2021 06:21:04 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-eopbgr750080.outbound.protection.outlook.com [40.107.75.80]) by mails.dpdk.org (Postfix) with ESMTP id E9F0041108 for ; Wed, 5 May 2021 06:21:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OORH3kqbXds9LNhayLOfWOW0UhCJCI5lcXpGoN4mHSPcz0KB2+Sz12RffAz9DwYeL6/rrzla2PZMECCZaLa+GxQFxftulM7ONxHtW8sx9ykmUCXZgTLKRuP8ay26hKxlD3Yj+iaPQIda9byzIWQZn6tPTjn16KTTXPfalY1Ywmv4tKOKm2fpup1nrX481fUyjcW1TbXYU3hME1CPQAJzW8mtO3bHmj6UUWvTtFBGXPfYuMlsEPxEC/AQEZwHLo3nS7m5hohwtPj2D/OLFscL3XhwgJzHA00w8Pv3rDQVKscvL6e9rZmb4naICZLD1u3MRSmn6EqTTXxn+HpWUaZ0Sg== 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=OB9QjXJGXbhLb1/0luHWhUnb+chfwEk8CvgDQRtS55Y=; b=QjHnEGulNbcuqAwi5RIS6pkt8XTLJf8gxvbm5Bccs1hQD64A12ABy9a/vLQBqY8PyDPSgWZLr6I50xMm4YEdKSm95g94PBFc5Due1x84GwzLFiEZ21KfYgbELi9mVghWErlwDQ+iH+7FYZzBHxOiOLrHNuZRtdqDvv0rgiMUfpD7lPwkjZNcsGhenzUxwZ47Mw8kGHpl6ZIQLwSd/BlHZBSa/ehRDErxgwvOP93PnNTugrr8qWpzgzRjl/o3UbwnTeBztqCEc9ABWMFCFm5r++FKNn926ICR3B2S1OGZtAtO5jR2klzJ0FcKQUSUJCGF4pC0nheOGJORwLsxTUii2g== 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=OB9QjXJGXbhLb1/0luHWhUnb+chfwEk8CvgDQRtS55Y=; b=mCcY5l2m7Bvm4reBtxZbAG1uacM2R+ArnrjRmVwjX3hhQ6lkVbBfhUhlgVJR8IJtgLRoAUqHnu/3Dw5oB5OnG0zvMtWZSQu9WQZZapP5ZO4GDTNkYRLk6lpA+zSxYIAffrRHZSZlZvYk67nMbo7kkBmIvn4JdezTdhIfKAKVJSpjZm05Nm9Oif5TVlbzN14MuxEkhZ3DFbhwLPJYoMOLTMwb3BfTknEKgrJlgBVckggss05jHDtSaDn1DpTv1np0pe4NwG5um/z4BkrlJu29EOQoUYcVXrgeVIYweF2L7BZfAdNcOtiRguv9hW0zSAdmDEliyUCcZy7hf0QqiohqsA== Received: from BN9P220CA0014.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::19) by BN6PR1201MB0212.namprd12.prod.outlook.com (2603:10b6:405:56::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.42; Wed, 5 May 2021 04:21:01 +0000 Received: from BN8NAM11FT060.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13e:cafe::ad) by BN9P220CA0014.outlook.office365.com (2603:10b6:408:13e::19) 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 04:21:01 +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 BN8NAM11FT060.mail.protection.outlook.com (10.13.177.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4087.27 via Frontend Transport; Wed, 5 May 2021 04:21:01 +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 04:20:59 +0000 From: Bing Zhao To: , , CC: , , Date: Wed, 5 May 2021 07:19:55 +0300 Message-ID: <20210505042004.25280-9-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210505042004.25280-1-bingz@nvidia.com> References: <20210427153811.11554-1-bingz@nvidia.com> <20210505042004.25280-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: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92f9e224-7254-4da6-7199-08d90f7d30cc X-MS-TrafficTypeDiagnostic: BN6PR1201MB0212: 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: ezuHvIX+e0/pJ83Wn0XTyPni0qzwmDXKPteNeSiob1YDsGCKhVNbpOCVZtB9KjlnXhBVLseB0QB+ZptJyL/K6flxJWqlUYx02KxzR8IM3S2WOwNS3nnb1fKSoGh6emNwjM18/LxxmTwyqk4G3/as8lGbkF4MVDtj1+lb2UEryM29sKuZGl9NSWQTPcWbRAu5w5ZvSgWQ+mJ4URclrhCdf1O/W8yDVXeGTfWP9YK9ZDrXdV5mjLt6WVc9woQaThcDOm3r1TF3eY765t95lfb+E41sMeKOm3WuUUxShGjv7IAQauBJkrbv7/ai8x8FfylBkEFEwLcMvcmkUDNXsutMVce48P37PoSYKxURrc+OR0lV4htVae/BgYtbrkX+7PeOOQrJiPEfKNS+mWdFPEukvS5+1ciaxHCl+6AhDwo0q7if5lr4Qka97ypVNNcAqyMLH3f5IunwcPovGRiRX8VEWyjnBlvii1oK+jc2IaS5WkG6J2ow3ggF5Z1mM9GSlRHWTSZhBkrNje+pqKaCArqV1EXfmFM+ttbSkYOJIdhyjgDotmyzS9JXu9CeVSblxa85JxNeoCfU72LWtbqpD4iAGVXlmeWFm70uSnFPbK5uRxLPwcNglgh8nD7o+/Y6Kpz5B+80eWlHTwpaSIG/puy5OWsWikWu8JGYl8THE2GKVUE= 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)(346002)(39860400002)(396003)(136003)(376002)(36840700001)(46966006)(70206006)(8676002)(70586007)(55016002)(5660300002)(2906002)(6666004)(26005)(36906005)(336012)(478600001)(1076003)(36756003)(4326008)(107886003)(186003)(82740400003)(86362001)(110136005)(316002)(54906003)(7636003)(6286002)(36860700001)(356005)(7696005)(16526019)(82310400003)(83380400001)(47076005)(2616005)(426003)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2021 04:21:01.1020 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92f9e224-7254-4da6-7199-08d90f7d30cc 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: BN8NAM11FT060.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0212 Subject: [dpdk-dev] [PATCH v2 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 28b0c05814..c93764f684 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