From nobody Fri May 3 13:48:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522301222029696.8556053240205; Wed, 28 Mar 2018 22:27:02 -0700 (PDT) Received: from localhost ([::1]:48446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1Q5U-0005pY-Tg for importer@patchew.org; Thu, 29 Mar 2018 01:27:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1Q4M-0005Cv-EM for qemu-devel@nongnu.org; Thu, 29 Mar 2018 01:25:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1Q4J-0001tw-8I for qemu-devel@nongnu.org; Thu, 29 Mar 2018 01:25:50 -0400 Received: from ozlabs.org ([103.22.144.67]:34677) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1Q4I-0001qT-BX; Thu, 29 Mar 2018 01:25:47 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 40BY9x6bpqz9s0m; Thu, 29 Mar 2018 16:25:41 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1522301141; bh=5minmpsisJ0I9GGgZBRrYu17bsDenmTIBxdgLQa4x2Q=; h=From:To:Cc:Subject:Date:From; b=dH2KGrXj48w09rz64DzHCtKJ6j3dzndUGZp/k33gUbVcXoZW86QAusKrUUeXzBb5s er6topd2ZCwaYlAmjETaeHh2KQJloLzl9MetKGmoT1RGp4prLD4ceoEPPzeh2B/hvp GyjiN756Kdq/B6uK3cNezqt8VN6Wi5XMblnKjWeY= From: David Gibson To: ehabkost@redhat.com, imammedo@redhat.com Date: Thu, 29 Mar 2018 16:25:37 +1100 Message-Id: <20180329052537.32163-1-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH for-2.13] Add host_memory_backend_pagesize() helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There are a couple places (one generic, one target specific) where we need to get the host page size associated with a particular memory backend. I have some upcoming code which will add another place which wants this. So, for convenience, add a helper function to calculate this. host_memory_backend_pagesize() returns the host pagesize for a given HostMemoryBackend object, or for the default backend (-mem-path) if passed NULL. Signed-off-by: David Gibson --- backends/hostmem.c | 20 ++++++++++++++++++++ exec.c | 21 +++++---------------- include/sysemu/hostmem.h | 2 ++ target/ppc/kvm.c | 10 +--------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index f61093654e..b6a60cfc5d 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -18,6 +18,7 @@ #include "qapi/visitor.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h" +#include "qemu/mmap-alloc.h" =20 #ifdef CONFIG_NUMA #include @@ -262,6 +263,25 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *= backend) return backend->is_mapped; } =20 +long host_memory_backend_pagesize(HostMemoryBackend *memdev) +{ + const char *path =3D NULL; + +#ifdef __linux__ + if (memdev) { + path =3D object_property_get_str(OBJECT(memdev), "mem-path", NULL); + } else { + path =3D mem_path; + } +#endif + + if (path) { + return qemu_mempath_getpagesize(path); + } else { + return getpagesize(); + } +} + static void host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) { diff --git a/exec.c b/exec.c index c09bd93df3..04856c2402 100644 --- a/exec.c +++ b/exec.c @@ -1488,18 +1488,13 @@ void ram_block_dump(Monitor *mon) */ static int find_max_supported_pagesize(Object *obj, void *opaque) { - char *mem_path; long *hpsize_min =3D opaque; =20 if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) { - mem_path =3D object_property_get_str(obj, "mem-path", NULL); - if (mem_path) { - long hpsize =3D qemu_mempath_getpagesize(mem_path); - if (hpsize < *hpsize_min) { - *hpsize_min =3D hpsize; - } - } else { - *hpsize_min =3D getpagesize(); + long hpsize =3D host_memory_backend_pagesize(MEMORY_BACKEND(obj)); + + if (hpsize < *hpsize_min) { + *hpsize_min =3D hpsize; } } =20 @@ -1509,15 +1504,9 @@ static int find_max_supported_pagesize(Object *obj, = void *opaque) long qemu_getrampagesize(void) { long hpsize =3D LONG_MAX; - long mainrampagesize; + long mainrampagesize =3D host_memory_backend_pagesize(NULL); Object *memdev_root; =20 - if (mem_path) { - mainrampagesize =3D qemu_mempath_getpagesize(mem_path); - } else { - mainrampagesize =3D getpagesize(); - } - /* 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 diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index 47bc9846ac..f474ef97f6 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -68,4 +68,6 @@ MemoryRegion *host_memory_backend_get_memory(HostMemoryBa= ckend *backend, =20 void host_memory_backend_set_mapped(HostMemoryBackend *backend, bool mappe= d); bool host_memory_backend_is_mapped(HostMemoryBackend *backend); +long host_memory_backend_pagesize(HostMemoryBackend *memdev); + #endif diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index b329cd8173..0adcf18c9f 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -493,15 +493,7 @@ static void kvm_fixup_page_sizes(PowerPCCPU *cpu) bool kvmppc_is_mem_backend_page_size_ok(const char *obj_path) { Object *mem_obj =3D object_resolve_path(obj_path, NULL); - char *mempath =3D object_property_get_str(mem_obj, "mem-path", NULL); - long pagesize; - - if (mempath) { - pagesize =3D qemu_mempath_getpagesize(mempath); - g_free(mempath); - } else { - pagesize =3D getpagesize(); - } + long pagesize =3D host_memory_backend_pagesize(MEMORY_BACKEND(mem_obj)= ); =20 return pagesize >=3D max_cpu_page_size; } --=20 2.14.3