From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists1p.gnu.org (lists1p.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 5BDF3CD4F26 for ; Tue, 23 Jun 2026 07:52:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wbvvG-0006Kw-Kz; Tue, 23 Jun 2026 03:51:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wbvvA-0006Ff-71 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 03:51:48 -0400 Received: from mail-eastus2azlp170110003.outbound.protection.outlook.com ([2a01:111:f403:c110::3] helo=BN8PR05CU002.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 1wbvv7-0000hX-V8 for qemu-devel@nongnu.org; Tue, 23 Jun 2026 03:51:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q2KDA9VL6fny+UFA7SvDmMo6bv4yP4+QNjdDPfa2mXRhMRH4GuS/ACVP2L4+Q7HyJhybt8/bQPWynoTf3bKxtaBsXUzi8H/rRil4HcM2ld0SeGeoobcgYtIbAjkQG6pdwqPmajBI+0VTU0J5oqgi2+3W2pXyyM9lQU7+tljEphHyyjL2zD6UZHVMBaYnfZXfxKfOJCaA360JR7TkQ5LaALOVOcD3PzNZoqwZ7nxptaP9O2m4dwqaPtIcme9qy03svvKeoqh0a27e+53wllv+uZXgqfMMl2+62AF9CY6DSw4gmCOeapkvFlMvYVtgiWIbSbPi7BYRXx3IaG37+4dk6w== 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=zvn2DbhvmYkxJU4hIQ2m7Uycv31Z5NldVRCEfVIXlx8=; b=RbboPrWf7QANdY+IZsooDBsSuNN2lD7KMsrbETJ+j6GxLSLewqgzzZNFXB0PeATE9OG+H+HTwgPSYrU32OOSLw0KMRUlCAwGJop1CNngp553uKteadMuW7gEyavICFfeEj5cMXqOMeKMccKUstjYfUck/+IMYkDNCRvaIsBYpiNLTZgSDTm7LMw+MYNaf1+XldUTXN01qQbG3s6bNdJXKlPu5jk2Lv6+3x7dkZR895kTRMKjjKQJwbiHzOVNTb7KzNkJV+r/1NsNmQxzIkSqxUbxHv/uXq7w+YR1d4q/TyVbzWqeztaAA5wzDWLVFkb/sfiUheUrb0jUB3SY9FjUow== 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=zvn2DbhvmYkxJU4hIQ2m7Uycv31Z5NldVRCEfVIXlx8=; b=2cXFFZGV41G9sCqcX3ibbrdKJ1yCMa/PktVliETxvbSl13Ssh6lSHbGETL3r5fcZUNiHJiLnJ9/I/g8elT87BiO4GOpQy02vj7SZvfc572nNnSJ2bYRP1w6OX70dioIeQlFVl1X9sPhPugCuwhHo42nTePz5s3oXd/YKWPEkqyQ= Received: from SJ0PR05CA0172.namprd05.prod.outlook.com (2603:10b6:a03:339::27) by SA1PR12MB8598.namprd12.prod.outlook.com (2603:10b6:806:253::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.20; Tue, 23 Jun 2026 07:51:39 +0000 Received: from SJ5PEPF000001EE.namprd05.prod.outlook.com (2603:10b6:a03:339:cafe::3f) by SJ0PR05CA0172.outlook.office365.com (2603:10b6:a03:339::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.159.11 via Frontend Transport; Tue, 23 Jun 2026 07:51:38 +0000 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 (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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by SJ5PEPF000001EE.mail.protection.outlook.com (10.167.242.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.159.10 via Frontend Transport; Tue, 23 Jun 2026 07:51:38 +0000 Received: from k-Super-Server.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Tue, 23 Jun 2026 02:51:34 -0500 From: fanhuang To: , , , , CC: , , , , , fanhuang Subject: [PATCH v14 04/10] hw/i386: hook sp-mem into the pc machine plug path Date: Tue, 23 Jun 2026 15:50:45 +0800 Message-ID: <20260623075051.3797975-5-FangSheng.Huang@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260623075051.3797975-1-FangSheng.Huang@amd.com> References: <20260623075051.3797975-1-FangSheng.Huang@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001EE:EE_|SA1PR12MB8598:EE_ X-MS-Office365-Filtering-Correlation-Id: a645ee39-062c-4eb4-abff-08ded0fc41e0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700016|1800799024|23010399003|11063799006|56012099006|18002099003|22082099003|43062017; X-Microsoft-Antispam-Message-Info: qMpfVqlEMWeM8PmQJYg1BC5q5G8EMbmYz9KZYUorJx2OLfXhcco4Yz4TOgyMlKORmJ8kFYuRFhWfHixP9i7n5UIpi6eS2appfIBXQxku6BxiUjjrotRQhVsUnK6/Pz88kGo5WBZ5A+YMHQAb5RRb8TNiCZMYmvOYSdKm3Fqqrs5Lh5rEDQBdyks5KHYS1x+bvUe+WbDyeiWMubwg/hvKiql8jwA5qtukVds66K+OgW7mYD+fJ1nkA2YqnoUImOMhv1qzBHv1hqYLLGHoDbjGw9td/lLxaMGHzlfAWA63BlD1cmMnAbj0H0eT9xYWIl1WtvEU3ISctDku3Ha8flgM1RcMwrIz5r0P7dII2XVXyQNwawlff61mndmYiCRjmXYXGhFpeiusjntbDXxTmWr8gXTO4+SqYe/n/a1V+lFyFjShvq3SGnuulw2weVECtOH2ySNrOmB4bFCDN3W3xIULFrlDp0ScSSQ5F7Tbw36WuqcmgPaP8I2A+QpO1zhzXE7JiYMYZ64nSi8KqwQqtbZRtaSE6gNEoLaag3nl0AVR+rtvYpq1rEWVspiwzQPIgbdBtFQFHpssZNne8oaqgx0lqrfLDfXQsobOOS8TtIch3ieUfWdtiJDPV2vflBhWXbbiY1I+91izYxmquEuBePx04OEGU+QnhzwNFFgpjnRFwHLILf/zFE8JOs8uzVRE2zTYeLUklqXIpVZghd/UmfvfDSeCbN6t/6di0IwVlPYY+up645zXUVg4NrLUtT8MGcLJ X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(376014)(82310400026)(36860700016)(1800799024)(23010399003)(11063799006)(56012099006)(18002099003)(22082099003)(43062017); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OoZlUF77o8GDS0Yby8Xbz8WLi1wudATusuhM8L0CvzK66YYdICZMENe0aUx9+MF3nmMFH94+LZ13NbKCObHNmj/0BdXmPgEzrTinmjXwzfHlZMH2JElb9dKv0yv4WqR/+y2Z5wTZFIl/nREspr2CnxiDlosAiSNEU4gOdi/x0XmvxgIX0/q5drVSF7oIdbUz9ZBjSHeZUrRn/Pj++tA6yKWzsQlbnTMitfjAy8ZlvjOKcSQm6OvzJu8I2CSXObk0IgH0mzwdomgMBSDP6UiwOTyvpN3hmjJK0oQl7vV+dtPO7bDo+euVjmCZ5b+G9EGpxnOrDt8a9fdkPedcn+7+nUolrOrfmce0UlbFsjQ0e5Y7Euc2UOd9Jmgt7EO2mmamkwJzA5NVUhOyVRGdgBkdFDAGJIudoDuDG9WMEVcfXltL63xwDpif7UuC58iwy2aN X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2026 07:51:38.7469 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a645ee39-062c-4eb4-abff-08ded0fc41e0 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001EE.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8598 Received-SPF: permerror client-ip=2a01:111:f403:c110::3; envelope-from=FangSheng.Huang@amd.com; helo=BN8PR05CU002.outbound.protection.outlook.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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: qemu development 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 the pc machine hookup for TYPE_SP_MEM so each sp-mem instance is placed by the memory-device framework and reported to the guest as E820_SOFT_RESERVED. Signed-off-by: FangSheng Huang Reviewed-by: Igor Mammedov --- hw/i386/e820_memory_layout.h | 11 ++++++----- hw/i386/pc.c | 36 ++++++++++++++++++++++++++++++++++++ hw/i386/Kconfig | 2 ++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/hw/i386/e820_memory_layout.h b/hw/i386/e820_memory_layout.h index b50acfa201..6ef169db9c 100644 --- a/hw/i386/e820_memory_layout.h +++ b/hw/i386/e820_memory_layout.h @@ -10,11 +10,12 @@ #define HW_I386_E820_MEMORY_LAYOUT_H /* e820 types */ -#define E820_RAM 1 -#define E820_RESERVED 2 -#define E820_ACPI 3 -#define E820_NVS 4 -#define E820_UNUSABLE 5 +#define E820_RAM 1 +#define E820_RESERVED 2 +#define E820_ACPI 3 +#define E820_NVS 4 +#define E820_UNUSABLE 5 +#define E820_SOFT_RESERVED 0xefffffff struct e820_entry { uint64_t address; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 73a625327c..2bacece249 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -63,6 +63,7 @@ #include "hw/i386/kvm/xen_gnttab.h" #include "hw/i386/kvm/xen_xenstore.h" #include "hw/mem/memory-device.h" +#include "hw/mem/sp-mem.h" #include "e820_memory_layout.h" #include "trace.h" #include "sev.h" @@ -1285,11 +1286,43 @@ static void pc_hv_balloon_plug(HotplugHandler *hotplug_dev, memory_device_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev)); } +static void pc_sp_mem_pre_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + MachineState *ms = MACHINE(hotplug_dev); + SpMemDevice *spm = SP_MEM(dev); + + if (ms->numa_state && spm->node >= ms->numa_state->num_nodes) { + error_setg(errp, + "'node' property value %" PRIu32 + " exceeds the number of NUMA nodes (%d)", + spm->node, ms->numa_state->num_nodes); + return; + } + memory_device_pre_plug(MEMORY_DEVICE(dev), ms, errp); +} + +static void pc_sp_mem_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + SpMemDevice *spm = SP_MEM(dev); + MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(MEMORY_DEVICE(dev)); + uint64_t addr, size; + + memory_device_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev)); + + addr = mdc->get_addr(MEMORY_DEVICE(dev)); + size = memory_region_size(host_memory_backend_get_memory(spm->hostmem)); + e820_add_entry(addr, size, E820_SOFT_RESERVED); +} + static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { pc_memory_pre_plug(hotplug_dev, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_SP_MEM)) { + pc_sp_mem_pre_plug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { x86_cpu_pre_plug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MD_PCI)) { @@ -1326,6 +1359,8 @@ static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev, { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { pc_memory_plug(hotplug_dev, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_SP_MEM)) { + pc_sp_mem_plug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { x86_cpu_plug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MD_PCI)) { @@ -1370,6 +1405,7 @@ static HotplugHandler *pc_get_hotplug_handler(MachineState *machine, DeviceState *dev) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) || + object_dynamic_cast(OBJECT(dev), TYPE_SP_MEM) || object_dynamic_cast(OBJECT(dev), TYPE_CPU) || object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MD_PCI) || object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI) || diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 12473acaa7..e27d8816e5 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -84,6 +84,7 @@ config I440FX select PCI_I440FX select PIIX select DIMM + select SP_MEM select SMBIOS select SMBIOS_LEGACY select FW_CFG_DMA @@ -113,6 +114,7 @@ config Q35 select LPC_ICH9 select AHCI_ICH9 select DIMM + select SP_MEM select SMBIOS select FW_CFG_DMA -- 2.34.1