From patchwork Wed Jun 26 10:26:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dragos Tatulea X-Patchwork-Id: 13712585 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2073.outbound.protection.outlook.com [40.107.102.73]) (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 9217E1891C5; Wed, 26 Jun 2024 10:28:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397706; cv=fail; b=EkRGFcl9fBwZ3BrL/+2EKihvvYVrTKvzVAZThzaJY1r2rjQgF0I6nNPtSycpyEShfsW9XtJC232YTs0SdgA5iqNWXWQpI993+HDnLM3Y1P8VVEu/2ZKCvpPz0hV2MqWS2P39PLTLaFb/Hl1SI3nPnh2wcryodl7Oymhvpdp/Omg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397706; c=relaxed/simple; bh=FEcoyi4MwChTT94/YoCRTjbpe6Lewj5Xkqw5N8AkdAE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=AfIgjq+ciEYxBDKKcLmTIt+2Pymc1o3EsjqXQ68Vk11B6Gd7kFY3qu5OJCA1Xg+c1Qq+Ks35rbqHp+iIsMOAyW7z4OTlYtLXsxdKCvAsN6apwtE4J2tef9lrbaqYIFev1kdm5lFfyODbIOoVs0MgMJ7nixgEytt23AbWzRkog14= 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=rOmvKGm3; arc=fail smtp.client-ip=40.107.102.73 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="rOmvKGm3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FZo5HXYOzl7nvWs3zPKMIoDd61gs/BGJ8Va2EvgGOltMQzvVdMAFuY4y+fTc+5NLwgoKGCRDn3dyeaR5aoJMzXH5vrE/RFO6Bs3z8a7vK6MgZMzButdETQ6tbKUSQEm8nPEv20APxyY51goNJz94bbUBtle4zcU6R2JPdBeTMcliEFh2ZSnYAm46I2w86b/45/9hG3VPT9VLaVpVJP2dAeRBPCpqM7L7zhSTb/tYAuL1ebcKzEgimImCP+uF6e08cGH8YiIEM2HF7JF0R5vBcPJ8Uf64oRcrbf/dXwvkuwpI6ZX5yCmq+AdUP7XMz0mP/Mv+ho6pGXwN9C+L+uLq3g== 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=RO9B6pk2HLDFatJ39WrGheP+Kp8n4ALs/ymCH9Z8CR0=; b=YqVh63ao2I4wz6ZCwzejSjKM2HgsjplXwlsj+94PsDIqch4rSjGXLvVhwgCtdcJzF1j7ovGCMYbnQOFWFygRJhalw7eq8Kk2B6FsWe/N1nR4uSeSxOSN18t9fGEEsWZAmihEE9AJnvlM0zKRgIawnhHT5h9KfImGP54RW8NLnO58ZNV2fsAcm3UMkzPqqIEdCgQG/l9IpqZVLUgF/cAad+2ZmoIxHdvA4Ca74zyOIB+11dPttS2rDD5KTsZ4pHDUBWnn9Sc7UFyHQ64tX3t3mNL1d/gmX5kFS3L53tjRNk39iOHAabhWqx2/UDDwL+YMADtbANKvHndU5W7LOSU0Kw== 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=RO9B6pk2HLDFatJ39WrGheP+Kp8n4ALs/ymCH9Z8CR0=; b=rOmvKGm3m4Rm8UuNkAlbaqS7dY4i5CpFp6RnWWr8mHHEJiV6+gedqAZl5Gq/LTJixhKvJu8sHnUAYmVJKzcJn8KQa2cGQbKxo6Vnuuv4IWlKYy4jSOO96lUz7gNDQnMt4ZYhDhlRKNAsIkfm2rfXiSbFB/dsbMM6nGGmQMs5dgYjExtc95Hv9R1ek6yXXVsCl926FI+U/p2uPI0mX6PKFRVIo5VyrG1P98ZfxmNPeQVAwm4JheVjyOLVuJA1l1ZCIxdu1DUWYKpVekfdkI7bMXkQtZ25o0TKlRy+IdjbW0S29fZO5Pt0H1cmuQMiMbwuMBwckl4vEMWUBBDrHfW/Pg== Received: from BYAPR11CA0101.namprd11.prod.outlook.com (2603:10b6:a03:f4::42) by CH3PR12MB9078.namprd12.prod.outlook.com (2603:10b6:610:196::11) 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:28:22 +0000 Received: from MWH0EPF000971E6.namprd02.prod.outlook.com (2603:10b6:a03:f4:cafe::a9) by BYAPR11CA0101.outlook.office365.com (2603:10b6:a03:f4::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.22 via Frontend Transport; Wed, 26 Jun 2024 10:28:21 +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 MWH0EPF000971E6.mail.protection.outlook.com (10.167.243.74) 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:28:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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:28:09 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail201.nvidia.com (10.129.68.8) 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:28:08 -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:28:05 -0700 From: Dragos Tatulea Date: Wed, 26 Jun 2024 13:26:56 +0300 Subject: [PATCH vhost v2 20/24] vdpa/mlx5: Use suspend/resume during VQP change Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20240626-stage-vdpa-vq-precreate-v2-20-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: MWH0EPF000971E6:EE_|CH3PR12MB9078:EE_ X-MS-Office365-Filtering-Correlation-Id: f1b5f09c-f89a-486f-3efa-08dc95cab438 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230038|82310400024|7416012|376012|1800799022|36860700011; X-Microsoft-Antispam-Message-Info: =?utf-8?q?15hFon5AQXG/pyM+qD4PFgyesSOuSRd?= =?utf-8?q?aJYeCV3/pAyj4HOV8nNPGVRzfTVC+yX4KfXCg8H+rCekicxKRd58zezVU6d1HEviy?= =?utf-8?q?g7PpVBgq1LPaAuloua/VFvAz1gVX1RVgn6mVZlNARvR80eYcyE5kCbzmdBZby7h0U?= =?utf-8?q?DSdPsAmcgU5Aec8tVe7fOZ4m0l/WuP961bNVI85dti03csBzruJRYVtIaWFZa3cnR?= =?utf-8?q?3sZizVlzZ6d2F4F5fUfNtppNC+Ibzvc9UQNttOptabKs+btFIrgkj67WkQE/tPyT3?= =?utf-8?q?aCBbOA5Y3J6H/9XxVOPkg+XqEa9gFF5BOe4ar/OaP0a+i9BlZZ/v1IbG45b+CU6tS?= =?utf-8?q?N7jIV+05yK2o8G9MYD8ahDR5dSePf6ahWC17S17jOmjuwJ7jHcmzydZ+5f1pSBBAm?= =?utf-8?q?1eyVZ59jp+O4xJ2msKxhsIQ+0NkeLPlxF3Qcnd5C2TQZTq3qb+7Z+vCUHFRX6ZV2n?= =?utf-8?q?3IFm3l0VjD9WpH6fhbEq+ftjs3dRoLnR+G+4Kwd2hnVfdu1kdUOz9+rZBQUSjypJH?= =?utf-8?q?A7ou0cyABA/VjbDvpb0iitNDTF1Z4eBOT31Cq5ybfBwRvv3Y8ENdAyoU7OiEU+z3A?= =?utf-8?q?yhkRSZukWoiJOoPR7RlLojAhzzs344A5hPiEdNZtHX1JofIpLZjj7n62sp3ZecYfr?= =?utf-8?q?AROpthcgQZKOnAbbl3idqxaKY3PCvWK/BF5Jhmf67gU1GRFhTpIrfpoChNeKrJUkX?= =?utf-8?q?FNYM1mpyjbckw3Z4qFgCA91JP9nXeLMcV5dOK6G2IOD+5B16nsrD+G4Wsp7/sSssL?= =?utf-8?q?pkrPdHyEATWGRkSx/FDCC2jotJSMRw4H8pzgEjU/WrNhwrxCPAp7v1VyYPTyXT4Xz?= =?utf-8?q?SGTKJ5AlumYw1THiHuiWegACX7xd2QiIS4tcT8jnhAHSuL2UjRedNFV95EuthpiDr?= =?utf-8?q?2I1gmAx1Oim/eLDzji6CmZK8oqRtvKwvNgpdIZNUR0LriXaFEqAgTQ3q511+R8jrR?= =?utf-8?q?6RSumZQTih2xl0ZGKFny8j0E1QWtzzn8C9xCLCGfnco5F9g6mZ60gWIGCTXhZrdoN?= =?utf-8?q?vweZLuZFEJ+whI6SWvPxj7FCOheOBZHHnyzt5ScQ8YLuXV+V8YKPUbW4kgGy32tRh?= =?utf-8?q?6I3Uxwsiw3LLbBRTX2jp1CVV/dmTjM3MeVYMDlY3Lspk70lYW4bkraMASaCDMP0Wv?= =?utf-8?q?K2jFz+UnxjBHAI5kd0CXSZncwQubmLqtQlt65dXE6s/vg2BKe/XcT8uRLNJjdh7KY?= =?utf-8?q?7ZP89G0MMsgvtvmsDo0J8zxQlArmYrSXMopirjtHZxSdhsSiU6cABBovyUIvtw2LG?= =?utf-8?q?H0XewfgG4T96AF1oImotC5NVgv0zUOAA4kefE7FKCSTpPbT8ewxyxtfDJVc5b/IPf?= =?utf-8?q?DBfeC/pFg3loDODHEQLisHhr+b3CuQzYEg=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)(82310400024)(7416012)(376012)(1800799022)(36860700011);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2024 10:28:21.8347 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f1b5f09c-f89a-486f-3efa-08dc95cab438 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: MWH0EPF000971E6.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB9078 Resume a VQ if it is already created when the number of VQ pairs increases. This is done in preparation for VQ pre-creation which is coming in a later patch. It is necessary because calling setup_vq() on an already created VQ will return early and will not enable the queue. For symmetry, suspend a VQ instead of tearing it down when the number of VQ pairs decreases. But only if the resume operation is supported. Reviewed-by: Cosmin Ratiu Acked-by: Eugenio Pérez Signed-off-by: Dragos Tatulea --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index ce1f6a1f36cd..324604b16b91 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -2130,14 +2130,22 @@ static int change_num_qps(struct mlx5_vdpa_dev *mvdev, int newqps) if (err) return err; - for (i = ndev->cur_num_vqs - 1; i >= 2 * newqps; i--) - teardown_vq(ndev, &ndev->vqs[i]); + for (i = ndev->cur_num_vqs - 1; i >= 2 * newqps; i--) { + struct mlx5_vdpa_virtqueue *mvq = &ndev->vqs[i]; + + if (is_resumable(ndev)) + suspend_vq(ndev, mvq); + else + teardown_vq(ndev, mvq); + } ndev->cur_num_vqs = 2 * newqps; } else { ndev->cur_num_vqs = 2 * newqps; for (i = cur_qps * 2; i < 2 * newqps; i++) { - err = setup_vq(ndev, &ndev->vqs[i], true); + struct mlx5_vdpa_virtqueue *mvq = &ndev->vqs[i]; + + err = mvq->initialized ? resume_vq(ndev, mvq) : setup_vq(ndev, mvq, true); if (err) goto clean_added; }