From patchwork Fri Oct 22 15:45:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francis Kelly X-Patchwork-Id: 102672 X-Patchwork-Delegate: thomas@monjalon.net 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 2AF08A0C43; Fri, 22 Oct 2021 17:47:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C58F041186; Fri, 22 Oct 2021 17:47:42 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2061.outbound.protection.outlook.com [40.107.244.61]) by mails.dpdk.org (Postfix) with ESMTP id F113B41149 for ; Fri, 22 Oct 2021 17:47:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h89FyHjSlOuu8Y/MjJLxbVdepjgENZqfZ260+TxHoEbxOtYrXEEHLcK12+29fsz99CGvv6iPQk1NbkA2AvgNhvIym02c3X1WnB9spzB/aCoKt3WI38YTTZlN1AKDHrGJnFQOEEVTjdDhuhX/GURDVbvIVaAso7Mvyy82mTK7J2mxJBvKdjuAkT5PpRJRllZc8cyXsYF7rMMkikElM2EUSI+OMYeRFETdrH23BcNIX+vfmUyXIogwRRBxmG2iuCtovbboOVh7HtKQNq6Whj+dJb2Y2ptTDT2F1LjNW+dc550VvGcE4xR/inyeNVZQQda46T6zfPAq5qNoV7RpAQmXOw== 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=51J3zh7KcnaJN+MHw3NWqyCet59CsxKKCzBb3u5F6Rg=; b=nxEMpk2JcRW4oF/fdHCo3Vg05C9E3QYS8L92VH5jS9CzZMQIDZ3ZN7CUWkLZ49mMGuZQCcabnJTONzJ/GRzKvPoCCxLnh+VEqFXmeZ0uWwUq98ukUlbQKfGlKgGyl8LP6fxwqXzGbopRnRJpWJLN1TfAGQbvqiBO3SWvqfiY44OGbWWnHxtUdgaBxueQhpB6M3d2l/g65PpO+5sxh62brYPhnz2JD1PtoEpKV+1U25Mo6LhEfY/pKjlgwXwVB8mbnRr/KgGOf/OeK0FAfhBHRPt/lPwSy13UyXnKfD+lzAZki0PnBdsdTw0XhRT3LrgpR9tQPcj8rgeckIL0fn9XWw== 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=quarantine sp=quarantine 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=51J3zh7KcnaJN+MHw3NWqyCet59CsxKKCzBb3u5F6Rg=; b=QzHATibdOKaDRC2m5KDQyOuG/hu9aKqxUjAaCM4dqgPL1cBFcQl2pRAiMYogsP1Sa3r0y1TIv7k+S8+Xg4esLSLX22a0GNN1VoUUhXTO82j53afzVGoTFHDwaY5hXIDqN2M2ZTbScMDzWla3tTTfFPVpiGGlm9JIKF27gENoGizr+/7xxH8NEk74b18C5IHk0wG48KgJ3HDVX0l4yZhXTRxozj/ntAltme2vC1q9VSEPqSee4v8jFKbFAEtFuVixJ5uCyJpLCciStBhN+mZF1fGxKXWZQxM9tRCssA80sa8zEm0YTQS9tUGp6AXeZ4ydjUqnXCx3NiRluTrqf7hS+Q== Received: from DS7PR07CA0003.namprd07.prod.outlook.com (2603:10b6:5:3af::11) by BN9PR12MB5114.namprd12.prod.outlook.com (2603:10b6:408:137::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Fri, 22 Oct 2021 15:47:38 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3af:cafe::79) by DS7PR07CA0003.outlook.office365.com (2603:10b6:5:3af::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15 via Frontend Transport; Fri, 22 Oct 2021 15:47:38 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Fri, 22 Oct 2021 15:47:38 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 22 Oct 2021 15:47:36 +0000 From: Francis Kelly To: , Ori Kam CC: , , Date: Fri, 22 Oct 2021 15:45:52 +0000 Message-ID: <20211022154600.2180938-2-fkelly@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211022154600.2180938-1-fkelly@nvidia.com> References: <20211022154600.2180938-1-fkelly@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.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: 42fd75e3-9ddc-458f-ac1f-08d99573466a X-MS-TrafficTypeDiagnostic: BN9PR12MB5114: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:19; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jLIvpwI0Fp9iRXcEuhqo4owWV2w6EN/1lwEQrgwv7C5Ziq55EL7P0vfVNs0UOk+9iwfA+71a5lZodHmu+S4PbeY1gbYpOxL7NGXsCnarEc4F59/y8C9YE0nT6Ip0e0RLk1PZb62N+qVZxafynYa+yUaUqxwkBAlDPVWYY3wuyu5hwZaScSHwmYcnYXvdyT2Bgj8y4rd1hmAXfEjnXATim3Pv+V5WwxrtNvTqR3T8H1LVStkm+r14C3wRpeGci+k1supQAKAyptbvh73j+tsyCwdU8cDzoGvbk6phFZZnq/rk+Y36eMJb6RigyErbTZqRDz8O/4Ws5EZb2aZIDaRixkoYpYNfur7lD7KImcyaInrZFmO7LprHorlwQ9WmKpecNMyUTKy8cbgX7rC8brcRfOo2LUYgk4B+V1yu1eZoa0YaaZoGwr+mhNoWB8FhnBfJRTJb9LmAGYhhFL57hyAmFL9C7iAdisNWTzcZSpa3Rjsq90ujPvoidkBVgmVnl3FtJYLwFYLATfmmAWt6F11Ua0eJ/5lHiPnGbJZ2juBZ7UymXFVtLhMk0Vb9ncLcmQk/dEvUR4AO8euWTjYa4ckz64R9MrUaEwEaIAs+DYMGfUyZXVNhLDLGGOh5TXZm2DfkreUD7czMpUCYZIEkoj+7bjQGlNx41V0/U/FjKPh31+hZQWkthp66SOPDAkv4P8caxioHgUnDUCf/bNJhFeDUwA== 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)(36840700001)(46966006)(1076003)(16526019)(186003)(6636002)(508600001)(70206006)(47076005)(4326008)(26005)(2616005)(2906002)(36756003)(356005)(6666004)(426003)(5660300002)(8936002)(7636003)(70586007)(336012)(82310400003)(316002)(55016002)(7696005)(110136005)(36906005)(6286002)(36860700001)(83380400001)(8676002)(54906003)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2021 15:47:38.3610 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42fd75e3-9ddc-458f-ac1f-08d99573466a 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5114 Subject: [dpdk-dev] [PATCH 02/10] regex/mlx5: add cleanup code 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" From: Ori Kam When stopping the device we should release all data allocated. This commit add this cleanup logic. Signed-off-by: Ori Kam --- drivers/regex/mlx5/mlx5_regex.c | 14 ++++++++++++++ drivers/regex/mlx5/mlx5_regex.h | 1 + drivers/regex/mlx5/mlx5_regex_control.c | 20 ++++++++++++++++++++ drivers/regex/mlx5/mlx5_rxp.c | 4 ++-- 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c index 2124fd15f0..b7175ff8e9 100644 --- a/drivers/regex/mlx5/mlx5_regex.c +++ b/drivers/regex/mlx5/mlx5_regex.c @@ -48,6 +48,20 @@ mlx5_regex_start(struct rte_regexdev *dev __rte_unused) int mlx5_regex_stop(struct rte_regexdev *dev __rte_unused) { + struct mlx5_regex_priv *priv = dev->data->dev_private; + uint32_t i; + + mlx5_regex_clean_ctrl(dev); + rte_free(priv->qps); + priv->qps = NULL; + + for (i = 0; i < (priv->nb_engines + MLX5_RXP_EM_COUNT); i++) { + if (priv->db[i].umem.umem) + mlx5_glue->devx_umem_dereg(priv->db[i].umem.umem); + rte_free(priv->db[i].ptr); + priv->db[i].ptr = NULL; + } + return 0; } diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h index 2242d250a3..329768980d 100644 --- a/drivers/regex/mlx5/mlx5_regex.h +++ b/drivers/regex/mlx5/mlx5_regex.h @@ -125,6 +125,7 @@ int mlx5_devx_regex_database_program(void *ctx, uint8_t engine, /* mlx5_regex_control.c */ int mlx5_regex_qp_setup(struct rte_regexdev *dev, uint16_t qp_ind, const struct rte_regexdev_qp_conf *cfg); +void mlx5_regex_clean_ctrl(struct rte_regexdev *dev); /* mlx5_regex_fastpath.c */ int mlx5_regexdev_setup_fastpath(struct mlx5_regex_priv *priv, uint32_t qp_id); diff --git a/drivers/regex/mlx5/mlx5_regex_control.c b/drivers/regex/mlx5/mlx5_regex_control.c index 572ecc6d86..1783df923c 100644 --- a/drivers/regex/mlx5/mlx5_regex_control.c +++ b/drivers/regex/mlx5/mlx5_regex_control.c @@ -271,3 +271,23 @@ mlx5_regex_qp_setup(struct rte_regexdev *dev, uint16_t qp_ind, rte_free(qp->qps); return ret; } + +void +mlx5_regex_clean_ctrl(struct rte_regexdev *dev) +{ + struct mlx5_regex_priv *priv = dev->data->dev_private; + struct mlx5_regex_qp *qp; + int qp_ind; + int i; + + if (!priv->qps) + return; + for (qp_ind = 0; qp_ind < priv->nb_queues; qp_ind++) { + qp = &priv->qps[qp_ind]; + mlx5_regexdev_teardown_fastpath(priv, qp_ind); + mlx5_mr_btree_free(&qp->mr_ctrl.cache_bh); + for (i = 0; i < qp->nb_obj; i++) + regex_ctrl_destroy_hw_qp(qp, i); + regex_ctrl_destroy_cq(&qp->cq); + } +} diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c index 380037e24c..5afdcb35cc 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -776,10 +776,10 @@ rxp_db_setup(struct mlx5_regex_priv *priv) return 0; tidyup_error: for (i = 0; i < (priv->nb_engines + MLX5_RXP_EM_COUNT); i++) { - if (priv->db[i].ptr) - rte_free(priv->db[i].ptr); if (priv->db[i].umem.umem) mlx5_glue->devx_umem_dereg(priv->db[i].umem.umem); + rte_free(priv->db[i].ptr); + priv->db[i].ptr = NULL; } return -ret; }