From nobody Sat Apr 11 21:30:48 2026 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=1772785722; cv=pass; d=zohomail.com; s=zohoarc; b=GyvBv+5CJSRgoaKAOv224G7i20LAilk6SQmlBtYxFkVT98qPWA3zvfMj8QX8GWXTZsln0qxFXcFDSye6o5nPo31Ptobrxn0vGX5F4mKtfMuBbY5+ERjIejUEQ0bEnRbUytzMp8M0T3y3JM42KNBog17oCmaSGj+SfzzWmuOlNMY= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772785722; 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=Nzmy3ufOTGy8V3OC9d7Hq2s7RnWbZt37TXSDEX9X/jk=; b=LXKWzEJYY3Iw65cykKUe1PZZDrhiHX04z6iHhVAn1alIiOCLGY1CPZSjQc5i/4E8+1MEFybUK+hh5PWCmvmweVBP/g4yKOe5iry3HsWJo9YY01xavbnVN3e5ec/iZWBv7a6/T0obVy0nwU652ykBhQRbu0D+XuNal1hrxvDRdzY= 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 1772785722840645.5786703957623; Fri, 6 Mar 2026 00:28:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vyQXX-0005yl-IL; Fri, 06 Mar 2026 03:28:08 -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 1vyQXV-0005yb-8x for qemu-devel@nongnu.org; Fri, 06 Mar 2026 03:28:06 -0500 Received: from mail-westus2azlp170100005.outbound.protection.outlook.com ([2a01:111:f403:c005::5] helo=CO1PR03CU002.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 1vyQXS-00020S-Ma for qemu-devel@nongnu.org; Fri, 06 Mar 2026 03:28:05 -0500 Received: from SA9PR03CA0012.namprd03.prod.outlook.com (2603:10b6:806:20::17) by DM4PR12MB6010.namprd12.prod.outlook.com (2603:10b6:8:6a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.18; Fri, 6 Mar 2026 08:27:55 +0000 Received: from SN1PEPF0002636D.namprd02.prod.outlook.com (2603:10b6:806:20:cafe::3) by SA9PR03CA0012.outlook.office365.com (2603:10b6:806:20::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9678.18 via Frontend Transport; Fri, 6 Mar 2026 08:27:54 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by SN1PEPF0002636D.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.18 via Frontend Transport; Fri, 6 Mar 2026 08:27:54 +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.17; Fri, 6 Mar 2026 02:27:51 -0600 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kV+q78NXCSf+CaoqnG+OX5U7tiBYq/fIP5xQFOaPO7I9pd7WVnkOhLE9zbBwYmA00BZO8nxPHN8vOGJRgKjaryX/RZE/40hEdewmwj4TqIb+ED+V3/zCu2WpXL14ntEZ+R4sJU/JOjgxs2eU6b4b7yN+2MtRIwTtYBsbMmczdTSznY7cJcIQWVe22H947l/+VeLbNoM0kXIeGvXEEj2i7BONPrnYyOW7wS8s5OG5uG+jnjbu3b2qY5g/iZ/r6EPYmuZrpMRfhao5BDC9uPcfsAXUJksEIOFY+kJ2NgqTNrKjg1J5nIs/jX6ifsUKqWu6wGT3hai2/TerZM3iByC4Og== 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=Nzmy3ufOTGy8V3OC9d7Hq2s7RnWbZt37TXSDEX9X/jk=; b=LeI4UHXnmsqN6CzCfAbYMXM3H/jX5Rm2O8bCI36JlwUB0jksdhcIJj2ECn/quIjBXelaiRUUrXpwhCDNHOdUwLcn1CLHTYfrkS+TK7aIkcYyLOL7Qqsue/f9pKo2MKxjl2MKrAwMtEtxI1kaAU5rHvxJhR1s44B8BeORWyp1tuv7813o/3r3t+mG95mXc4ytdM7pf8dSzvcoCbiWNoRcHj84JzGdlGwfmYxfWb4Ygv+NiAeZsUt9RyhWm2N1hD2jcuOvrQIuXRiddBC0cnOL/+HuosbNWWre8oy3LARBfgNOE5JfWHIdOat+aqr/gLzTBh2WwVT6lsIBCGSVhPrxCg== 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=Nzmy3ufOTGy8V3OC9d7Hq2s7RnWbZt37TXSDEX9X/jk=; b=VdK/itVaziDV/d2yU6RmfisAUisz4YJbwOM+xnxY52A9KEojELSiTDGyv0cPhLL6tTl6eEWx/ivCOABSSwCKwIvXjeb/KKJSFzXhi6hrgbPvjDyjEKdyRCTky7Fnfj5taTFXPTUP5hay47/8XXireqd2SwmepbjOuWxAT4N6im4= 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=satlexmb07.amd.com; pr=C From: fanhuang To: , , , , CC: , , , , fanhuang , David Hildenbrand Subject: [PATCH v7 1/1] numa: add 'memmap-type' option for memory type configuration Date: Fri, 6 Mar 2026 16:27:35 +0800 Message-ID: <20260306082735.1106690-2-FangSheng.Huang@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260306082735.1106690-1-FangSheng.Huang@amd.com> References: <20260306082735.1106690-1-FangSheng.Huang@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: SN1PEPF0002636D:EE_|DM4PR12MB6010:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c668119-d641-4dcc-f872-08de7b5a43da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|1800799024|376014|36860700016|43062017; X-Microsoft-Antispam-Message-Info: ugYNd/sz9l43V6O4JotELDR2QOGx2st6ZDcONwOhxbns/gIfquHJCjAR5TMj9rap2cS0NfavjUiK9fCcpwf6fBQe0u2G6NcUYl66YpFB+gXFmwztrAt/sLhYtZif7uC6Sojt0BXXJlrRtBl8WBu5rc7o18cu1uIwZETMukw1Y0UU1OGg7W3LvctCxJFmWR6N4LUVCSREE2NHUm12J/F50rnh1ahPkmg2L0N+ZEt8a+xNHRBAj+wfpg5h4Gs9k8vw6N2DlMCD3X2kD6fZClzJyaEaPuAh36lLaTYpfic/AZK391sFVeFGAeijJFPy8CIldbzsNe0ATyLiZLnBei/uxQyqQRbGL8Junb4San+i9Je/79GXng0K6gozUF0L1wGS23kZGdeLzbNISZsW5KUnOmZYhjx7POAke1+h95FtwNVqu0YEJ2XvDuCCbMd4ZZNLgiWOdsHUP9tueRzdlXDImFGGrdLUyYbDYbwdkKFCYDy0/2Ibei6CkUXFdxjENFHWtJmVj+UsrTVXuqfjdUwNlU+oCgYLk81duYN4U4xd2ytC0fsiWPiBqVvLD9xVD241SSZYNRoxhq3QSkAlCEfGzF1vqo1MIX7Im9pGGon/DX7b99t0zTaNoGNSuCgYD4e00akYfh9+t9tIbAEQKmhqEAvGoebSrDEQ+VFatBUpGWMLR3EN0aCknZ3rvKSWHFg2a/nZj3bL3Zke+f/iSbHxS3C82f6WQZkuJgUQJuSeRqF+8q1ZZz+riQUuvoFKoInsif7wLc8mRKlzNGtnSAcNKtASGvEBehAcV7Bo6RZGk+b/oQvGZEXlOe2jl9pACi98 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)(82310400026)(1800799024)(376014)(36860700016)(43062017); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vFQnPnm+K18EvHOgRDoYiCHFk0+T96Tn1VsownU4PZbPC4PAXT02lnBmXQx8Xm7u63ivSg+gM4anl6UQq1yvcbQIlDlAgjR5bhbBhu6mk12mwLX3D+VrRq+f9JeY3Ao/6DAfMxt5SQkXPwyOOXqSHQ+4nunN32Rl/EmBriQkU04UOuqIMLmc+ZtG/FRE1Yu8cYLWZh1Jb3n8PKA9+TXW6IWD49KAsy7ZeVONdFLXume06Yxe1NsZwneow7Y+xdP4NOAMo0tvK4CgWmnkiNv+Ir2LOBqToD20nanwJi7Z3jGOdMLJgXkqqeCw9g1WIH5gzJIgrpKeTAtoSnHSBCIGQkh1zhynuG5mJp7ZeAg5kQ+mS9bAbxhSO/EXWQbdv0Pwql0jv838ZDpUpUE4F9ZV5TCZ3wkbo/YH1Ol3tjVYgkpMQu9MVTKHGln0/5qb5GXj X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2026 08:27:54.8221 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c668119-d641-4dcc-f872-08de7b5a43da 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: SN1PEPF0002636D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6010 Received-SPF: permerror client-ip=2a01:111:f403:c005::5; envelope-from=FangSheng.Huang@amd.com; helo=CO1PR03CU002.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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1772785725710158500 Content-Type: text/plain; charset="utf-8" Add a 'memmap-type' option to NUMA node configuration that allows specifying the memory type for a NUMA node. Supported values: - normal: Regular system RAM (E820 type 1, default) - spm: Specific Purpose Memory (E820 type 0xEFFFFFFF) - reserved: Reserved memory (E820 type 2) The 'spm' type indicates Specific Purpose Memory - a hint to the guest that this memory might be managed by device drivers based on guest policy. The 'reserved' type marks memory as not usable as RAM. Note: This option is only supported on x86 platforms. Usage: -numa node,nodeid=3D1,memdev=3Dm1,memmap-type=3Dspm Signed-off-by: fanhuang Acked-by: David Hildenbrand Reviewed-by: Gregory Price --- hw/core/numa.c | 24 ++++++++++++ hw/i386/acpi-build.c | 8 ++++ hw/i386/e820_memory_layout.c | 72 ++++++++++++++++++++++++++++++++++++ hw/i386/e820_memory_layout.h | 12 +++--- hw/i386/pc.c | 48 ++++++++++++++++++++++++ include/system/numa.h | 7 ++++ qapi/machine.json | 24 ++++++++++++ qemu-options.hx | 14 ++++++- 8 files changed, 202 insertions(+), 7 deletions(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index f462883c87..521c8f10f1 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -38,6 +38,7 @@ #include "hw/mem/pc-dimm.h" #include "hw/core/boards.h" #include "hw/mem/memory-device.h" +#include "hw/i386/x86.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/cutils.h" @@ -164,6 +165,29 @@ static void parse_numa_node(MachineState *ms, NumaNode= Options *node, numa_info[nodenr].node_memdev =3D MEMORY_BACKEND(o); } =20 + if (node->has_memmap_type && node->memmap_type !=3D NUMA_MEMMAP_TYPE_N= ORMAL) { + if (!node->memdev) { + error_setg(errp, "memmap-type=3D%s requires memdev to be speci= fied", + NumaMemmapType_str(node->memmap_type)); + return; + } + if (!object_dynamic_cast(OBJECT(ms), TYPE_X86_MACHINE)) { + error_setg(errp, "memmap-type=3D%s is only supported on x86 ma= chines", + NumaMemmapType_str(node->memmap_type)); + return; + } + switch (node->memmap_type) { + case NUMA_MEMMAP_TYPE_SPM: + numa_info[nodenr].memmap_type =3D NUMA_MEMMAP_SPM; + break; + case NUMA_MEMMAP_TYPE_RESERVED: + numa_info[nodenr].memmap_type =3D NUMA_MEMMAP_RESERVED; + break; + default: + break; + } + } + numa_info[nodenr].present =3D true; max_numa_nodeid =3D MAX(max_numa_nodeid, nodenr + 1); ms->numa_state->num_nodes++; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index f622b91b76..521bf66ca1 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1417,6 +1417,14 @@ build_srat(GArray *table_data, BIOSLinker *linker, M= achineState *machine) mem_len =3D numa_info[i - 1].node_mem; next_base =3D mem_base + mem_len; =20 + /* + * Skip reserved memory nodes - E820 marks them as reserved, + * so SRAT should not report them as enabled memory affinity. + */ + if (numa_info[i - 1].memmap_type =3D=3D NUMA_MEMMAP_RESERVED) { + continue; + } + /* Cut out the 640K hole */ if (mem_base <=3D HOLE_640K_START && next_base > HOLE_640K_START) { diff --git a/hw/i386/e820_memory_layout.c b/hw/i386/e820_memory_layout.c index 3e848fb69c..4c62b5ddea 100644 --- a/hw/i386/e820_memory_layout.c +++ b/hw/i386/e820_memory_layout.c @@ -46,3 +46,75 @@ bool e820_get_entry(int idx, uint32_t type, uint64_t *ad= dress, uint64_t *length) } return false; } + +bool e820_update_entry_type(uint64_t start, uint64_t length, uint32_t new_= type) +{ + uint64_t end =3D start + length; + assert(!e820_done); + + /* For E820_SOFT_RESERVED, validate range is within E820_RAM */ + if (new_type =3D=3D E820_SOFT_RESERVED) { + bool range_in_ram =3D false; + + for (size_t j =3D 0; j < e820_entries; j++) { + uint64_t ram_start =3D le64_to_cpu(e820_table[j].address); + uint64_t ram_end =3D ram_start + le64_to_cpu(e820_table[j].len= gth); + uint32_t ram_type =3D le32_to_cpu(e820_table[j].type); + + if (ram_type =3D=3D E820_RAM && ram_start <=3D start && ram_en= d >=3D end) { + range_in_ram =3D true; + break; + } + } + if (!range_in_ram) { + return false; + } + } + + /* Find entry that contains the target range and update it */ + for (size_t i =3D 0; i < e820_entries; i++) { + uint64_t entry_start =3D le64_to_cpu(e820_table[i].address); + uint64_t entry_length =3D le64_to_cpu(e820_table[i].length); + uint64_t entry_end =3D entry_start + entry_length; + + if (entry_start <=3D start && entry_end >=3D end) { + uint32_t original_type =3D e820_table[i].type; + + /* Remove original entry */ + memmove(&e820_table[i], &e820_table[i + 1], + (e820_entries - i - 1) * sizeof(struct e820_entry)); + e820_entries--; + + /* Add split parts inline */ + if (entry_start < start) { + e820_table =3D g_renew(struct e820_entry, e820_table, + e820_entries + 1); + e820_table[e820_entries].address =3D cpu_to_le64(entry_sta= rt); + e820_table[e820_entries].length =3D + cpu_to_le64(start - entry_start); + e820_table[e820_entries].type =3D original_type; + e820_entries++; + } + + e820_table =3D g_renew(struct e820_entry, e820_table, + e820_entries + 1); + e820_table[e820_entries].address =3D cpu_to_le64(start); + e820_table[e820_entries].length =3D cpu_to_le64(length); + e820_table[e820_entries].type =3D cpu_to_le32(new_type); + e820_entries++; + + if (end < entry_end) { + e820_table =3D g_renew(struct e820_entry, e820_table, + e820_entries + 1); + e820_table[e820_entries].address =3D cpu_to_le64(end); + e820_table[e820_entries].length =3D cpu_to_le64(entry_end = - end); + e820_table[e820_entries].type =3D original_type; + e820_entries++; + } + + return true; + } + } + + return false; +} diff --git a/hw/i386/e820_memory_layout.h b/hw/i386/e820_memory_layout.h index b50acfa201..a85b4fd14c 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 =20 /* 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 =20 struct e820_entry { uint64_t address; @@ -26,5 +27,6 @@ void e820_add_entry(uint64_t address, uint64_t length, ui= nt32_t type); bool e820_get_entry(int index, uint32_t type, uint64_t *address, uint64_t *length); int e820_get_table(struct e820_entry **table); +bool e820_update_entry_type(uint64_t start, uint64_t length, uint32_t new_= type); =20 #endif diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 819e729a6e..c024a34db2 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -740,6 +740,51 @@ static hwaddr pc_max_used_gpa(PCMachineState *pcms, ui= nt64_t pci_hole64_size) return pc_above_4g_end(pcms) - 1; } =20 +/* + * Update E820 entries for NUMA nodes with non-default memory types. + */ +static void pc_update_numa_memory_types(X86MachineState *x86ms) +{ + MachineState *ms =3D MACHINE(x86ms); + uint64_t addr =3D 0; + + for (int i =3D 0; i < ms->numa_state->num_nodes; i++) { + NodeInfo *numa_info =3D &ms->numa_state->nodes[i]; + uint64_t node_size =3D numa_info->node_mem; + + if (numa_info->node_memdev && + (numa_info->memmap_type =3D=3D NUMA_MEMMAP_SPM || + numa_info->memmap_type =3D=3D NUMA_MEMMAP_RESERVED)) { + uint64_t guest_addr; + uint32_t e820_type =3D (numa_info->memmap_type =3D=3D NUMA_MEM= MAP_SPM) + ? E820_SOFT_RESERVED : E820_RESERVED; + + if (addr < x86ms->below_4g_mem_size) { + if (addr + node_size <=3D x86ms->below_4g_mem_size) { + guest_addr =3D addr; + } else { + error_report("NUMA node %d with memmap-type spans acro= ss " + "4GB boundary, not supported", i); + exit(EXIT_FAILURE); + } + } else { + guest_addr =3D x86ms->above_4g_mem_start + + (addr - x86ms->below_4g_mem_size); + } + + if (!e820_update_entry_type(guest_addr, node_size, e820_type))= { + warn_report("Failed to update E820 entry for node %d " + "at 0x%" PRIx64 " length 0x%" PRIx64, + i, guest_addr, node_size); + } + } + + if (numa_info->node_memdev) { + addr +=3D node_size; + } + } +} + /* * AMD systems with an IOMMU have an additional hole close to the * 1Tb, which are special GPAs that cannot be DMA mapped. Depending @@ -856,6 +901,9 @@ void pc_memory_init(PCMachineState *pcms, e820_add_entry(pcms->sgx_epc.base, pcms->sgx_epc.size, E820_RESERV= ED); } =20 + /* Update E820 for NUMA nodes with special memory types */ + pc_update_numa_memory_types(x86ms); + if (!pcmc->has_reserved_memory && (machine->ram_slots || (machine->maxram_size > machine->ram_size))) { diff --git a/include/system/numa.h b/include/system/numa.h index 1044b0eb6e..64e8f63736 100644 --- a/include/system/numa.h +++ b/include/system/numa.h @@ -35,12 +35,19 @@ enum { =20 #define UINT16_BITS 16 =20 +typedef enum { + NUMA_MEMMAP_NORMAL =3D 0, + NUMA_MEMMAP_SPM, + NUMA_MEMMAP_RESERVED, +} NumaMemmapTypeInternal; + typedef struct NodeInfo { uint64_t node_mem; struct HostMemoryBackend *node_memdev; bool present; bool has_cpu; bool has_gi; + NumaMemmapTypeInternal memmap_type; uint8_t lb_info_provided; uint16_t initiator; uint8_t distance[MAX_NODES]; diff --git a/qapi/machine.json b/qapi/machine.json index 685e4e29b8..67ba487f6c 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -466,6 +466,22 @@ { 'enum': 'NumaOptionsType', 'data': [ 'node', 'dist', 'cpu', 'hmat-lb', 'hmat-cache' ] } =20 +## +# @NumaMemmapType: +# +# Memory mapping type for a NUMA node. +# +# @normal: Normal system RAM (E820 type 1) +# +# @spm: Specific Purpose Memory (E820 type 0xEFFFFFFF) +# +# @reserved: Reserved memory (E820 type 2) +# +# Since: 10.2 +## +{ 'enum': 'NumaMemmapType', + 'data': ['normal', 'spm', 'reserved'] } + ## # @NumaOptions: # @@ -502,6 +518,13 @@ # @memdev: memory backend object. If specified for one node, it must # be specified for all nodes. # +# @memmap-type: specifies the memory type for this NUMA node. +# 'normal' (default) is regular system RAM. +# 'spm' is Specific Purpose Memory - a hint to the guest that +# this memory might be managed by device drivers based on policy. +# 'reserved' is reserved memory, not usable as RAM. +# Currently only supported on x86. (since 10.2) +# # @initiator: defined in ACPI 6.3 Chapter 5.2.27.3 Table 5-145, points # to the nodeid which has the memory controller responsible for # this NUMA node. This field provides additional information as @@ -516,6 +539,7 @@ '*cpus': ['uint16'], '*mem': 'size', '*memdev': 'str', + '*memmap-type': 'NumaMemmapType', '*initiator': 'uint16' }} =20 ## diff --git a/qemu-options.hx b/qemu-options.hx index 0da2b4d034..c898428822 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -433,7 +433,7 @@ ERST =20 DEF("numa", HAS_ARG, QEMU_OPTION_numa, "-numa node[,mem=3Dsize][,cpus=3Dfirstcpu[-lastcpu]][,nodeid=3Dnode][,= initiator=3Dnode]\n" - "-numa node[,memdev=3Did][,cpus=3Dfirstcpu[-lastcpu]][,nodeid=3Dnode][= ,initiator=3Dnode]\n" + "-numa node[,memdev=3Did][,cpus=3Dfirstcpu[-lastcpu]][,nodeid=3Dnode][= ,initiator=3Dnode][,memmap-type=3Dnormal|spm|reserved]\n" "-numa dist,src=3Dsource,dst=3Ddestination,val=3Ddistance\n" "-numa cpu,node-id=3Dnode[,socket-id=3Dx][,core-id=3Dy][,thread-id=3Dz= ]\n" "-numa hmat-lb,initiator=3Dnode,target=3Dnode,hierarchy=3Dmemory|first= -level|second-level|third-level,data-type=3Daccess-latency|read-latency|wri= te-latency[,latency=3Dlat][,bandwidth=3Dbw]\n" @@ -442,7 +442,7 @@ DEF("numa", HAS_ARG, QEMU_OPTION_numa, SRST ``-numa node[,mem=3Dsize][,cpus=3Dfirstcpu[-lastcpu]][,nodeid=3Dnode][,ini= tiator=3Dinitiator]`` \=20 -``-numa node[,memdev=3Did][,cpus=3Dfirstcpu[-lastcpu]][,nodeid=3Dnode][,in= itiator=3Dinitiator]`` +``-numa node[,memdev=3Did][,cpus=3Dfirstcpu[-lastcpu]][,nodeid=3Dnode][,in= itiator=3Dinitiator][,memmap-type=3Dtype]`` \ ``-numa dist,src=3Dsource,dst=3Ddestination,val=3Ddistance`` \=20 @@ -510,6 +510,16 @@ SRST largest bandwidth) to this NUMA node. Note that this option can be set only when the machine property 'hmat' is set to 'on'. =20 + '\ ``memmap-type``\ ' specifies the memory type for this NUMA node: + + - ``normal`` (default): Regular system RAM (E820 type 1) + - ``spm``: Specific Purpose Memory (E820 type 0xEFFFFFFF). This is a + hint to the guest that the memory might be managed by device drivers + based on guest policy. + - ``reserved``: Reserved memory (E820 type 2), not usable as RAM. + + This option is only supported on x86 platforms. + Following example creates a machine with 2 NUMA nodes, node 0 has CPU. node 1 has only memory, and its initiator is node 0. Note that because node 0 has CPU, by default the initiator of node 0 is itself --=20 2.34.1