External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 19:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
a68b849c51
libvirt/src/util/virnuma.h

70 lines
2.6 KiB
C
Raw Normal View History

rename qemuGetNumadAdvice to virNumaGetAutoPlacementAdvice qemuGetNumadAdvice will be used by LXC driver, rename it to virNumaGetAutoPlacementAdvice and move it to virnuma.c Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
2013-03-18 09:04:01 +00:00
/*
* virnuma.h: helper APIs for managing numa
*
numatune: create new module for numatune There are many places with numatune-related code that should be put into special numatune_conf and this patch creates a basis for that. Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
2014-06-06 14:50:39 +00:00
* Copyright (C) 2011-2014 Red Hat, Inc.
rename qemuGetNumadAdvice to virNumaGetAutoPlacementAdvice qemuGetNumadAdvice will be used by LXC driver, rename it to virNumaGetAutoPlacementAdvice and move it to virnuma.c Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
2013-03-18 09:04:01 +00:00
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*
*/
util: misc: use #pragma once in headers Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
2019-06-18 16:13:08 +00:00
#pragma once
rename qemuGetNumadAdvice to virNumaGetAutoPlacementAdvice qemuGetNumadAdvice will be used by LXC driver, rename it to virNumaGetAutoPlacementAdvice and move it to virnuma.c Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
2013-03-18 09:04:01 +00:00
util: misc: use #pragma once in headers Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Ján Tomko <jtomko@redhat.com>
2019-06-18 16:13:08 +00:00
#include "internal.h"
#include "virbitmap.h"
NUMA: cleanup for numa related codes Intend to reduce the redundant code,use virNumaSetupMemoryPolicy to replace virLXCControllerSetupNUMAPolicy and qemuProcessInitNumaMemoryPolicy. This patch also moves the numa related codes to the file virnuma.c and virnuma.h Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
2013-03-20 03:35:08 +00:00
util: Fix typo vcups -> vcpus Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
2018-10-22 13:37:54 +00:00
char *virNumaGetAutoPlacementAdvice(unsigned short vcpus,
rename qemuGetNumadAdvice to virNumaGetAutoPlacementAdvice qemuGetNumadAdvice will be used by LXC driver, rename it to virNumaGetAutoPlacementAdvice and move it to virnuma.c Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
2013-03-18 09:04:01 +00:00
unsigned long long balloon);
numa: split util/ and conf/ and support non-contiguous nodesets This is a reaction to Michal's fix [1] for non-NUMA systems that also splits out conf/ out of util/ because libvirt_util shouldn't require libvirt_conf if it is the other way around. This particular use case worked, but we're trying to avoid it as mentioned [2], many times. The only functions from virnuma.c that needed numatune_conf were virDomainNumatuneNodesetIsAvailable() and virNumaSetupMemoryPolicy(). The first one should be in numatune_conf as it works with virDomainNumatune, the second one just needs nodeset and mode, both of which can be passed without the need of numatune_conf. Apart from fixing that, this patch also fixes recently added code (between commits d2460f85^..5c8515620) that doesn't support non-contiguous nodesets. It uses new function virNumaNodesetIsAvailable(), which doesn't need a stub as it doesn't use any libnuma functions, to check if every specified nodeset is available. [1] https://www.redhat.com/archives/libvir-list/2014-November/msg00118.html [2] http://www.redhat.com/archives/libvir-list/2011-June/msg01040.html Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
2014-11-06 11:16:54 +00:00
int virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode,
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 07:16:13 +00:00
virBitmap *nodeset);
numa: Introduce virNumaIsAvailable and use it instead of numa_available All functions from libnuma must be protected with ifdefs. Avoid this by using our own wrapper.
2013-10-17 14:57:29 +00:00
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 07:16:13 +00:00
virBitmap *virNumaGetHostMemoryNodeset(void);
qemuxml2argvmock: Drop virNuma* mocks Since qemuxml2argvtest is now using virnumamock, there's no need for qemuxml2argvmock to offer reimplementation of virNuma*() functions. Also, the comment about CLang and FreeBSD (introduced in v4.3.0-40-g77ac204d14) is no longer true. Looks like noinline attribute was the missing culprit. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2023-03-07 15:06:14 +00:00
bool virNumaNodesetIsAvailable(virBitmap *nodeset);
lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE The G_GNUC_NO_INLINE macro will eventually be marked as deprecated [1] and we are recommended to use G_NO_INLINE instead. Do the switch now, rather than waiting for compile time warning to occur. 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2022-07-18 11:02:19 +00:00
bool virNumaIsAvailable(void) G_NO_INLINE;
int virNumaGetMaxNode(void) G_NO_INLINE;
bool virNumaNodeIsAvailable(int node) G_NO_INLINE;
virnuma: Introduce virNumaGetDistances The API gets a NUMA node and find distances to other nodes. The distances are returned in an array. If an item X within the array equals to value of zero, then there's no such node as X. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2014-06-02 10:06:56 +00:00
int virNumaGetDistances(int node,
int **distances,
lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE The G_GNUC_NO_INLINE macro will eventually be marked as deprecated [1] and we are recommended to use G_NO_INLINE instead. Do the switch now, rather than waiting for compile time warning to occur. 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2022-07-18 11:02:19 +00:00
int *ndistances) G_NO_INLINE;
numa: Introduce virNumaGetNodeMemory and use it instead of numa_node_size64
2013-10-17 16:30:09 +00:00
int virNumaGetNodeMemory(int node,
unsigned long long *memsize,
lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE The G_GNUC_NO_INLINE macro will eventually be marked as deprecated [1] and we are recommended to use G_NO_INLINE instead. Do the switch now, rather than waiting for compile time warning to occur. 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2022-07-18 11:02:19 +00:00
unsigned long long *memfree) G_NO_INLINE;
numa: Introduce virNumaGetMaxNode and use it instead of numa_max_node Avoid necessary checks for the numa library with this helper.
2013-10-17 15:42:22 +00:00
lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE The G_GNUC_NO_INLINE macro will eventually be marked as deprecated [1] and we are recommended to use G_NO_INLINE instead. Do the switch now, rather than waiting for compile time warning to occur. 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2022-07-18 11:02:19 +00:00
unsigned int virNumaGetMaxCPUs(void) G_NO_INLINE;
numa: Replace NUMA_MAX_N_CPUS macro with virNumaGetMaxCPUs()
2013-10-18 12:43:34 +00:00
virnumamock: Introduce virNumaGetNodeOfCPU() mock Introduce a mock of virNumaGetNodeOfCPU() because soon we will need virNumaCPUSetToNodeset() to return predictable results. Also, fill in missing symlinks in vircaps2xmldata/. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2023-03-07 14:44:41 +00:00
int virNumaGetNodeOfCPU(int cpu) G_NO_INLINE;
lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE The G_GNUC_NO_INLINE macro will eventually be marked as deprecated [1] and we are recommended to use G_NO_INLINE instead. Do the switch now, rather than waiting for compile time warning to occur. 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2022-07-18 11:02:19 +00:00
int virNumaGetNodeCPUs(int node, virBitmap **cpus) G_NO_INLINE;
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>
2023-03-07 13:05:27 +00:00
int virNumaCPUSetToNodeset(virBitmap *cpuset,
virBitmap **nodeset);
lib: Drop internal virXXXPtr typedefs Historically, we declared pointer type to our types: typedef struct _virXXX virXXX; typedef virXXX *virXXXPtr; But usefulness of such declaration is questionable, at best. Unfortunately, we can't drop every such declaration - we have to carry some over, because they are part of public API (e.g. virDomainPtr). But for internal types - we can do drop them and use what every other C project uses 'virXXX *'. This change was generated by a very ugly shell script that generated sed script which was then called over each file in the repository. For the shell script refer to the cover letter: https://listman.redhat.com/archives/libvir-list/2021-March/msg00537.html Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-03-11 07:16:13 +00:00
int virNumaNodesetToCPUset(virBitmap *nodeset,
virBitmap **cpuset);
numa: Add wrapper of numa_node_to_cpus and use it
2013-10-18 14:21:24 +00:00
virnuma: Introduce pages helpers For future work we need two functions that fetches total number of pages and number of free pages for given NUMA node and page size (virNumaGetPageInfo()). Then we need to learn pages of what sizes are supported on given node (virNumaGetPages()). Note that system page size is disabled at the moment as there's one issue connected. If you have a NUMA node with huge pages allocated the kernel would return the normal size of memory for that node. It basically ignores the fact that huge pages steal size from the system memory. Until we resolve this, it's safer to not confuse users and hence not report any system pages yet. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2014-06-06 16:09:01 +00:00
int virNumaGetPageInfo(int node,
unsigned int page_size,
virNumaGetPageInfo: Take huge pages into account On the Linux kernel, if huge pages are allocated the size they cut off from memory is accounted under the 'MemUsed' in the meminfo file. However, we want the sum to be subtracted from 'MemTotal'. This patch implements this feature. After this change, we can enable reporting of the ordinary system pages in the capability XML: <capabilities> <host> <uuid>01281cda-f352-cb11-a9db-e905fe22010c</uuid> <cpu> <arch>x86_64</arch> <model>Haswell</model> <vendor>Intel</vendor> <topology sockets='1' cores='1' threads='1'/> <feature/> <pages unit='KiB' size='4'/> <pages unit='KiB' size='2048'/> <pages unit='KiB' size='1048576'/> </cpu> <power_management/> <migration_features/> <topology> <cells num='4'> <cell id='0'> <memory unit='KiB'>4048248</memory> <pages unit='KiB' size='4'>748382</pages> <pages unit='KiB' size='2048'>3</pages> <pages unit='KiB' size='1048576'>1</pages> <distances/> <cpus num='1'> <cpu id='0' socket_id='0' core_id='0' siblings='0'/> </cpus> </cell> ... </cells> </topology> </host> </capabilities> You can see the beautiful thing about this: if you sum up all the <pages/> you'll get <memory/>. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2014-06-23 13:04:11 +00:00
unsigned long long huge_page_sum,
virNumaGetHugePageInfo: Return page_avail and page_free as ULL https://bugzilla.redhat.com/show_bug.cgi?id=1569678 On some large systems (with ~400GB of RAM) it is possible for unsigned int to overflow in which case we report invalid number of 4K pages pool size. Switch to unsigned long long. We hit overflow in virNumaGetPages when doing: huge_page_sum += 1024 * page_size * page_avail; because although 'huge_page_sum' is an unsigned long long, the page_size and page_avail are both unsigned int, so the promotion to unsigned long long doesn't happen until the sum has been calculated, by which time we've already overflowed. Turning page_avail into a unsigned long long is not strictly needed until we need ability to represent more than 2^32 4k pages, which equates to 16 TB of RAM. That's not outside the realm of possibility, so makes sense that we change it to unsigned long long to avoid future problems. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-04-23 14:36:53 +00:00
unsigned long long *page_avail,
unsigned long long *page_free);
virnuma: Introduce pages helpers For future work we need two functions that fetches total number of pages and number of free pages for given NUMA node and page size (virNumaGetPageInfo()). Then we need to learn pages of what sizes are supported on given node (virNumaGetPages()). Note that system page size is disabled at the moment as there's one issue connected. If you have a NUMA node with huge pages allocated the kernel would return the normal size of memory for that node. It basically ignores the fact that huge pages steal size from the system memory. Until we resolve this, it's safer to not confuse users and hence not report any system pages yet. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2014-06-06 16:09:01 +00:00
int virNumaGetPages(int node,
unsigned int **pages_size,
virNumaGetHugePageInfo: Return page_avail and page_free as ULL https://bugzilla.redhat.com/show_bug.cgi?id=1569678 On some large systems (with ~400GB of RAM) it is possible for unsigned int to overflow in which case we report invalid number of 4K pages pool size. Switch to unsigned long long. We hit overflow in virNumaGetPages when doing: huge_page_sum += 1024 * page_size * page_avail; because although 'huge_page_sum' is an unsigned long long, the page_size and page_avail are both unsigned int, so the promotion to unsigned long long doesn't happen until the sum has been calculated, by which time we've already overflowed. Turning page_avail into a unsigned long long is not strictly needed until we need ability to represent more than 2^32 4k pages, which equates to 16 TB of RAM. That's not outside the realm of possibility, so makes sense that we change it to unsigned long long to avoid future problems. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2018-04-23 14:36:53 +00:00
unsigned long long **pages_avail,
unsigned long long **pages_free,
virnuma: Introduce pages helpers For future work we need two functions that fetches total number of pages and number of free pages for given NUMA node and page size (virNumaGetPageInfo()). Then we need to learn pages of what sizes are supported on given node (virNumaGetPages()). Note that system page size is disabled at the moment as there's one issue connected. If you have a NUMA node with huge pages allocated the kernel would return the normal size of memory for that node. It basically ignores the fact that huge pages steal size from the system memory. Until we resolve this, it's safer to not confuse users and hence not report any system pages yet. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2014-06-06 16:09:01 +00:00
size_t *npages)
lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE The G_GNUC_NO_INLINE macro will eventually be marked as deprecated [1] and we are recommended to use G_NO_INLINE instead. Do the switch now, rather than waiting for compile time warning to occur. 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2022-07-18 11:02:19 +00:00
ATTRIBUTE_NONNULL(5) G_NO_INLINE;
virnuma: Introduce virNumaSetPagePoolSize This internal API can be used to allocate or free some pages in the huge pages pool. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2014-09-18 07:24:16 +00:00
int virNumaSetPagePoolSize(int node,
unsigned int page_size,
unsigned long long page_count,
bool add);
Reference in New Issue Copy Permalink