From patchwork Fri Jun 28 19:11:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxiao Shi X-Patchwork-Id: 55650 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 334D81B994; Fri, 28 Jun 2019 21:16:44 +0200 (CEST) Received: from mails1n0-route0.email.arizona.edu (mails1n0-route0.email.arizona.edu [128.196.130.69]) by dpdk.org (Postfix) with ESMTP id D9DF25424 for ; Fri, 28 Jun 2019 21:16:42 +0200 (CEST) IronPort-SDR: EY0ZC/rhl+I/MRvEKuMOs1rQPc3lc2K1VBt205B+ghL6zAKDaAaD8AnXggAt9JlZNivAqp0OhA /Fi9MI20ORsQ== IronPort-PHdr: 9a23:aWO8oR0unYqXnAyYsmDT+DRfVm0co7zxezQtwd8Zse0QLPad9pjvdHbS+e9qxAeQG9mCsbQe06GP6PyoGTRZp8rY6TZaKN0EfiRGoP1epxYnDs+BBB+zB9/RRAt+Iv5/UkR49WqwK0lfFZW2TVTTpnqv8WxaQU2nZkJ6KevvB4Hdkdm82fys9J3PeQVIgye2ba9vIBmsogjdq9cajZF8JqotxRfFv3VFdutLzm9sOV6fggzw68it8JJ+6Shcp+4t+8tdWqjmYqo0SqBVAi47OG4v/s3rshfDTQqL5nQCV2gdjwRFDQvY4hzkR5n9qiT1uPZz1ymcJs32UKs7WS++4KdxSR/nkzkIOjgk+2zKkMNwjaZboBW8pxxjxoPffY+YOOZicq7bYNgXQ3dKUMRMWCxbGo6zbYUPAeoPM+hFsYfwvEcCoQeiCQWwGO/j1iNEi3nr1qM6yeQhFgTG0RQkEdITtnTVo9T1O70VUeuo0afIzTTDZO5R1Dfy6YjIbgssofSWUrJxdcrd1FMjFgPCjlWNs4zlJC6V1uILs2mb9eZvSeWvi2s+pgx3vzOhxd8sh5HUio8R1FzI7zh1zJgvKdC5TEN3e96pHINNuyyeKYd6WN4uT39ytCs7zrAKo4O3cSsLxZkh2hXRceaIc5KS7RLmTOuRJDB4i297d7+nnBay9FSgyvX7VsmpzFZGtipFncfItnAKzxHT7dCHSud8/kekwzmDzRzc6vpeLU8uj6rbKp8gwrk2lpUJq0jMADL5mFjugK+XcEUr5PSo5vz6brjiuJOQLZJ4hh/kPqkvnsGzG+Q1PhALX2eB+OS80LPj/Vf+QLVPlvA2ianZsJHYJcQGoK64DA5V3Zwk6xukEzimy84UkmMdLFJEeROHiI7pNEvULP/mEPi/nkygkC13yPDeIr3hHpLNI2Den7j/Y7Zw8FNTyBIuwtBc/Z5UDasBIP2gEnP24dDVEDc1KwC3heH9B4ZTzIQbDECSBL+YOaSail+JrrYgIvWkYYYUvG+7Ov84/eXzi3ko31QaeP/6jtMsdHmkE6E+cA2ian32j4JZHA== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CwAwCOZhZdjAVFDMBlhWwyKI0XiXcBUQEBBosPkR0BAQEMAQETGQECAQGHQiM4EwEDAQEBBAEBAQEDAgETAQEBJopzgjoigm8GJ2IsJQ9IGYMigXcUqFEzgk+HbYE0i18XeIEHgRGDUIomBJN7gRyVFQmCGJQUl2OMTpgAAgQGBQIUAYFnIIFZMxoIGxWDJ4FIgQUXjkAgATKBBgEBjzsBAQ X-IPAS-Result: A2CwAwCOZhZdjAVFDMBlhWwyKI0XiXcBUQEBBosPkR0BAQEMAQETGQECAQGHQiM4EwEDAQEBBAEBAQEDAgETAQEBJopzgjoigm8GJ2IsJQ9IGYMigXcUqFEzgk+HbYE0i18XeIEHgRGDUIomBJN7gRyVFQmCGJQUl2OMTpgAAgQGBQIUAYFnIIFZMxoIGxWDJ4FIgQUXjkAgATKBBgEBjzsBAQ X-IronPort-AV: E=Sophos;i="5.63,428,1557212400"; d="scan'208";a="406958290" Received: from optima.cs.arizona.edu ([192.12.69.5]) by mails1n0out.email.arizona.edu with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2019 12:16:41 -0700 Received: from lectura.cs.arizona.edu (lectura.cs.arizona.edu [192.12.69.186]) by optima.cs.arizona.edu (8.14.4/8.14.4/Debian-2ubuntu2.1) with ESMTP id x5SJGeZp020661 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 28 Jun 2019 12:16:40 -0700 Received: from lectura.cs.arizona.edu (localhost [127.0.0.1]) by lectura.cs.arizona.edu (8.14.4/8.14.4/Debian-4.1ubuntu1.1) with ESMTP id x5SJGep7004671 for ; Fri, 28 Jun 2019 12:16:40 -0700 Received: (from shijunxiao@localhost) by lectura.cs.arizona.edu (8.14.4/8.14.4/Submit) id x5SJGeFj004670; Fri, 28 Jun 2019 12:16:40 -0700 Message-Id: <201906281916.x5SJGeFj004670@lectura.cs.arizona.edu> In-Reply-To: <201905301724.x4UHOJN7016223@lectura.cs.arizona.edu> References: <201905301724.x4UHOJN7016223@lectura.cs.arizona.edu> From: Junxiao Shi Date: Fri, 28 Jun 2019 13:11:03 -0600 To: dev@dpdk.org Subject: [dpdk-dev] [PATCH v2] cryptodev: free memzone when releasing cryptodev X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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 a cryptodev is created in a primary process, rte_cryptodev_data_alloc reserves a memzone. However, this memzone was not released when the cryptodev is uninitialized. After that, new cryptodev cannot be created due to memzone name conflict. This commit frees the memzone when a cryptodev is uninitialized, fixing this bug. This approach is chosen instead of keeping and reusing the old memzone, because the new cryptodev could belong to a different NUMA socket. Also, rte_cryptodev_data pointer is now properly recorded in cryptodev_globals.data array. Bugzilla ID: 105 Signed-off-by: Junxiao Shi Acked-by: Akhil Goyal --- lib/librte_cryptodev/rte_cryptodev.c | 46 ++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c index 00c2cf4..a7a0d4b 100644 --- a/lib/librte_cryptodev/rte_cryptodev.c +++ b/lib/librte_cryptodev/rte_cryptodev.c @@ -627,7 +627,7 @@ static inline int rte_cryptodev_data_alloc(uint8_t dev_id, struct rte_cryptodev_data **data, int socket_id) { - char mz_name[RTE_CRYPTODEV_NAME_MAX_LEN]; + char mz_name[RTE_MEMZONE_NAMESIZE]; const struct rte_memzone *mz; int n; @@ -653,6 +653,31 @@ rte_cryptodev_data_alloc(uint8_t dev_id, struct rte_cryptodev_data **data, return 0; } +static inline int +rte_cryptodev_data_free(uint8_t dev_id, struct rte_cryptodev_data **data) +{ + char mz_name[RTE_MEMZONE_NAMESIZE]; + const struct rte_memzone *mz; + int n; + + /* generate memzone name */ + n = snprintf(mz_name, sizeof(mz_name), "rte_cryptodev_data_%u", dev_id); + if (n >= (int)sizeof(mz_name)) + return -EINVAL; + + mz = rte_memzone_lookup(mz_name); + if (mz == NULL) + return -ENOMEM; + + RTE_ASSERT(*data == mz->addr); + *data = NULL; + + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + return rte_memzone_free(mz); + + return 0; +} + static uint8_t rte_cryptodev_find_free_device_index(void) { @@ -687,16 +712,16 @@ rte_cryptodev_pmd_allocate(const char *name, int socket_id) cryptodev = rte_cryptodev_pmd_get_dev(dev_id); if (cryptodev->data == NULL) { - struct rte_cryptodev_data *cryptodev_data = - cryptodev_globals.data[dev_id]; + struct rte_cryptodev_data **cryptodev_data = + &cryptodev_globals.data[dev_id]; - int retval = rte_cryptodev_data_alloc(dev_id, &cryptodev_data, + int retval = rte_cryptodev_data_alloc(dev_id, cryptodev_data, socket_id); - if (retval < 0 || cryptodev_data == NULL) + if (retval < 0 || *cryptodev_data == NULL) return NULL; - cryptodev->data = cryptodev_data; + cryptodev->data = *cryptodev_data; strlcpy(cryptodev->data->name, name, RTE_CRYPTODEV_NAME_MAX_LEN); @@ -720,17 +745,24 @@ int rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev) { int ret; + uint8_t dev_id; if (cryptodev == NULL) return -EINVAL; + dev_id = cryptodev->data->dev_id; + /* Close device only if device operations have been set */ if (cryptodev->dev_ops) { - ret = rte_cryptodev_close(cryptodev->data->dev_id); + ret = rte_cryptodev_close(dev_id); if (ret < 0) return ret; } + ret = rte_cryptodev_data_free(dev_id, &cryptodev_globals.data[dev_id]); + if (ret < 0) + return ret; + cryptodev->attached = RTE_CRYPTODEV_DETACHED; cryptodev_globals.nb_devs--; return 0;