On Mon, 5 Mar 2018 14:57:08 +0800
Haozhong Zhang <haozhong.zh...@intel.com> wrote:
> ACPI 6.2A Table 5-129 "SPA Range Structure" requires the proximity
> domain of a NVDIMM SPA range must match with corresponding entry in
> SRAT table.
>
> The address ranges of vNVDIMM in QEMU are allocated from the
> hot-pluggable address space, which is entirely covered by one SRAT
> memory affinity structure. However, users can set the vNVDIMM
> proximity domain in NFIT SPA range structure by the 'node' property of
> '-device nvdimm' to a value different than the one in the above SRAT
> memory affinity structure.
>
> In order to solve such proximity domain mismatch, this patch builds
> one SRAT memory affinity structure for each DIMM device present at
> boot time, including both PC-DIMM and NVDIMM, with the proximity
> domain specified in '-device pc-dimm' or '-device nvdimm'.
>
> The remaining hot-pluggable address space is covered by one or multiple
> SRAT memory affinity structures with the proximity domain of the last
> node as before.
>
> Signed-off-by: Haozhong Zhang <haozhong.zh...@intel.com>
> ---
> hw/i386/acpi-build.c | 60
> ++++++++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 56 insertions(+), 4 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index deb440f286..2ca0317386 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2323,6 +2323,59 @@ build_tpm2(GArray *table_data, BIOSLinker *linker,
> GArray *tcpalog)
> #define HOLE_640K_START (640 * 1024)
> #define HOLE_640K_END (1024 * 1024)
>
> +static void build_srat_hotpluggable_memory(GArray *table_data, uint64_t base,
> + uint64_t len, int default_node)
> +{
> + MemoryDeviceInfoList *info_list = qmp_pc_dimm_device_list();
> + MemoryDeviceInfoList *info;
> + MemoryDeviceInfo *mi;
> + PCDIMMDeviceInfo *di;
> + uint64_t end = base + len, cur, addr, size;
> + int node;
> + bool is_nvdimm;
> + AcpiSratMemoryAffinity *numamem;
> + MemoryAffinityFlags flags;
> +
> + for (cur = base, info = info_list;
> + cur < end;
> + cur += size, info = info->next) {
> + numamem = acpi_data_push(table_data, sizeof *numamem);
> +
> + if (!info) {
> + build_srat_memory(numamem, cur, end - cur, default_node,
> + MEM_AFFINITY_HOTPLUGGABLE |
> MEM_AFFINITY_ENABLED);
> + break;
> + }
> +
> + mi = info->value;
> + is_nvdimm = (mi->type == MEMORY_DEVICE_INFO_KIND_NVDIMM);
> + di = !is_nvdimm ? mi->u.dimm.data :
> + qapi_NVDIMMDeviceInfo_base(mi->u.nvdimm.data);
> +
> + addr = di->addr;
maybe drop addr and use di->addr directly
> + if (cur < addr) {
> + build_srat_memory(numamem, cur, addr - cur, default_node,
> + MEM_AFFINITY_HOTPLUGGABLE |
> MEM_AFFINITY_ENABLED);
> + numamem = acpi_data_push(table_data, sizeof *numamem);
> + }
> +
> + size = di->size;
> + node = di->node;
the same wrt di->node
> +
> + flags = MEM_AFFINITY_ENABLED;
> + if (di->hotpluggable) {
> + flags |= MEM_AFFINITY_HOTPLUGGABLE;
> + }
> + if (is_nvdimm) {
> + flags |= MEM_AFFINITY_NON_VOLATILE;
> + }
> +
> + build_srat_memory(numamem, addr, size, node, flags);
> + }
> +
> + qapi_free_MemoryDeviceInfoList(info_list);
> +}
> +
> static void
> build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
> {
> @@ -2434,10 +2487,9 @@ build_srat(GArray *table_data, BIOSLinker *linker,
> MachineState *machine)
> * providing _PXM method if necessary.
> */
> if (hotplugabble_address_space_size) {
> - numamem = acpi_data_push(table_data, sizeof *numamem);
> - build_srat_memory(numamem, pcms->hotplug_memory.base,
> - hotplugabble_address_space_size, pcms->numa_nodes
> - 1,
> - MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
> + build_srat_hotpluggable_memory(table_data, pcms->hotplug_memory.base,
> + hotplugabble_address_space_size,
> + pcms->numa_nodes - 1);
> }
>
> build_header(linker, table_data,
