From nobody Tue Oct 28 04:14:08 2025 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; 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 1514164208049972.3249568426928; Sun, 24 Dec 2017 17:10:08 -0800 (PST) Received: from localhost ([::1]:49934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eTHHD-0007vp-WC for importer@patchew.org; Sun, 24 Dec 2017 20:10:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eTHED-00064a-1o for qemu-devel@nongnu.org; Sun, 24 Dec 2017 20:06:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eTHE9-0007nR-SJ for qemu-devel@nongnu.org; Sun, 24 Dec 2017 20:06:53 -0500 Received: from mga03.intel.com ([134.134.136.65]:31731) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eTHE9-0007mF-Iq for qemu-devel@nongnu.org; Sun, 24 Dec 2017 20:06:49 -0500 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Dec 2017 17:06:47 -0800 Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.142]) by orsmga007.jf.intel.com with ESMTP; 24 Dec 2017 17:06:45 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,452,1508828400"; d="scan'208";a="5252900" From: Haozhong Zhang To: qemu-devel@nongnu.org Date: Mon, 25 Dec 2017 09:06:10 +0800 Message-Id: <20171225010611.32621-2-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171225010611.32621-1-haozhong.zhang@intel.com> References: <20171225010611.32621-1-haozhong.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH 1/2] util/pmem: add function to make writes to pmem persistent 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: Haozhong Zhang , Xiao Guangrong , mst@redhat.com, Stefan Hajnoczi , Igor Mammedov , Dan Williams Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The new function pmem_persistent() flushes the previous cached writes on the specified memory buffer, which ensures the write persistence if the buffer is in persistent memory. Signed-off-by: Haozhong Zhang --- include/qemu/pmem.h | 25 ++++++++++ util/Makefile.objs | 1 + util/pmem.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 158 insertions(+) create mode 100644 include/qemu/pmem.h create mode 100644 util/pmem.c diff --git a/include/qemu/pmem.h b/include/qemu/pmem.h new file mode 100644 index 0000000000..6593ae1d5c --- /dev/null +++ b/include/qemu/pmem.h @@ -0,0 +1,25 @@ +/* + * Helper functions to operate on persistent memory. + * + * Copyright (c) 2017 Intel Corporation. + * + * Author: Haozhong Zhang + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#ifndef QEMU_PMEM_H +#define QEMU_PMEM_H + +/** + * Flush previous cached writes to the specified memory buffer. If the + * buffer is in persistent memory, this function will ensure the write + * persistence. + * + * @p: the pointer to the memory buffer + * @len: the length in bytes of the memory buffer + */ +void pmem_persistent(void *p, unsigned long len); + +#endif /* QEMU_PMEM_H */ diff --git a/util/Makefile.objs b/util/Makefile.objs index 2973b0a323..2614a84a9e 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -41,6 +41,7 @@ util-obj-y +=3D timed-average.o util-obj-y +=3D base64.o util-obj-y +=3D log.o util-obj-y +=3D pagesize.o +util-obj-y +=3D pmem.o util-obj-y +=3D qdist.o util-obj-y +=3D qht.o util-obj-y +=3D range.o diff --git a/util/pmem.c b/util/pmem.c new file mode 100644 index 0000000000..44be1dde58 --- /dev/null +++ b/util/pmem.c @@ -0,0 +1,132 @@ +/* + * Helper functions to operate on persistent memory. + * + * Copyright (c) 2017 Intel Corporation. + * + * Author: Haozhong Zhang + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "qemu/pmem.h" + +static size_t cache_line_size; + +typedef void (*cache_flush_func_t)(void *p); +typedef void (*store_fence_func_t)(void); + +static cache_flush_func_t cache_flush_func; +static store_fence_func_t store_fence_func; + +#if defined(__x86_64__) || defined(__i386__) + +#define CPUID_1_0_EBX_CLSIZE_MASK 0x0000ff00 +#define CPUID_1_0_EBX_CLSIZE_SHIFT 8 +#define CPUID_1_0_EDX_CLFLUSH (1U << 19) +#define CPUID_7_0_EBX_CLFLUSHOPT (1U << 23) +#define CPUID_7_0_EBX_CLWB (1U << 24) + +static inline void cpuid(uint32_t function, uint32_t count, + uint32_t *eax, uint32_t *ebx, + uint32_t *ecx, uint32_t *edx) +{ + uint32_t vec[4]; + +#ifdef __x86_64__ + asm volatile("cpuid" + : "=3Da"(vec[0]), "=3Db"(vec[1]), + "=3Dc"(vec[2]), "=3Dd"(vec[3]) + : "0"(function), "c"(count) : "cc"); +#else + asm volatile("pusha\n\t" + "cpuid\n\t" + "mov %%eax, 0(%2)\n\t" + "mov %%ebx, 4(%2)\n\t" + "mov %%ecx, 8(%2)\n\t" + "mov %%edx, 12(%2)\n\t" + "popa" + : : "a"(function), "c"(count), "S"(vec) + : "memory", "cc"); +#endif + + if (eax) { + *eax =3D vec[0]; + } + if (ebx) { + *ebx =3D vec[1]; + } + if (ecx) { + *ecx =3D vec[2]; + } + if (edx) { + *edx =3D vec[3]; + } +} + +static void clflush(void *p) +{ + asm volatile("clflush %0" : "+m" (*(volatile char *)p)); +} + +static void clflushopt(void *p) +{ + asm volatile(".byte 0x66; clflush %0" : "+m" (*(volatile char *)p)); +} + +static void clwb(void *p) +{ + asm volatile(".byte 0x66; xsaveopt %0" : "+m" (*(volatile char *)p)); +} + +static void sfence(void) +{ + asm volatile("sfence" : : : "memory"); +} + +static void __attribute__((constructor)) init_funcs(void) +{ + uint32_t ebx, edx; + + cpuid(0x1, 0x0, NULL, &ebx, NULL, &edx); + + cache_line_size =3D ((ebx & CPUID_1_0_EBX_CLSIZE_MASK) >> + CPUID_1_0_EBX_CLSIZE_SHIFT) * 8; + assert(cache_line_size && !(cache_line_size & (cache_line_size - 1))); + + cpuid(0x7, 0x0, NULL, &ebx, NULL, NULL); + if (ebx & CPUID_7_0_EBX_CLWB) { + cache_flush_func =3D clwb; + } else if (ebx & CPUID_7_0_EBX_CLFLUSHOPT) { + cache_flush_func =3D clflushopt; + } else { + if (edx & CPUID_1_0_EDX_CLFLUSH) { + cache_flush_func =3D clflush; + } + } + + store_fence_func =3D sfence; +} + +#endif /* __x86_64__ || __i386__ */ + +void pmem_persistent(void *p, unsigned long len) +{ + uintptr_t s, e; + + if (!cache_flush_func || !store_fence_func) { + return; + } + + s =3D (uintptr_t)p & ~(cache_line_size - 1); + e =3D (uintptr_t)p + len; + + while (s < e) { + cache_flush_func((void *)s); + s +=3D cache_line_size; + } + + store_fence_func(); +} --=20 2.14.1 From nobody Tue Oct 28 04:14:08 2025 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; 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 15141641072664.812616860412277; Sun, 24 Dec 2017 17:08:27 -0800 (PST) Received: from localhost ([::1]:49870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eTHFc-0006oF-Ol for importer@patchew.org; Sun, 24 Dec 2017 20:08:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eTHED-00064Z-1Q for qemu-devel@nongnu.org; Sun, 24 Dec 2017 20:06:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eTHEA-0007no-CO for qemu-devel@nongnu.org; Sun, 24 Dec 2017 20:06:53 -0500 Received: from mga03.intel.com ([134.134.136.65]:31731) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eTHEA-0007mF-1o for qemu-devel@nongnu.org; Sun, 24 Dec 2017 20:06:50 -0500 Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Dec 2017 17:06:49 -0800 Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.142]) by orsmga007.jf.intel.com with ESMTP; 24 Dec 2017 17:06:48 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,452,1508828400"; d="scan'208";a="5252910" From: Haozhong Zhang To: qemu-devel@nongnu.org Date: Mon, 25 Dec 2017 09:06:11 +0800 Message-Id: <20171225010611.32621-3-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171225010611.32621-1-haozhong.zhang@intel.com> References: <20171225010611.32621-1-haozhong.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH 2/2] mem/nvdimm: ensure persistence of QEMU writes to real NVDIMM device 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: Haozhong Zhang , Xiao Guangrong , mst@redhat.com, Stefan Hajnoczi , Igor Mammedov , Dan Williams Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" QEMU intercepts guest writes to vNVDIMM labels, and then stores them to the backend. When the backend is a real NVDIMM device, QEMU needs to ensure the write persistence before returning to guest, so that the guest labels will not be lost if QEMU exits abnormally. Signed-off-by: Haozhong Zhang --- hw/mem/nvdimm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 952fce5ec8..b644876eb1 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/pmem.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/mem/nvdimm.h" @@ -135,6 +136,8 @@ static void nvdimm_write_label_data(NVDIMMDevice *nvdim= m, const void *buf, nvdimm_validate_rw_label_data(nvdimm, size, offset); =20 memcpy(nvdimm->label_data + offset, buf, size); + /* Make QEMU writes persistent in case the backend is a real NVDIMM. */ + pmem_persistent(nvdimm->label_data + offset, size); =20 mr =3D host_memory_backend_get_memory(dimm->hostmem, &error_abort); backend_offset =3D memory_region_size(mr) - nvdimm->label_size + offse= t; --=20 2.14.1