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 B8C1C4554D; Tue, 2 Jul 2024 16:47:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BA04340E45; Tue, 2 Jul 2024 16:46:58 +0200 (CEST) Received: from smtp-fw-6002.amazon.com (smtp-fw-6002.amazon.com [52.95.49.90]) by mails.dpdk.org (Postfix) with ESMTP id E7E3840DF8 for ; Tue, 2 Jul 2024 16:46:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1719931617; x=1751467617; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=FCOFdRog5WXNUC+9IYcvHrESI94Rcm3mlZwTGGl1Xz4=; b=kDg+SbAw4jrKzT/WRhnAw8kuFBmgeifCDqUz4g1upe9R+t9AP+KNSyXF xGAFtaGVAd4JPm+trS8Eu7ZvFocuXb6ciM0X2VFL9n6cG+bRiVKobPtiy 4sSpQpl53OORfCAwK3U+Rw8Qe7YUXDVISAjGywN/U52QMKZMQ8TZcoJ2h Y=; X-IronPort-AV: E=Sophos;i="6.09,178,1716249600"; d="scan'208";a="417221164" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO smtpout.prod.us-east-1.prod.farcaster.email.amazon.dev) ([10.43.8.6]) by smtp-border-fw-6002.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2024 14:46:53 +0000 Received: from EX19MTAEUB002.ant.amazon.com [10.0.43.254:4302] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.43.71:2525] with esmtp (Farcaster) id 197036ff-a4f6-4a42-beac-52b7039588f1; Tue, 2 Jul 2024 14:46:52 +0000 (UTC) X-Farcaster-Flow-ID: 197036ff-a4f6-4a42-beac-52b7039588f1 Received: from EX19D007EUB004.ant.amazon.com (10.252.51.85) by EX19MTAEUB002.ant.amazon.com (10.252.51.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Tue, 2 Jul 2024 14:46:52 +0000 Received: from EX19MTAUWB001.ant.amazon.com (10.250.64.248) by EX19D007EUB004.ant.amazon.com (10.252.51.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.1258.34; Tue, 2 Jul 2024 14:46:52 +0000 Received: from HFA15-CG15235BS.amazon.com (10.85.143.173) by mail-relay.amazon.com (10.250.64.254) with Microsoft SMTP Server id 15.2.1258.34 via Frontend Transport; Tue, 2 Jul 2024 14:46:50 +0000 From: To: CC: , Shai Brandes Subject: [PATCH 10/15] net/ena: rework device uninit Date: Tue, 2 Jul 2024 17:46:21 +0300 Message-ID: <20240702144626.14545-11-shaibran@amazon.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240702144626.14545-1-shaibran@amazon.com> References: <20240702144626.14545-1-shaibran@amazon.com> MIME-Version: 1.0 Content-Type: text/plain 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 From: Shai Brandes Rework device uninitialization flow to ensure complete resource cleanup, and lay the groundwork for hot-unplug support. With this change, `ena_destroy_device()` is removed, its functionality now incorporated into `ena_close()`. Signed-off-by: Shai Brandes --- doc/guides/rel_notes/release_24_07.rst | 2 + drivers/net/ena/ena_ethdev.c | 55 ++++++++++++-------------- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/doc/guides/rel_notes/release_24_07.rst b/doc/guides/rel_notes/release_24_07.rst index 1e46a4b7c7..a59fb2a21f 100644 --- a/doc/guides/rel_notes/release_24_07.rst +++ b/doc/guides/rel_notes/release_24_07.rst @@ -76,6 +76,8 @@ New Features * **Updated Amazon ena (Elastic Network Adapter) net driver.** * Reworked the driver logger usage in order to improve Tx performance. + * Reworked the device uninitialization flow to ensure complete resource + cleanup and lay the groundwork for hot-unplug support. * **Update Tap PMD driver.** diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 56dbe3b9cd..4e7171e629 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -280,8 +280,8 @@ static int ena_infos_get(struct rte_eth_dev *dev, static void ena_control_path_handler(void *cb_arg); static void ena_control_path_poll_handler(void *cb_arg); static void ena_timer_wd_callback(struct rte_timer *timer, void *arg); -static void ena_destroy_device(struct rte_eth_dev *eth_dev); static int eth_ena_dev_init(struct rte_eth_dev *eth_dev); +static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev); static int ena_xstats_get_names(struct rte_eth_dev *dev, struct rte_eth_xstat_name *xstats_names, unsigned int n); @@ -880,12 +880,16 @@ static int ena_close(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = pci_dev->intr_handle; struct ena_adapter *adapter = dev->data->dev_private; + struct ena_com_dev *ena_dev = &adapter->ena_dev; int ret = 0; int rc; if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; + if (adapter->state == ENA_ADAPTER_STATE_CLOSED) + return 0; + if (adapter->state == ENA_ADAPTER_STATE_RUNNING) ret = ena_stop(dev); adapter->state = ENA_ADAPTER_STATE_CLOSED; @@ -905,6 +909,19 @@ static int ena_close(struct rte_eth_dev *dev) rte_free(adapter->drv_stats); adapter->drv_stats = NULL; + ena_com_set_admin_running_state(ena_dev, false); + + ena_com_rss_destroy(ena_dev); + + ena_com_delete_debug_area(ena_dev); + ena_com_delete_host_info(ena_dev); + + ena_com_abort_admin_commands(ena_dev); + ena_com_wait_for_abort_completion(ena_dev); + ena_com_admin_destroy(ena_dev); + ena_com_mmio_reg_read_request_destroy(ena_dev); + ena_com_delete_customer_metrics_buffer(ena_dev); + /* * MAC is not allocated dynamically. Setting NULL should prevent from * release of the resource in the rte_eth_dev_release_port(). @@ -925,7 +942,12 @@ ena_dev_reset(struct rte_eth_dev *dev) return -EPERM; } - ena_destroy_device(dev); + rc = eth_ena_dev_uninit(dev); + if (rc) { + PMD_INIT_LOG(CRIT, "Failed to un-initialize device\n"); + return rc; + } + rc = eth_ena_dev_init(dev); if (rc) PMD_INIT_LOG(CRIT, "Cannot initialize device\n"); @@ -2434,39 +2456,12 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev) return rc; } -static void ena_destroy_device(struct rte_eth_dev *eth_dev) -{ - struct ena_adapter *adapter = eth_dev->data->dev_private; - struct ena_com_dev *ena_dev = &adapter->ena_dev; - - if (adapter->state == ENA_ADAPTER_STATE_FREE) - return; - - ena_com_set_admin_running_state(ena_dev, false); - - if (adapter->state != ENA_ADAPTER_STATE_CLOSED) - ena_close(eth_dev); - - ena_com_rss_destroy(ena_dev); - - ena_com_delete_debug_area(ena_dev); - ena_com_delete_host_info(ena_dev); - - ena_com_abort_admin_commands(ena_dev); - ena_com_wait_for_abort_completion(ena_dev); - ena_com_admin_destroy(ena_dev); - ena_com_mmio_reg_read_request_destroy(ena_dev); - ena_com_delete_customer_metrics_buffer(ena_dev); - - adapter->state = ENA_ADAPTER_STATE_FREE; -} - static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev) { if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - ena_destroy_device(eth_dev); + ena_close(eth_dev); return 0; } -- 2.17.1