From patchwork Wed Jun 26 10:26:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dragos Tatulea X-Patchwork-Id: 13712592 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2081.outbound.protection.outlook.com [40.107.237.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42A5A17DE02; Wed, 26 Jun 2024 10:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397637; cv=fail; b=M+ba43QrrqeZGRFwu3ThXwF3VN3zbbS+ixYq0om/WI2BPg6rxfckY71KErRHHkCJhI3SA4w3NeY+oY/D5tJ1rLW5aN/7gFfsq4T0lq4DVhy3CtDHLSvSY1ZlJzx7OtaRf2FaMbsIvsgOQxKVV7fG1qC3iB3o2l5B/tv5iUzfXIk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397637; c=relaxed/simple; bh=0xyUujEt5tlp/JGtbLdkTmvJMn5GpsoNwlG+zuN1A4U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=YCJhpCY8NDvCwF3LC3yzK3MiMNdy0XecksWUV4xcXfzFUFWWUYend2fT5C99c9QB76YrUp2KcaWIGbdexaRP6V/uf6iO/jqfHJBkz8/7k2DkC8vSEKlpeRC64aKT5S5Kz2fou8PqNxI0qWmZVE7J+AAv3c118L+RNtvRn8jhSig= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=brtJMiBs; arc=fail smtp.client-ip=40.107.237.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="brtJMiBs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aFT9IfDSBszZRSrTNDq73Hpkvb7cnky3UBg8cgXCRoQd73U0Fx6gkIGeVGr9oFNBpURtF5wVDSLE9xhYc4b6jFFIzhxSgDksuwp2lmonySinoHc5xmp/2HKAwgXYxa120yZ+YUxDUoqmc+Sn+lzxXNueJ++l6U3vjkbQIgyVDWHdm4vOsry8M3FThYO0Ows2TC6YndVnkNb6T6FbV8+w9VBrx0vVeqBlM4ugmUhhSWsxaGRGcNOYQeEIVPZ+2BtDLGx8Zi8x6v/5BcMSkdKFXGcA9BAnr9B2Bu/9bn/q1je/VYhiygyf/PKnhgR01ugrhXO9n/3P2pJgCpidMWt71Q== 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=dqqdoPA11rvLppM3bcAIiQFOvnyc7bkbAU7AC+X1w44=; b=KjXfDzmyRiek7agQL2WCGqPRgpdpbB6sgdL+Hv/3+QFjXE8Cw2L0mt82u8oWPwi7WBjZ/lF++NMtaKBTNn2SMgjKjWXTFF1PG0txQ4Ooj55k7wfbZUrpUub7tUhsrksvmawAhNvmHq3YcHa33VZlu9FQGv/Lpx69PXezwDj3oQhcmwTFy+qBUmiWnY0503IWZ1tSYDY1wRUDur/jXC158gxbimKank3Pa4mY1wU+zHE7CDwxC5OneEOHqumDLqrBhMS2BPCx3H1VUka/OxXUEkQMSsl1ejtYR+fx7tlNjbFQNwLIFcKOpcxtyKv2tRqYlaMvYTdztuEOGOg03bSU8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=dqqdoPA11rvLppM3bcAIiQFOvnyc7bkbAU7AC+X1w44=; b=brtJMiBs5F/7Ol0/HgwlLrGiCaJGN5RgdLTPSc02nlKeoUS96FpcUmcRwn4ncYjlENXgypuxSU/akNgCuCiAeOXpgzApWNvJioaTaZp73gAWO7RxWje8MXffzUoR16kUP6YChWgxks/7ZCosoX3wRT9KLOC+L3RV6BCJOJcTc4Gw11oDpWGAlQOvSjp+B/VFanjDgnz3uv6ZUsxJ8C4CghUTzYHAvnQ37OXLe4TXMD2oAa9sSeCur0elYSA5SyuS1j/f3zvlDDcLPRkDx6oZImH/oV99Iz6FYhm/4xjy3iOB8TQZMA+p5LJA/714V5oY6tONZKJ0UiNhvuPqUWN8Uw== Received: from SJ0PR13CA0096.namprd13.prod.outlook.com (2603:10b6:a03:2c5::11) by LV3PR12MB9331.namprd12.prod.outlook.com (2603:10b6:408:219::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7698.32; Wed, 26 Jun 2024 10:27:12 +0000 Received: from SJ5PEPF000001CA.namprd05.prod.outlook.com (2603:10b6:a03:2c5:cafe::1a) by SJ0PR13CA0096.outlook.office365.com (2603:10b6:a03:2c5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.18 via Frontend Transport; Wed, 26 Jun 2024 10:27:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF000001CA.mail.protection.outlook.com (10.167.242.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.15 via Frontend Transport; Wed, 26 Jun 2024 10:27:11 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 26 Jun 2024 03:26:55 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 26 Jun 2024 03:26:55 -0700 Received: from dev-l-177.mtl.labs.mlnx (10.127.8.11) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 26 Jun 2024 03:26:51 -0700 From: Dragos Tatulea Date: Wed, 26 Jun 2024 13:26:38 +0300 Subject: [PATCH vhost v2 02/24] vdpa/mlx5: Make setup/teardown_vq_resources() symmetrical Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20240626-stage-vdpa-vq-precreate-v2-2-560c491078df@nvidia.com> References: <20240626-stage-vdpa-vq-precreate-v2-0-560c491078df@nvidia.com> In-Reply-To: <20240626-stage-vdpa-vq-precreate-v2-0-560c491078df@nvidia.com> To: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?utf-8?q?Eugenio_P=C3=A9rez?= , Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Si-Wei Liu CC: , , , , Cosmin Ratiu , Dragos Tatulea X-Mailer: b4 0.13.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001CA:EE_|LV3PR12MB9331:EE_ X-MS-Office365-Filtering-Correlation-Id: 25333384-52d7-4e79-2ca3-08dc95ca8a8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230038|1800799022|36860700011|7416012|82310400024|376012; X-Microsoft-Antispam-Message-Info: =?utf-8?q?1qpZ355BNyUZNdCfCUSZzX8zf2DHbmd?= =?utf-8?q?0OHlErWJpR0Z6NM0aKUrV9jrefnAMTajeqvK3XXIoAGCEJXk7MvwgkGl+1N1RLLlx?= =?utf-8?q?/G/UriLUQDkFyMOthQDyYg9pCYwILUgappCY6k07LUVFwqMNBNBg1kg739vSz7mAv?= =?utf-8?q?oGQEd4DZkW/jhL5C16e7gcBU/IoovYPoefW151bMusN9DlN5JET7yepfFWxGvQuHp?= =?utf-8?q?zdxRbiKWlxh+90XuZ2YvUrXqMVDq5TP7CVfKyIHZ6T8l12m0QSmr661RmE4XwZ40T?= =?utf-8?q?9D6SqGKOHVyWOEs7cyHZfURflwIPLy2UDcevGBermZ0wctyOnfqKhSZg50/gKrAOj?= =?utf-8?q?xnNbLInPu7xKlAflwOEzQzVx8OhRl4bWllvrNCE6STv84k0oTy4pTHb1v6zemTT9b?= =?utf-8?q?O50jL+/4Ac5zVCuRukci5OQfEm5khqU4w0pY1gGLBlnNvZxn0P3wsriqb8Z9luJkz?= =?utf-8?q?lsN3B1nt/BpR28SOdRS7DkrrOCw7a5U9sd65lZUNLV5N81+3Si0ZJGSkiqCl6RZFL?= =?utf-8?q?LLrw03O+OoPQPbvpGUU0Jy8Fl4rzdNdQyXES7hs0TruphYbRcS5o3gGUieHqypqAJ?= =?utf-8?q?s5J89fu+e5Z/gpk9Krz1yUsj3AHy1+HGvp/pKL4OaT/ASIjKxPIx+uPO31SwmFBLb?= =?utf-8?q?S0bahMKpByzyrrKvqbObA1QoyOjWcSZjrXa4nyaLS3e8FBfjwa5lIqz1SCUhfi7SC?= =?utf-8?q?ecQOcwsHdeJKQEZFlB+jic+yfGM6d/ifkgPVDWGf4IOdFIAEeqiuMTy0aJfeKuc4f?= =?utf-8?q?rH07HNJdSEne/j3xI5BB94GkhTQyW32EtN3l9cF7Y15jzlfpe92zlE4ez+oORvn2s?= =?utf-8?q?ICgP3NQziTkHGZG0zMeG54iF8W8CU6rk/XQB/woSNdHrg/4DNEi8wuPqVXzfDffI6?= =?utf-8?q?bP2wu5DWe5h8gukT1xY6i8+eDxqVTRA/koI+igvsseY5xRWYUqwYeusGn/uJ5q6cc?= =?utf-8?q?INIvmuI7iA5gDk4oYQ3QYcP1aduHQhoAuQmfYWvWEM9S9JXMbUfbOPHBPAUhFdRXQ?= =?utf-8?q?m/kGZn2MnxDIlIRDF2EJOVpeG36hq+qgGoRRuRyI52AynYw1X31F2TWnJyindS7+u?= =?utf-8?q?Jl/yWF0hsyF5uTgcKkBrhChZPEnh+LjXmfsAoCAUEW88UD+RYVYDxpPYe2/XnQOUg?= =?utf-8?q?KF5JRCrHhjegEilc67c1ZDmH9iMY/TrTwR7UwInBmKLYiV157cBHeyDop2FDxx6oF?= =?utf-8?q?bPLYm0vBcdLyR6wSsPwfU01A+aCGv8i+bpEXLjyBOq4qiYSVhPTaxVfVUClMt1l/1?= =?utf-8?q?xWKhYoEmGuXa8CooP0LbRlCuyAsoYU5/qltLL3gRkoO244bQ30XqdTUVWOzUbQdwf?= =?utf-8?q?mxqptXZTKkWU8YVdILOhEX8A4mBiul92Gg=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230038)(1800799022)(36860700011)(7416012)(82310400024)(376012);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2024 10:27:11.8761 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25333384-52d7-4e79-2ca3-08dc95ca8a8a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001CA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9331 ... by changing the setup_vq_resources() parameter type. Reviewed-by: Cosmin Ratiu Acked-by: Eugenio Pérez Signed-off-by: Dragos Tatulea --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 3422da0e344b..1ad281cbc541 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -146,7 +146,7 @@ static bool is_index_valid(struct mlx5_vdpa_dev *mvdev, u16 idx) static void free_fixed_resources(struct mlx5_vdpa_net *ndev); static void init_mvqs(struct mlx5_vdpa_net *ndev); -static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev); +static int setup_vq_resources(struct mlx5_vdpa_net *ndev); static void teardown_vq_resources(struct mlx5_vdpa_net *ndev); static bool mlx5_vdpa_debug; @@ -2862,7 +2862,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, if (teardown) { restore_channels_info(ndev); - err = setup_vq_resources(mvdev); + err = setup_vq_resources(ndev); if (err) return err; } @@ -2873,9 +2873,9 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, } /* reslock must be held for this function */ -static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev) +static int setup_vq_resources(struct mlx5_vdpa_net *ndev) { - struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev); + struct mlx5_vdpa_dev *mvdev = &ndev->mvdev; int err; WARN_ON(!rwsem_is_locked(&ndev->reslock)); @@ -2997,7 +2997,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status) goto err_setup; } register_link_notifier(ndev); - err = setup_vq_resources(mvdev); + err = setup_vq_resources(ndev); if (err) { mlx5_vdpa_warn(mvdev, "failed to setup driver\n"); goto err_driver;