From patchwork Wed Jun 26 10:26:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dragos Tatulea X-Patchwork-Id: 13712583 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2064.outbound.protection.outlook.com [40.107.244.64]) (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 756A7187564; Wed, 26 Jun 2024 10:28:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397698; cv=fail; b=TmUhndl3S6HQAXuosGa1KkWTt8SyGGuiNNBda4kAWH/XbNqybXPYx0vYjzp35wfdH74Oer7NR+ib4EqPcIlr/zkrf90RmaeElhP6v8hRaNrldAgKFHlZjrTYT2jucc1YeDv3CTnhu9byVgZCCHC9+ISkEmJ+Rrq+fXvmEsS7hnM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397698; c=relaxed/simple; bh=gBLMxEbyo+AjXzJedZb+UeAlN9ZzXN9HJNGJC20iaHg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=cBAhqKeW9c59LBYU9iIKMLjt++W5qe5QSD9IfSQYrd4Kx4F1q85VPeFhxNfTVyNrzyGot0O4GCrrjrr9oEP6a5ktng8YM3Ncze3G05iRbuhJdfQ/1F8mL3TbqRVFz7BrCOlFX+JW3LWN2uaT3hnFTNRYHS62moL5v80D/iffUaE= 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=uLE5oozF; arc=fail smtp.client-ip=40.107.244.64 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="uLE5oozF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C208pU2sK+hExO6RYUvFlxFdwE/otWPhOGGkbUnNwntNg8sOD9ci+//CG4iadm0q9mZGfCyNMdrV641bPV/QU790iSzvBLPEujGkkBm0SRDAxSSc3NGmc3sVb3ywGNbaB1Y0imJI8Xvvh0I/Yaa2UfDrKd53BIj5LzIaqWYGMvqGvlGM/ZISIhPJT/dKSCM/4HlB4gFTiac0x3UEZ9axG1USETPVaFdHMnKt9Sd4EVf8/feLBVAdOghpl0cuC8sD4gaiE2jjbH76vl+9LlW8En/0px3u6JLF8JH3uqHdsmaTS7IxQufxYF1YbjH+det2NNLpqFnpkmM6JSHeJY5qhw== 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=PyJ9GytNsv+ncxwwEyPP0fedd6ujHBMzMq3fxV9BgNA=; b=MSgz5XFAdBBNW5ucHPgpNEsonBhEdI4CGeJMVzfgRGU1GLjBfnhiDflh003W/DvYToAczm209aIEUtobYj35kVzez8PEbK+TJmOUAAjXrRAy8cgRJx6dTTedIah/A3/XfI7YJMc+OpgIs6cwZDQ0CyX1OCJpA6bNZnuAY1eA2nUYcntbB9VPvOFzzQVASD2zow9RNaZOZzjG0WzoOksn78n0JA83/+BUewuVqaIgQ64YEBdL197q6iJbgxRSGaOAbFVek3I307WRT/y0hyXL8h8DZjRFHbRjLq6IsnteBzte5SnqqKDZKBbNx2S9nCK1LKeNjepxUHZ6GRmK5gYvIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=PyJ9GytNsv+ncxwwEyPP0fedd6ujHBMzMq3fxV9BgNA=; b=uLE5oozF8QQAnLtLd/WnfNTvTZ8QrLgb6pAaBo6vLRi0eBTESnNGhEXhygObhfDNPMqOY1juQB4bW8prQyw2ylLFynndWVYSqD8dwhql6jgvytnGZYopAe719rXaFPb5fYXqOzndRV8+8BP/09lpsnDcbgWuc+R+Jpsq3knFudlz/6LOFTq/LAata+SAB7+u2nw6UMfmVQb8dTKHz0/DrSa9jfSqexAiI/fp2GeHoYkKqsmb+5mmmMbqsjdRcxr1kz5BUDziPVD443497TbXtus1LLi5fuRcKMeacdz7J7EYMXRo9A5oSoUC4SSjX4yJ+1Dm89ntNAQNsw0WYB+FkA== Received: from BLAPR03CA0124.namprd03.prod.outlook.com (2603:10b6:208:32e::9) by PH7PR12MB9202.namprd12.prod.outlook.com (2603:10b6:510:2ef::6) 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:12 +0000 Received: from BL6PEPF00020E60.namprd04.prod.outlook.com (2603:10b6:208:32e:cafe::13) by BLAPR03CA0124.outlook.office365.com (2603:10b6:208:32e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.39 via Frontend Transport; Wed, 26 Jun 2024 10:28:12 +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 BL6PEPF00020E60.mail.protection.outlook.com (10.167.249.21) 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:12 +0000 Received: from rnnvmail202.nvidia.com (10.129.68.7) 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; Wed, 26 Jun 2024 03:28:00 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail202.nvidia.com (10.129.68.7) 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:00 -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:27:56 -0700 From: Dragos Tatulea Date: Wed, 26 Jun 2024 13:26:54 +0300 Subject: [PATCH vhost v2 18/24] vdpa/mlx5: Consolidate all VQ modify to Ready to use resume_vq() 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-18-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: BL6PEPF00020E60:EE_|PH7PR12MB9202:EE_ X-MS-Office365-Filtering-Correlation-Id: 410338ca-e137-46c1-a3c3-08dc95caaec6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230038|36860700011|376012|7416012|1800799022|82310400024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?rcXI5QFBWrJ8RRqtW0s/Ym0GZdqQ0GE?= =?utf-8?q?YpCWAj5GE7n5uMc+EYXCLE7pOtFvvsDnRPuBJnqBJ5i9VDPqeaPd96Ni4Nl/+OpBg?= =?utf-8?q?lZMK3SPDza4nMtYM1qbqkGaktXmADfWDA5OF0VGRnPZYhcuOE29SWBBlwNYWTAJ7Q?= =?utf-8?q?kvdfySZm6/FUhh8l//0B3sHDbkRfSDVDjDCzwdPrgRak7pIACIuUHIiJSaYFZ94oc?= =?utf-8?q?Ej+mN87gWXlWgRQnmgEprLMQ4+Xr0CABkM/VNSDEXJOdCcxd3w/Tkk+Ye8KGReq5o?= =?utf-8?q?KV48oA1p6brcsXzn0XGXUz30cX8HXmAFp3iEzdR/wYoTSFDBIiAxq+4HWd7WRFo7n?= =?utf-8?q?ckkHGnbIdRuAxMejVXdyE9WTAeb+n4/s3qXHSUCk41V4C7oDRJq4schOXjaOCkx5S?= =?utf-8?q?WAJ47eeDcyMOex0ebdSMUerHdbCqPrYgWKJiF29yUffwlmdEBpgCzpSqb+Q4hq9CO?= =?utf-8?q?Tci0C1Ly0J+ET5qsfdRKLIfseU3RyUL1PuHJUruJLN4qH8O5Hc5DQva2Ok4H41Fcy?= =?utf-8?q?wOJ5aSzzmx26IA87OuW9G1xI3PM3f0/O63mMpQSEnt9ElezD5hygssHXZVeCXOIwy?= =?utf-8?q?8fTvZ/dZ7ySnn2H2/u3hEcbZeavM9fE3K452KtEXl+WY/1V8kl+SDOEw/nStn8GQM?= =?utf-8?q?flS9QuizpK2C2Jg+pfclrL/dFXNRx3NDhb8dwdYJqpnJFLKKfb8snm2DiznVuupyE?= =?utf-8?q?IHY3TBVQRSEmorrPYCTS7A79kUFqpnadWA1VWpMlF7lktJ4GQjWaPBl1oiIeOtYnb?= =?utf-8?q?M7LdpsDd4vPzytjof6azycTnFRD0fk/EwUtCFszgXuy+4DxO43wEzHnlxhCoIX88M?= =?utf-8?q?EtdQLddi6Ko/K2LrncbRYCMjUEeaoHgxT7UR0G6X4y3GrfOfCOfhDcTEcxsY8wfWf?= =?utf-8?q?JK1Pq7iGWOXjuA7IvqvD9RbVW3kd+Xh4TjuFe0Z1umFFAWjpyBxWIUs9wrT2mqp76?= =?utf-8?q?DIFYMMZ52fyBt9RQoLX1Ifa3I1srfdqgsjFUFOiIwwcKtLsJg19kt2b2UafPBO2Fa?= =?utf-8?q?tUt1m3XYq/6R5G7XtAm+3O1469LOR75c39kZL225Viza4pahoYEbUlzTwHQ5EB+fk?= =?utf-8?q?Ahq2QJCVis5AxeeJUpCt7nwxONvZY6np2zqT6CpbVySMcqSTC9M1paAeEpeCFB7Xe?= =?utf-8?q?x4USvFJ15eZFsBjZnBRcir/eovCTNwtbfRs/VdPPT52MLm/8ikFjgrOb2Wn5h5i1J?= =?utf-8?q?raUMEv0E/YU4l7z5zEjrJ7vQEGY65SpVb2UvGOCf6p02CQL9MBTmslKSnbeOwdNxZ?= =?utf-8?q?+3OCHOMZhYGSOVPRYxW+wsf0cxcIBAc47Xm+ADVT/paZissKOjQ3pzWXLoKVVeuVP?= =?utf-8?q?jtIDwGZWok0kUpc5KNTLD1oaWlOE6WDO3g=3D=3D?= 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:(13230038)(36860700011)(376012)(7416012)(1800799022)(82310400024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2024 10:28:12.6078 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 410338ca-e137-46c1-a3c3-08dc95caaec6 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: BL6PEPF00020E60.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9202 There are a few more places modifying the VQ to Ready directly. Let's consolidate them into resume_vq(). The redundant warnings for resume_vq() errors can also be dropped. There is one special case that needs to be handled for virtio-vdpa: the initialized flag must be set to true earlier in setup_vq() so that resume_vq() doesn't return early. Reviewed-by: Cosmin Ratiu Acked-by: Eugenio Pérez Signed-off-by: Dragos Tatulea --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 8ab5cf1bbc43..e65d488f7a08 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -160,6 +160,7 @@ static void free_fixed_resources(struct mlx5_vdpa_net *ndev); static void mvqs_set_defaults(struct mlx5_vdpa_net *ndev); static int setup_vq_resources(struct mlx5_vdpa_net *ndev, bool filled); static void teardown_vq_resources(struct mlx5_vdpa_net *ndev); +static int resume_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq); static bool mlx5_vdpa_debug; @@ -1500,16 +1501,14 @@ static int setup_vq(struct mlx5_vdpa_net *ndev, if (err) goto err_vq; + mvq->initialized = true; + if (mvq->ready) { - err = modify_virtqueue_state(ndev, mvq, MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY); - if (err) { - mlx5_vdpa_warn(&ndev->mvdev, "failed to modify to ready vq idx %d(%d)\n", - idx, err); + err = resume_vq(ndev, mvq); + if (err) goto err_modify; - } } - mvq->initialized = true; return 0; err_modify: @@ -2422,7 +2421,6 @@ static void mlx5_vdpa_set_vq_ready(struct vdpa_device *vdev, u16 idx, bool ready struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev); struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev); struct mlx5_vdpa_virtqueue *mvq; - int err; if (!mvdev->actual_features) return; @@ -2439,14 +2437,10 @@ static void mlx5_vdpa_set_vq_ready(struct vdpa_device *vdev, u16 idx, bool ready if (!ready) { suspend_vq(ndev, mvq); } else { - err = modify_virtqueue_state(ndev, mvq, MLX5_VIRTIO_NET_Q_OBJECT_STATE_RDY); - if (err) { - mlx5_vdpa_warn(mvdev, "modify VQ %d to ready failed (%d)\n", idx, err); + if (resume_vq(ndev, mvq)) ready = false; - } } - mvq->ready = ready; }