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 6E6BCA0A02; Tue, 27 Apr 2021 17:39:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 42A744128A; Tue, 27 Apr 2021 17:39:02 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2076.outbound.protection.outlook.com [40.107.92.76]) by mails.dpdk.org (Postfix) with ESMTP id 5365641284 for ; Tue, 27 Apr 2021 17:39:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQRX6G4INvvANLDFMngValEqjsHZ12wDDM/ru+Pxi6taproh3+3KM/QgzC71M5nLPJyguIRpYFSwcaChA5LjRp1K07rIowMnJE7BO5dH+4NPh+WjNFIAAr6KcbVmFcEdPk413XT+yfLIv2cN0pG1hSoj4F36sbmMJ6myoETgpG/S/T++66h84KOwVV/4OsDeNzj6uqCuGaYVgM7Ecdh50sCBlqiSEXjQ2bgADDkwpiYAjrSrurqWujglQ8vbx8QKMAcz/Ce8jFm7FXZKOJQDhPWZqdUtB9FE3mFjNU2RwBuLK7VFXf99pVUZu1kQxvkTP5jRxFfcn9U0vjA/tOrKYw== 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=07shCMasPR0Iw+w0gFbx9DUXFGNYmVyHZPTmz4CsTpw=; b=O5VI0vC64xjiXrIZTBHnLqFjY3+KdtIpgKCdJYL0KbF9ZVJ5u6bhywMLxu1eARuZ5oUQWlDYbpXWP7vrJhFDyH0DKMLyH+X19HQCx1Uok8Nv0zFW2Q/HbmZRL//qrGLqpQmoyvpG7axzllDEMQzi79Nf5bsjhdGp1fBjI+4IItfA8vFR5mCrD/taG1wdbui3pKXGUi0Ostszl0GcH1Xla7Sw7Hj5diH4N94OQ+i01TiKxz4I2qXZCVeQmW7vHrumHfWWjixUS3z8x7Vy5mOV2PLyu4YmOpKiOKbeQlAFn0OjfDbVt1OPRuWYqT0IVQ/pw6OcnZxkK9D4QPCKMCkknQ== 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=07shCMasPR0Iw+w0gFbx9DUXFGNYmVyHZPTmz4CsTpw=; b=epjiARHkv45YL4EUmx3KgWoaLFFIPdriq3QBzfaaqIYKMeUCDzmF3WhqGyPRywmaHcv1xanuqu6bfaO6pYiHI3dZDZUXtyxKtmqQJ5G4aZZKq0apPQPO59R6zZykCwWCpwh5oW1f7m9yCfBDADGe8U2atWnCbxWZpPeOuJjopnBFJCcLw2jm3xD/rC82Hji4/HmB8XHfkojR5DpWjw9NE6jQ1DSJFYXbqV94mgsiKRBRh/4STeImyMWMw5DbjN+SPseKp9Wwv1J/OoliSHkR98fNM1frfgrhStq64i72pNbO81tzWQgFF4f2f9bd3j5Vyv7AnNpG8a7ezv2cBI66fQ== Received: from MW4PR03CA0103.namprd03.prod.outlook.com (2603:10b6:303:b7::18) by BYAPR12MB3141.namprd12.prod.outlook.com (2603:10b6:a03:da::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.25; Tue, 27 Apr 2021 15:38:58 +0000 Received: from CO1NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::b2) by MW4PR03CA0103.outlook.office365.com (2603:10b6:303:b7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.22 via Frontend Transport; Tue, 27 Apr 2021 15:38:58 +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 CO1NAM11FT028.mail.protection.outlook.com (10.13.175.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4065.21 via Frontend Transport; Tue, 27 Apr 2021 15:38:58 +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; Tue, 27 Apr 2021 15:38:56 +0000 From: Bing Zhao To: , CC: , , Date: Tue, 27 Apr 2021 18:38:02 +0300 Message-ID: <20210427153811.11554-9-bingz@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210427153811.11554-1-bingz@nvidia.com> References: <20210427153811.11554-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: 5e59c36d-38ec-48b0-b44a-08d909929307 X-MS-TrafficTypeDiagnostic: BYAPR12MB3141: 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: Dg5vLuv/5hg9SkTUdqtJZntjrCsv6g4ktjNg0rycYRpIh4C63gJHb/lUqSSA2Thch11t9jhTYadvbtCJHbBA31PaNH0YqXwqFn2d32ZzwtUU6+v0Mw+5lyGsrl1LIPIpj3qC5HL+rLmGosfFzVkn44Xcoor2+fYy/TN1oY1CNImRlHKmQrADEQCvUXPHOKtKMu0/6uFb3jz0bOlfgIcQAIJkD+OuIbA/L9cex7gHqfmZJkPX6sKjjW7Abb3ENeJeLEnNQ6eUYFP2edBniIBpIEyrvQsCThEgEqrOYkU4xi0lpkPKtnc29CPNRYd7/t/5paQHDAo8xKuVpb2EsTkiKV2F9F/X50hYF2BaI+hSIl2tz2ZHJuMRKjeX41u4nhWl+oxCA+BwwbMM/qiG65Mxw/U+uNVnf2qyenn45ZZjmS79IGHrUPBatv3lDRh9a3Mj2y364QiIs4RFBMQR2hDFIOgVMaqvEiwyQXDKXYqvdEqxqobUWv602+LsTEtiWuCIy/eYh086cA2eKhStrcvaGqXQ0zizNGYhLXjmPn/q114+8uCiBC0PLO1xUEIZxX02f5xCrzgiYYybHQLLOcgfkxDOQY/CEBsLIlTM+o3yWpXWiw0VLgV82gG7pwLexo8S3Yk5hfw+OCaSreJsigLbuhi2efc76PNWmSxwGeFNH8c= 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)(376002)(136003)(36840700001)(46966006)(70586007)(70206006)(47076005)(82310400003)(83380400001)(55016002)(82740400003)(5660300002)(336012)(316002)(36906005)(426003)(6666004)(186003)(16526019)(2616005)(36756003)(110136005)(26005)(7696005)(7636003)(54906003)(8936002)(86362001)(8676002)(6636002)(2906002)(478600001)(1076003)(356005)(4326008)(6286002)(36860700001)(107886003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2021 15:38:58.5127 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e59c36d-38ec-48b0-b44a-08d909929307 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: CO1NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3141 Subject: [dpdk-dev] [PATCH 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 a884234..5717e72 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_sub_fetch(&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(WARNING, "%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. * @@ -1238,6 +1292,8 @@ mlx5_free_shared_dev_ctx(struct mlx5_dev_ctx_shared *sh) } if (sh->mtrmng) mlx5_aso_flow_mtrs_mng_close(sh); + if (sh->ct_mng) + mlx5_flow_aso_ct_mng_close(sh); mlx5_flow_ipool_destroy(sh); mlx5_os_dev_shared_handler_uninstall(sh); if (sh->cnt_id_tbl) { diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c index bb3221a..6a13b98 100644 --- a/drivers/net/mlx5/mlx5_flow_aso.c +++ b/drivers/net/mlx5/mlx5_flow_aso.c @@ -393,6 +393,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_devx_dereg_mr(&sh->ct_mng->aso_sq.mr); + sq = &sh->ct_mng->aso_sq; + break; default: DRV_LOG(ERR, "Unknown ASO operation mode"); return; -- 2.5.5