From patchwork Wed Apr 15 03:35:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Jingqi" X-Patchwork-Id: 1270852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4927T40k3Kz9sQx for ; Wed, 15 Apr 2020 13:42:00 +1000 (AEST) Received: from localhost ([::1]:42364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOYw2-0004IT-2l for incoming@patchwork.ozlabs.org; Tue, 14 Apr 2020 23:41:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48657) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOYuW-00029H-2P for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOYuU-0000ko-GF for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:23 -0400 Received: from mga01.intel.com ([192.55.52.88]:4321) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOYuT-0000il-Uv for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:22 -0400 IronPort-SDR: hsv30nG8nXvtUPIKpFnMYV2L9NgJgQM+iS4+kOcIB4lbb6oLR5orFFr0tDjHslRnxEQ5XCCIfQ s4wUB9A1RIow== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2020 20:40:15 -0700 IronPort-SDR: aSpHhgfP5+7mUNptpgEg8lFvXL60uKwnRf6uPJy7OKAjYKNnS7/fLhRD9kPp0v9TGqGvx04iTT lrziVRl0/cPQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,385,1580803200"; d="scan'208";a="256729954" Received: from dazhang1-mobile.sh.intel.com ([10.239.48.70]) by orsmga006.jf.intel.com with ESMTP; 14 Apr 2020 20:40:13 -0700 From: Jingqi Liu To: Paolo Bonzini , Richard Henderson , Xiao Guangrong , Dan Williams Subject: [PATCH v2 1/3] exec: fetch the alignment of Linux devdax pmem character device nodes Date: Wed, 15 Apr 2020 11:35:36 +0800 Message-Id: <20200415033538.43329-2-jingqi.liu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200415033538.43329-1-jingqi.liu@intel.com> References: <20200415033538.43329-1-jingqi.liu@intel.com> X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 192.55.52.88 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jingqi Liu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If the backend file is devdax pmem character device, the alignment specified by the option 'align=NUM' in the '-object memory-backend-file' needs to match the alignment requirement of the devdax pmem character device. This patch uses the interfaces of libdaxctl to fetch the devdax pmem file 'align', so that we can compare it with the NUM of 'align=NUM'. The NUM needs to be larger than or equal to the devdax pmem file 'align'. It also fixes the problem that mmap() returns failure in qemu_ram_mmap() when the NUM of 'align=NUM' is less than the devdax pmem file 'align'. Suggested-by: Dan Williams Signed-off-by: Jingqi Liu --- exec.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index de9d949902..2c3444e47e 100644 --- a/exec.c +++ b/exec.c @@ -77,6 +77,10 @@ #include "monitor/monitor.h" +#ifdef CONFIG_LIBDAXCTL +#include +#endif + //#define DEBUG_SUBPAGE #if !defined(CONFIG_USER_ONLY) @@ -1736,6 +1740,46 @@ static int64_t get_file_size(int fd) return size; } +static int64_t get_file_align(int fd) +{ + int64_t align = -1; +#if defined(__linux__) && defined(CONFIG_LIBDAXCTL) + struct stat st; + + if (fstat(fd, &st) < 0) { + return -errno; + } + + /* Special handling for devdax character devices */ + if (S_ISCHR(st.st_mode)) { + g_autofree char *path = NULL; + g_autofree char *rpath = NULL; + struct daxctl_ctx *ctx; + struct daxctl_region *region; + int rc = 0; + + path = g_strdup_printf("/sys/dev/char/%d:%d", + major(st.st_rdev), minor(st.st_rdev)); + rpath = realpath(path, NULL); + + rc = daxctl_new(&ctx); + if (rc) { + return -1; + } + + daxctl_region_foreach(ctx, region) { + if (strstr(rpath, daxctl_region_get_path(region))) { + align = daxctl_region_get_align(region); + break; + } + } + daxctl_unref(ctx); + } +#endif /* defined(__linux__) && defined(CONFIG_LIBDAXCTL) */ + + return align; +} + static int file_ram_open(const char *path, const char *region_name, bool *created, @@ -2275,7 +2319,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, { RAMBlock *new_block; Error *local_err = NULL; - int64_t file_size; + int64_t file_size, file_align; /* Just support these ram flags by now. */ assert((ram_flags & ~(RAM_SHARED | RAM_PMEM)) == 0); @@ -2311,6 +2355,14 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, return NULL; } + file_align = get_file_align(fd); + if (file_align > 0 && mr && file_align > mr->align) { + error_setg(errp, "backing store align 0x%" PRIx64 + " is larger than 'align' option 0x" RAM_ADDR_FMT, + file_align, mr->align); + return NULL; + } + new_block = g_malloc0(sizeof(*new_block)); new_block->mr = mr; new_block->used_length = size; From patchwork Wed Apr 15 03:35:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Jingqi" X-Patchwork-Id: 1270851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4927T41yjcz9sSX for ; Wed, 15 Apr 2020 13:42:00 +1000 (AEST) Received: from localhost ([::1]:42366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOYw2-0004Kh-6Z for incoming@patchwork.ozlabs.org; Tue, 14 Apr 2020 23:41:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48654) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOYuW-000295-1p for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOYuU-0000kj-G0 for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:23 -0400 Received: from mga01.intel.com ([192.55.52.88]:4323) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOYuU-0000jA-0X for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:22 -0400 IronPort-SDR: VJhoo/Om8EEMi09m5tPil2QmzCj2Su/N4SrlkJnER8OzsECB3iInjD8slfWWX5KFS+lKUo1AQI t3KUDeD9RtTQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2020 20:40:17 -0700 IronPort-SDR: stj/CEM85xbeawe0j05JhvWneRlBBntwJhlPCiM/DboGrfuPlM92I5bx6LcL1KGpwKZ9rIFJt0 dLTdzhtsSxDQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,385,1580803200"; d="scan'208";a="256729963" Received: from dazhang1-mobile.sh.intel.com ([10.239.48.70]) by orsmga006.jf.intel.com with ESMTP; 14 Apr 2020 20:40:15 -0700 From: Jingqi Liu To: Paolo Bonzini , Richard Henderson , Xiao Guangrong , Dan Williams Subject: [PATCH v2 2/3] docs/nvdimm: add description of alignment requirement of device dax Date: Wed, 15 Apr 2020 11:35:37 +0800 Message-Id: <20200415033538.43329-3-jingqi.liu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200415033538.43329-1-jingqi.liu@intel.com> References: <20200415033538.43329-1-jingqi.liu@intel.com> X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 192.55.52.88 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jingqi Liu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" For device dax (e.g., /dev/dax0.0), the NUM of 'align=NUM' option needs to match the alignment requirement of the device dax. It must be larger than or equal to the 'align' of device dax. Signed-off-by: Jingqi Liu --- docs/nvdimm.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt index 362e99109e..3c7b6dab5f 100644 --- a/docs/nvdimm.txt +++ b/docs/nvdimm.txt @@ -132,6 +132,15 @@ address to the page size (getpagesize(2)) by default. However, some types of backends may require an alignment different than the page size. In that case, QEMU v2.12.0 and later provide 'align' option to memory-backend-file to allow users to specify the proper alignment. +For device dax (e.g., /dev/dax0.0), this alignment needs to match the +alignment requirement of the device dax. The NUM of 'align=NUM' option +must be larger than or equal to the 'align' of device dax. +We can use the following command to show the 'align' of device dax. + + ndctl list -X + +In order to get the proper 'align' of device dax, you need to install +the library 'libdaxctl'. For example, device dax require the 2 MB alignment, so we can use following QEMU command line options to use it (/dev/dax0.0) as the From patchwork Wed Apr 15 03:35:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liu, Jingqi" X-Patchwork-Id: 1270847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4927Rm6VWjz9sSX for ; Wed, 15 Apr 2020 13:40:51 +1000 (AEST) Received: from localhost ([::1]:42352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOYuv-0002DD-TX for incoming@patchwork.ozlabs.org; Tue, 14 Apr 2020 23:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48666) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOYuW-0002A1-6p for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOYuU-0000l3-Ur for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:24 -0400 Received: from mga01.intel.com ([192.55.52.88]:4319) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOYuU-0000iK-LK for qemu-devel@nongnu.org; Tue, 14 Apr 2020 23:40:22 -0400 IronPort-SDR: Vso2MVOuXhj6IrylKLZ5Z2G2aUgZB3/GkWDmqTq/n+5pIHFf3a3yepjvw9ZVmhjZd1P/hmO3AM 5CUnBG/lJ9zA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2020 20:40:19 -0700 IronPort-SDR: EdPkNu5xjSXD4FZCpo1TdrgpS97aHxyJXq2yKdksV0tKeUMzPMhQXH+8wMznzuvl+kAzMlg3Ze ytZXUrgV1FRA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,385,1580803200"; d="scan'208";a="256729973" Received: from dazhang1-mobile.sh.intel.com ([10.239.48.70]) by orsmga006.jf.intel.com with ESMTP; 14 Apr 2020 20:40:17 -0700 From: Jingqi Liu To: Paolo Bonzini , Richard Henderson , Xiao Guangrong , Dan Williams Subject: [PATCH v2 3/3] configure: add libdaxctl support Date: Wed, 15 Apr 2020 11:35:38 +0800 Message-Id: <20200415033538.43329-4-jingqi.liu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200415033538.43329-1-jingqi.liu@intel.com> References: <20200415033538.43329-1-jingqi.liu@intel.com> X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 192.55.52.88 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jingqi Liu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add a pair of configure options --{enable,disable}-libdaxctl to control whether QEMU is compiled with libdaxctl [1]. Libdaxctl is a utility library for managing the device dax subsystem. QEMU uses mmap(2) to maps vNVDIMM backends and aligns the mapping address to the page size (getpagesize(2)) by default. However, some types of backends may require an alignment different than the page size. The 'align' option is provided to memory-backend-file to allow users to specify the proper alignment. For device dax (e.g., /dev/dax0.0), the 'align' option needs to match the alignment requirement of the device dax, which can be fetched through the libdaxctl APIs. [1] Libdaxctl is a part of ndctl project. The project's repository is: https://github.com/pmem/ndctl For more information about libdaxctl APIs, you can refer to the comments in source code of: pmem/ndctl/daxctl/lib/libdaxctl.c. Signed-off-by: Jingqi Liu --- configure | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/configure b/configure index e225a1e3ff..df1752cf08 100755 --- a/configure +++ b/configure @@ -509,6 +509,7 @@ libpmem="" default_devices="yes" plugins="no" fuzzing="no" +libdaxctl="" supported_cpu="no" supported_os="no" @@ -1601,6 +1602,10 @@ for opt do ;; --gdb=*) gdb_bin="$optarg" ;; + --enable-libdaxctl) libdaxctl=yes + ;; + --disable-libdaxctl) libdaxctl=no + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -1894,6 +1899,7 @@ disabled with --disable-FEATURE, default is enabled if available: debug-mutex mutex debugging support libpmem libpmem support xkbcommon xkbcommon support + libdaxctl libdaxctl support NOTE: The object files are built at the place where configure is launched EOF @@ -6190,6 +6196,25 @@ if test "$libpmem" != "no"; then fi fi +########################################## +# check for libdaxctl + +if test "$libdaxctl" != "no"; then + if $pkg_config --exists "libdaxctl"; then + libdaxctl="yes" + libdaxctl_libs=$($pkg_config --libs libdaxctl) + libdaxctl_cflags=$($pkg_config --cflags libdaxctl) + libs_softmmu="$libs_softmmu $libdaxctl_libs" + QEMU_CFLAGS="$QEMU_CFLAGS $libdaxctl_cflags" + else + if test "$libdaxctl" = "yes" ; then + feature_not_found "libdaxctl" "Install libdaxctl" + fi + libdaxctl="no" + fi +fi + + ########################################## # check for slirp @@ -6767,6 +6792,7 @@ echo "parallels support $parallels" echo "sheepdog support $sheepdog" echo "capstone $capstone" echo "libpmem support $libpmem" +echo "libdaxctl support $libdaxctl" echo "libudev $libudev" echo "default devices $default_devices" echo "plugin support $plugins" @@ -7590,6 +7616,10 @@ if test "$libpmem" = "yes" ; then echo "CONFIG_LIBPMEM=y" >> $config_host_mak fi +if test "$libdaxctl" = "yes" ; then + echo "CONFIG_LIBDAXCTL=y" >> $config_host_mak +fi + if test "$bochs" = "yes" ; then echo "CONFIG_BOCHS=y" >> $config_host_mak fi