From patchwork Thu May 9 09:09:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Avihai Horon X-Patchwork-Id: 13659594 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 905FAC25B74 for ; Thu, 9 May 2024 09:17:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4zsE-0007kS-68; Thu, 09 May 2024 05:15:34 -0400 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 1s4zs4-0007jZ-OY for qemu-devel@nongnu.org; Thu, 09 May 2024 05:15:24 -0400 Received: from mail-mw2nam10on2084.outbound.protection.outlook.com ([40.107.94.84] helo=NAM10-MW2-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 1s4zs0-0005mZ-BT for qemu-devel@nongnu.org; Thu, 09 May 2024 05:15:24 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E9olfczyYCOP95g2hlYy/8wVwwgepR9t7C19Ymrik/9O6tmY+M3lcQf48n8MFBtbAcF7dLq8RWc7GBYhsbWW48lhMjOb96oo83C2s26GFhZknjZiTE/X2+RtX6deKTPj0L9iz1+zeA2LbCCesKxPB4T/AwMOEg6VNvcHnE/0wyrO351nz5r9xf4SJYFOuLsby9l4LKU0dVKetYJ4nAgi9aByKaZoajeX6JS04/wntFo5wA0K2gaZJ3Sib2sg/lPEeBMRnhL9+tv6MKXIHZuqH4Rh+3BvQnXYzvTnii7lYccLfhTLN6PJHnNn0WWaKIZC2Bxn1NHgcTsSo0skFZ6rTw== 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=v0yPHHloLUKIK3bsg7eDBRSATaUMxTXGbX6fYXMt5fE=; b=QMRmnjbe9EP9Xz1VaUsC7+SPGZpH4er6g4NQk8aptSIgU97l9hrvPWV58hCtNpzTwiC3BYBxpFGm4FcDm/f89p40MzWxMCVHWDRhrwJBDz4Liwe0RYV2b8GRNCeBvpcvW3/YluhYsLWairGVvxLjcwvpZtEtvbDapwdftaikByqDAs3LlEoFhrC2LgaRQk2S9euAcFygsZh21pQ/87aepzNg95y2Bub/rKgBeNIVF8dlNNhOYC60Prsbw6iBCT3CWdbBtDyGgwmCxQkRbx7mRpfxZfsBooDq40WWfEMfs20de8/fri5aF5xXGqix7i/Oz4Guk9fgnbjeh+nPUmsIsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 (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=v0yPHHloLUKIK3bsg7eDBRSATaUMxTXGbX6fYXMt5fE=; b=TlGiLYVPqWsE/ki5cgHJMm//2KIFY9FYBuodxZE5OfH7DwKIUEyr2gaotzLfCaIoy+oRchEqniBB8+vYClv2A6DO90/+8vlDVc6ZpnIm1UlJ50TArxhqRsr2e4gm68xxfF6qqpLjYdOkMNTQ9tyndEp4oRft59+779oGDhWMuGrCBkjAirTOLWw/LCje5CpPUnp41gM/DMJ0t7ezULIsKzqq4BeWQDvB+MDyFn73vOkXKEkAriUVZ49yiLYMe6vYUwGX14yVnK9gLrLZLqHgMJ9wCGEbY1eY7y0UAD3dIgEs1de5sOBvjGTVudLJzTEqY2U6fEDWJawt4plwpSTAtg== Received: from MN2PR20CA0037.namprd20.prod.outlook.com (2603:10b6:208:235::6) by MW4PR12MB7237.namprd12.prod.outlook.com (2603:10b6:303:22a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.35; Thu, 9 May 2024 09:10:14 +0000 Received: from BL6PEPF0002256E.namprd02.prod.outlook.com (2603:10b6:208:235:cafe::e9) by MN2PR20CA0037.outlook.office365.com (2603:10b6:208:235::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.45 via Frontend Transport; Thu, 9 May 2024 09:10:14 +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 BL6PEPF0002256E.mail.protection.outlook.com (10.167.249.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.18 via Frontend Transport; Thu, 9 May 2024 09:10:13 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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; Thu, 9 May 2024 02:10:02 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Thu, 9 May 2024 02:10:01 -0700 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 9 May 2024 02:09:58 -0700 From: Avihai Horon To: CC: Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Markus Armbruster , Michael Roth , Eric Blake , Peter Xu , Fabiano Rosas , Joao Martins , Maor Gottlieb , Avihai Horon Subject: [PATCH v2 1/3] qapi/vfio: Add VFIO migration QAPI event Date: Thu, 9 May 2024 12:09:52 +0300 Message-ID: <20240509090954.16447-2-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20240509090954.16447-1-avihaih@nvidia.com> References: <20240509090954.16447-1-avihaih@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0002256E:EE_|MW4PR12MB7237:EE_ X-MS-Office365-Filtering-Correlation-Id: 13609ea6-9b89-4bcc-154d-08dc7007d606 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|1800799015|36860700004|82310400017; X-Microsoft-Antispam-Message-Info: 5Gc2poBx2x7CuwVVgONTk+VS+ySqSl5RwBFUcn/AQ2lytN46dAK+qDLwtqyDBVAudAL2EIqL8KQ+KmF3HlfaPIPyfYokw1E6om+4294knijMYB6YEzQjGmE22Z3aWD0BomvqC6QTyLbbdzzsqnIc0/SptFVQu7C5ep+zfvBChE4kPqgB2k/C6ShvjAK2T777kB20PXttEClexZZkpx8b3Kuo6Lz47wbuoAWCNqfKOwKmxfP1g+oW0pnUunWLjD0cuXv+o4Mzhu8cRkzwk3nj1vtMbyVNiGdwCYwdGFtlJ36xaRfPa6Owl9kw2F9K/QiUnQEL4Qk1KWk08aSDkNdsNxh9EdgN830ZxbSCLdpdQFYw9C5DWdztfENe030livhqnkmWK9WYAHWuSqw9WBJmQsPVhudepQwRt6paEPr5PuPn0TsTYAk7uMTUosD+sLL5h+nEVbUXdxt3j4gqFV9Axin9l0Uq/6TMI7q1tfF2oHy6idldc1hKSHCmNvUevv+IEN4nq6SxadaDYDYN+l/GIOTkc27y8/WAlTf+189gb9HuckINPHDVHsJUa8cpkRvMFuO8RPzo0tHZD9+rDkycMZS5wR2btsogm7sGA7kvfm5hT/frlFw8I90104TOlVFUM3GnA++l24r7kXeCKs19MSYIrDf+6z+ttNvayTgrYOJHJ+uvbd1CWJEPu06AftTGmEqF/a0n3wqozgRevQh35mr31mR2s57CxzjyMrv+Nmymne0MG8C8KFR5cxdeIRK+xqKLQqt4ij+9PR0eTyzy7zdddydhPlqd3xMRZDawCVcJapnM7r7B5T4LTHIz9RvTpHooPJ95bVb4LpzmPqQzwhASdLnB1d52bXLK54NkMIbWvK80ubbLp58bAwQ8BHh4zULgM9/oCDlpCkU1kN7VbXKejPI2Swfs2qUP4R1nlOr7c8IwUNSeBtQxJ5kicMnamHrgSjwarBMy7k7jwBBtPJwOF0QH7FfVdtg6wjrcvsBhcXKd+yh8HIyE8S/jpzN5JzKNOwjm05fpjDAXatP6aOj+nNGs+HpylaFm4I9ZqHo+sdAXJEk5uFmOiAiBRnB89gH/xltBa486sW+7jZNuMWD/i+rPjTz1pKG0he34E0dIyLkAb5R/iLnAHUG1U3JPMRpG1ojwtSL57HpVZ130slxs9WLsI2HpNIZe1uV+LHvtWMKwc5hLQWE+MpCSDYVrBefQttB67bs/po5ay94l9xoDGuAmf/MCDww8ZkTpcpmSHJBA6yDP9w6vHzVvlZBK2Dl4wERScKAxQMZ6Z42ntLu5jFKYxAP31UB0+JZQfkz0406xSoMR+ZKBflBEr7aeh1WQ/2/aLP2WhXksP210FDaA/99eVOYYZs+MYh415iOYe6ZKyJwRvnNAWlEqanNJ 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:(13230031)(376005)(1800799015)(36860700004)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2024 09:10:13.5541 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13609ea6-9b89-4bcc-154d-08dc7007d606 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: BL6PEPF0002256E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7237 Received-SPF: softfail client-ip=40.107.94.84; envelope-from=avihaih@nvidia.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.582, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 Add a new QAPI event for VFIO migration. This event will be emitted when a VFIO device changes its migration state, for example, during migration or when stopping/starting the guest. This event can be used by management applications to get updates on the current state of the VFIO device for their own purposes. Note that this new event is introduced since VFIO devices have a unique set of migration states which cannot be described as accurately by other existing events such as run state or migration status. Signed-off-by: Avihai Horon Reviewed-by: Cédric Le Goater --- MAINTAINERS | 1 + qapi/qapi-schema.json | 1 + qapi/vfio.json | 67 +++++++++++++++++++++++++++++++++++++++++++ qapi/meson.build | 1 + 4 files changed, 70 insertions(+) create mode 100644 qapi/vfio.json diff --git a/MAINTAINERS b/MAINTAINERS index 84391777db..b5f1de459e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2160,6 +2160,7 @@ F: hw/vfio/* F: include/hw/vfio/ F: docs/igd-assign.txt F: docs/devel/migration/vfio.rst +F: qapi/vfio.json vfio-ccw M: Eric Farman diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 5e33da7228..b1581988e4 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -78,5 +78,6 @@ { 'include': 'pci.json' } { 'include': 'stats.json' } { 'include': 'virtio.json' } +{ 'include': 'vfio.json' } { 'include': 'cryptodev.json' } { 'include': 'cxl.json' } diff --git a/qapi/vfio.json b/qapi/vfio.json new file mode 100644 index 0000000000..a0e5013188 --- /dev/null +++ b/qapi/vfio.json @@ -0,0 +1,67 @@ +# -*- Mode: Python -*- +# vim: filetype=python +# + +## +# = VFIO devices +## + +## +# @VfioMigrationState: +# +# An enumeration of the VFIO device migration states. +# +# @stop: The device is stopped. +# +# @running: The device is running. +# +# @stop-copy: The device is stopped and its internal state is available +# for reading. +# +# @resuming: The device is stopped and its internal state is available +# for writing. +# +# @running-p2p: The device is running in the P2P quiescent state. +# +# @pre-copy: The device is running, tracking its internal state and its +# internal state is available for reading. +# +# @pre-copy-p2p: The device is running in the P2P quiescent state, +# tracking its internal state and its internal state is available +# for reading. +# +# Since: 9.1 +## +{ 'enum': 'VfioMigrationState', + 'data': [ 'stop', 'running', 'stop-copy', 'resuming', 'running-p2p', + 'pre-copy', 'pre-copy-p2p' ], + 'prefix': 'QAPI_VFIO_MIGRATION_STATE' } + +## +# @VFIO_MIGRATION: +# +# This event is emitted when a VFIO device migration state is changed. +# +# @device-id: The device's id, if it has one. +# +# @qom-path: The device's QOM path. +# +# @device-state: The new changed device migration state. +# +# Since: 9.1 +# +# Example: +# +# <- { "timestamp": { "seconds": 1713771323, "microseconds": 212268 }, +# "event": "VFIO_MIGRATION", +# "data": { +# "device-id": "vfio_dev1", +# "qom-path": "/machine/peripheral/vfio_dev1", +# "device-state": "stop" } } +## +{ 'event': 'VFIO_MIGRATION', + 'data': { + 'device-id': 'str', + 'qom-path': 'str', + 'device-state': 'VfioMigrationState' + } } diff --git a/qapi/meson.build b/qapi/meson.build index c92af6e063..e7bc54e5d0 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -52,6 +52,7 @@ qapi_all_modules = [ 'stats', 'trace', 'transaction', + 'vfio', 'virtio', 'yank', ] From patchwork Thu May 9 09:09:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avihai Horon X-Patchwork-Id: 13659581 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 E42F1C41513 for ; Thu, 9 May 2024 09:11:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4znR-0004o6-Kk; Thu, 09 May 2024 05:10:37 -0400 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 1s4znQ-0004nd-3t for qemu-devel@nongnu.org; Thu, 09 May 2024 05:10:36 -0400 Received: from mail-mw2nam12on20601.outbound.protection.outlook.com ([2a01:111:f403:200a::601] helo=NAM12-MW2-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 1s4znN-0003T5-GV for qemu-devel@nongnu.org; Thu, 09 May 2024 05:10:35 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CESMs1JkvJ15BtB/SGdEAbaX6MtTqdH9dhB+OwOhh+x2bI8IWs+49EO5IQ8xUOWIaXa91FQSIAyNx8pZ/SaBGulhOet2aBGOFvojJJyX8uZk60JtKLYFyyM9/DPfpd7hKOcvK7bPN234Ch3Kb59CekZWOxHb0MAbPqpxmRxes90xbXf2PRlsUBmYwnq+LyMJBQwyEo8IAyS+V612Fjbqa50Pf1Hy82hBGyMO8uVbSdyt9wAVy6Ush+NJkJdtdJtMP9qsRyWoISHyB5p9HdsCL0mMZLImUa4Kmm6xv651A5JNsUB3HI+nd3AewsBW9axUrzPIhtkKJfL57/0WwmtwKw== 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=kDXPi1eKaN76rgzC+w4BLL1j0SEwquiNwP6LCfrF4Ss=; b=I7sR/oJIP2UeHtZDrhe1PAK4vc5g/1bCok6PjtGS7uZX2K6cByLvwiEiqaJtnaOfrnHQgNtkuMZrrQ0LIHNpWieMylTwmGPhyRP+cCiP9A8WjuJG/KQz/GqgYts71CXjFJbwpLwzq3grusmKaVaZawo/NythnquLWJQuqk5k01kW44c/Fa6D/YAEAIEdbAK5xtKmQXNgzin1YDwBoAEQtLEcvbdXHDPSUJK36hZjeKJYimn/qaWf3GRzmrtRcETSK4hq9M8Gsto5DoVDeFuMJhk1JUKs7Gb03RmNAAF1uBeM0D5qHQln/6cy9pWweZ/Rebb/BLF3glKloY8SRhJxoA== 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 (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=kDXPi1eKaN76rgzC+w4BLL1j0SEwquiNwP6LCfrF4Ss=; b=T8+EbUNEpOIzhTnz5NW4ObYyqshl2IPI61eC01kX08ujAtHuh+gTluCIGG4uem2h48BwrC8A+kgKK8p5gbzVP7dgUDG6FBHrF8YJggxyRjf77C1D+2kW6u2Wt4j2xtQfwNXORcg7UMQzKe8LmnAX8LxTwOJfXFevEntfUi6lXQjH3vwENDjL7ESEqO2nDUQVKe/c7jyJbImKZZlFtfQr1HD1HuM5WnevXPxWCHa17wF/Txcwu3XPzqoOMPQThfUgt9g6xSMN1YDOJwFNcUw6pVvQRt/AomXqpoMbSiU+wYqiHc612IYq5lKZR3xJcfAtHEK4caIen6iJtF5ZoBmm9w== Received: from SJ0PR03CA0216.namprd03.prod.outlook.com (2603:10b6:a03:39f::11) by DM4PR12MB6325.namprd12.prod.outlook.com (2603:10b6:8:a4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.46; Thu, 9 May 2024 09:10:25 +0000 Received: from CO1PEPF000042AE.namprd03.prod.outlook.com (2603:10b6:a03:39f:cafe::e8) by SJ0PR03CA0216.outlook.office365.com (2603:10b6:a03:39f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.45 via Frontend Transport; Thu, 9 May 2024 09:10:24 +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 CO1PEPF000042AE.mail.protection.outlook.com (10.167.243.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.18 via Frontend Transport; Thu, 9 May 2024 09:10:24 +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.1544.4; Thu, 9 May 2024 02:10:05 -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; Thu, 9 May 2024 02:10:05 -0700 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 9 May 2024 02:10:02 -0700 From: Avihai Horon To: CC: Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Markus Armbruster , Michael Roth , Eric Blake , Peter Xu , Fabiano Rosas , Joao Martins , Maor Gottlieb , Avihai Horon Subject: [PATCH v2 2/3] vfio/migration: Emit VFIO migration QAPI event Date: Thu, 9 May 2024 12:09:53 +0300 Message-ID: <20240509090954.16447-3-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20240509090954.16447-1-avihaih@nvidia.com> References: <20240509090954.16447-1-avihaih@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000042AE:EE_|DM4PR12MB6325:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d6251c3-fb0b-4f10-0c2a-08dc7007dc71 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|376005|82310400017|36860700004|1800799015; X-Microsoft-Antispam-Message-Info: dzzOCja6BMwakU7hXPVpEBJRO8f+e5mbRs5pI5BIZ3E37Z8W3ifKk6O1odk/29IUZ/d7+/MUeIAMUQZdnW2CTdLDAZs7i/gmz3aYcY4QDjzyrrNTjo++mgZPl6KerkRy3OnUbkPWCGQ0s1lWsdW936hUR9/LE33qYsttCt+zAGb5g7uzaz7NQyKtyyvq5N7QvtUk0y04tOTdZdfs800c4GuWy/3OcqfRpF8SEbNWx2i1jEjuOgyNc4dsvpx9PRQBbG503GuI9+KbHnYzYi3UEEvD/+aqTGkWrF/YZ+Qaowdh4JAtzu4rdX6aBxbl1PZVCrf61HDPs7gIL2gkUigDQNI1u5e2EubEXhyzC++yN8NwgExggnXONPTftqmCCW5AHEk5QdBebQSnl67vetPeOmLy03H4Pq3ObcogZBO/AZqpvYRy16qoAUsVrYMrk9F38DTGc3uYpQOlqZ1+IqBGmUVSIGR7MJJpEpa2EnrcvGJyHxw/ZWi4jBYIS5UTGgr7uDBnwO0IAMzG9p2IMOxdJiyZrJcwaYaNJALycK/o24MEE0Qa2IcfBklIT6KFfMafgR75Ecdj+Pjha/XfMu5pcm4vzLSjxgeGiCEBDpV8cGwFpZ9hZR55Qx244Qsf+1Q7dygpYuejnsg1Vfl0ADfLcSFgjHYN7UqMNhq5Q4bIDYzMoYj5k6kllEvR2+SKyoe2cxndcxbUpoapj8WVz+UN0YsOFF+N5C9oEi3dzqeQkUMg5vHgHuUXtcQDSvIJwLyWP4M4/04gMSMc659eAWrJv7vn2Ro4xv5ufVxyqLB+v6456puB9xMAwQXLr3lgCdU57RPvLHmfSX9OcJ+IUWtGhJ93Gxn0IYsbrULcQVda8iOKH5qrA89hEMuATxPhyghXoF5sH4x3EgXtghPLWftvE49rnQBsh51I5f5eJF2EBI3FpyQwt9GgI3zkBNcWI89G9HX9HTfFE6on1ArImnGkbrs3oR6tKQ7RbEEsCLzrUzCNzyB/kBa6a3/dOQ/66sJpCGQ+dbYdg3SrA13TTTVBEW3lEDT+m22QsWdoRvH4KOXEAOKb0t1q6oZVZqy3J4qAR6RU0fDBY09KbKgzavP3zAsvOQPAgiizMsfSXeaJdY9+DlmxyYvKAqNuf6R0dXMZXw9ouObjnLXkey2cIXr8EpWs4Wj2zisO7Sspnvj7WAbWmoUkoWXe08Aq/H491fLS0slye1jYHggyNx2TYLDXUVkX/Au2Hp3sgjXKUvoDEo5z16qxJhgRbRpy8CeVwSWkE8sv7GQ3Ls5mbpB3PUS42Z7ou+ukooVJXKsgAIo/yx7S6tTRHYd3aolnTD4oPExeDjLdWNVn3fp2noOODKcRSgGaJdtfOBHPVabV87/yZT+1G4D/9TM3rPh0zbncATXI 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:(13230031)(376005)(82310400017)(36860700004)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2024 09:10:24.3683 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d6251c3-fb0b-4f10-0c2a-08dc7007dc71 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: CO1PEPF000042AE.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6325 Received-SPF: softfail client-ip=2a01:111:f403:200a::601; envelope-from=avihaih@nvidia.com; helo=NAM12-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.582, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 Emit VFIO migration QAPI event when a VFIO device changes its migration state. This can be used by management applications to get updates on the current state of the VFIO device for their own purposes. A new per VFIO device capability, "migration-events", is added so events can be enabled only for the required devices. It is disabled by default. Signed-off-by: Avihai Horon --- include/hw/vfio/vfio-common.h | 1 + hw/vfio/migration.c | 56 +++++++++++++++++++++++++++++++++-- hw/vfio/pci.c | 2 ++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index b9da6c08ef..3ec5f2425e 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -115,6 +115,7 @@ typedef struct VFIODevice { bool no_mmap; bool ram_block_discard_allowed; OnOffAuto enable_migration; + bool migration_events; VFIODeviceOps *ops; unsigned int num_irqs; unsigned int num_regions; diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 06ae40969b..5a359c4c78 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -24,6 +24,7 @@ #include "migration/register.h" #include "migration/blocker.h" #include "qapi/error.h" +#include "qapi/qapi-events-vfio.h" #include "exec/ramlist.h" #include "exec/ram_addr.h" #include "pci.h" @@ -80,6 +81,55 @@ static const char *mig_state_to_str(enum vfio_device_mig_state state) } } +static VfioMigrationState +mig_state_to_qapi_state(enum vfio_device_mig_state state) +{ + switch (state) { + case VFIO_DEVICE_STATE_STOP: + return QAPI_VFIO_MIGRATION_STATE_STOP; + case VFIO_DEVICE_STATE_RUNNING: + return QAPI_VFIO_MIGRATION_STATE_RUNNING; + case VFIO_DEVICE_STATE_STOP_COPY: + return QAPI_VFIO_MIGRATION_STATE_STOP_COPY; + case VFIO_DEVICE_STATE_RESUMING: + return QAPI_VFIO_MIGRATION_STATE_RESUMING; + case VFIO_DEVICE_STATE_RUNNING_P2P: + return QAPI_VFIO_MIGRATION_STATE_RUNNING_P2P; + case VFIO_DEVICE_STATE_PRE_COPY: + return QAPI_VFIO_MIGRATION_STATE_PRE_COPY; + case VFIO_DEVICE_STATE_PRE_COPY_P2P: + return QAPI_VFIO_MIGRATION_STATE_PRE_COPY_P2P; + default: + g_assert_not_reached(); + } +} + +static void vfio_migration_send_event(VFIODevice *vbasedev) +{ + VFIOMigration *migration = vbasedev->migration; + DeviceState *dev = vbasedev->dev; + g_autofree char *qom_path = NULL; + Object *obj; + + if (!vbasedev->migration_events) { + return; + } + + obj = vbasedev->ops->vfio_get_object(vbasedev); + qom_path = object_get_canonical_path(obj); + + qapi_event_send_vfio_migration( + dev->id, qom_path, mig_state_to_qapi_state(migration->device_state)); +} + +static void set_state(VFIODevice *vbasedev, enum vfio_device_mig_state state) +{ + VFIOMigration *migration = vbasedev->migration; + + migration->device_state = state; + vfio_migration_send_event(vbasedev); +} + static int vfio_migration_set_state(VFIODevice *vbasedev, enum vfio_device_mig_state new_state, enum vfio_device_mig_state recover_state) @@ -125,12 +175,12 @@ static int vfio_migration_set_state(VFIODevice *vbasedev, goto reset_device; } - migration->device_state = recover_state; + set_state(vbasedev, recover_state); return ret; } - migration->device_state = new_state; + set_state(vbasedev, new_state); if (mig_state->data_fd != -1) { if (migration->data_fd != -1) { /* @@ -156,7 +206,7 @@ reset_device: strerror(errno)); } - migration->device_state = VFIO_DEVICE_STATE_RUNNING; + set_state(vbasedev, VFIO_DEVICE_STATE_RUNNING); return ret; } diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 64780d1b79..8840602c50 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -3362,6 +3362,8 @@ static Property vfio_pci_dev_properties[] = { VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT, false), DEFINE_PROP_ON_OFF_AUTO("enable-migration", VFIOPCIDevice, vbasedev.enable_migration, ON_OFF_AUTO_AUTO), + DEFINE_PROP_BOOL("migration-events", VFIOPCIDevice, + vbasedev.migration_events, false), DEFINE_PROP_BOOL("x-no-mmap", VFIOPCIDevice, vbasedev.no_mmap, false), DEFINE_PROP_BOOL("x-balloon-allowed", VFIOPCIDevice, vbasedev.ram_block_discard_allowed, false), From patchwork Thu May 9 09:09:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Avihai Horon X-Patchwork-Id: 13659580 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 D1C06C10F1A for ; Thu, 9 May 2024 09:11:28 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4znT-0004oW-PY; Thu, 09 May 2024 05:10:39 -0400 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 1s4znS-0004o9-7F for qemu-devel@nongnu.org; Thu, 09 May 2024 05:10:38 -0400 Received: from mail-bn1nam02on20601.outbound.protection.outlook.com ([2a01:111:f403:2407::601] helo=NAM02-BN1-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 1s4znM-0003T4-PR for qemu-devel@nongnu.org; Thu, 09 May 2024 05:10:37 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mdaySpgfM8n/vem47ABvCq8sBwiU47Lf1ksQ/Qt/Z8TggYumdNlYteQoXi4tQEzOGIM7CJ+Mfujjc6y8Kt88cVLJ26AoEIi0pEq1eD8zvdRocT7SgR7WZwVurNzATHN+boFEvDjMWEsHwUdsrcp+hgrJut/82Rp0AD0ykTrAukK9PninXdAXLT4j0TG+2mA+/+vT6pA5ut23f7SIpKEuP0BepIphbpuCY1z4QSuuY/lgWCZeQYe9SMTrjiJbZUFJavr0Teh5IqaUrgeGYiEve66eI0/DPtZlNEtSyx/CwTFJM9qmCgEdiT4R6V31QAFIWF3oJasxy7X49aVpyGsCzQ== 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=5lWyV9quOOxfAeWLQKjuqBfvQRwQ9aN5eUYcsXLYsjY=; b=MkG+Nld3bVvTCxETiN/4JZuj29++B5CJGVEBf7gcuhSP9CcKeAjI+N2J5dtit/nAap2/FgqTCcRc1D2iMfMZ3JG4HbxcQScdCPUCKZ3L0kXuy4VuyAHOxXgj6YNDMF/H54LvTlZQaEFOnYNo16fmRI9/oCg7iJc3JHjI+UDbkSZh3mSypf6+IOWruSi/se71OUD4FylQL1AgmaHy6QBWH5gi/+QXJjFvKqNSXRbWSdI51L2cPdJGNjcBcCNm5DwfGzySIoZ0j7mFSOEepy8KJgTR+VvJ+K5rAlgu/k0AJhcI7nPOJrulOWEmnVEOoYUURm5NmH+bzYd6wsrkvkzhSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 (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=5lWyV9quOOxfAeWLQKjuqBfvQRwQ9aN5eUYcsXLYsjY=; b=nvpD710oqYo86fdZ8LIZVZrBd45Q4FctltSLq5ZMFHnE2QYE51IoSOFDRKXXaTanAqtBVA/fT/rMS4u9hetB8YFidaGQLr3QqzKq3dZRn2ws0Raodihh/XbBMPA4XUd6txV7gWGE87uiTB7Oy2g5cQTNiFiEdsXWlD0zRsM7Q2cW27119bHGGXfQT3pNAmdbQm9CeKuK5HOLVgAal74fOxgMq7SzJKKdySCZo7Krn3Hp40uZGKYosAONp5HCP8Dy/SKUZqGZ2WRM8x0e+iKk8eTX1ClDIpX10TzeTktXzS040efZMBCHtX/AncOP0LVdfi5v9uEMlGMX/pJpJKwL3w== Received: from BL1PR13CA0143.namprd13.prod.outlook.com (2603:10b6:208:2bb::28) by SN7PR12MB7021.namprd12.prod.outlook.com (2603:10b6:806:262::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.47; Thu, 9 May 2024 09:10:28 +0000 Received: from BL6PEPF00022573.namprd02.prod.outlook.com (2603:10b6:208:2bb:cafe::f3) by BL1PR13CA0143.outlook.office365.com (2603:10b6:208:2bb::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Thu, 9 May 2024 09:10:28 +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 BL6PEPF00022573.mail.protection.outlook.com (10.167.249.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.18 via Frontend Transport; Thu, 9 May 2024 09:10:28 +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; Thu, 9 May 2024 02:10:09 -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; Thu, 9 May 2024 02:10:08 -0700 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.10) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Thu, 9 May 2024 02:10:05 -0700 From: Avihai Horon To: CC: Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Markus Armbruster , Michael Roth , Eric Blake , Peter Xu , Fabiano Rosas , Joao Martins , Maor Gottlieb , Avihai Horon Subject: [PATCH v2 3/3] vfio/migration: Don't emit STOP_COPY VFIO migration QAPI event twice Date: Thu, 9 May 2024 12:09:54 +0300 Message-ID: <20240509090954.16447-4-avihaih@nvidia.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20240509090954.16447-1-avihaih@nvidia.com> References: <20240509090954.16447-1-avihaih@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022573:EE_|SN7PR12MB7021:EE_ X-MS-Office365-Filtering-Correlation-Id: 535c83ff-2185-424a-f053-08dc7007dea0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|36860700004|376005|1800799015|82310400017; X-Microsoft-Antispam-Message-Info: NvohWKiYDR00GrllSuiXfK4OQw0wLXoMuWQlc9a/s4gy5hhclWxWm6K7Gxl8h1P4k84qjlR4fwFLNiyr7SN8ThqhnMcr96FEkGdlnlfUcDxu2xeza5MXC5WaXBR6mAeOKm2K7zKywLewvrbFP6/4fH+VZOUtqVUgWa3h780wy+OZ0o0DGFP7t801fW2zOGRFraRrlu3wtNpZUQctHxki+62e7w8ogbtdAstn2rkNLktJHBmI8q8xaQIDTsCfCcuD0YqHm/POYBJmkCFXdGoFTwl/xjShWa2eCQwBDxWU9SUVzCnzJHyYfdQnHCwQAi2Vy36cPDZyq57DUXnL/ivh4rAXEO6TSTROeMxaf21e2uRdhgYbj72O/snac0ckXIBhsFkWnk75yyzbbVd4UhFsRdMsZg5aJbuZ/7Rg6Qgt/KeInPebXNIunDDgacG67L3DKeNWmZ+KWMMl0MKmL1r2vm7EpNn48riOwfXwuniyhSrYroyiVWZ+BdEDIgVs9ygRzXOdTgGQELI+TANpZe4tf0FGe4wXd7BScj7CWEhEnDkKXJo17XzxP1iZs7CHKScvERkshgwN0b377z32xA6Yt7H7fudIGw6GDrx6nOLk4MQiH2eh1Yfj+4UaPuDzJnVcDEDSX8Y+LDwz1RZZawENpPtj8U4PNj+LwLjEtPq3N4QFKdPKKscaRzptPLQRLCp2tZFDWLMY/7WJolaEMI8SSyTZ5xeeiHGlgRJEFwj8NCblMIfn2iRwKOQAuZFCShbmi+kaKWpa69/iQnbW+R3hpOvIodn+5G4PeIo7r9NP856o6NF/K+fTEDFpxylWTOxjT1zNsQnmQwZV2q7/uR6chRJegHwxHNuGAX1TlsGY5b+vcsFj5gfvhlQIXLlfTVRxk2nB2/cvZxfDckqU8CqcEY/FChBWf5nAt8quQkrzsORqIIgg2mOYqY5mtUqIeiK2o5GbQqNydkZMzDj+Wlf4kNYXkYZffBq10nVjf0590vzr9/Wgl9o1UYvaO5apLYS1vAA8lzxqD4tOTf9LAquuyQivfiWUBAoTLhTmRpz894rRwErKmKj3ob3BMTporCB6dtiGMK+SQb9DcXRFHxo2SKR4AoCSya/cWVIFiHkERCNIDD3jzTeUdShobfA15NKhSDyy5msmITDiX1HbZYW2L9sNOnayVgYXwljn4Viq+DIZS12tzx/RpoyF50bpioPOjFMxR6PB/nt7vceYJnWHV6sccAiC7vWKKmCMoZkcbvnG4dnT93TpOZPw85FSElYc+HtM1ooLQoDQdzzD/hCL64TCAzx27Q24Mok+UfeLuuk/MGodOtxFyv8iBgtlyhjbiBjfAgL6EtWi8E+9fNWq29zJ4wuAV/gIcYZV6rM3eTTF1UeV2G/USHTqPV/xHfgc 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:(13230031)(36860700004)(376005)(1800799015)(82310400017); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2024 09:10:28.0064 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 535c83ff-2185-424a-f053-08dc7007dea0 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: BL6PEPF00022573.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7021 Received-SPF: softfail client-ip=2a01:111:f403:2407::601; envelope-from=avihaih@nvidia.com; helo=NAM02-BN1-obe.outbound.protection.outlook.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.582, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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 When migrating a VFIO device that supports pre-copy, it is transitioned to STOP_COPY twice: once in vfio_vmstate_change() and second time in vfio_save_complete_precopy(). The second transition is harmless, as it's a STOP_COPY->STOP_COPY no-op transition. However, with the newly added VFIO migration QAPI event, the STOP_COPY event is undesirably emitted twice. Prevent this by returning early in vfio_migration_set_state() if new_state is the same as current device state. Note that the STOP_COPY transition in vfio_save_complete_precopy() is essential for VFIO devices that don't support pre-copy, for migrating an already stopped guest and for snapshots. Signed-off-by: Avihai Horon Reviewed-by: Cédric Le Goater --- hw/vfio/migration.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 5a359c4c78..14ef9c924e 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -143,6 +143,10 @@ static int vfio_migration_set_state(VFIODevice *vbasedev, (struct vfio_device_feature_mig_state *)feature->data; int ret; + if (new_state == migration->device_state) { + return 0; + } + feature->argsz = sizeof(buf); feature->flags = VFIO_DEVICE_FEATURE_SET | VFIO_DEVICE_FEATURE_MIG_DEVICE_STATE;