virnuma: Introduce virNumaCPUSetToNodeset()

So far, we have a function that expands given list of NUMA nodes
into list of CPUs. But soon, we are going to need the inverse -
expand list of CPUs into list of NUMA nodes. Introduce
virNumaCPUSetToNodeset() for that.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Michal Privoznik 2023-03-07 14:05:27 +01:00
parent 01e5111c3c
commit b6cfd348e9
3 changed files with 64 additions and 0 deletions

View File

@ -2976,6 +2976,7 @@ virNodeSuspendGetTargetMask;
# util/virnuma.h # util/virnuma.h
virNumaCPUSetToNodeset;
virNumaGetAutoPlacementAdvice; virNumaGetAutoPlacementAdvice;
virNumaGetDistances; virNumaGetDistances;
virNumaGetHostMemoryNodeset; virNumaGetHostMemoryNodeset;
@ -2983,6 +2984,7 @@ virNumaGetMaxCPUs;
virNumaGetMaxNode; virNumaGetMaxNode;
virNumaGetNodeCPUs; virNumaGetNodeCPUs;
virNumaGetNodeMemory; virNumaGetNodeMemory;
virNumaGetNodeOfCPU;
virNumaGetPageInfo; virNumaGetPageInfo;
virNumaGetPages; virNumaGetPages;
virNumaIsAvailable; virNumaIsAvailable;

View File

@ -311,6 +311,22 @@ virNumaGetNodeCPUs(int node,
# undef MASK_CPU_ISSET # undef MASK_CPU_ISSET
# undef n_bits # undef n_bits
/**
* virNumaGetNodeOfCPU:
* @cpu: CPU ID
*
* For given @cpu, return NUMA node which it belongs to.
*
* Returns: NUMA node # on success,
* -1 on failure (with errno set).
*/
int
virNumaGetNodeOfCPU(int cpu)
{
return numa_node_of_cpu(cpu);
}
#else /* !WITH_NUMACTL */ #else /* !WITH_NUMACTL */
int int
@ -366,6 +382,14 @@ virNumaGetNodeCPUs(int node G_GNUC_UNUSED,
return -1; return -1;
} }
int
virNumaGetNodeOfCPU(int cpu G_GNUC_UNUSED)
{
errno = ENOSYS;
return -1;
}
#endif /* !WITH_NUMACTL */ #endif /* !WITH_NUMACTL */
/** /**
@ -990,6 +1014,41 @@ virNumaGetHostMemoryNodeset(void)
} }
/**
* virNumaCPUSetToNodeset:
* @cpuset: bitmap containing a set of CPUs
* @nodeset: returned bitmap containing a set of NUMA nodes
*
* Convert a set of CPUs to set of NUMA nodes that contain the CPUs.
*
* Returns: 0 on success,
* -1 on failure (with error reported)
*/
int
virNumaCPUSetToNodeset(virBitmap *cpuset,
virBitmap **nodeset)
{
g_autoptr(virBitmap) nodes = virBitmapNew(0);
ssize_t pos = -1;
while ((pos = virBitmapNextSetBit(cpuset, pos)) >= 0) {
int node = virNumaGetNodeOfCPU(pos);
if (node < 0) {
virReportSystemError(errno,
_("Unable to get NUMA node of cpu %zd"),
pos);
return -1;
}
virBitmapSetBitExpand(nodes, node);
}
*nodeset = g_steal_pointer(&nodes);
return 0;
}
/** /**
* virNumaNodesetToCPUset: * virNumaNodesetToCPUset:
* @nodeset: bitmap containing a set of NUMA nodes * @nodeset: bitmap containing a set of NUMA nodes

View File

@ -45,7 +45,10 @@ int virNumaGetNodeMemory(int node,
unsigned int virNumaGetMaxCPUs(void) G_NO_INLINE; unsigned int virNumaGetMaxCPUs(void) G_NO_INLINE;
int virNumaGetNodeOfCPU(int cpu);
int virNumaGetNodeCPUs(int node, virBitmap **cpus) G_NO_INLINE; int virNumaGetNodeCPUs(int node, virBitmap **cpus) G_NO_INLINE;
int virNumaCPUSetToNodeset(virBitmap *cpuset,
virBitmap **nodeset);
int virNumaNodesetToCPUset(virBitmap *nodeset, int virNumaNodesetToCPUset(virBitmap *nodeset,
virBitmap **cpuset); virBitmap **cpuset);