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 341B8A0C4C; Thu, 14 Oct 2021 10:55:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19A1540042; Thu, 14 Oct 2021 10:55:48 +0200 (CEST) Received: from AZHDRRW-EX02.NVIDIA.COM (azhdrrw-ex02.nvidia.com [20.64.145.131]) by mails.dpdk.org (Postfix) with ESMTP id EF22140041; Thu, 14 Oct 2021 10:55:46 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.49) by mxs.oss.nvidia.com (10.13.234.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.858.15; Thu, 14 Oct 2021 01:55:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUqVINgU7+bKXWymY464kpD5vqXnDutss4TKU5W5zuFJj4ZM2NKPNG9VANOOk+NuVIfrI7B0Bg5ZT2lJ7siro2ydSmnJLlzxsSqUSPi7BtBOuYT7YD7Ly1FmvNKHLAF+JdwO0hZm9ytMU87pfZEBQoiLHU+lyAT/oQiVI3A15uKqSCZXmPQz9Ij1FzuNyzvUgeHk/5UeA+GnbT7Brplh4jo5voKIB4YIHdePkhQhTc3CyJuSe45NdxKYiQJqjnrZuJOy9RbkzMk2XTK6+auP/wFnxlgAXHo/eCZVIKtJk3kcyt5IFvaYOPYXzjC0GuHJfmNfJdLRLjKCrzYW0NdaNA== 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=b38T9+LDVr2JxN0r2zoPdTqLSmrX1ZxvSAhkysZBCrM=; b=MzyW0EEQqIWjIIB6sxWyXWFHmggkWpKIFY7pEyYT6wKyfpLvuO1PvkA7D5SY/iJl9h8o3iVsL/duVwnPtlJP6ZD7d/0I9aUC6NeB0buDmPbQ07FgR1waVL/zRF/eHlT+a82+/2MjQeuNA+19w9qTT13wmQfxisk0C/bUq+qnNTKL31Q0EWI8Fj57NwLR1q03MM9qG4rpAj03zv5Gi3NHjROkGS4/El/jUgDhckdTQQWsbx8RrfvmhXnNw/SAfEOdP5eKpH1lv8D90jMZjzVxR8gF/2/HbfAkSKJmBn55iLaL9qtfGhIk+LQnqg7MfKRDMyizNNXlD69MeMMg6dt+CQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com 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=b38T9+LDVr2JxN0r2zoPdTqLSmrX1ZxvSAhkysZBCrM=; b=d+YSVC94E/7OSGwe600OwOa+sXMZRAdRTUv5g6wSSquXc1egsAf+x6ZLalfTjDOqMNYxQzo3D1oBEGKc2IkU8bmF8a52uprb3R6cmZh8LA4HA6aRzDjXtP/Ryx6orR83ttPRgQoSfkhSUltnKgx06LBgmm+esUCiDPHqmcZzdMbas6lbAmkJYaWE+s4OIE261qY5faa5MAGvF4PwgGamyjmmvF5pCWZ7BSnqT2onqHJfdBEJefTSNJFXM6f2ChnbU87SfU23Ow4o7k59BpjsTd2np87uaUvqw7IJ6pqwBgddwAnrwiRwzlEhfzbDTUYMTnEKkWCdKg+1Om4+T4nB5A== Received: from BN6PR11CA0049.namprd11.prod.outlook.com (2603:10b6:404:f7::11) by DM6PR12MB3179.namprd12.prod.outlook.com (2603:10b6:5:183::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.22; Thu, 14 Oct 2021 08:55:44 +0000 Received: from BN8NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:404:f7:cafe::b7) by BN6PR11CA0049.outlook.office365.com (2603:10b6:404:f7::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Thu, 14 Oct 2021 08:55:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.com; 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 BN8NAM11FT013.mail.protection.outlook.com (10.13.176.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Thu, 14 Oct 2021 08:55:43 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 14 Oct 2021 08:55:40 +0000 From: Dmitry Kozlyuk To: CC: David Marchand , Raslan Darawsheh , Xueming Li , , Harman Kalra , Thomas Monjalon , Matan Azrad , Viacheslav Ovsiienko Date: Thu, 14 Oct 2021 11:55:28 +0300 Message-ID: <20211014085528.2992805-1-dkozlyuk@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014085026.2991677-1-dkozlyuk@nvidia.com> References: <20211014085026.2991677-1-dkozlyuk@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 420fbc7c-5481-4cb1-0897-08d98ef0682c X-MS-TrafficTypeDiagnostic: DM6PR12MB3179: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wmRFWZIGXvR9srOyu4NUpPy766LRP75kKDmk+HDLimS3o9Xc2XqJ/XhfeeHDCPzHAgAA/YeeADDYE4UWa+0zQnnvmQa3pkkn7Mjn+P3Gd0eSKQFeEaxDXzVkJHG78GLsOBMkhgV/KMCmXcAG7xGax+emMGQrscMzIivMzly7khno3PVhJNvFOm1rYmhWsftcmNdo3bchO7uvy/E3mIr/PPdzFpLB/EdplZSTxlBw1l4ZUYlrAdpMmXbcL1jdlNbIKRAF4FFPwCQQ+6CKEVVbojnxmD4bx0XtNAVAY8Pjck9U/ZeMMNovmzj3NFKFuzzHP60pLPbbpI/KuZFJCwJZG2skl+RXDpyA3Vhh6pIdVCofXR9TqKm+drci6QMDF3A25xKGAxTee0+sbqsSq9bTHW1/dbJFGZqrg/Fxty8xUMKE3VSGGvlM1I7F25nkHAuwzg/+phvFTmSlMmkG53jpnG5SZraW+G2mEfLKBcIuIb5++OcO8P1PPl84X6WKT6agbOI9oAV0YjmXflJEderWBiGyDNWr9D47A8ZZSx9JaCxb+gG1O4YV6W4ypDpLxQIOAVKltSKWRetOSyknGjgtzw5iGXYqtQmYXGFKOtbwHccx0FSQl7RqW8LzdNQhqen1RLLrZwuowrMt/x8YX9763rf7+S9mILX0k0fQ6hUjrA4ojFH0Jnz/OzNC0hu5mfyOLY/05nS2oyQsGn6fSpmeyw== 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)(54906003)(6666004)(450100002)(86362001)(336012)(316002)(8676002)(6916009)(26005)(36756003)(83380400001)(1076003)(47076005)(55016002)(5660300002)(36860700001)(356005)(4326008)(8936002)(70586007)(2616005)(70206006)(2906002)(7696005)(186003)(107886003)(16526019)(508600001)(426003)(6286002)(82310400003)(7636003); DIR:OUT; SFP:1101; X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2021 08:55:43.8838 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 420fbc7c-5481-4cb1-0897-08d98ef0682c 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: BN8NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3179 Subject: [dpdk-dev] [PATCH v2] net/mlx5: close tools socket with the last device 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" MLX5 PMD exposes a socket for external tools to dump port state. Socket events are listened using an interrupt source of EXT type. The socket was closed and the interrupt callback was unregistered at program exit, which is incorrect because DPDK could be already shut down at this point. Move actions performed at program exit to the moment the last MLX5 port is closed. The socket will be opened again if later a new MLX5 device is plugged in and probed. Also fix comments that were deceisively talking about secondary processes instead of external tools. Fixes: e6cdc54cc0ef ("net/mlx5: add socket server for external tools") Cc: Xueming Li Cc: stable@dpdk.org Reported-by: Harman Kalra Signed-off-by: Dmitry Kozlyuk Acked-by: Thomas Monjalon --- v2: add Fixes tag drivers/net/mlx5/linux/mlx5_os.c | 9 +++++++++ drivers/net/mlx5/linux/mlx5_socket.c | 12 +++--------- drivers/net/mlx5/mlx5.c | 6 ++++-- drivers/net/mlx5/mlx5.h | 2 ++ drivers/net/mlx5/windows/mlx5_os.c | 8 ++++++++ 5 files changed, 26 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 3746057673..28db0827d5 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2793,6 +2793,15 @@ mlx5_os_net_probe(struct rte_device *dev) return mlx5_os_auxiliary_probe(dev); } +/** + * Cleanup resources when the last device is closed. + */ +void +mlx5_os_net_cleanup(void) +{ + mlx5_pmd_socket_uninit(); +} + static int mlx5_config_doorbell_mapping_env(const struct mlx5_dev_config *config) { diff --git a/drivers/net/mlx5/linux/mlx5_socket.c b/drivers/net/mlx5/linux/mlx5_socket.c index 6356b66dc4..902b8ec934 100644 --- a/drivers/net/mlx5/linux/mlx5_socket.c +++ b/drivers/net/mlx5/linux/mlx5_socket.c @@ -167,10 +167,7 @@ mlx5_pmd_interrupt_handler_uninstall(void) } /** - * Initialise the socket to communicate with the secondary process - * - * @param[in] dev - * Pointer to Ethernet device. + * Initialise the socket to communicate with external tools. * * @return * 0 on success, a negative value otherwise. @@ -187,10 +184,6 @@ mlx5_pmd_socket_init(void) MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY); if (server_socket) return 0; - /* - * Initialize the socket to communicate with the secondary - * process. - */ ret = socket(AF_UNIX, SOCK_STREAM, 0); if (ret < 0) { DRV_LOG(WARNING, "Failed to open mlx5 socket: %s", @@ -237,7 +230,8 @@ mlx5_pmd_socket_init(void) /** * Un-Initialize the pmd socket */ -RTE_FINI(mlx5_pmd_socket_uninit) +void +mlx5_pmd_socket_uninit(void) { if (!server_socket) return; diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 45ccfe2784..497cf52787 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1315,9 +1315,11 @@ mlx5_free_shared_dev_ctx(struct mlx5_dev_ctx_shared *sh) mlx5_mr_release_cache(&sh->share_cache); /* Remove context from the global device list. */ LIST_REMOVE(sh, next); - /* Release flow workspaces objects on the last device. */ - if (LIST_EMPTY(&mlx5_dev_ctx_list)) + /* Release resources on the last device removal. */ + if (LIST_EMPTY(&mlx5_dev_ctx_list)) { + mlx5_os_net_cleanup(); mlx5_flow_os_release_workspace(); + } pthread_mutex_unlock(&mlx5_dev_ctx_list_mutex); /* * Ensure there is no async event handler installed. diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 3581414b78..08eeddaddc 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1739,6 +1739,7 @@ int mlx5_mp_os_req_queue_control(struct rte_eth_dev *dev, uint16_t queue_id, /* mlx5_socket.c */ int mlx5_pmd_socket_init(void); +void mlx5_pmd_socket_uninit(void); /* mlx5_flow_meter.c */ @@ -1787,6 +1788,7 @@ int mlx5_os_set_promisc(struct rte_eth_dev *dev, int enable); int mlx5_os_set_allmulti(struct rte_eth_dev *dev, int enable); int mlx5_os_set_nonblock_channel_fd(int fd); void mlx5_os_mac_addr_flush(struct rte_eth_dev *dev); +void mlx5_os_net_cleanup(void); /* mlx5_txpp.c */ diff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c index 26fa927039..bcfb26c57f 100644 --- a/drivers/net/mlx5/windows/mlx5_os.c +++ b/drivers/net/mlx5/windows/mlx5_os.c @@ -1185,4 +1185,12 @@ mlx5_os_get_pdn(void *pd, uint32_t *pdn) return 0; } +/** + * Cleanup resources when the last device is closed. + */ +void +mlx5_os_net_cleanup(void) +{ +} + const struct mlx5_flow_driver_ops mlx5_flow_verbs_drv_ops = {0}; -- 2.25.1