From patchwork Fri Aug 16 09:01: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: 13765793 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2072.outbound.protection.outlook.com [40.107.220.72]) (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 A858014C59A; Fri, 16 Aug 2024 09:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723798983; cv=fail; b=gdOuubGt5itKggvgwGbokbv1VYDM8FCkYU/zhTq7K/STUbcBRAjfIONwifn8GgtSG4VU8chw3++4Ux0Tssp0iHVGcmrPQlcDYXg/+WbaHbugqXJQSKQeEZ5T/HorTWAs2wvm9na0ZNPE4PmLJgpGc0F6uTfFaRgMYq8u4Yv4NoI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723798983; c=relaxed/simple; bh=AaojRqciGzZpgysJ+0AjGAE5jNukjY3I6kZx9XT/QlA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Hnj1ZSxZDXCFUm/8MhoROtVqlKJ7vxjCRFF0cjfh8oY9TVS0zgmSVmJjLAZujR4XcIO0J49MX/TS08fNvLxgAaaY24wx5tbB8oLKSs9x6c3i7AIWMKYJhcSgVKkbsU6BoVq7nz0JM5C7FbsOLs2vyropp9A1esAVVKdAWzkOtrk= 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=Io5KtwpY; arc=fail smtp.client-ip=40.107.220.72 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="Io5KtwpY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CUp1R9RztHXIRxCmBdbnnstwWkDffQmD+9PX3WusZ0GBP8PDps9Yvnu+n2u2yeGzUW4sdD2dy70AHhDGP3TJ5f7zQBnnroQPaqiq8IagYSIy9TWcli5feJaQhYTKUqudXiFBiJkh+tpFmNL4phthG5EewefCDsLsuBUp/ZedQs6OhOj0xpgZvkUELvKoiwwd990rBzL5h/sqQUbi0/uHXmo9Od8xTLvYVX16S1m22/3+01bCkeZDXDe2evsPfsl4R83Bgizi9mVLs0u9/DT1o1DawIUxkBUe828euOUFceiJIq8Kt/F6EaN7FcxBT8U0AsmMEsvmsVw8C1P+sylmZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=9/WRppdg9XWVo0cpx8Hq1bCb18U/qC407LW87OYi+Js=; b=hiPxwZSoeA2+pfMoJE+Ao4EB35fhOkCfX0PxdIBHdSB0AGWv+ZI4ldY3nZocFiqE6Ht7fLb7kbbjEjRLYDe1zTXFRjF0tLzr5BQlcjq3IFh4CJHc0FJzfSq9DhxbSh4p0bwzZFkSU+2El3VwPO404mh+WSCoaiH/fRLw36aY1wo9TTyyr6OsZ6Z2yKYF+8xy24raaW+esA+1Q32lSo560UfEFw4efBwqsF7swBNxMRPcH01ZEJm9Sz/wLkY2AMR9oS0v1WSb2O6bXLzjFT+fiXCh8r/9u9BvAsuW1HzbnSipX7DPvKm0qPDpYGmotTBT9gKXN0qjWeWQJcdLFtEI6g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=9/WRppdg9XWVo0cpx8Hq1bCb18U/qC407LW87OYi+Js=; b=Io5KtwpYnqOpydlz40nwhNeVEqzmkO502P+0wVv3AtveyxoPBmyHyTSkGW6G8sZ18WQnuCVZfZfQ+ki1KMUpQ6YS0cUY0LOkEO/vq7BKW5eM+oU4oAv/y3vggd0RtOzDuakPRhp1efkokoaYVzG3RVK1uBpAO0dURguOWaf+oylZxHit+0fyCtCKZfBJoENt9FB1wR0sf/3SjI8P9E/fXUKilMejeC7T8Y1OZL+HhOODLTcR+xKwiyfC/2wLMlSEythLVh2zsbFXJEPXaH4ZkYknAQQlsBlQZYzHPV4Ze8SwTMqUTZu0Z/DSvgpEJVuO2OwZDvzLbnX102Th9nzHpg== Received: from BN0PR04CA0110.namprd04.prod.outlook.com (2603:10b6:408:ec::25) by PH0PR12MB7983.namprd12.prod.outlook.com (2603:10b6:510:28e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.19; Fri, 16 Aug 2024 09:02:54 +0000 Received: from BN1PEPF0000468E.namprd05.prod.outlook.com (2603:10b6:408:ec:cafe::43) by BN0PR04CA0110.outlook.office365.com (2603:10b6:408:ec::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.23 via Frontend Transport; Fri, 16 Aug 2024 09:02:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN1PEPF0000468E.mail.protection.outlook.com (10.167.243.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Fri, 16 Aug 2024 09:02:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 16 Aug 2024 02:02:41 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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; Fri, 16 Aug 2024 02:02:41 -0700 Received: from c-237-113-220-225.mtl.labs.mlnx (10.127.8.12) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Fri, 16 Aug 2024 02:02:37 -0700 From: Dragos Tatulea To: "Michael S . Tsirkin" , Jason Wang , Eugenio Perez Martin , CC: Dragos Tatulea , Si-Wei Liu , Saeed Mahameed , Leon Romanovsky , , , Gal Pressman , Parav Pandit , Xuan Zhuo , Tariq Toukan Subject: [PATCH vhost v2 07/10] vdpa/mlx5: Parallelize device resume Date: Fri, 16 Aug 2024 12:01:56 +0300 Message-ID: <20240816090159.1967650-8-dtatulea@nvidia.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240816090159.1967650-1-dtatulea@nvidia.com> References: <20240816090159.1967650-1-dtatulea@nvidia.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN1PEPF0000468E:EE_|PH0PR12MB7983:EE_ X-MS-Office365-Filtering-Correlation-Id: eb613aad-8205-4caa-f76c-08dcbdd236e1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?utf-8?q?mYMLUyfO092pEbK7hPhch3fPTcIRoEK?= =?utf-8?q?ARiQZ8McFfEuLluHB/7msf5Hbzlm2dcFjvjFXfCKSiMx+H9hkX7i3M2ijTs8cKg6z?= =?utf-8?q?utcVZ0R3MnXhU6kzPxPbrrlaidbwdcgAD04bmNhEqz61a0FVr8Acw+DyWwmi9xcTG?= =?utf-8?q?jAyHvHbwqzjKPTFGgbNl0qga/Zigw+OIHEp0hU73csRMMALD3fj0bJpmgrTBUrIsQ?= =?utf-8?q?f3d7aaiiVboqqm//bHF3/xyzW0sc8FpNhsSI7ETy9xdAcYZbO87tDncIrsOht/cLa?= =?utf-8?q?pX3Y4fyitT2pakO8gE2ACkCWiPqCZFLQAG9pilcjzYupjBQa4Ab9YFO7OrCcK1dEm?= =?utf-8?q?wFiRespvTTrahlsso87Y+V2l0FEsXEWffvrEuEcPxCYdK6aZg852UQ9MVm8+H6muI?= =?utf-8?q?Vav6faJB3OOYigj7Uh9D4CkypxPkM43fcqzP3dBkpz41S3A0RKpgXR8vIt/wm1B9v?= =?utf-8?q?t9/wmpMVDsWgoz3oA41MAYc8tmV/W83EmhXu3v48iVyw5W8qyIivl24AJv35WqTLb?= =?utf-8?q?raxRratGVa4Q4MrF0S3AVhTeATNQbX9/vKdfqWexccGQCzuSq7NJZNGeSzC6KP+9/?= =?utf-8?q?anE+Dmg0xppCiSZBrClKNPzbgKxcHj7KqXQHi/UkLCwiMfaqSltJrKU4wYJoWwCaX?= =?utf-8?q?Fig+oZ5HizMAH8cyGdNAHRfswxJrVBg9PhdzOnet+kKQBF+/0lDyGg3P0ZrYQfGQ+?= =?utf-8?q?YT7eaYbYEdc87V3JDZfrv8RGtaGsbLa49WGuLV+u8yGWRtUJWMlEnygxMw4nRrTBV?= =?utf-8?q?lK5kHNyViqE0eiUpYNYHXLqfZwpk08GKYEg5ChhG05kC4rU9NSlJi/qlUnHh2Z4es?= =?utf-8?q?uhSyPFURA78nCcwubEjv0/t9HuzLzTluyY4a80vMIcK4txVDX25zYGNaXUqNGUi59?= =?utf-8?q?q0no/eOITxtHbUdYf8hqo3PBB+43LrsT5gy/YsJEyuDGpaQgeMMrEa3lrwc/fk7AH?= =?utf-8?q?l1Uhncl/8o9KfqmqUE2hKRMD8RasE3mXcZ0UL7J4drqvKJQd7IdjooweXbJr/R4iY?= =?utf-8?q?kEiTW5nRS7pKQ/pnoK/EyRbMRMsJG35QJ0F+eMyZzO5PRz00vQDRWdqGRQmHd5M84?= =?utf-8?q?zZ+Vyn3U2mBGcUwoaq+NlR/lCmvL8XkcHcyKO1womGAJCbUykaB/lN8MI8+YH5myA?= =?utf-8?q?bvX0KInEOQBK5PecXsagAxICr9QauOtZ8NaNT0FA1dVTkcoIOIZqxt2rphE3kH2H1?= =?utf-8?q?xZuyiuLFzhJ+MubKO3l9cBucgXwphj39NucBSAEk9ayYjO3cPeQRVBkndhGjz7AC7?= =?utf-8?q?0KfCAf45lKx/CzoX+4AyYS35VBdH61oMuNvqDRynRKV9OkwE9mmSY0XBPDO74qBEp?= =?utf-8?q?bHQNsi3seAKITMAOWs8UP0vA4v/hoY+LMcKHutD8+N7MEeXI+GLhdIVdCVc+VdPg2?= =?utf-8?q?qBviExwEXcW?= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2024 09:02:53.8828 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb613aad-8205-4caa-f76c-08dcbdd236e1 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.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF0000468E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7983 Currently device resume works on vqs serially. Building up on previous changes that converted vq operations to the async api, this patch parallelizes the device resume. For 1 vDPA device x 32 VQs (16 VQPs) attached to a large VM (256 GB RAM, 32 CPUs x 2 threads per core), the device resume time is reduced from ~16 ms to ~4.5 ms. Signed-off-by: Dragos Tatulea Reviewed-by: Tariq Toukan Acked-by: Eugenio Pérez --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 40 +++++++++++-------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 5fba16c80dbb..0773bec917be 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -1675,10 +1675,15 @@ static int suspend_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mv return suspend_vqs(ndev, mvq->index, 1); } -static int resume_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq) +static int resume_vqs(struct mlx5_vdpa_net *ndev, int start_vq, int num_vqs) { + struct mlx5_vdpa_virtqueue *mvq; int err; + if (start_vq >= ndev->mvdev.max_vqs) + return -EINVAL; + + mvq = &ndev->vqs[start_vq]; if (!mvq->initialized) return 0; @@ -1690,13 +1695,9 @@ static int resume_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq /* Due to a FW quirk we need to modify the VQ fields first then change state. * This should be fixed soon. After that, a single command can be used. */ - err = modify_virtqueues(ndev, mvq->index, 1, mvq->fw_state); - if (err) { - mlx5_vdpa_err(&ndev->mvdev, - "modify vq properties failed for vq %u, err: %d\n", - mvq->index, err); + err = modify_virtqueues(ndev, start_vq, num_vqs, mvq->fw_state); + if (err) return err; - } break; case MLX5_VIRTIO_NET_Q_OBJECT_STATE_SUSPEND: if (!is_resumable(ndev)) { @@ -1712,25 +1713,12 @@ static int resume_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq return -EINVAL; } - err = modify_virtqueues(ndev, mvq->index, 1, MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY); - if (err) - mlx5_vdpa_err(&ndev->mvdev, "modify to resume failed for vq %u, err: %d\n", - mvq->index, err); - - return err; + return modify_virtqueues(ndev, start_vq, num_vqs, MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY); } -static int resume_vqs(struct mlx5_vdpa_net *ndev) +static int resume_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq) { - int err = 0; - - for (int i = 0; i < ndev->cur_num_vqs; i++) { - int local_err = resume_vq(ndev, &ndev->vqs[i]); - - err = local_err ? local_err : err; - } - - return err; + return resume_vqs(ndev, mvq->index, 1); } static void teardown_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq) @@ -3080,7 +3068,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, return err; } - resume_vqs(ndev); + resume_vqs(ndev, 0, ndev->cur_num_vqs); return 0; } @@ -3204,7 +3192,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status) teardown_vq_resources(ndev); if (ndev->setup) { - err = resume_vqs(ndev); + err = resume_vqs(ndev, 0, ndev->cur_num_vqs); if (err) { mlx5_vdpa_warn(mvdev, "failed to resume VQs\n"); goto err_driver; @@ -3628,7 +3616,7 @@ static int mlx5_vdpa_resume(struct vdpa_device *vdev) down_write(&ndev->reslock); mvdev->suspended = false; - err = resume_vqs(ndev); + err = resume_vqs(ndev, 0, ndev->cur_num_vqs); register_link_notifier(ndev); up_write(&ndev->reslock);