From nobody Sat Nov 8 08:17:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549443744325864.6130522299462; Wed, 6 Feb 2019 01:02:24 -0800 (PST) Received: from localhost ([127.0.0.1]:47160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grJ66-0008Vo-Pc for importer@patchew.org; Wed, 06 Feb 2019 04:02:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grJ3l-0007BY-P4 for qemu-devel@nongnu.org; Wed, 06 Feb 2019 03:59:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grJ0q-0004ML-DC for qemu-devel@nongnu.org; Wed, 06 Feb 2019 03:56:58 -0500 Received: from mga01.intel.com ([192.55.52.88]:8357) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grJ0m-0004Ck-LX for qemu-devel@nongnu.org; Wed, 06 Feb 2019 03:56:54 -0500 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Feb 2019 00:56:35 -0800 Received: from dazhang1-ssd.sh.intel.com (HELO localhost) ([10.239.48.91]) by fmsmga008.fm.intel.com with ESMTP; 06 Feb 2019 00:56:33 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,339,1544515200"; d="scan'208";a="122357783" From: "Zhang, Yi" To: xiaoguangrong.eric@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, pagupta@redhat.com, yu.c.zhang@linux.intel.com, richardw.yang@linux.intel.com, mst@redhat.com, ehabkost@redhat.com Date: Thu, 7 Feb 2019 01:27:19 +0800 Message-Id: X-Mailer: git-send-email 2.7.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH V12 4/5] util/mmap-alloc: support MAP_SYNC in qemu_ram_mmap() 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: imammedo@redhat.com, dan.j.williams@intel.com, qemu-devel@nongnu.org, Zhang Yi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Zhang Yi When a file supporting DAX is used as vNVDIMM backend, mmap it with MAP_SYNC flag in addition which can ensure file system metadata synced in each guest writes to the backend file, without other QEMU actions (e.g., periodic fsync() by QEMU). Current, We have below different possible use cases: 1. pmem=3Don is set, shared=3Don is set, MAP_SYNC supported: a: backend is a dax supporting file. - MAP_SYNC will active. b: backend is not a dax supporting file. - mmap will trigger a warning. then MAP_SYNC flag will be ignored 2. The rest of cases: - we will never pass the MAP_SYNC to mmap2 Signed-off-by: Haozhong Zhang Signed-off-by: Zhang Yi --- include/qemu/osdep.h | 7 +++++++ util/mmap-alloc.c | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 457d24e..9a94cc3 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -115,6 +115,13 @@ extern int daemon(int, int); #include "sysemu/os-win32.h" #endif =20 +#ifdef CONFIG_LINUX +#include +#else /* !CONFIG_LINUX */ +#define MAP_SYNC 0x0 +#define MAP_SHARED_VALIDATE 0x0 +#endif /* CONFIG_LINUX */ + #ifdef CONFIG_POSIX #include "sysemu/os-posix.h" #endif diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 97bbeed..e4e55fc 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -15,6 +15,7 @@ #include "qemu/host-utils.h" =20 #define HUGETLBFS_MAGIC 0x958458f6 +#define MAP_SYNC_FLAGS (MAP_SYNC | MAP_SHARED_VALIDATE) =20 #ifdef CONFIG_LINUX #include @@ -101,6 +102,7 @@ void *qemu_ram_mmap(int fd, #else void *ptr =3D mmap(0, total, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -= 1, 0); #endif + int mmap_flags; size_t offset; void *ptr1; =20 @@ -111,13 +113,33 @@ void *qemu_ram_mmap(int fd, assert(is_power_of_2(align)); /* Always align to host page size */ assert(align >=3D getpagesize()); + mmap_flags =3D shared ? MAP_SHARED : MAP_PRIVATE; + if (shared && is_pmem) { + mmap_flags |=3D MAP_SYNC_FLAGS; + } =20 offset =3D QEMU_ALIGN_UP((uintptr_t)ptr, align) - (uintptr_t)ptr; ptr1 =3D mmap(ptr + offset, size, PROT_READ | PROT_WRITE, MAP_FIXED | (fd =3D=3D -1 ? MAP_ANONYMOUS : 0) | - (shared ? MAP_SHARED : MAP_PRIVATE), + mmap_flags, fd, 0); + + + if (ptr1 =3D=3D MAP_FAILED && + (mmap_flags & MAP_SYNC_FLAGS) =3D=3D MAP_SYNC_FLAGS) { + if (errno =3D=3D ENOTSUP) { + perror("failed to validate with mapping flags"); + } + /* if map failed with MAP_SHARED_VALIDATE | MAP_SYNC, + * we will remove these flags to handle compatibility. + */ + ptr1 =3D mmap(ptr + offset, size, PROT_READ | PROT_WRITE, + MAP_FIXED | + (fd =3D=3D -1 ? MAP_ANONYMOUS : 0) | + MAP_SHARED, + fd, 0); + } if (ptr1 =3D=3D MAP_FAILED) { munmap(ptr, total); return MAP_FAILED; --=20 2.7.4