From nobody Fri Dec 19 17:53:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1746378321; cv=pass; d=zohomail.com; s=zohoarc; b=R28OjLD843N8DGe8JLPtCEBuQYWe8FdPSfgEqsFIZijJccU3wbL8FsdDColvTaDJHVLgWI8mKFAOoAexLzNwvK67TEoXs18Ehs5OnAed2t7RpwCjc1XrUyxNsp5rJiBUOYJrLXuE5p8cP4ased2cTkxEPqp/JKUHYBDt301bAEE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746378321; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VqU/Qv+WSNXmCO13v3CFdl+DaNQMspts1AKGD/ijmBA=; b=mJ8JOvTyYF+Y21Du0xeXpPKON6Ddl5KOYrL9KRhpH6aNJEf3/u9/5/wj/d/79H8q8sZXDzo/o3L508knRlIm/FJRqU6KIaFylosz1yhtsEA+fqw9ZrkJKrcNTLJUQ60aQo2cbEUgDNrWudGaxydTBnMPDvVh/VvLewKPh4a9niU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17463783211941021.1724124643658; Sun, 4 May 2025 10:05:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBclg-0006vC-OZ; Sun, 04 May 2025 13:04:44 -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 1uBcle-0006un-8f for qemu-devel@nongnu.org; Sun, 04 May 2025 13:04:42 -0400 Received: from mail-co1nam11on20630.outbound.protection.outlook.com ([2a01:111:f403:2416::630] helo=NAM11-CO1-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 1uBclb-0005JZ-V7 for qemu-devel@nongnu.org; Sun, 04 May 2025 13:04:41 -0400 Received: from CH2PR14CA0042.namprd14.prod.outlook.com (2603:10b6:610:56::22) by SN7PR12MB8025.namprd12.prod.outlook.com (2603:10b6:806:340::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Sun, 4 May 2025 17:04:32 +0000 Received: from CH2PEPF00000146.namprd02.prod.outlook.com (2603:10b6:610:56:cafe::5e) by CH2PR14CA0042.outlook.office365.com (2603:10b6:610:56::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8699.27 via Frontend Transport; Sun, 4 May 2025 17:04:32 +0000 Received: from SATLEXMB04.amd.com (165.204.84.17) by CH2PEPF00000146.mail.protection.outlook.com (10.167.244.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Sun, 4 May 2025 17:04:32 +0000 Received: from purico-ed03host.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Sun, 4 May 2025 12:04:28 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RYEROnmIgKY6CxeTm3258gPFELCxW8YpRttI4GVAstg7RyEfdrZKHugrbzBGm9/Czoa2Rhb1AS59owjbk1NoXbg5bFADytysx5xiBVPhnatC5YPvXUbNOJO24ExiSTKPHk9tfhcExseZcQU4GLIOE9Z1OrWa/nd8xQp8KoQEctavGyjqTCBE9cwmtSbfsSVZo6ndDjBKuVmc8QNtFvLaDq+btrqeIco6wCU74SAYQzt3UtHXYpehxNWBNUMr+YZ4IdEnGT0Avb4OYXQd9AgEPP6AWpLe0HTIxaC5AYocM7o43yM6fKTyw0E+miKtSJ2wfhXBVzs6lyBNmRoAYrYb7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=VqU/Qv+WSNXmCO13v3CFdl+DaNQMspts1AKGD/ijmBA=; b=KDynHfBfbegIAzmYVv95UboR/6pwK548i8TIpaRqU4yGSA8ALwCTNUyBb7TuIXU60zhdBmlX2r1nbw3tiFd2oyCbiKxMv84yI/33eIRwJQCRBnsoPH63jS/G2+h69h+oxAHlruJvLjUByRcgmwZjNzBi6RZ4juYDrfaMfNWbKkuhSsb8CvyqoIgVYas9lbQh+mMCnK6orISJ34yZvbrbHCyXTbsS9BptIVe0ilQbIbg9CxfK3Z3GQn3KykWBJqqEtawflvb9kZ7GYWJNjZvstyZgNV/e8KRF6cSpvrYrFCwvfec9ipFtz+kEZplbCj7A+hWFBILTemxErTK+jBdMiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=nongnu.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VqU/Qv+WSNXmCO13v3CFdl+DaNQMspts1AKGD/ijmBA=; b=f0gDQTEZ6vHg3vKE/W2f/x7eyf01NNalZ4uvd6Qx8anuqSz8/Tfd2yaIK0TStXb0lyVYYbmTB3gXgcDMh5Rvc2eb4W9Mvh16f8rPJqpopJt7vB4CHzYCPcOTYk+9g2n+MTV7vNWHCKQv6zeqeBC1Rp96Fn3dObJl1O914fLhGqU= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C From: Suravee Suthikulpanit To: CC: , , , , , , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 2/2] hw/i386/amd_iommu: Allow migration when explicitly create the AMDVI-PCI device Date: Sun, 4 May 2025 17:04:05 +0000 Message-ID: <20250504170405.12623-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250504170405.12623-1-suravee.suthikulpanit@amd.com> References: <20250504170405.12623-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000146:EE_|SN7PR12MB8025:EE_ X-MS-Office365-Filtering-Correlation-Id: ff575100-ceef-49ee-a587-08dd8b2dbd7c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4SAgFlJU9wDw+hBdaieDxVM3DXsgXOFZ5203S8o2rzLiKJ1yBspBUqnxmxwm?= =?us-ascii?Q?GHNvsjFYtIMfESJrRHk1nsr4wOaWoZjHn4Pf6cMAGL7OIpIPpEy0pHspt4tF?= =?us-ascii?Q?KX5U5SiH9HJwPjtKkbvDFtlaNECk1O8yrdNgKAgGXD3DyfSKEJbCAGA1j5AR?= =?us-ascii?Q?wpy65TIdL8vbrQXsuxd9qM5ZeWtocZAia9aAEnsg9AKUxW9oXT3B1QvwhHl8?= =?us-ascii?Q?oHrigDitnWEmA6PqyM7mVGY+uqXxKA3DSxCFlHfUo53izbatgdeNPYxEm4yj?= =?us-ascii?Q?asQlcjdiqpodoCrBEdfkEYcd112X7W+B3kv9s3EcHxDqjlfReZjnqgBmH6nx?= =?us-ascii?Q?M5kZIx1lWkvptLttDzfNMpu3BTLCAlRtijhkM+Kg0cGAbOpSMW2zDOrytFAW?= =?us-ascii?Q?Yq3Eq6Eq2MyTzaEX9gOfU7oGtti3xhsS8EVqmqvKmWFprgpz9jJgXbgWuJ3v?= =?us-ascii?Q?EWndHFH5Q1Z/n+ovn/CfYd6/zPJCcrKgpsWQz3XqOxninaG+LR8HuI4//cfE?= =?us-ascii?Q?TKcEn8j0HtuQBtCVdq8EJBHgY2QUCBcnZPYnshWbVU1omKTxi8aJ1gxRaW+B?= =?us-ascii?Q?7nrYApbrTBZttwAgLJDh3CnNK0BA9Peb1hpFNO26n1SU7c8JCOYD/+uEW70X?= =?us-ascii?Q?FceqkGoQxPP6PadD4mVYSfdUFLUFC/F61chKQSxO3OkqNSPVJg9JZzYtZ5uZ?= =?us-ascii?Q?J4nuoiScBo29pNggS5xeEle7HgQCweEN4erpMgVjsRe4D0N+9t7ViJNBCvYZ?= =?us-ascii?Q?MB6ye+BwxR9kQVs3pUOi9xcV3U203HbpJlxE61CA2RibGOdGKqbSh9y9w7hf?= =?us-ascii?Q?dYvh0X96PAGNOVViZPwuuxwRiBsZ6+qJxIF7vUtkiodsP07RIO+yiAJa5yHf?= =?us-ascii?Q?ca2plqND8r726NOxE/9NmCvKZML8tZkRNxNefx8ISY155u3YE10vQ0ou0T2y?= =?us-ascii?Q?R2NIMEr7NuC67HibpYGb36nK4XWHJ3Wy0FrHZ8k1IRe0/JOTMej6vyJrEA3z?= =?us-ascii?Q?nfzJFIt61yVIsURQtR3LmoiZ9OEOR/EnRjzeunilqw1whxNp2zo+XuRaW81o?= =?us-ascii?Q?I/yebs0XR9OQLMOJVklp3XxJxiN4jwMXEunTjZ3wKHSpiuRMcKxpvtyS1NNW?= =?us-ascii?Q?fOWyDwSAwb9JlBooQzUX6VPBCzEbHZUR+kPcctnJ7ku8+PyV505S6SaGiapp?= =?us-ascii?Q?kRcqdvkTux9hiyT/xpb5Yc4kIhzRfl1OKJQUFyHWPWwlwFN5T7JS3oUo2VE5?= =?us-ascii?Q?WBEfJMbJ21WImsKnaeKJ6Q62XDEWmxaUV3uI/qizVLbAhnXVc2ISTiHP/6LS?= =?us-ascii?Q?TwuEDa+4P1GxNIUNbr4FT0R7gITn+k5zmUQhzpdZPbTAXrj0yawmkgWCfMu3?= =?us-ascii?Q?7efczkBhLB+YKsLlAzbX5qeKFUSNxispV9pz1SseYxMqpzp3la48XKpf8Jg3?= =?us-ascii?Q?a+WQGcm2mmdDnLDjpj1ohUVwkmQKV1+s8a+xtncSeWJt1QUkUvNsxoHMxwBy?= =?us-ascii?Q?2d9+/D2scS5x955osj+OtRuy0XwPdS3mgph3?= X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2025 17:04:32.4667 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff575100-ceef-49ee-a587-08dd8b2dbd7c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000146.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8025 Received-SPF: permerror client-ip=2a01:111:f403:2416::630; envelope-from=Suravee.Suthikulpanit@amd.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.411, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1746378323589019000 Content-Type: text/plain; charset="utf-8" Add migration support for AMD IOMMU model by saving necessary AMDVIState parameters for MMIO registers, device table, command buffer, and event buffers. Also change devtab_len type from size_t to uint64_t to avoid 32-bit build issue. Signed-off-by: Suravee Suthikulpanit --- hw/i386/amd_iommu.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ hw/i386/amd_iommu.h | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index f5466fdc98..0775c8f3bb 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1611,8 +1611,55 @@ static void amdvi_sysbus_reset(DeviceState *dev) amdvi_init(s); } =20 +static const VMStateDescription vmstate_amdvi_sysbus_migratable =3D { + .name =3D "amd-iommu", + .version_id =3D 1, + .minimum_version_id =3D 1, + .priority =3D MIG_PRI_IOMMU, + .fields =3D (VMStateField[]) { + /* Updated in amdvi_handle_control_write() */ + VMSTATE_BOOL(enabled, AMDVIState), + VMSTATE_BOOL(ga_enabled, AMDVIState), + VMSTATE_BOOL(ats_enabled, AMDVIState), + VMSTATE_BOOL(cmdbuf_enabled, AMDVIState), + VMSTATE_BOOL(completion_wait_intr, AMDVIState), + VMSTATE_BOOL(evtlog_enabled, AMDVIState), + VMSTATE_BOOL(evtlog_intr, AMDVIState), + /* Updated in amdvi_handle_devtab_write() */ + VMSTATE_UINT64(devtab, AMDVIState), + VMSTATE_UINT64(devtab_len, AMDVIState), + /* Updated in amdvi_handle_cmdbase_write() */ + VMSTATE_UINT64(cmdbuf, AMDVIState), + VMSTATE_UINT64(cmdbuf_len, AMDVIState), + /* Updated in amdvi_handle_cmdhead_write() */ + VMSTATE_UINT32(cmdbuf_head, AMDVIState), + /* Updated in amdvi_handle_cmdtail_write() */ + VMSTATE_UINT32(cmdbuf_tail, AMDVIState), + /* Updated in amdvi_handle_evtbase_write() */ + VMSTATE_UINT64(evtlog, AMDVIState), + VMSTATE_UINT32(evtlog_len, AMDVIState), + /* Updated in amdvi_handle_evthead_write() */ + VMSTATE_UINT32(evtlog_head, AMDVIState), + /* Updated in amdvi_handle_evttail_write() */ + VMSTATE_UINT32(evtlog_tail, AMDVIState), + /* Updated in amdvi_handle_pprbase_write() */ + VMSTATE_UINT64(ppr_log, AMDVIState), + VMSTATE_UINT32(pprlog_len, AMDVIState), + /* Updated in amdvi_handle_pprhead_write() */ + VMSTATE_UINT32(pprlog_head, AMDVIState), + /* Updated in amdvi_handle_tailhead_write() */ + VMSTATE_UINT32(pprlog_tail, AMDVIState), + /* MMIO registers */ + VMSTATE_UINT8_ARRAY(mmior, AMDVIState, AMDVI_MMIO_SIZE), + VMSTATE_UINT8_ARRAY(romask, AMDVIState, AMDVI_MMIO_SIZE), + VMSTATE_UINT8_ARRAY(w1cmask, AMDVIState, AMDVI_MMIO_SIZE), + VMSTATE_END_OF_LIST() + } +}; + static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) { + DeviceClass *dc =3D (DeviceClass *) object_get_class(OBJECT(dev)); AMDVIState *s =3D AMD_IOMMU_DEVICE(dev); MachineState *ms =3D MACHINE(qdev_get_machine()); PCMachineState *pcms =3D PC_MACHINE(ms); @@ -1634,6 +1681,7 @@ static void amdvi_sysbus_realize(DeviceState *dev, Er= ror **errp) } =20 s->pci =3D AMD_IOMMU_PCI(pdev); + dc->vmsd =3D &vmstate_amdvi_sysbus_migratable; } else { s->pci =3D AMD_IOMMU_PCI(object_new(TYPE_AMD_IOMMU_PCI)); /* This device should take care of IOMMU PCI properties */ diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h index 7a28181d9c..5672bdef89 100644 --- a/hw/i386/amd_iommu.h +++ b/hw/i386/amd_iommu.h @@ -329,7 +329,7 @@ struct AMDVIState { bool excl_enabled; =20 hwaddr devtab; /* base address device table */ - size_t devtab_len; /* device table length */ + uint64_t devtab_len; /* device table length */ =20 hwaddr cmdbuf; /* command buffer base address */ uint64_t cmdbuf_len; /* command buffer length */ --=20 2.34.1