exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize()
Since all RAM is backed by hostmem backends, drop global -mem-path invariant and simplify code. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200219160953.13771-74-imammedo@redhat.com>
This commit is contained in:
parent
f0530f14c7
commit
ad1172d8e5
49
exec.c
49
exec.c
@ -1667,59 +1667,18 @@ static int find_max_backend_pagesize(Object *obj, void *opaque)
|
|||||||
long qemu_minrampagesize(void)
|
long qemu_minrampagesize(void)
|
||||||
{
|
{
|
||||||
long hpsize = LONG_MAX;
|
long hpsize = LONG_MAX;
|
||||||
long mainrampagesize;
|
Object *memdev_root = object_resolve_path("/objects", NULL);
|
||||||
Object *memdev_root;
|
|
||||||
MachineState *ms = MACHINE(qdev_get_machine());
|
|
||||||
|
|
||||||
mainrampagesize = qemu_mempath_getpagesize(mem_path);
|
|
||||||
|
|
||||||
/* it's possible we have memory-backend objects with
|
|
||||||
* hugepage-backed RAM. these may get mapped into system
|
|
||||||
* address space via -numa parameters or memory hotplug
|
|
||||||
* hooks. we want to take these into account, but we
|
|
||||||
* also want to make sure these supported hugepage
|
|
||||||
* sizes are applicable across the entire range of memory
|
|
||||||
* we may boot from, so we take the min across all
|
|
||||||
* backends, and assume normal pages in cases where a
|
|
||||||
* backend isn't backed by hugepages.
|
|
||||||
*/
|
|
||||||
memdev_root = object_resolve_path("/objects", NULL);
|
|
||||||
if (memdev_root) {
|
|
||||||
object_child_foreach(memdev_root, find_min_backend_pagesize, &hpsize);
|
|
||||||
}
|
|
||||||
if (hpsize == LONG_MAX) {
|
|
||||||
/* No additional memory regions found ==> Report main RAM page size */
|
|
||||||
return mainrampagesize;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If NUMA is disabled or the NUMA nodes are not backed with a
|
|
||||||
* memory-backend, then there is at least one node using "normal" RAM,
|
|
||||||
* so if its page size is smaller we have got to report that size instead.
|
|
||||||
*/
|
|
||||||
if (hpsize > mainrampagesize &&
|
|
||||||
(ms->numa_state == NULL ||
|
|
||||||
ms->numa_state->num_nodes == 0 ||
|
|
||||||
ms->numa_state->nodes[0].node_memdev == NULL)) {
|
|
||||||
static bool warned;
|
|
||||||
if (!warned) {
|
|
||||||
error_report("Huge page support disabled (n/a for main memory).");
|
|
||||||
warned = true;
|
|
||||||
}
|
|
||||||
return mainrampagesize;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
object_child_foreach(memdev_root, find_min_backend_pagesize, &hpsize);
|
||||||
return hpsize;
|
return hpsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
long qemu_maxrampagesize(void)
|
long qemu_maxrampagesize(void)
|
||||||
{
|
{
|
||||||
long pagesize = qemu_mempath_getpagesize(mem_path);
|
long pagesize = 0;
|
||||||
Object *memdev_root = object_resolve_path("/objects", NULL);
|
Object *memdev_root = object_resolve_path("/objects", NULL);
|
||||||
|
|
||||||
if (memdev_root) {
|
object_child_foreach(memdev_root, find_max_backend_pagesize, &pagesize);
|
||||||
object_child_foreach(memdev_root, find_max_backend_pagesize,
|
|
||||||
&pagesize);
|
|
||||||
}
|
|
||||||
return pagesize;
|
return pagesize;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user