From patchwork Mon Jan 16 14:11:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Avihai Horon X-Patchwork-Id: 13103277 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DB03FC46467 for ; Mon, 16 Jan 2023 14:13:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHQEB-0002el-6L; Mon, 16 Jan 2023 09:12:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHQE8-0002dj-NI; Mon, 16 Jan 2023 09:12:44 -0500 Received: from mail-bn7nam10on2081.outbound.protection.outlook.com ([40.107.92.81] helo=NAM10-BN7-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHQE6-0002PF-Ns; Mon, 16 Jan 2023 09:12:44 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VdNypuy9t+2HUMDl+CM8JlMPnUigigAn9FWYCkD9Cvqh0UlueCJ6Si1dpbyaUUidR9FTmBV+Zh4rHr106dyOBlPtrVJNjqsewp0o73F5+ew9Y/kHb4zH9FdkfP+QAITtqbRchlnYobKJE+656tm8/IbAi+MnQG5rQuA2T4K3M4FqYLGkJ7hl47ZuqIYeDesLHNrvJ1nqpr9RNagdxdPC/ka+K9L/BoJ/WYgwUdcR6Ijl/hzS1NFkKEAhGc9Rqv4j9vldMH2UjzJffz6NDzBjkloDeQSjmwgpYP/r37EuUMoFKhLdT8PnDdyeGXSpJdv7R4/MvVFgfqwZkW6/mmNtYA== 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=t9muwuHUKNRpSuMJd4KvW//7z9qHoDEToDY35/BiWaY=; b=gzijtVRweYioVL1pERKkdokR+hlVkJjSidgN1unebgawzBSsGe4d0h8PBZ97KHFRfI1PoM9T36egv/luFdKEaTnY8Cmk00dBelQxkxQUplF1pwJTY8SNIVUKcJ+nPjem9CBa6KMrzBXNvl7myvnJb8U6skTr7gDF0T5vo64j6D4Jx0fgxPyg+pvKQfvbDV7woQUvxYe0PT903rC9It1ns1MFWaawtoscPjai8kLqPab2qV0Bn6G2OSp53WV/mvZ9zB6sAxgzeSVSdKJKFBItwNJKLQ6fjfUyuPMhNwxW1QvNdOuDoywSFEyHVes7Uk/UFcNkFMc3Y8E0kkIHP2bzfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=nongnu.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 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=t9muwuHUKNRpSuMJd4KvW//7z9qHoDEToDY35/BiWaY=; b=F6nBtMxlc1z0IwW2Qdvi/RrA/AHsxsSFe1nYsDy7vqtEXoDETVowkw2zjuSHPyVLpOiZ5HuSnkH4gdMauZduwLoOEXRyF6PPq9AMYEqHiJczdYSj9HBR6elBwxRmZLaEDhF01eYd75warXYWVixnqY8ne30+CUnbtw3GRCcX50k7kURF2jHpATeMrwLH0Mx7lw775vqlhR98PGkcBqSQRHKEpW/j7NRxRtK6eT0/vRg07lyIckicERUnPIXocwkLtN6YOuUR+ZUawGr4MjmYVBeW3PWET5rNM8O18/t1boAEqs+rzx+1+Ovk6GXPfIO4ExVc1nVurA4zThtxv4FCBQ== Received: from DS7PR03CA0293.namprd03.prod.outlook.com (2603:10b6:5:3ad::28) by DS7PR12MB8417.namprd12.prod.outlook.com (2603:10b6:8:e9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Mon, 16 Jan 2023 14:12:39 +0000 Received: from DS1PEPF0000E633.namprd02.prod.outlook.com (2603:10b6:5:3ad:cafe::39) by DS7PR03CA0293.outlook.office365.com (2603:10b6:5:3ad::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.19 via Frontend Transport; Mon, 16 Jan 2023 14:12:39 +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 DS1PEPF0000E633.mail.protection.outlook.com (10.167.17.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.11 via Frontend Transport; Mon, 16 Jan 2023 14:12:39 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.986.36; Mon, 16 Jan 2023 06:12:28 -0800 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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.986.36; Mon, 16 Jan 2023 06:12:27 -0800 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Mon, 16 Jan 2023 06:12:20 -0800 From: Avihai Horon To: CC: Alex Williamson , Halil Pasic , Christian Borntraeger , Eric Farman , Richard Henderson , David Hildenbrand , "Ilya Leoshkevich" , Thomas Huth , "Juan Quintela" , "Dr. David Alan Gilbert" , "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Stefan Hajnoczi , Fam Zheng , Eric Blake , Vladimir Sementsov-Ogievskiy , John Snow , =?utf-8?q?C=C3=A9dric_Le_Goater?= , , , Yishai Hadas , Jason Gunthorpe , Maor Gottlieb , Avihai Horon , Kirti Wankhede , Tarun Gupta , Joao Martins Subject: [PATCH v8 06/13] vfio/common: Change vfio_devices_all_running_and_saving() logic to equivalent one Date: Mon, 16 Jan 2023 16:11:28 +0200 Message-ID: <20230116141135.12021-7-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20230116141135.12021-1-avihaih@nvidia.com> References: <20230116141135.12021-1-avihaih@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0000E633:EE_|DS7PR12MB8417:EE_ X-MS-Office365-Filtering-Correlation-Id: 14a6c148-319f-4878-5fe0-08daf7cbb9ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wPliV3xd0lvD1Q1FCuKjGNu6LAWoltsR1T7q2Evbam8Xe9IQ9d4zeq0nG0wrN8UVqGf2sgkceM5uqfKuBqE9+RATT1YBuius8bUpF5/mlFEyloe8UVmYbE0xPtovBSSI5wY08lpuT6dxYGjJWykcV3Ytas48ch9maWSaAmuoVapdnQtjELWVTBzUOLFedvEqybTjr8HmvSLGOnolMIiyXMHgGSvj0VL42Au45pXhSgHBc3reaF2U25rh7daBbKPsSgFR7fs3oDlYfagMHgxM5Igd79MgeIPhiT1M+J7YLOtLRRr3P7D3WjHbAoqvcySEaw2eGGkRKPvRZCjwMzIg4OGngMcIBzmRsjbZFpIqqsIt5MdqDd+3xGKdAm2RfkGHjbciNquTXi8DZIRLCpDrzNu7dhMD7JPorOjKPQshcLPcGwuAWn4N887wXDngvfdckP02wNLHD+T9hT2MLKBhfaGUnr6vbJSMpDJRW+Bat2+NFivvxAbu8FSfykeT2iDNR11ndBW13wpa3GB01KjMYLWxiHvQg7jgDMEp41+L6LXMKBTwk6omzmnNZ7l4oyFXVe31TbW5BU+vcTgf5VszYOrgrHn2bDPmQJRgoLY2DoVBKa0d58NjqbszFh30BtPnikOOE0bDVjKbtI+K5AD+zBAToQL0KfdHQy8dOGD2X8q8kU5mz7eHzyG+2nWyXkv3Fs2gRsPEb6MlJdV3099eVw== 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:(13230022)(4636009)(136003)(396003)(346002)(39860400002)(376002)(451199015)(40470700004)(46966006)(36840700001)(70206006)(70586007)(36756003)(8676002)(336012)(4326008)(316002)(6916009)(83380400001)(36860700001)(478600001)(66574015)(47076005)(40480700001)(426003)(40460700003)(86362001)(41300700001)(82310400005)(7696005)(186003)(26005)(54906003)(7636003)(2616005)(1076003)(2906002)(356005)(7416002)(5660300002)(82740400003)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2023 14:12:39.2515 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14a6c148-319f-4878-5fe0-08daf7cbb9ce 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: DS1PEPF0000E633.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8417 Received-SPF: softfail client-ip=40.107.92.81; envelope-from=avihaih@nvidia.com; helo=NAM10-BN7-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org vfio_devices_all_running_and_saving() is used to check if migration is in pre-copy phase. This is done by checking if migration is in setup or active states and if all VFIO devices are in pre-copy state, i.e. _SAVING | _RUNNING. In VFIO migration protocol v2 pre-copy support is made optional. Hence, a matching v2 protocol pre-copy state can't be used here. As preparation for adding v2 protocol, change vfio_devices_all_running_and_saving() logic such that it doesn't use the VFIO pre-copy state. The new equivalent logic checks if migration is in active state and if all VFIO devices are in running state [1]. No functional changes intended. [1] Note that checking if migration is in setup or active states and if all VFIO devices are in running state doesn't guarantee that we are in pre-copy phase, thus we check if migration is only in active state. Signed-off-by: Avihai Horon Reviewed-by: Cédric Le Goater --- hw/vfio/common.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index f6dd571549..3a35f4afad 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -40,6 +40,7 @@ #include "trace.h" #include "qapi/error.h" #include "migration/migration.h" +#include "migration/misc.h" #include "sysemu/tpm.h" VFIOGroupList vfio_group_list = @@ -363,13 +364,16 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container) return true; } -static bool vfio_devices_all_running_and_saving(VFIOContainer *container) +/* + * Check if all VFIO devices are running and migration is active, which is + * essentially equivalent to the migration being in pre-copy phase. + */ +static bool vfio_devices_all_running_and_mig_active(VFIOContainer *container) { VFIOGroup *group; VFIODevice *vbasedev; - MigrationState *ms = migrate_get_current(); - if (!migration_is_setup_or_active(ms->state)) { + if (!migration_is_active(migrate_get_current())) { return false; } @@ -381,8 +385,7 @@ static bool vfio_devices_all_running_and_saving(VFIOContainer *container) return false; } - if ((migration->device_state & VFIO_DEVICE_STATE_V1_SAVING) && - (migration->device_state & VFIO_DEVICE_STATE_V1_RUNNING)) { + if (migration->device_state & VFIO_DEVICE_STATE_V1_RUNNING) { continue; } else { return false; @@ -461,7 +464,7 @@ static int vfio_dma_unmap(VFIOContainer *container, }; if (iotlb && container->dirty_pages_supported && - vfio_devices_all_running_and_saving(container)) { + vfio_devices_all_running_and_mig_active(container)) { return vfio_dma_unmap_bitmap(container, iova, size, iotlb); } @@ -488,7 +491,7 @@ static int vfio_dma_unmap(VFIOContainer *container, return -errno; } - if (iotlb && vfio_devices_all_running_and_saving(container)) { + if (iotlb && vfio_devices_all_running_and_mig_active(container)) { cpu_physical_memory_set_dirty_range(iotlb->translated_addr, size, tcg_enabled() ? DIRTY_CLIENTS_ALL : DIRTY_CLIENTS_NOCODE);