From patchwork Thu May 30 17:07:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxiao Shi X-Patchwork-Id: 53914 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 0B055375B; Thu, 30 May 2019 19:35:38 +0200 (CEST) Received: from mails1n1-route0.email.arizona.edu (mails1n1-route0.email.arizona.edu [128.196.130.51]) by dpdk.org (Postfix) with ESMTP id 8C5742C55 for ; Thu, 30 May 2019 19:35:36 +0200 (CEST) IronPort-SDR: YANAGMdZQ1XzT5GtwrVj4GXFe+aRVUB6vmNWuYpsClSyKNQetS0fdf9wBiNfNa3olTTHf9ClN6 nI2QMh73wcdA== IronPort-PHdr: 9a23:6LCdiRDZsxFpbWNcVj45UyQJP3N1i/DPJgcQr6AfoPdwSPv5rsbcNUDSrc9gkEXOFd2Cra4d0qyP6fGrADVbqb+681k6OKRWUBEEjchE1ycBO+WiTXPBEfjxciYhF95DXlI2t1uyMExSBdqsLwaK+i764jEdAAjwOhRoLerpBIHSk9631+ev8JHPfglEnjWwba5vIBmssAndqM0bjYR/JqosxBbCv2dFdflRyW50P1yYggzy5t23/J5t8iRQv+wu+stdWqjkfKo2UKJVAi0+P286+MPkux/DTRCS5nQHSWUZjgBIAwne4x7kWJr6rzb3ufB82CmeOs32UKw0VDG/5KplVBPklCEKPCM//WrKiMJ/kbhbrQqhqRJhzYDafZqYOOZicq/BYd8WWXZNUtpXWidcAo28dYwPD+8ZMOhcson9oVQPrRqkCgmrGejh1z9Ihn7r1qA93OQhEB3G0RclH90UsXTUqMj5OL0SUOCy0anI1y7Db+5Q2Tf76InEaAwuofaJXb9pd8fa1EohFxvdg1mNrYHpISmZ2vkTv2SB7udtUfijhm4/pw1spjWj2N0ghpTXio4Py13J8T91zJs2KNC5TkNwfMSqH4FKty6AMot7WsYiQ2Z1tykk0rAGopu7fDQSyJQg2h7fd+SLc4iW7RLnU+acOTB4hGp5eLK+gha961KsxfHnVsWuyllKtCtFk9jLtnALzRPf8NaIReZg/ku52DaP0R7c6v1cLEwpkafXNYQtzqMumpYJsEnOGjX6lUXugK+TbEok++yo6+r9YrXho5+RL5R0igH/MqQsh8y/B+s5MgkUUGic4umzyKbj8VfjT7VQj/03k67ZsJbAKsgBuKG2HhJV3p456xmjFzemzMgYnX4fIV1YZh2HkZPkNEzWIP/lDvezmVOskC1kx6OOArq0DpjTBnTbnLSneqxyuGBGzw9m781Z95NdDfk6IPO7DkDwqPTdBx49akqlxPv9E8h70JJYUmWKVPzKeJjOuEOFs7p8a9KHY5UY7W7w X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2B2AwC7E/BcjAVFDMBlhhWNN4oGnG4BAQEMAQETGQECAQGHPyM4EwQBAQEEAgEBAgIBEwEBASZYgjoihCo0YYMiggurfYJPh2qNCheBf4RhiiaTG4ETlEIJgg+TJBqWVwGMGpZmAgQGBQIUAYFmIIFZMxoIGxWUGCABgTgBAY4QAQE X-IPAS-Result: A2B2AwC7E/BcjAVFDMBlhhWNN4oGnG4BAQEMAQETGQECAQGHPyM4EwQBAQEEAgEBAgIBEwEBASZYgjoihCo0YYMiggurfYJPh2qNCheBf4RhiiaTG4ETlEIJgg+TJBqWVwGMGpZmAgQGBQIUAYFmIIFZMxoIGxWUGCABgTgBAY4QAQE X-IronPort-AV: E=Sophos;i="5.60,532,1549954800"; d="scan'208";a="386164014" Received: from optima.cs.arizona.edu ([192.12.69.5]) by mails1n1out.email.arizona.edu with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2019 10:24:19 -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 x4UHOJEJ003685 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 30 May 2019 10:24:19 -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 x4UHOJG9016224 for ; Thu, 30 May 2019 10:24:19 -0700 Received: (from shijunxiao@localhost) by lectura.cs.arizona.edu (8.14.4/8.14.4/Submit) id x4UHOJN7016223; Thu, 30 May 2019 10:24:19 -0700 Message-Id: <201905301724.x4UHOJN7016223@lectura.cs.arizona.edu> From: Junxiao Shi To: dev@dpdk.org Date: Thu, 30 May 2019 11:07:53 -0600 Subject: [dpdk-dev] [PATCH] 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 | 44 +++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c index 00c2cf4..666dfea 100644 --- a/lib/librte_cryptodev/rte_cryptodev.c +++ b/lib/librte_cryptodev/rte_cryptodev.c @@ -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_CRYPTODEV_NAME_MAX_LEN]; + 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); @@ -724,13 +749,20 @@ rte_cryptodev_pmd_release_device(struct rte_cryptodev *cryptodev) if (cryptodev == NULL) return -EINVAL; + uint8_t 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; } + struct rte_cryptodev_data **cryptodev_data = &cryptodev_globals.data[dev_id]; + ret = rte_cryptodev_data_free(dev_id, cryptodev_data); + if (ret < 0) + return ret; + cryptodev->attached = RTE_CRYPTODEV_DETACHED; cryptodev_globals.nb_devs--; return 0;