From patchwork Mon Jun 17 15:07:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dragos Tatulea X-Patchwork-Id: 13700927 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2055.outbound.protection.outlook.com [40.107.102.55]) (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 CBDA013C835; Mon, 17 Jun 2024 15:08:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718636897; cv=fail; b=F1z3PG9v9Bar/6CYFf7OdSKE+JjhKexVlSeYZ3Y9pi2I55ZD7DmxecWKHbnXQxjbQSdGCGexa5S2/GkAxWdTARW8Sgeu7gjzFGXhjeLuzjCvI+PvCCZc6gxiUDP2Bljufa254sMnU0d2zIREKVDnfYRB9WBzvwwQoA++kp/ErdA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718636897; c=relaxed/simple; bh=fXevU3hdj0JvO+58iWTjO4mWUEeF/0S08VrGg74MY1g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=H/8iPQpILikxfsGr9dZ/3NEn11khk1hzcQZ2N3jr0b2ehCTKXOLKBG/ZkJhcgAAyujmNz1F7P0JsQ/itsEhGK7t+xYfC8TLGT6XexyNnJSCRE6wYicsixJU3NKe83lLpN6kO+0hhdaqMVosK3AoTppGPYr+JTSNhs1M9zVTrGmg= 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=Q1DqKb2w; arc=fail smtp.client-ip=40.107.102.55 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="Q1DqKb2w" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MgMbU8Qm3E0WrBEXmk/1UBhg+y3flMMlbsW4Uurs4bDwkGGdJfWYUJiaI776dX2iat80JfCxTjA/MInkVOsP47U0r8oZ4Lt1QMsoY3lZohZ5262CY8/FkId2gCfq5tpI8uOo1pJUZ0fwYR5gyx/0bngzY5uatEBqkBhs/5Z84eaSjiD6MSOSwlJ3yU3SLLZexBG2TSMPqVMfI/qII7/+gIxVlL8Xi1wYIjpDSJypiecmpUa7FxzalnREg9PCST3JhkLVTb7w7ihY93ShWlYb/RpnwS5hQqyQzjXunsHPeVNJhrVXk9bA5YOpz4AkZLiY4aYj185f4pMlaUyBKi8hhA== 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=P1GgYmuetoGlnCnxjBm2rDm9Az0PPDqZMoSL4OCPk2Y=; b=WVW96CrriNpdEWvBdfv57YprsynlNGWrKOXUoK4AHfHfDdNYwrBggPM75WawhWjg5b/iUKkDvN7vJs5248UKeitfo0DsGacQHvUQKIDCUuKXFlSoXt4+IXIXPnJCsNGOKIeRDwS5v39y+954Qy7rooSXXHEY6L8IMPh8c+7vhN5KAf53nC2DT7pxMHk9Z5G/c35mCto03aZu3OIaulrf4zcMk4X82+dlzDj429ar2zNNY6XGCKt00HOBB+degjgntRNQeOhZBZcAcuiDHsvyYG5SMRzM9d3snD9EjtdggTlmdOoAoURcww6fKq0xpmfp1M5ElU2vK2I8YzyYOF0peg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=redhat.com 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=P1GgYmuetoGlnCnxjBm2rDm9Az0PPDqZMoSL4OCPk2Y=; b=Q1DqKb2wDbu15JVFMeT+xzaVI+s0g7dRn5yBYN5y07zTihoFiOG7tlI+Vm7A4oGyHu+4LWlH4dqy0/KUy+WmwxBrtjO/yLQQg7oIL3LXRhhWNXb/Zi9vk7QSJFdQ/FM/mH+QIAhNbn0CR3viVTEw2RF2h1OP1pK+p+tYneNtBRNCHzKfZtdYpK7dAVLPt50mVpRxZ1fIQwi2qhsnu7J26yBBib3OtC+K8xbLDdG2nEkJmMYMb0VToKTq0L3iAlLv6cyNeuUkVN1mz+lG29GDLPVr6njXWCmhPVQ89hwmRLaZM6SjwndKXqVo8Dw+sfNsLlxWArChSZq1u482F2DdGg== Received: from SN7PR04CA0081.namprd04.prod.outlook.com (2603:10b6:806:121::26) by MW6PR12MB8833.namprd12.prod.outlook.com (2603:10b6:303:23f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.30; Mon, 17 Jun 2024 15:08:07 +0000 Received: from SA2PEPF00003AE9.namprd02.prod.outlook.com (2603:10b6:806:121:cafe::b4) by SN7PR04CA0081.outlook.office365.com (2603:10b6:806:121::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.31 via Frontend Transport; Mon, 17 Jun 2024 15:08:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) 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.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by SA2PEPF00003AE9.mail.protection.outlook.com (10.167.248.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.15 via Frontend Transport; Mon, 17 Jun 2024 15:08:07 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 17 Jun 2024 08:07:56 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 17 Jun 2024 08:07:55 -0700 Received: from dev-l-177.mtl.labs.mlnx (10.127.8.11) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Mon, 17 Jun 2024 08:07:52 -0700 From: Dragos Tatulea Date: Mon, 17 Jun 2024 18:07:36 +0300 Subject: [PATCH vhost 02/23] 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: <20240617-stage-vdpa-vq-precreate-v1-2-8c0483f0ca2a@nvidia.com> References: <20240617-stage-vdpa-vq-precreate-v1-0-8c0483f0ca2a@nvidia.com> In-Reply-To: <20240617-stage-vdpa-vq-precreate-v1-0-8c0483f0ca2a@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: , , , , Dragos Tatulea , Cosmin Ratiu X-Mailer: b4 0.13.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003AE9:EE_|MW6PR12MB8833:EE_ X-MS-Office365-Filtering-Correlation-Id: f376fee9-d15c-4477-8cac-08dc8edf4b58 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230037|36860700010|376011|7416011|82310400023|1800799021; X-Microsoft-Antispam-Message-Info: =?utf-8?q?tdrFd2ImaKJjjygCy4PGAQzXoAPdICg?= =?utf-8?q?CeE5tiOzLHeagPg6JHaxRr/UKqpZmiqbkpgG2WNJgDVAfX9QDSU/mfdfMuycmoFxp?= =?utf-8?q?rxgFFuMHsPMOLJtafR3idC0Ci+O0KncbAPuo46/g+evyaEDZe1Czm/EYaJzgDcMLi?= =?utf-8?q?PWZeuRUva1AD2ii6QI9Zb5VvMp74WBJWtMk3TN5M4268ZyXW3BZ0OsdG2SArsuUIi?= =?utf-8?q?3sxedb6O7I5ZP7MoqiUDBcATibnT+tk1CuAsPkviNgTHya2V5y9CWAoVlQmh2e/DM?= =?utf-8?q?FUDE5rSyOduwo+YfJ18Dtqt2KDidt9P0mR//8ANsbEb9qHtQtmh7BtgiRDyHBmb9u?= =?utf-8?q?3ISf3UY+IU+dzdzU4or738WRzzU0MXexvRDW+F7VVZoWpjTMkl/ue6ZLpC1w+2CH8?= =?utf-8?q?PShe6YbRN/krRTlx8XtIRRmncI2aaYeCLoyLnb7okrO69qRstXWjgAGsfKtYoZIbT?= =?utf-8?q?UWLT2bQvcXiratABPQgqLBb7Kxx7lr7wouNnR7gzoBnC6mUjL6mgtm2xYpUTOLKUG?= =?utf-8?q?/pDKynuY4LzfVPuixyW5g21Z0CNf+Rt525p7PP6Uhq7khiVJ3rDD0ZLHYQ4Exo9OQ?= =?utf-8?q?IL93oBVqsD6sbZciKtiNZnr2/3i1N/HmkTr51QlOVaT6OLzBdsreHLxaiE+XIdGZI?= =?utf-8?q?pE1jCbX1AyYB11M64BLFAOS9Z+bL1CP6Icd57X/ZSsLiXTjzSlDKz5cGP041mpkJ5?= =?utf-8?q?xoogHEsyQ2lgFia1HQg0DEmida+S4u2iV+O/b1pc9tESsMlPnQIKFxxHffDmmuK24?= =?utf-8?q?1JBKFHOWjRxn5stVh5ByBlSydMkcLaS30fkixhK1nSp4vVpOFIU3Dkwr7UDykmAgY?= =?utf-8?q?0f3CT3HEpCAAkBU1XzJRmMRa4ZmbvHxPjuFcRuEKQJYuB4WbUlqVD/xBAzqzJTR9/?= =?utf-8?q?iy0cVvX8ZXXyyy5NO+wmO2pIA+teC5SmAX8svqJeBT1UMm+IpMT81+Gr0puafiZc9?= =?utf-8?q?Iz61DEFGGZpbb/MueSHjfACKKR9LvIMv5eXFZDHZ1UQA/Hux8WGa62OvIfRJaA5ww?= =?utf-8?q?Nq6tAqcxFEAom3dpDqvEUxMLcWoJ+AceLP7UJnMOhxhUysVZMDDbLFZwoGgFLC4dJ?= =?utf-8?q?Cwv0v9ktf8dw0XvVsZ3eaTTlCXDNuelyiFpmyNvvH9KWMGlz9TCyAdgorspzR1+vB?= =?utf-8?q?Ysl/e7Pp/zYyemCFr2/ZE26yRA6jy0qcZWjv1WBGYVvTCt4+alzQToTVxgPc0fo4F?= =?utf-8?q?oJzJ60zM81AgzdQiefL70wNSoILz2/Lj2vy/Ut9SQshr0GY8B81WMKmWMuoyed3l4?= =?utf-8?q?uujohfh0B0SYDROi+tOu27VAKG2+adKgdOMrrc2jemR3JQP5DIS14ChexISQ71tyc?= =?utf-8?q?ylqMW2KbGoVIZPDzyJ6mOemY2qIw7tgIXg=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.232;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge1.nvidia.com;CAT:NONE;SFS:(13230037)(36860700010)(376011)(7416011)(82310400023)(1800799021);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2024 15:08:07.1307 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f376fee9-d15c-4477-8cac-08dc8edf4b58 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.232];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003AE9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8833 ... by changing the setup_vq_resources() parameter. Signed-off-by: Dragos Tatulea Reviewed-by: Cosmin Ratiu Acked-by: Eugenio Pérez --- 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;