From patchwork Mon Jun 17 15:07:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dragos Tatulea X-Patchwork-Id: 13700933 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2073.outbound.protection.outlook.com [40.107.94.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 B64FF145A1F; Mon, 17 Jun 2024 15:08:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718636925; cv=fail; b=oUkRQT34fg4erCPJa+wPDJOvktI/y2JRxooAU2wKkXHBoLIsIxdkRbR59ISCTYZ4nCGefXztvLwdUXfKIr4CjTGXHRghULGJJahbPLIKOPeFDpZGJaX4wn42Hp7g9QwVJQWoFgdVenT+uGDDS6xGFulGHC3JnOmaa4yp2FMvLHY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718636925; c=relaxed/simple; bh=/GcAG51JzSd41406OQJOJV5R2SAJ/EXb73/Zmue+8zQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=ojP3ekWb5aXEoQ7emQrLcPJdGbYmAz2PqOIwMydigYSna4K5irwpJqc7bFOwgCiYDxSGNJy7l7t0l5l0R+Ndy4ItEwkAN82tkmKvv30n6dCtVrBOhIdo3co7ZrmaO6Osy0d6+QFNkqR8/89DBCb4CzHtfZhOKoTgoS7dFi4KCy4= 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=CIDkWPyF; arc=fail smtp.client-ip=40.107.94.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="CIDkWPyF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OgO59ytYSFv3ydMta/ZBX54XsE+n8pU1PviBy7F3Cal3PxaiwZlbXqFmgy+2PIjXeEmIHgQjeaaFbNpETGs0gL7Cxq59VbalytVJsPHXPbr0m9235ZoFRNNgoSLm5VygE/XTZEK4aV7yk9KqJ6bhVNIiR5LQviVSGkY6iZ7ZI8HzOLqqA4BR8GzrdsqwB39hgUEUSRrRryPiY7Xk1YgwduUVaxd8Lib+lea0g/ZUepoCSfMHDnKI73RWZ0daZyDcxkhQlog3mbeMDvVwjqwcCyVMPQk+l6+0rwmNGa/W+lm0eb+M0c03LF3k5uA+HV0x5NXjoz60tQnche9iNmkJQQ== 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=Br7FTYfEmEm/j676tWsLBfs55UWg5gCW5oR/lgiGrFk=; b=f9zMygx5HArPlEWTSNA9LTAo3xtW44xAfgl8hHO27uTgpWTuA0PlxlN+R9TCA8WxlhR05YOzwR5puXXZymkEYM93nPvxNLiej9LM/bvgqGL6rL42abNY9SpiNTB1syw7F3BzlF3Gv3h6aXPjGhqr+DNvOe+UqsFEXbUkvRWxwchRV6qDj042vuoY/uOhQ+XiRxX+WxQYJMaAJwmjTRrei5e6yU9DVuaPr1/BATHCvg+enoDGlw/iYnBKcwjv7jPkl8Sqxl7vE4rzydtKuRbhgBO6Wn8rBTZ6EL4dyu+8FDvpZcOnapHFPNbXhRKeIjvogU/sa8rEb5MJ8rybS+8Yzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=Br7FTYfEmEm/j676tWsLBfs55UWg5gCW5oR/lgiGrFk=; b=CIDkWPyFTu7whgtyY5lJnS9sSNAKjHk1YViKxXv9ziOtjHmD/mS5nVZ1AV9j0tlCrE8BP3xqX3PVhErSz+zr67Wu3kPGV1+enSdyB2LS+gq9e82ztcSZz3GeAxrZ7GLMxkwGQX0ht31IVjiwDR+xiI1Bn6EN6ytBq68nb9NSvkmdkJgNBVYkFnSB1E/J93sNZZQGhnl1e/70iede4IarAyh6zP9JBDrE96d8NdBovcGuxuKeJ7GAH2KnEkZ8HGn9J72ihldoP1gzc8jXx9BIwQYi7SHfSeRSrIUKJ7Yz12BNQXR0gn1XSJDwM1NZhdLQzSHw6sy/RHYO4pFVbhD0Pg== Received: from BN0PR02CA0021.namprd02.prod.outlook.com (2603:10b6:408:e4::26) by DS0PR12MB7654.namprd12.prod.outlook.com (2603:10b6:8:11d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.31; Mon, 17 Jun 2024 15:08:39 +0000 Received: from BN1PEPF0000468B.namprd05.prod.outlook.com (2603:10b6:408:e4:cafe::f9) by BN0PR02CA0021.outlook.office365.com (2603:10b6:408:e4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.30 via Frontend Transport; Mon, 17 Jun 2024 15:08:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by BN1PEPF0000468B.mail.protection.outlook.com (10.167.243.136) 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:39 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) 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:08:19 -0700 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) 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:08:19 -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:08:16 -0700 From: Dragos Tatulea Date: Mon, 17 Jun 2024 18:07:42 +0300 Subject: [PATCH vhost 08/23] vdpa/mlx5: Clear and reinitialize software VQ data on reset 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-8-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: BN1PEPF0000468B:EE_|DS0PR12MB7654:EE_ X-MS-Office365-Filtering-Correlation-Id: 9892c8fe-e06d-488d-5461-08dc8edf5e86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230037|7416011|376011|36860700010|1800799021|82310400023; X-Microsoft-Antispam-Message-Info: =?utf-8?q?T+fLPE1PKH7hno6JCPaoRCxJRHJ2Dtq?= =?utf-8?q?EGNB6es3zW++EePZmiFvmJ6E+kJu+FZgiAqZ8F44t+7tvJoV7ZX429FKHYa1CaJ7X?= =?utf-8?q?7N21+5RO6Mg8LS6IxuKwDwlZw1ooQbk1b+xNNTowNHae/AUEk9ee8WXX1jcfD9rOO?= =?utf-8?q?eClKDJm3Ov4CIrBk2ZFbDRgFZ5lhxMI7AfzCqOA8TRcH6fVJZj04im8tufeIClM5j?= =?utf-8?q?IwWhmgFpfWwB7s9wTu/JZrzPG3jhwY3h4dwe+xdy5Z3BsKMbDgCT2yk1KsC65TTdX?= =?utf-8?q?b+RVN/VCRet0RfxoQlG9GPt6LnSNrnmQs6lb2B3JKLSiu4Gd41p+8P15Qr178855K?= =?utf-8?q?vs5xgW0N1vYngTkTQaMfLNqZBfc3dDWZEJMMu161mqKcVQm7eyvHTheVV7wFpWC8c?= =?utf-8?q?+/qtcfhstmJ/vUHRBvCbFzsGvqNXJQROJI0krtusl306z2C5q797Jp7iEI2iOWGOa?= =?utf-8?q?l7d63mJITfWxyHGbbPV5aYkuod7QH8Va2BKihAIHcYNUYsE4/BNg4LiGtzCMylafe?= =?utf-8?q?IulH9fx5OSFxUF0+mXVODENOk7zIzvo2YhPyN5VP3bqrO+JnCl8qwSz81AxvVqRWG?= =?utf-8?q?MvSmiIqj2RItkB15lMF6w0iBJu+co444Xe2FCXP+yisFRcXtwa20avHmyH2RO+Ts2?= =?utf-8?q?Yse8ZJhcMLCURT8pwTrTo95rx//KOA5EMRGDj/Oqd5yDpLfCh87846eTPfFNBFsIW?= =?utf-8?q?NZAgHbDWisFj4iFZ/Uyetlyzl37Ucdoy1E8ECKEL28z8G+BZ1ezHzSH3Fjt/U+bKe?= =?utf-8?q?m7cVAmLNRggDDGp/QeZUjRo+SdNyOTrsuWpe0m46F9A4FCYhaHFeTmxl2tDNrSPE0?= =?utf-8?q?FsCAL2HrGdDuAHlS8bB4BhP4Tn3iR7itJamDrVQfgFzM1S5TqWC+WxANbwhrfxL66?= =?utf-8?q?I7jCdTGJEegwfV1X+aIO5pT+xuJStMhtm7kXyNy5qH/ic12Ng7fbHbyJHhajAUoQ+?= =?utf-8?q?OHfk3DUhVaex9SZ5rC1GNNp278DsXVp7A00myiw4B4HJQYc13vMQaKP5ScT0RVfRn?= =?utf-8?q?GjupQbQEZpznN2cXLIeIhaaK2l34RuMIt83L6WoVfuHu2WQIKKhUAi79eTbzGblXL?= =?utf-8?q?swgDuEnZht9O+BDdcmNl+JRsDt/hxhXdJiqH4usGiLniyLfoNdd8F/wqD1kdnobcq?= =?utf-8?q?8JRu8kSEjNQCRrP4S+R+IY2k9mPWQlGhUJEPaapqjzEQ8MrkR1MITSuzENggMJNNp?= =?utf-8?q?ylbOnTloWBPIKwoJBR9wUNI8YLcpN5ylwsPP1T08B9QX/snvjJqYCrK2tKB0uiIgq?= =?utf-8?q?MouyyHWsblAe7b11vXRrcOz57yAn3ZeGVGruyUSl0wSoqoM24/ScfYnZrcshcpCbA?= =?utf-8?q?oLd6UcmBpAP+q9UIP7j1oYL20cxhKfn8HA=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230037)(7416011)(376011)(36860700010)(1800799021)(82310400023);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2024 15:08:39.2605 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9892c8fe-e06d-488d-5461-08dc8edf5e86 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.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN1PEPF0000468B.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7654 The hardware VQ configuration is mirrored by data in struct mlx5_vdpa_virtqueue . Instead of clearing just a few fields at reset, fully clear the struct and initialize with the appropriate default values. As clear_vqs_ready() is used only during reset, get rid of it. Signed-off-by: Dragos Tatulea Reviewed-by: Cosmin Ratiu Acked-by: Eugenio Pérez --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index c8b5c87f001d..de013b5a2815 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -2941,18 +2941,6 @@ static void teardown_vq_resources(struct mlx5_vdpa_net *ndev) ndev->setup = false; } -static void clear_vqs_ready(struct mlx5_vdpa_net *ndev) -{ - int i; - - for (i = 0; i < ndev->mvdev.max_vqs; i++) { - ndev->vqs[i].ready = false; - ndev->vqs[i].modified_fields = 0; - } - - ndev->mvdev.cvq.ready = false; -} - static int setup_cvq_vring(struct mlx5_vdpa_dev *mvdev) { struct mlx5_control_vq *cvq = &mvdev->cvq; @@ -3035,12 +3023,14 @@ static int mlx5_vdpa_compat_reset(struct vdpa_device *vdev, u32 flags) down_write(&ndev->reslock); unregister_link_notifier(ndev); teardown_vq_resources(ndev); - clear_vqs_ready(ndev); + init_mvqs(ndev); + if (flags & VDPA_RESET_F_CLEAN_MAP) mlx5_vdpa_destroy_mr_resources(&ndev->mvdev); ndev->mvdev.status = 0; ndev->mvdev.suspended = false; ndev->cur_num_vqs = MLX5V_DEFAULT_VQ_COUNT; + ndev->mvdev.cvq.ready = false; ndev->mvdev.cvq.received_desc = 0; ndev->mvdev.cvq.completed_desc = 0; memset(ndev->event_cbs, 0, sizeof(*ndev->event_cbs) * (mvdev->max_vqs + 1));