From nobody Wed Oct 29 17:31:57 2025 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 1524822254637680.2034261371307; Fri, 27 Apr 2018 02:44:14 -0700 (PDT) Received: from localhost ([::1]:46799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBzvJ-0004Vt-Mw for importer@patchew.org; Fri, 27 Apr 2018 05:44:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBzaZ-0002Bw-L7 for qemu-devel@nongnu.org; Fri, 27 Apr 2018 05:22:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBzaY-0002K1-I7 for qemu-devel@nongnu.org; Fri, 27 Apr 2018 05:22:47 -0400 Received: from ozlabs.org ([203.11.71.1]:55113) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBzaX-0002IG-Ud; Fri, 27 Apr 2018 05:22:46 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 40XT2q2j7lz9s4q; Fri, 27 Apr 2018 19:21:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1524820899; bh=RTjFG8AzBmXHwjuLGEK2thQzkFxySySMTOn3y0TwVfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uo2icjPmpu48xYJ3koHW+fD/9vpJ73cfM1myLCf8JW2ITRHPUW/IPK7gJYLW5DAH3 +ZtyAUbQmdhIwm7IGBEUpChsoaJOJVrh/iUWAmIpdimYWr2SQQ6wS32v3Tr5DTzYrs d4HkI1GmTqpe7IJK3NG46BltluGKZdlhVC/oXvxA= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 27 Apr 2018 19:21:04 +1000 Message-Id: <20180427092126.24812-28-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180427092126.24812-1-david@gibson.dropbear.id.au> References: <20180427092126.24812-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 27/49] 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: David Gibson , qemu-ppc@nongnu.org, groug@kaod.org, qemu-devel@nongnu.org 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. Signed-off-by: David Gibson Reviewed-by: Greg Kurz Acked-by: Paolo Bonzini --- backends/hostmem.c | 18 ++++++++++++++++++ exec.c | 5 ++--- include/sysemu/hostmem.h | 2 ++ target/ppc/kvm.c | 6 +----- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index f61093654e..6a0c474222 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,23 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *= backend) return backend->is_mapped; } =20 +#ifdef __linux__ +size_t host_memory_backend_pagesize(HostMemoryBackend *memdev) +{ + Object *obj =3D OBJECT(memdev); + char *path =3D object_property_get_str(obj, "mem-path", NULL); + size_t pagesize =3D qemu_mempath_getpagesize(path); + + g_free(path); + return pagesize; +} +#else +size_t host_memory_backend_pagesize(HostMemoryBackend *memdev) +{ + return getpagesize(); +} +#endif + static void host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) { diff --git a/exec.c b/exec.c index b38b004563..c7fcefa851 100644 --- a/exec.c +++ b/exec.c @@ -1491,9 +1491,8 @@ static int find_max_supported_pagesize(Object *obj, v= oid *opaque) long *hpsize_min =3D opaque; =20 if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) { - char *mem_path =3D object_property_get_str(obj, "mem-path", NULL); - long hpsize =3D qemu_mempath_getpagesize(mem_path); - g_free(mem_path); + long hpsize =3D host_memory_backend_pagesize(MEMORY_BACKEND(obj)); + if (hpsize < *hpsize_min) { *hpsize_min =3D hpsize; } diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index 47bc9846ac..bc36899bb8 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); +size_t host_memory_backend_pagesize(HostMemoryBackend *memdev); + #endif diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index e24fa50dc9..f62f7ac288 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -496,11 +496,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; - - pagesize =3D qemu_mempath_getpagesize(mempath); - g_free(mempath); + long pagesize =3D host_memory_backend_pagesize(MEMORY_BACKEND(mem_obj)= ); =20 return pagesize >=3D max_cpu_page_size; } --=20 2.14.3