From nobody Tue Apr 30 00:58:57 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 1523430384695633.7113339294103; Wed, 11 Apr 2018 00:06:24 -0700 (PDT) Received: from localhost ([::1]:57846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f69pl-0001Dx-Fr for importer@patchew.org; Wed, 11 Apr 2018 03:06:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f69ny-0008Lk-Gw for qemu-devel@nongnu.org; Wed, 11 Apr 2018 03:04:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f69nu-0002xB-J2 for qemu-devel@nongnu.org; Wed, 11 Apr 2018 03:04:30 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:46397) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f69nt-0002vo-SA; Wed, 11 Apr 2018 03:04:26 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 40LZln23WNz9s1r; Wed, 11 Apr 2018 17:04:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1523430261; bh=pPyHLICDo1gf7jBlwKcarsXobTeE3ZYeRRUKXg7UMaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IiDiqZrA/gPwPzTmJZNOd9VXbA7MTDve33Azry8pHS1ptrvlFqFmZOJw7qMBIkIR3 Rc4bzhJVJ37UrM/KONEb3euHQr4DOwBU6WUwPWo9aQxsb0rhjTjg05gpNUO+kc2XdJ wdKNxUy4HjRfYiQhU8m2u07ghY5wymfoEb1k0ELI= From: David Gibson To: ehabkost@redhat.com, imammedo@redhat.com Date: Wed, 11 Apr 2018 17:04:17 +1000 Message-Id: <20180411070418.6304-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411070418.6304-1-david@gibson.dropbear.id.au> References: <20180411070418.6304-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCHv3 for-2.13 1/2] Make qemu_mempath_getpagesize() accept NULL 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 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" qemu_mempath_getpagesize() gets the effective (host side) page size for a block of memory backed by an mmap()ed file on the host. It requires the mem_path parameter to be non-NULL. This ends up meaning all the callers need a different case for handling anonymous memory (for memory-backend-ram or default memory with -mem-path is not specified). We can make all those callers a little simpler by having qemu_mempath_getpagesize() accept NULL, and treat that as the anonymous memory case. Signed-off-by: David Gibson Reviewed-by: Greg Kurz Acked-by: Paolo Bonzini --- exec.c | 21 ++++++--------------- target/ppc/kvm.c | 8 ++------ util/mmap-alloc.c | 26 ++++++++++++++------------ 3 files changed, 22 insertions(+), 33 deletions(-) diff --git a/exec.c b/exec.c index 02b1efebb7..b38b004563 100644 --- a/exec.c +++ b/exec.c @@ -1488,19 +1488,14 @@ 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); - g_free(mem_path); - if (hpsize < *hpsize_min) { - *hpsize_min =3D hpsize; - } - } else { - *hpsize_min =3D getpagesize(); + char *mem_path =3D object_property_get_str(obj, "mem-path", NULL); + long hpsize =3D qemu_mempath_getpagesize(mem_path); + g_free(mem_path); + if (hpsize < *hpsize_min) { + *hpsize_min =3D hpsize; } } =20 @@ -1513,11 +1508,7 @@ long qemu_getrampagesize(void) long mainrampagesize; Object *memdev_root; =20 - if (mem_path) { - mainrampagesize =3D qemu_mempath_getpagesize(mem_path); - } else { - mainrampagesize =3D getpagesize(); - } + mainrampagesize =3D qemu_mempath_getpagesize(mem_path); =20 /* it's possible we have memory-backend objects with * hugepage-backed RAM. these may get mapped into system diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 79a436a384..e24fa50dc9 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -499,12 +499,8 @@ bool kvmppc_is_mem_backend_page_size_ok(const char *ob= j_path) char *mempath =3D object_property_get_str(mem_obj, "mem-path", NULL); long pagesize; =20 - if (mempath) { - pagesize =3D qemu_mempath_getpagesize(mempath); - g_free(mempath); - } else { - pagesize =3D getpagesize(); - } + pagesize =3D qemu_mempath_getpagesize(mempath); + g_free(mempath); =20 return pagesize >=3D max_cpu_page_size; } diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 2fd8cbcc6f..fd329eccd8 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -50,19 +50,21 @@ size_t qemu_mempath_getpagesize(const char *mem_path) struct statfs fs; int ret; =20 - do { - ret =3D statfs(mem_path, &fs); - } while (ret !=3D 0 && errno =3D=3D EINTR); - - if (ret !=3D 0) { - fprintf(stderr, "Couldn't statfs() memory path: %s\n", - strerror(errno)); - exit(1); - } + if (mem_path) { + do { + ret =3D statfs(mem_path, &fs); + } while (ret !=3D 0 && errno =3D=3D EINTR); =20 - if (fs.f_type =3D=3D HUGETLBFS_MAGIC) { - /* It's hugepage, return the huge page size */ - return fs.f_bsize; + if (ret !=3D 0) { + fprintf(stderr, "Couldn't statfs() memory path: %s\n", + strerror(errno)); + exit(1); + } + + if (fs.f_type =3D=3D HUGETLBFS_MAGIC) { + /* It's hugepage, return the huge page size */ + return fs.f_bsize; + } } #ifdef __sparc__ /* SPARC Linux needs greater alignment than the pagesize */ --=20 2.14.3 From nobody Tue Apr 30 00:58:57 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523430384996370.6011374183481; Wed, 11 Apr 2018 00:06:24 -0700 (PDT) Received: from localhost ([::1]:57845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f69pd-00018n-JC for importer@patchew.org; Wed, 11 Apr 2018 03:06:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f69nw-0008LT-Ff for qemu-devel@nongnu.org; Wed, 11 Apr 2018 03:04:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f69nv-0002xd-5p for qemu-devel@nongnu.org; Wed, 11 Apr 2018 03:04:28 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:45877) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f69nu-0002vq-C9; Wed, 11 Apr 2018 03:04:27 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 40LZln3ChXz9s3B; Wed, 11 Apr 2018 17:04:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1523430261; bh=levMvkybAVvz2sujQk85b9w9/TGv6krw28kEXYQtmJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ng8c2Kkdx6X5hmeB9K4W/L6dLtvkSw5OoesuyqoOOZL8TKEEt1CdTZOPstkXMcpGS OkVK9WeZM8aL1Bo90ct6WjHjLhLrMUohhiD3gDTHCyrlE/JMTnxmEdGc1L9ssyR8WT ybbE9RPIBgSED0UcYuU9rMM32TykrHdOQpbPhDdA= From: David Gibson To: ehabkost@redhat.com, imammedo@redhat.com Date: Wed, 11 Apr 2018 17:04:18 +1000 Message-Id: <20180411070418.6304-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411070418.6304-1-david@gibson.dropbear.id.au> References: <20180411070418.6304-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCHv3 for-2.13 2/2] 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 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