From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: gleb@kernel.org, mtosatti@redhat.com, stefanha@redhat.com, mst@redhat.com, rth@twiddle.net, ehabkost@redhat.com, dan.j.williams@intel.com, kvm@vger.kernel.org, qemu-devel@nongnu.org, Xiao Guangrong <guangrong.xiao@linux.intel.com> Subject: [PATCH v4 07/33] util: introduce qemu_file_get_page_size() Date: Mon, 19 Oct 2015 08:53:53 +0800 [thread overview] Message-ID: <1445216059-88521-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1445216059-88521-1-git-send-email-guangrong.xiao@linux.intel.com> There are three places use the some logic to get the page size on the file path or file fd This patch introduces qemu_file_get_page_size() to unify the code Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- include/qemu/osdep.h | 1 + target-ppc/kvm.c | 21 +++------------------ util/oslib-posix.c | 16 ++++++++++++++++ util/oslib-win32.c | 5 +++++ 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index ef21efb..9c8c0c4 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -286,4 +286,5 @@ void os_mem_prealloc(int fd, char *area, size_t sz); int qemu_read_password(char *buf, int buf_size); +size_t qemu_file_get_page_size(const char *mem_path); #endif diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index f8ea783..ed3424e 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -306,28 +306,13 @@ static void kvm_get_smmu_info(PowerPCCPU *cpu, struct kvm_ppc_smmu_info *info) static long gethugepagesize(const char *mem_path) { - struct statfs fs; - int ret; - - do { - ret = statfs(mem_path, &fs); - } while (ret != 0 && errno == EINTR); + long size = qemu_file_get_page_size(mem_path); - if (ret != 0) { - fprintf(stderr, "Couldn't statfs() memory path: %s\n", - strerror(errno)); + if (!size) { exit(1); } -#define HUGETLBFS_MAGIC 0x958458f6 - - if (fs.f_type != HUGETLBFS_MAGIC) { - /* Explicit mempath, but it's ordinary pages */ - return getpagesize(); - } - - /* It's hugepage, return the huge page size */ - return fs.f_bsize; + return size; } static int find_max_supported_pagesize(Object *obj, void *opaque) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 892d2d8..32b4d1f 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -360,6 +360,22 @@ static size_t fd_getpagesize(int fd) return getpagesize(); } +size_t qemu_file_get_page_size(const char *path) +{ + size_t size = 0; + int fd = qemu_open(path, O_RDONLY); + + if (fd < 0) { + fprintf(stderr, "Could not open %s.\n", path); + goto exit; + } + + size = fd_getpagesize(fd); + qemu_close(fd); +exit: + return size; +} + void os_mem_prealloc(int fd, char *area, size_t memory) { int ret; diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 08f5a9c..1ff1fae 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -462,6 +462,11 @@ size_t getpagesize(void) return system_info.dwPageSize; } +size_t qemu_file_get_page_size(const char *path) +{ + return getpagesize(); +} + void os_mem_prealloc(int fd, char *area, size_t memory) { int i; -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Xiao Guangrong <guangrong.xiao@linux.intel.com> To: pbonzini@redhat.com, imammedo@redhat.com Cc: Xiao Guangrong <guangrong.xiao@linux.intel.com>, ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, gleb@kernel.org, mtosatti@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, dan.j.williams@intel.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH v4 07/33] util: introduce qemu_file_get_page_size() Date: Mon, 19 Oct 2015 08:53:53 +0800 [thread overview] Message-ID: <1445216059-88521-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1445216059-88521-1-git-send-email-guangrong.xiao@linux.intel.com> There are three places use the some logic to get the page size on the file path or file fd This patch introduces qemu_file_get_page_size() to unify the code Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com> --- include/qemu/osdep.h | 1 + target-ppc/kvm.c | 21 +++------------------ util/oslib-posix.c | 16 ++++++++++++++++ util/oslib-win32.c | 5 +++++ 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index ef21efb..9c8c0c4 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -286,4 +286,5 @@ void os_mem_prealloc(int fd, char *area, size_t sz); int qemu_read_password(char *buf, int buf_size); +size_t qemu_file_get_page_size(const char *mem_path); #endif diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index f8ea783..ed3424e 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -306,28 +306,13 @@ static void kvm_get_smmu_info(PowerPCCPU *cpu, struct kvm_ppc_smmu_info *info) static long gethugepagesize(const char *mem_path) { - struct statfs fs; - int ret; - - do { - ret = statfs(mem_path, &fs); - } while (ret != 0 && errno == EINTR); + long size = qemu_file_get_page_size(mem_path); - if (ret != 0) { - fprintf(stderr, "Couldn't statfs() memory path: %s\n", - strerror(errno)); + if (!size) { exit(1); } -#define HUGETLBFS_MAGIC 0x958458f6 - - if (fs.f_type != HUGETLBFS_MAGIC) { - /* Explicit mempath, but it's ordinary pages */ - return getpagesize(); - } - - /* It's hugepage, return the huge page size */ - return fs.f_bsize; + return size; } static int find_max_supported_pagesize(Object *obj, void *opaque) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 892d2d8..32b4d1f 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -360,6 +360,22 @@ static size_t fd_getpagesize(int fd) return getpagesize(); } +size_t qemu_file_get_page_size(const char *path) +{ + size_t size = 0; + int fd = qemu_open(path, O_RDONLY); + + if (fd < 0) { + fprintf(stderr, "Could not open %s.\n", path); + goto exit; + } + + size = fd_getpagesize(fd); + qemu_close(fd); +exit: + return size; +} + void os_mem_prealloc(int fd, char *area, size_t memory) { int ret; diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 08f5a9c..1ff1fae 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -462,6 +462,11 @@ size_t getpagesize(void) return system_info.dwPageSize; } +size_t qemu_file_get_page_size(const char *path) +{ + return getpagesize(); +} + void os_mem_prealloc(int fd, char *area, size_t memory) { int i; -- 1.8.3.1
next prev parent reply other threads:[~2015-10-18 16:59 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-19 0:53 [PATCH v4 00/33] implement vNVDIMM Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 01/33] acpi: add aml_derefof Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 02/33] acpi: add aml_sizeof Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 03/33] acpi: add aml_create_field Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 04/33] acpi: add aml_concatenate Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 05/33] acpi: add aml_object_type Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 06/33] acpi: add aml_method_serialized Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` Xiao Guangrong [this message] 2015-10-19 0:53 ` [Qemu-devel] [PATCH v4 07/33] util: introduce qemu_file_get_page_size() Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 08/33] exec: allow memory to be allocated from any kind of path Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 09/33] exec: allow file_ram_alloc to work on file Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 10/33] hostmem-file: clean up memory allocation Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 11/33] hostmem-file: use whole file size if possible Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 12/33] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:53 ` [PATCH v4 13/33] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong 2015-10-19 0:53 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 14/33] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 15/33] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 16/33] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 17/33] dimm: abstract dimm device from pc-dimm Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-24 3:20 ` Bharata B Rao 2015-10-24 3:20 ` [Qemu-devel] " Bharata B Rao 2015-10-28 14:31 ` Xiao Guangrong 2015-10-28 14:31 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 18/33] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 19/33] dimm: keep the state of the whole backend memory Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 20/33] dimm: introduce realize callback Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 21/33] nvdimm: implement NVDIMM device abstract Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 22/33] docs: add NVDIMM ACPI documentation Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 23/33] nvdimm acpi: init the address region used by NVDIMM ACPI Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-18 17:15 ` Michael S. Tsirkin 2015-10-18 17:15 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-19 3:58 ` Xiao Guangrong 2015-10-19 3:58 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 24/33] nvdimm acpi: build ACPI NFIT table Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 25/33] nvdimm acpi: init the address region used by DSM Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 26/33] nvdimm acpi: build ACPI nvdimm devices Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 27/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-18 17:16 ` Michael S. Tsirkin 2015-10-18 17:16 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-19 4:04 ` Xiao Guangrong 2015-10-19 4:04 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 6:57 ` Michael S. Tsirkin 2015-10-19 6:57 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-19 7:09 ` Michael S. Tsirkin 2015-10-19 7:09 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-19 17:29 ` Dan Williams 2015-10-19 17:29 ` [Qemu-devel] " Dan Williams 2015-10-19 21:19 ` Michael S. Tsirkin 2015-10-19 21:19 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-19 21:29 ` Dan Williams 2015-10-19 21:29 ` [Qemu-devel] " Dan Williams 2015-10-19 0:54 ` [PATCH v4 28/33] nvdimm acpi: support DSM_FUN_IMPLEMENTED function Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-18 18:05 ` Michael S. Tsirkin 2015-10-18 18:05 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-19 4:39 ` Xiao Guangrong 2015-10-19 4:39 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 7:06 ` Michael S. Tsirkin 2015-10-19 7:06 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-19 7:39 ` Xiao Guangrong 2015-10-19 7:39 ` [Qemu-devel] " Xiao Guangrong 2015-10-20 15:51 ` Stefan Hajnoczi 2015-10-20 15:51 ` [Qemu-devel] " Stefan Hajnoczi 2015-10-20 16:05 ` Michael S. Tsirkin 2015-10-20 16:05 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-20 16:26 ` Xiao Guangrong 2015-10-20 16:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-20 16:29 ` Xiao Guangrong 2015-10-20 16:29 ` [Qemu-devel] " Xiao Guangrong 2015-10-21 10:49 ` Stefan Hajnoczi 2015-10-21 10:49 ` [Qemu-devel] " Stefan Hajnoczi 2015-10-21 13:32 ` Xiao Guangrong 2015-10-21 13:32 ` [Qemu-devel] " Xiao Guangrong 2015-10-29 14:36 ` Igor Mammedov 2015-10-29 14:36 ` [Qemu-devel] " Igor Mammedov 2015-10-19 0:54 ` [PATCH v4 29/33] nvdimm acpi: support DSM_DEV_FUN_NAMESPACE_LABEL_SIZE function Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 30/33] nvdimm acpi: support DSM_DEV_FUN_GET_NAMESPACE_LABEL_DATA Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 31/33] nvdimm acpi: support DSM_DEV_FUN_SET_NAMESPACE_LABEL_DATA Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 32/33] nvdimm: allow using whole backend memory as pmem Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong 2015-10-19 0:54 ` [PATCH v4 33/33] nvdimm: add maintain info Xiao Guangrong 2015-10-19 0:54 ` [Qemu-devel] " Xiao Guangrong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1445216059-88521-8-git-send-email-guangrong.xiao@linux.intel.com \ --to=guangrong.xiao@linux.intel.com \ --cc=dan.j.williams@intel.com \ --cc=ehabkost@redhat.com \ --cc=gleb@kernel.org \ --cc=imammedo@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ --cc=stefanha@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.