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 v6 07/33] util: introduce qemu_file_get_page_size() Date: Fri, 30 Oct 2015 13:56:01 +0800 [thread overview] Message-ID: <1446184587-142784-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1446184587-142784-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 b568424..d4dde02 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -302,4 +302,5 @@ int qemu_read_password(char *buf, int buf_size); */ pid_t qemu_fork(Error **errp); +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 ac70f08..c661f1c 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -308,28 +308,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 914cef5..ad94c5a 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 09f9e98..a18aa87 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 v6 07/33] util: introduce qemu_file_get_page_size() Date: Fri, 30 Oct 2015 13:56:01 +0800 [thread overview] Message-ID: <1446184587-142784-8-git-send-email-guangrong.xiao@linux.intel.com> (raw) In-Reply-To: <1446184587-142784-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 b568424..d4dde02 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -302,4 +302,5 @@ int qemu_read_password(char *buf, int buf_size); */ pid_t qemu_fork(Error **errp); +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 ac70f08..c661f1c 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -308,28 +308,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 914cef5..ad94c5a 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 09f9e98..a18aa87 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-30 6:02 UTC|newest] Thread overview: 182+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-30 5:55 [PATCH v6 00/33] implement vNVDIMM Xiao Guangrong 2015-10-30 5:55 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:55 ` [PATCH v6 01/33] acpi: add aml_derefof Xiao Guangrong 2015-10-30 5:55 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:55 ` [PATCH v6 02/33] acpi: add aml_sizeof Xiao Guangrong 2015-10-30 5:55 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:55 ` [PATCH v6 03/33] acpi: add aml_create_field Xiao Guangrong 2015-10-30 5:55 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:55 ` [PATCH v6 04/33] acpi: add aml_concatenate Xiao Guangrong 2015-10-30 5:55 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:55 ` [PATCH v6 05/33] acpi: add aml_object_type Xiao Guangrong 2015-10-30 5:55 ` [Qemu-devel] " Xiao Guangrong 2015-11-09 11:35 ` Michael S. Tsirkin 2015-11-09 11:35 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 12:40 ` Igor Mammedov 2015-11-09 12:40 ` [Qemu-devel] " Igor Mammedov 2015-10-30 5:56 ` [PATCH v6 06/33] acpi: add aml_method_serialized Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-11-09 11:14 ` Michael S. Tsirkin 2015-11-09 11:14 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 11:18 ` Xiao Guangrong 2015-11-09 11:18 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` Xiao Guangrong [this message] 2015-10-30 5:56 ` [Qemu-devel] [PATCH v6 07/33] util: introduce qemu_file_get_page_size() Xiao Guangrong 2015-10-30 13:26 ` Vladimir Sementsov-Ogievskiy 2015-10-30 13:26 ` Vladimir Sementsov-Ogievskiy 2015-10-31 7:26 ` Xiao Guangrong 2015-10-31 7:26 ` [Qemu-devel] " Xiao Guangrong 2015-10-31 9:37 ` Vladimir Sementsov-Ogievskiy 2015-10-31 9:37 ` Vladimir Sementsov-Ogievskiy 2015-10-31 14:06 ` Xiao Guangrong 2015-10-31 14:06 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 15:54 ` Eduardo Habkost 2015-10-30 15:54 ` [Qemu-devel] " Eduardo Habkost 2015-10-31 8:09 ` Xiao Guangrong 2015-10-31 8:09 ` [Qemu-devel] " Xiao Guangrong 2015-10-31 14:11 ` Eduardo Habkost 2015-10-31 14:11 ` [Qemu-devel] " Eduardo Habkost 2015-10-31 17:03 ` Xiao Guangrong 2015-10-31 17:03 ` [Qemu-devel] " Xiao Guangrong 2015-11-09 20:00 ` Michael S. Tsirkin 2015-11-09 20:00 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-31 8:25 ` Xiao Guangrong 2015-10-31 8:25 ` [Qemu-devel] " Xiao Guangrong 2015-11-09 10:33 ` Michael S. Tsirkin 2015-11-09 10:33 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 10:55 ` Xiao Guangrong 2015-11-09 10:55 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 08/33] exec: allow memory to be allocated from any kind of path Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 14:04 ` Vladimir Sementsov-Ogievskiy 2015-10-30 14:04 ` Vladimir Sementsov-Ogievskiy 2015-10-31 7:44 ` Xiao Guangrong 2015-10-31 13:55 ` Eduardo Habkost 2015-10-31 13:55 ` Eduardo Habkost 2015-10-31 15:56 ` Xiao Guangrong 2015-10-31 15:56 ` Xiao Guangrong 2015-11-09 10:39 ` Michael S. Tsirkin 2015-11-09 10:39 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 11:01 ` Xiao Guangrong 2015-11-09 11:01 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 09/33] exec: allow file_ram_alloc to work on file Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 14:25 ` Vladimir Sementsov-Ogievskiy 2015-10-30 14:25 ` Vladimir Sementsov-Ogievskiy 2015-10-31 7:53 ` Xiao Guangrong 2015-10-31 7:53 ` [Qemu-devel] " Xiao Guangrong 2015-11-09 10:13 ` Michael S. Tsirkin 2015-11-09 10:13 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 10:48 ` Xiao Guangrong 2015-11-09 10:48 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 10/33] hostmem-file: clean up memory allocation Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 14:54 ` Vladimir Sementsov-Ogievskiy 2015-10-30 14:54 ` Vladimir Sementsov-Ogievskiy 2015-10-30 5:56 ` [PATCH v6 11/33] hostmem-file: use whole file size if possible Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 15:27 ` Vladimir Sementsov-Ogievskiy 2015-10-30 15:27 ` Vladimir Sementsov-Ogievskiy 2015-10-31 7:59 ` Xiao Guangrong 2015-10-31 7:59 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 17:30 ` Eduardo Habkost 2015-10-30 17:30 ` Eduardo Habkost 2015-10-31 8:46 ` Xiao Guangrong 2015-10-31 8:46 ` Xiao Guangrong 2015-10-31 13:45 ` Eduardo Habkost 2015-10-31 13:45 ` Eduardo Habkost 2015-10-31 16:59 ` Xiao Guangrong 2015-10-31 16:59 ` [Qemu-devel] " Xiao Guangrong 2015-11-09 10:17 ` Michael S. Tsirkin 2015-11-09 10:17 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 10:49 ` Xiao Guangrong 2015-11-09 10:49 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 12/33] pc-dimm: remove DEFAULT_PC_DIMMSIZE Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-11-09 10:40 ` Michael S. Tsirkin 2015-11-09 10:40 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 11:03 ` Xiao Guangrong 2015-11-09 11:03 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 13/33] pc-dimm: make pc_existing_dimms_capacity static and rename it Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 15:38 ` Vladimir Sementsov-Ogievskiy 2015-10-30 15:38 ` Vladimir Sementsov-Ogievskiy 2015-10-30 5:56 ` [PATCH v6 14/33] pc-dimm: drop the prefix of pc-dimm Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 16:10 ` Vladimir Sementsov-Ogievskiy 2015-10-30 16:10 ` Vladimir Sementsov-Ogievskiy 2015-10-31 8:18 ` Xiao Guangrong 2015-10-30 17:06 ` Eric Blake 2015-10-31 8:23 ` Xiao Guangrong 2015-11-09 20:05 ` Michael S. Tsirkin 2015-11-09 20:05 ` [Qemu-devel] " Michael S. Tsirkin 2015-10-30 5:56 ` [PATCH v6 15/33] stubs: rename qmp_pc_dimm_device_list.c Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 16/33] pc-dimm: rename pc-dimm.c and pc-dimm.h Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-31 10:28 ` Vladimir Sementsov-Ogievskiy 2015-10-31 10:28 ` Vladimir Sementsov-Ogievskiy 2015-10-30 5:56 ` [PATCH v6 17/33] dimm: abstract dimm device from pc-dimm Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-31 10:41 ` Vladimir Sementsov-Ogievskiy 2015-10-31 10:41 ` [Qemu-devel] " Vladimir Sementsov-Ogievskiy 2015-10-30 5:56 ` [PATCH v6 18/33] dimm: get mapped memory region from DIMMDeviceClass->get_memory_region Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-31 10:52 ` Vladimir Sementsov-Ogievskiy 2015-10-31 10:52 ` Vladimir Sementsov-Ogievskiy 2015-10-31 14:15 ` Xiao Guangrong 2015-10-31 14:15 ` [Qemu-devel] " Xiao Guangrong 2015-11-02 9:18 ` Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 19/33] dimm: keep the state of the whole backend memory Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-31 11:05 ` Vladimir Sementsov-Ogievskiy 2015-10-31 11:05 ` Vladimir Sementsov-Ogievskiy 2015-10-31 14:19 ` Xiao Guangrong 2015-11-09 11:04 ` Michael S. Tsirkin 2015-11-09 11:04 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 11:13 ` Xiao Guangrong 2015-11-09 11:13 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 20/33] dimm: introduce realize callback Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-31 11:22 ` Vladimir Sementsov-Ogievskiy 2015-10-31 11:22 ` [Qemu-devel] " Vladimir Sementsov-Ogievskiy 2015-10-30 5:56 ` [PATCH v6 21/33] nvdimm: implement NVDIMM device abstract Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 22/33] docs: add NVDIMM ACPI documentation Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 23/33] nvdimm acpi: init the resource used by NVDIMM ACPI Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 24/33] nvdimm acpi: build ACPI NFIT table Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 25/33] nvdimm acpi: build ACPI nvdimm devices Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-11-08 17:38 ` Michael S. Tsirkin 2015-11-08 17:38 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 6:07 ` Xiao Guangrong 2015-11-09 6:07 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 26/33] nvdimm acpi: save arg3 for NVDIMM device _DSM method Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 27/33] nvdimm acpi: support function 0 Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 10:14 ` Stefan Hajnoczi 2015-10-30 10:14 ` [Qemu-devel] " Stefan Hajnoczi 2015-10-30 13:01 ` Xiao Guangrong 2015-10-30 13:01 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 28/33] nvdimm acpi: support Get Namespace Label Size function Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 29/33] nvdimm acpi: support Get Namespace Label Data function Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 30/33] nvdimm acpi: support Set " Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 31/33] nvdimm: allow using whole backend memory as pmem Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 32/33] nvdimm acpi: support _FIT method Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-11-08 17:50 ` Michael S. Tsirkin 2015-11-08 17:50 ` [Qemu-devel] " Michael S. Tsirkin 2015-11-09 6:37 ` Xiao Guangrong 2015-11-09 6:37 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 5:56 ` [PATCH v6 33/33] nvdimm: add maintain info Xiao Guangrong 2015-10-30 5:56 ` [Qemu-devel] " Xiao Guangrong 2015-10-30 10:15 ` [PATCH v6 00/33] implement vNVDIMM Stefan Hajnoczi 2015-10-30 10:15 ` [Qemu-devel] " Stefan Hajnoczi
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=1446184587-142784-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.