From patchwork Wed Jun 26 10:27:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dragos Tatulea X-Patchwork-Id: 13712614 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2054.outbound.protection.outlook.com [40.107.94.54]) (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 3F4AE18EFEB; Wed, 26 Jun 2024 10:28:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397723; cv=fail; b=cdt9fMdUS0fsmkzJQ3HwHlnigItuIBDX22O90MeDCvB2aLRhiIgvYj6xq4wd8ZHQdiuG6S+cYcu8OWDKSzGEA3qrAvkWUdFoBQMSwf/Ii8BDNJSg3hgH55Nm1F5Mjcch6ycC4ji2CsY5ym3fB+Fzd8HK7ViyJgoQ979BSm3PSLQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719397723; c=relaxed/simple; bh=KBnBLZMKRDaX0Ajt793FuGR2p9G/jNobTfmgv1LiTxI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Wq1QpQiHRDRSKZcf7T+Oo8P8yNmTrLYD70nzhN4DldtEIe7KRYFo56kC/hM9aSh99P+yYQbHHlJ1JIzRe/bor4S+eM4NbK5gOqESjeys/jUZ5gPIjYKywaHrMixDBRReoSbAUbo7I/ippIXKgidqvCbb7hmcTGIClHuUj7I3sms= 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=VQpb5nty; arc=fail smtp.client-ip=40.107.94.54 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="VQpb5nty" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pgk79V7g6AH+r9cGUb1XmHHWH0WjGz1NFmnMjV6o7fIcYW6GdoHM1rbjbml2Mp0bAtDfuAVWc2vlSzPk6o8UCVBV0Qbmldxj/pVPHnqo2uAzOiVBNLM3ib6Prh7dw6t/h8NqOfTyfaFXXv2+9cbMnam/gUw0q/gVafs7GCY88yR1zjQm/q9ileWMvW2djyLVkG2vgneei5JbMisg3qXZ/GDCOag0k09aW0hlbF0FCnCrbBixVf3hMohd31ln9bCokUXxJJS9pMjG9eEYZatJRdCkvOxcpIaAW9BJnoqWIDb74Ng/1EHiz/wrh4+lYgLMpsSnC3W7LYB3Q6OtManzEg== 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=U9kDi5k6Pml6EGu7R9eE8ZQZvIGr/YjAOvpoY03s6Pg=; b=jYlJH0uSnxu7jle4Hs5uk4ITc4qHHjrgclDENMOMmrLWlpuiBJyWWk+X8UJ+WbvdkjjKUi2Ouyn+aUsMvyf/R4zXes3zIWkVhEvZnp7xFbR58DNExyBrMMwEjEh/BkpXtEnEJfiozuiyqq9r+nhnkrC1NwPW6mL06g1Jee9apAQTEXML15P6que5GEAHuvpeOjWsxXTaRA4zaEJsP0qefn/Ch/W0ZzbczF7LX3POvvwOGV4BD/RVcMQm3YAJrNBQ74xEdSoELjM8l+WwGZ6KIcfnchzn23lU4WP5lzlQcShutSZdPScq2CESNtwsLPWXB9GaelDXr6cyxHR3FmPmrA== 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=U9kDi5k6Pml6EGu7R9eE8ZQZvIGr/YjAOvpoY03s6Pg=; b=VQpb5ntys9iumS/ffmCmINFScPRWH+QVOlyEkAY/CMdmaLZPVI8nJWb/tNGKa6JPBXy4HNzboOh+A4QCEIWny6hxFZ6FBhLpyAmQIYV30TOvDs3Q5B9JVwE3EdiqxwR9n7BC1UxufeJRGPX+56K+UsDsIoqDezxzZ7psTHplslXt1igOxGWuqfjG4sXrKe4L9FM3gJrFQ7JW1ZB/+VpEe4y67DI89yMPSwLFvoZ9SqnRrQ1mk8RuMRQeWeMqj20TP6EpDFcm/npD86oWLb/Tid2uNWZ+Uf1Z7gaWzrEAVOHPRn974uYp4q+Tx2/pXjG6p4mUs+/dp+dXvCFdm7hGqg== Received: from SJ0PR03CA0370.namprd03.prod.outlook.com (2603:10b6:a03:3a1::15) by MW4PR12MB7310.namprd12.prod.outlook.com (2603:10b6:303:22c::15) 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:37 +0000 Received: from MWH0EPF000971E9.namprd02.prod.outlook.com (2603:10b6:a03:3a1:cafe::e0) by SJ0PR03CA0370.outlook.office365.com (2603:10b6:a03:3a1::15) 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:37 +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 MWH0EPF000971E9.mail.protection.outlook.com (10.167.243.71) 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:37 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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:25 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail203.nvidia.com (10.129.68.9) 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:24 -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:21 -0700 From: Dragos Tatulea Date: Wed, 26 Jun 2024 13:27:00 +0300 Subject: [PATCH vhost v2 24/24] vdpa/mlx5: Don't enable non-active VQs in .set_vq_ready() 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-24-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: MWH0EPF000971E9:EE_|MW4PR12MB7310:EE_ X-MS-Office365-Filtering-Correlation-Id: ff6a3ebb-2596-429e-b0a8-08dc95cabd83 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?XwKPDhWJ0EFLkflfmzZPCcRJQ+w0Ovg?= =?utf-8?q?fwdci6Hgku1Vn5+aUS0lNHRNJL7/DWwN8FtZvTI6DasxHLpIr5RCGVDQOwpOj9eU5?= =?utf-8?q?y+BK6nTqwOv6w+a5p8HqskUSG/UE8QS1kDoadl21uOOUrxNVK2Wof5TSjCLWB77df?= =?utf-8?q?wrwR/COBHjVyWtbUJttESLHBdlNcUPPNXdbaFW79YFbGRkZpGRCWP6HzAc2m9cUBB?= =?utf-8?q?p1tFBunz91iW4H8xLbHvW+sBfZw3GLSxVjLVwjsmaR6KSXE3zhuvH2WNWBv9K2T2J?= =?utf-8?q?MM2iX1dRxRp+Fdi5UUTNPyfZ1mGR1JBcYwVSFq2VgPKxTMio1dZLwxNt2FvddaO76?= =?utf-8?q?Ui8ABXecvNeFSQJzi8jHnwj1XZbLgZoWf7ljxqgSdYtvsRQHV7y97PjjAdhTIWKGU?= =?utf-8?q?evcRi0FDyi4fhndjBNDRMhwPJGi1TtIahjQRLYp2e3mmtVMRE9/sU97Ij1qF7/JwQ?= =?utf-8?q?pKJP0Ndh2m8uQi180am2uYeALeMGs35/ZIfB6DgbsKool0VOt/jQsyA5pnA1JNcMd?= =?utf-8?q?48d0PCw2twppCnV5pVzGZ7hLnyte0/UCPIAJQpq5vbVwt49q6PGCBZlWeL1CASgzH?= =?utf-8?q?pAQrsY4Bmup5aR0iPP7em0iewQtEq1fu2ptE/BBWrpSdCtCamTL9DGV75GNnBhGKB?= =?utf-8?q?XCa2qO3MC12rTpZWBggn+0cmmHgCh3BgUYK7lccosvjE9n0fHws/6xy2+BaWC4Jk9?= =?utf-8?q?MSsRYxSygcz0wxoDgfTHqjSc+g4mlVRKqonm8Y28jzio94PMn/urTrUpIYi7fK9Ft?= =?utf-8?q?592MbwEKhS7V+9C26+2t4gRfCpLuvaSeXopz/S4S1gd6r83StJww1UKWs/vRW8Jad?= =?utf-8?q?Y5sHY9cx6enUdxYiJlJd+iWw51nVWI4fgkViuNvufHsuGWkXccxEZ9kV3EZkJfDaX?= =?utf-8?q?OQery5toPACPAlcG8rck9VpYqV3qU+Rpu7A8/jgsQZyu7b5ELBE7SW5NI2vk70gQh?= =?utf-8?q?8p8V/ELUM6bTFkcQrP+9uLddA4EzDTKTrsvCvfNGrQhpF35NhFE7adsfuKqTswZj/?= =?utf-8?q?nyRrXq2UJNnJEJoIeafapoj7Lv4QRksRsBTp4yodPCRDrmZoSZRPrnzjbSgDBZyhj?= =?utf-8?q?n22xP+NlvWQCqeplb+xgBPrBBwTMhduX1oWyg1rQELSeCvM69gub5nR6n7+ONDXA2?= =?utf-8?q?APp1RypAQIueSLXHRqGn/3Yt6XySr+iopXGlcpAIqV8ulUpXGS98h0EDnsMW7QgDu?= =?utf-8?q?7yh5uOB2k0DCHlxPrJUfteVPtuZsue/0VOnw6euTG2qLMNC9DWDNTJJz2vvjswlkW?= =?utf-8?q?NYzn2o4vV2L0bDzfpBYB2C6eBIw+ATrE92LYmz4f4i8rI8xdYsm87+ChX82v0GfRW?= =?utf-8?q?5IRDwcDIU3iXyNxI+0CAkW1ahsFSH3uOUyysqhpxZc03EBrpvsQ+1VRfhnptJ3bKM?= =?utf-8?q?342U/T0WqIo?= 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)(36860700011)(376012)(7416012)(1800799022)(82310400024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2024 10:28:37.4443 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff6a3ebb-2596-429e-b0a8-08dc95cabd83 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: MWH0EPF000971E9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7310 VQ indices in the range [cur_num_qps, max_vqs) represent queues that have not yet been activated. .set_vq_ready should not activate these VQs. Reviewed-by: Cosmin Ratiu Acked-by: Eugenio Pérez Signed-off-by: Dragos Tatulea --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 573dc01df8c3..fa78e8288ebb 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -1575,6 +1575,9 @@ static int resume_vq(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtqueue *mvq if (!mvq->initialized) return 0; + if (mvq->index >= ndev->cur_num_vqs) + return 0; + switch (mvq->fw_state) { case MLX5_VIRTIO_NET_Q_OBJECT_STATE_INIT: /* Due to a FW quirk we need to modify the VQ fields first then change state.