acpi: report numa nodes for device memory using GI
v5 cover acpi: report numa nodes for device memory using GI
From: Ankit Agrawal <[email protected]>
There are upcoming devices which allow CPU to cache coherently access their memory. It is sensible to expose such memory as NUMA nodes separate from the sysmem node to the OS. The ACPI spec provides a scheme in SRAT called Generic Initiator Affinity Structure [1] to allow an association between a Proximity Domain (PXM) and a Generic Initiator (GI) (e.g. heterogeneous processors and accelerators, GPUs, and I/O devices with integrated compute or DMA engines).
While a single node per device may cover several use cases, it is however insufficient for a full utilization of the NVIDIA GPUs MIG (Mult-Instance GPUs) [2] feature. The feature allows partitioning of the GPU device resources (including device memory) into several (upto 8) isolated instances. Each of the partitioned memory requires a dedicated NUMA node to operate. The partitions are not fixed and they can be created/deleted at runtime.
Linux OS does not provide a means to dynamically create/destroy NUMA nodes and such feature implementation is expected to be non-trivial. The nodes that OS discovers at the boot time while parsing SRAT remains fixed. So we utilize the GI Affinity structures that allows association between nodes and devices. Multiple GI structures per device/BDF is possible, allowing creation of multiple nodes in the VM by exposing unique PXM in each of these structures.
Implement the mechanism to build the GI affinity structures as Qemu currently does not. Introduce a new acpi-generic-initiator object that allows an association of a set of nodes with a device. During SRAT creation, all such objected are identified and used to add the GI Affinity Structures. Currently, only PCI device is supported.
The admin will create a range of 8 nodes and associate that with the device using the acpi-generic-initiator object. While a configuration of less than 8 nodes per device is allowed, such configuration will prevent utilization of the feature to the fullest. This setting is applicable to all the Grace+Hopper systems. The following is an example of the Qemu command line arguments to create 8 nodes and link them to the device 'dev0':
-numa node,nodeid=2 \
-numa node,nodeid=3 \
-numa node,nodeid=4 \
-numa node,nodeid=5 \
-numa node,nodeid=6 \
-numa node,nodeid=7 \
-numa node,nodeid=8 \
-numa node,nodeid=9 \
-device vfio-pci-nohotplug,host=0009:01:00.0,bus=pcie.0,addr=04.0,rombar=0,id=dev0 \
-object acpi-generic-initiator,id=gi0,pci-dev=dev0,host-nodes=2-9 \
The performance benefits can be realized by providing the NUMA node distances appropriately (through libvirt tags or Qemu params). The admin can get the distance among nodes in hardware using numactl -H.
This series goes along with the vfio-pci variant driver [3] under review.
Applied over v8.2.0-rc2.
[1] ACPI Spec 6.3, Section 5.2.16.6
[2] https://www.nvidia.com/en-in/technologies/multi-instance-gpu
[3] https://lore.kernel.org/all/[email protected]/
Link for v4:
https://lore.kernel.org/all/[email protected]/
v4 -> v5
- Removed acpi-dev option until full support.
- The numa nodes are saved as bitmap instead of uint16List.
- Replaced asserts to exit calls.
- Addressed other miscellaneous comments.
v3 -> v4
- changed the ':' delimited way to a uint16 array to communicate the nodes associated with the device.
- added asserts to handle invalid inputs.
- addressed other miscellaneous v3 comments.
v2 -> v3
- changed param to accept a ':' delimited list of numa nodes, instead of a range.
- Removed nvidia-acpi-generic-initiator object.
- Addressed miscellaneous comments in v2.
v1 -> v2
- Removed dependency on sysfs to communicate the feature with variant module.
- Use GI Affinity SRAT structure instead of Memory Affinity.
- No DSDT entries needed to communicate the PXM for the device. SRAT GI structure is used instead.
- New objects introduced to establish link between device and nodes.
Ankit Agrawal (2):
qom: new object to associate device to numa node hw/acpi: Implement the SRAT GI affinity structure
hw/acpi/acpi-generic-initiator.c | 169 +++++++++++++++++++++++ hw/acpi/meson.build | 1 + hw/arm/virt-acpi-build.c | 3 + include/hw/acpi/acpi-generic-initiator.h | 53 +++++++ qapi/qom.json | 17 +++ 5 files changed, 243 insertions(+) create mode 100644 hw/acpi/acpi-generic-initiator.c create mode 100644 include/hw/acpi/acpi-generic-initiator.h
Signature · 1 line
2.34.1
PATCH v5 1/2 qom: new object to associate device to numa node
From: Ankit Agrawal <[email protected]>
NVIDIA GPU's support MIG (Mult-Instance GPUs) feature [1], which allows partitioning of the GPU device resources (including device memory) into several (upto 8) isolated instances. Each of the partitioned memory needs a dedicated NUMA node to operate. The partitions are not fixed and they can be created/deleted at runtime.
Unfortunately Linux OS does not provide a means to dynamically create/destroy NUMA nodes and such feature implementation is not expected to be trivial. The nodes that OS discovers at the boot time while parsing SRAT remains fixed. So we utilize the Generic Initiator Affinity structures that allows association between nodes and devices. Multiple GI structures per BDF is possible, allowing creation of multiple nodes by exposing unique PXM in each of these structures.
Introduce a new acpi-generic-initiator object to allow host admin provide the device and the corresponding NUMA nodes. Qemu maintain this association and use this object to build the requisite GI Affinity Structure.
An admin can provide the range of nodes through a uint16 array host-nodes and link it to a device by providing its id. Currently, only PCI device is supported. The following sample creates 8 nodes and link them to the PCI device dev0:
-numa node,nodeid=2 \
-numa node,nodeid=3 \
-numa node,nodeid=4 \
-numa node,nodeid=5 \
-numa node,nodeid=6 \
-numa node,nodeid=7 \
-numa node,nodeid=8 \
-numa node,nodeid=9 \
-device vfio-pci-nohotplug,host=0009:01:00.0,bus=pcie.0,addr=04.0,rombar=0,id=dev0 \
-object acpi-generic-initiator,id=gi0,pci-dev=dev0,host-nodes=2-9 \
[1] https://www.nvidia.com/en-in/technologies/multi-instance-gpu
--- hw/acpi/acpi-generic-initiator.c | 70 ++++++++++++++++++++++++ hw/acpi/meson.build | 1 + include/hw/acpi/acpi-generic-initiator.h | 27 +++++++++ qapi/qom.json | 17 ++++++ 4 files changed, 115 insertions(+) create mode 100644 hw/acpi/acpi-generic-initiator.c create mode 100644 include/hw/acpi/acpi-generic-initiator.h
hw/acpi/acpi-generic-initiator.c new file +70 -0
@@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved +*/ + +#include "qemu/osdep.h" +#include "hw/acpi/acpi-generic-initiator.h" +#include "hw/pci/pci_device.h" +#include "qapi/error.h" +#include "qapi/qapi-builtin-visit.h" +#include "qapi/visitor.h" +#include "qemu/error-report.h" + +OBJECT_DEFINE_TYPE_WITH_INTERFACES (AcpiGenericInitiator, acpi_generic_initiator, +ACPI_GENERIC_INITIATOR ,OBJECT , + { TYPE_USER_CREATABLE }, + { NULL }) + +OBJECT_DECLARE_SIMPLE_TYPE(AcpiGenericInitiator, ACPI_GENERIC_INITIATOR) + +static void acpi_generic_initiator_init (Object *obj) +{ +AcpiGenericInitiator *gi =ACPI_GENERIC_INITIATOR (obj); +bitmap_zero (gi->host_nodes,MAX_NODES ); + gi->pci_dev =NULL ; +} + +static void acpi_generic_initiator_finalize (Object *obj) +{ +AcpiGenericInitiator *gi =ACPI_GENERIC_INITIATOR (obj); + +g_free (gi->pci_dev); +} + +static void acpi_generic_initiator_set_pci_device (Object *obj,const char *val, +Error **errp) +{ +AcpiGenericInitiator *gi =ACPI_GENERIC_INITIATOR (obj); + + gi->pci_dev =g_strdup (val); +} + +static void +acpi_generic_initiator_set_host_nodes (Object *obj,Visitor *v,const char *name, +void *opaque,Error **errp) +{ +AcpiGenericInitiator *gi =ACPI_GENERIC_INITIATOR (obj); +uint16List *l =NULL , *host_nodes =NULL ; + +visit_type_uint16List (v, name, &host_nodes, errp); + +for (l = host_nodes; l; l = l->next) { +if (l->value >=MAX_NODES ) { +error_setg (errp,"Invalid host-nodes value: %d" , l->value); +break ; + }else { +bitmap_set (gi->host_nodes, l->value,1 ); + } + } + +qapi_free_uint16List (host_nodes); +} + +static void acpi_generic_initiator_class_init (ObjectClass *oc,void *data) +{ +object_class_property_add_str (oc,"pci-dev" ,NULL , + acpi_generic_initiator_set_pci_device); +object_class_property_add (oc,"host-nodes" ,"int" ,NULL , + acpi_generic_initiator_set_host_nodes,NULL ,NULL ); +}
hw/acpi/meson.build +1 -0
@@ -1,5 +1,6 @@ acpi_ss = ss.source_set() acpi_ss.add(files( + 'acpi-generic-initiator.c', 'acpi_interface.c', 'aml-build.c', 'bios-linker-loader.c',
include/hw/acpi/acpi-generic-initiator.h new file +27 -0
@@ -0,0 +1,27 @@ +#ifndef ACPI_GENERIC_INITIATOR_H +#define ACPI_GENERIC_INITIATOR_H + +#include "hw/mem/pc-dimm.h" +#include "hw/acpi/bios-linker-loader.h" +#include "hw/acpi/aml-build.h" +#include "sysemu/numa.h" +#include "qemu/uuid.h" +#include "qom/object.h" +#include "qom/object_interfaces.h" + +#define TYPE_ACPI_GENERIC_INITIATOR "acpi-generic-initiator" + +typedef struct AcpiGenericInitiator { +/* private */ +Object parent; + +/* public */ +char *pci_dev; + DECLARE_BITMAP(host_nodes, MAX_NODES); +}AcpiGenericInitiator ; + +typedef struct AcpiGenericInitiatorClass { +ObjectClass parent_class; +}AcpiGenericInitiatorClass ; + +#endif
qapi/qom.json +17 -0
@@ -794,6 +794,21 @@ { 'struct': 'VfioUserServerProperties', 'data': { 'socket': 'SocketAddress', 'device': 'str' } } +## +# @AcpiGenericInitiatorProperties: +# +# Properties for acpi-generic-initiator objects. +# +# @pci-dev: PCI device ID to be associated with the node +# +# @host-nodes: numa node list +# +# Since: 9.0 +## +{ 'struct': 'AcpiGenericInitiatorProperties', + 'data': { 'pci-dev': 'str', + 'host-nodes': ['uint16'] } } + ## # @RngProperties: #
@@ -911,6 +926,7 @@ ## { 'enum': 'ObjectType', 'data': [ + 'acpi-generic-initiator', 'authz-list', 'authz-listfile', 'authz-pam',
@@ -981,6 +997,7 @@ 'id': 'str' }, 'discriminator': 'qom-type', 'data': { + 'acpi-generic-initiator': 'AcpiGenericInitiatorProperties', 'authz-list': 'AuthZListProperties', 'authz-listfile': 'AuthZListFileProperties', 'authz-pam': 'AuthZPAMProperties',
Signature · 1 line
2.34.1
Re: [PATCH v5 1/2] qom: new object to associate device to numa node
Quoted 16 lines · <[email protected]> writes:
From: Ankit Agrawal <[email protected]>
NVIDIA GPU's support MIG (Mult-Instance GPUs) feature [1], which allows partitioning of the GPU device resources (including device memory) into several (upto 8) isolated instances. Each of the partitioned memory needs a dedicated NUMA node to operate. The partitions are not fixed and they can be created/deleted at runtime.
Unfortunately Linux OS does not provide a means to dynamically create/destroy NUMA nodes and such feature implementation is not expected to be trivial. The nodes that OS discovers at the boot time while parsing SRAT remains fixed. So we utilize the Generic Initiator Affinity structures that allows association between nodes and devices. Multiple GI structures per BDF is possible, allowing creation of multiple nodes by exposing unique PXM in each of these structures.
Quoted 3 lines
Introduce a new acpi-generic-initiator object to allow host admin provide the device and the corresponding NUMA nodes. Qemu maintain this association and use this object to build the requisite GI Affinity Structure.
Pardon my ignorance... What makes this object an "initiator", and why is it "generic"?
Quoted 5 lines
An admin can provide the range of nodes through a uint16 array host-nodes and link it to a device by providing its id. Currently, only PCI device is supported. The following sample creates 8 nodes and link them to the PCI device dev0:
Review
Quoted 10 lines
(quoted diff) +0
-10-numa node,nodeid=2 \ -numa node,nodeid=3 \ -numa node,nodeid=4 \ -numa node,nodeid=5 \ -numa node,nodeid=6 \ -numa node,nodeid=7 \ -numa node,nodeid=8 \ -numa node,nodeid=9 \ -device vfio-pci-nohotplug,host=0009:01:00.0,bus=pcie.0,addr=04.0,rombar=0,id=dev0 \ -object acpi-generic-initiator,id=gi0,pci-dev=dev0,host-nodes=2-9 \
Does this link *all* NUMA nodes to dev0?
Would an example involving two devices be more instructive?
Quoted 3 lines
[1] https://www.nvidia.com/en-in/technologies/multi-instance-gpu
Signed-off-by Ankit Agrawal <[email protected]>
[...]
Quoted 6 lines
qapi/qom.json +0
-0@@ -794,6 +794,21 @@ { 'struct': 'VfioUserServerProperties',
qapi/qom.json line 804
Quoted 10 lines
qapi/qom.json +8
-0'data': { 'socket': 'SocketAddress', 'device': 'str' } } +## +# @AcpiGenericInitiatorProperties: +# +# Properties for acpi-generic-initiator objects. +# +# @pci-dev: PCI device ID to be associated with the node +# +# @host-nodes: numa node list
This feels a bit terse. The commit message makes me guess this specifies the NUMA nodes to be linked to @pci-dev. Correct?
Quoted 26 lines
qapi/qom.json +9
-0+# +# Since: 9.0 +## +{ 'struct': 'AcpiGenericInitiatorProperties', + 'data': { 'pci-dev': 'str', + 'host-nodes': ['uint16'] } } + ## # @RngProperties: #@@ -911,6 +926,7 @@ ## { 'enum': 'ObjectType', 'data': [ + 'acpi-generic-initiator', 'authz-list', 'authz-listfile', 'authz-pam',@@ -981,6 +997,7 @@ 'id': 'str' }, 'discriminator': 'qom-type', 'data': { + 'acpi-generic-initiator': 'AcpiGenericInitiatorProperties', 'authz-list': 'AuthZListProperties', 'authz-listfile': 'AuthZListFileProperties', 'authz-pam': 'AuthZPAMProperties',
Re: [PATCH v5 1/2] qom: new object to associate device to numa node
Thanks Markus for the review.
Quoted 6 lines
Quoted 3 lines
Introduce a new acpi-generic-initiator object to allow host admin provide the device and the corresponding NUMA nodes. Qemu maintain this association and use this object to build the requisite GI Affinity Structure.
Pardon my ignorance... What makes this object an "initiator", and why is it "generic"?
In ACPI 6.3 (https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf),
a new table in System Resource Affinity Table called Generic initiator Affinity table was introduced to describe devices such as heterogeneous processors and accelerators, GPUs, and I/O devices with integrated compute or DMA engines (termed as Generic Initiator) that are present on the system. It is used to associate a proximity domain with those devices.
You may refer 5.2.16.6 in the aforementioned link. This patch implements that structure (Table 5-78) for Qemu ACPI.
Quoted 18 lines
Quoted 5 lines
An admin can provide the range of nodes through a uint16 array host-nodes and link it to a device by providing its id. Currently, only PCI device is supported. The following sample creates 8 nodes and link them to the PCI device dev0:
Review
Quoted 10 lines
(quoted diff) +0
-10-numa node,nodeid=2 \ -numa node,nodeid=3 \ -numa node,nodeid=4 \ -numa node,nodeid=5 \ -numa node,nodeid=6 \ -numa node,nodeid=7 \ -numa node,nodeid=8 \ -numa node,nodeid=9 \ -device vfio-pci-nohotplug,host=0009:01:00.0,bus=pcie.0,addr=04.0,rombar=0,id=dev0 \ -object acpi-generic-initiator,id=gi0,pci-dev=dev0,host-nodes=2-9 \Does this link *all* NUMA nodes to dev0?
Quoted 1 line
Would an example involving two devices be more instructive?
Sure, updated in v6.
Quoted 8 lines
Quoted 8 lines
qapi/qom.json +0
-0@@ -794,6 +794,21 @@ { 'struct': 'VfioUserServerProperties', 'data': { 'socket': 'SocketAddress', 'device': 'str' } }
Quoted 11 lines
qapi/qom.json line 804
Quoted 8 lines
qapi/qom.json +8
-0+## +# @AcpiGenericInitiatorProperties: +# +# Properties for acpi-generic-initiator objects. +# +# @pci-dev: PCI device ID to be associated with the node +# +# @host-nodes: numa node listThis feels a bit terse. The commit message makes me guess this specifies the NUMA nodes to be linked to @pci-dev. Correct?
Right, it could be made cleared. Done in v6.
PATCH v5 2/2 hw/acpi: Implement the SRAT GI affinity structure
In reply to [email protected]From: Ankit Agrawal <[email protected]>
ACPI spec provides a scheme to associate "Generic Initiators" [1] (e.g. heterogeneous processors and accelerators, GPUs, and I/O devices with integrated compute or DMA engines GPUs) with Proximity Domains. This is achieved using Generic Initiator Affinity Structure in SRAT. During bootup, Linux kernel parse the ACPI SRAT to determine the PXM ids and create a NUMA node for each unique PXM ID encountered. Qemu currently do not implement these structures while building SRAT.
Add GI structures while building VM ACPI SRAT. The association between devices and nodes are stored using acpi-generic-initiator object. Lookup presence of all such objects and use them to build these structures.
The structure needs a PCI device handle [2] that consists of the device BDF. The vfio-pci device corresponding to the acpi-generic-initiator object is located to determine the BDF.
[1] ACPI Spec 6.3, Section 5.2.16.6
[2] ACPI Spec 6.3, Table 5.80
--- hw/acpi/acpi-generic-initiator.c | 99 ++++++++++++++++++++++++ hw/arm/virt-acpi-build.c | 3 + include/hw/acpi/acpi-generic-initiator.h | 26 +++++++ 3 files changed, 128 insertions(+)
hw/acpi/acpi-generic-initiator.c +99 -0
@@ -68,3 +68,102 @@ static void acpi_generic_initiator_class_init(ObjectClass *oc, void *data)object_class_property_add (oc,"host-nodes" ,"int" ,NULL , acpi_generic_initiator_set_host_nodes,NULL ,NULL ); } + +static int acpi_generic_initiator_list (Object *obj,void *opaque) +{ +GSList **list = opaque; + +if (object_dynamic_cast (obj,TYPE_ACPI_GENERIC_INITIATOR )) { + *list =g_slist_append (*list,ACPI_GENERIC_INITIATOR (obj)); + } + +object_child_foreach (obj, acpi_generic_initiator_list, opaque); +return 0 ; +} + +/* +* Identify Generic Initiator objects and link them into the list which is +* returned to the caller. +* +* Note: it is the caller's responsibility to free the list to avoid +* memory leak. +*/ +static GSList *acpi_generic_initiator_get_list (void ) +{ +GSList *list =NULL ; + +object_child_foreach (object_get_root (), + acpi_generic_initiator_list, &list); +return list; +} + +/* +* ACPI 6.3: +* Table 5-78 Generic Initiator Affinity Structure +*/ +static void +build_srat_generic_pci_initiator_affinity (GArray *table_data,int node, +PCIDeviceHandle *handle) +{ +uint8_t index; + +build_append_int_noprefix (table_data,5 ,1 );/* Type */ +build_append_int_noprefix (table_data,32 ,1 );/* Length */ +build_append_int_noprefix (table_data,0 ,1 );/* Reserved */ +build_append_int_noprefix (table_data,1 ,1 );/* Device Handle Type: PCI */ +build_append_int_noprefix (table_data, node,4 );/* Proximity Domain */ + +/* Device Handle - PCI */ +build_append_int_noprefix (table_data, handle->segment,2 ); +build_append_int_noprefix (table_data, handle->bdf,2 ); +for (index =0 ; index <12 ; index++) { +build_append_int_noprefix (table_data,0 ,1 ); + } + +build_append_int_noprefix (table_data,GEN_AFFINITY_ENABLED ,4 );/* Flags */ +build_append_int_noprefix (table_data,0 ,4 );/* Reserved */ +} + +void build_srat_generic_pci_initiator (GArray *table_data) +{ +GSList *gi_list, *list =acpi_generic_initiator_get_list (); +AcpiGenericInitiator *gi; + +for (gi_list = list; gi_list; gi_list = gi_list->next) { +Object *o; +uint16_t node; +PCIDevice *pci_dev; +bool node_specified = false; + + gi = gi_list->data; + + o =object_resolve_path_type (gi->pci_dev,TYPE_PCI_DEVICE ,NULL ); +if (!o) { +error_printf ("Specified device must be a PCI device.\n" ); +exit (1 ); + } + pci_dev =PCI_DEVICE (o); + +for (node =0 ; (node =find_next_bit (gi->host_nodes, +MAX_NODES , node)) !=MAX_NODES ; node++) + { +PCIDeviceHandle dev_handle; + dev_handle.segment =0 ; + dev_handle.bdf =PCI_BUILD_BDF (pci_bus_num (pci_get_bus (pci_dev)), + pci_dev->devfn); +build_srat_generic_pci_initiator_affinity (table_data, + node, &dev_handle); + node_specified = true; + } + +if (!node_specified) { +error_report ("Generic Initiator device 0:%x:%x.%x has no associated" +" NUMA node." ,pci_bus_num (pci_get_bus (pci_dev)), +PCI_SLOT (pci_dev->devfn),PCI_FUNC (pci_dev->devfn)); +error_printf ("Specify NUMA node with -host-nodes option.\n" ); +exit (1 ); + } + } + +g_slist_free (list); +}
hw/arm/virt-acpi-build.c +3 -0
@@ -58,6 +58,7 @@#include "migration/vmstate.h" #include "hw/acpi/ghes.h" #include "hw/acpi/viot.h" +#include "hw/acpi/acpi-generic-initiator.h" #define ARM_SPI_BASE 32
@@ -558,6 +559,8 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) } } +build_srat_generic_pci_initiator (table_data); +if (ms->nvdimms_state->is_enabled) {nvdimm_build_srat (table_data); }
include/hw/acpi/acpi-generic-initiator.h +26 -0
@@ -24,4 +24,30 @@ typedef struct AcpiGenericInitiatorClass { ObjectClass parent_class; } AcpiGenericInitiatorClass; +/* +* ACPI 6.3: +* Table 5-81 Flags – Generic Initiator Affinity Structure +*/ +typedef enum { +GEN_AFFINITY_ENABLED = (1 <<0 ),/* +* If clear, the OSPM ignores the contents +* of the Generic Initiator/Port Affinity +* Structure. This allows system firmware +* to populate the SRAT with a static +* number of structures, but only enable +* them as necessary. +*/ +}GenericAffinityFlags ; + +/* +* ACPI 6.3: +* Table 5-80 Device Handle - PCI +*/ +typedef struct PCIDeviceHandle { +uint16_t segment; +uint16_t bdf; +}PCIDeviceHandle ; + +void build_srat_generic_pci_initiator (GArray *table_data); +#endif
Signature · 1 line
2.34.1