From: Haozhong Zhang <haozhong.zhang@intel.com>
To: xen-devel@lists.xen.org
Cc: Haozhong Zhang <haozhong.zhang@intel.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Jan Beulich <jbeulich@suse.com>,
Chao Peng <chao.p.peng@linux.intel.com>,
Dan Williams <dan.j.williams@intel.com>
Subject: [RFC XEN PATCH v3 06/39] acpi: probe valid PMEM regions via NFIT
Date: Mon, 11 Sep 2017 12:37:47 +0800 [thread overview]
Message-ID: <20170911043820.14617-7-haozhong.zhang@intel.com> (raw)
In-Reply-To: <20170911043820.14617-1-haozhong.zhang@intel.com>
A PMEM region with failures (e.g., not properly flushed in the last
power cycle, or some blocks within it are borken) cannot be safely
used by Xen and guest. Scan the state flags of NVDIMM region mapping
structures in NFIT to check whether any failures happened to a PMEM
region. The recovery of those failure are left out of Xen (e.g. left
to the firmware or other management utilities on the bare metal).
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
xen/arch/x86/acpi/boot.c | 4 ++
xen/drivers/acpi/nfit.c | 153 +++++++++++++++++++++++++++++++++++++++++++++-
xen/include/acpi/actbl1.h | 26 ++++++++
xen/include/xen/acpi.h | 1 +
4 files changed, 183 insertions(+), 1 deletion(-)
diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 8e6c96dcf6..f52a2c6dc5 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -732,5 +732,9 @@ int __init acpi_boot_init(void)
acpi_table_parse(ACPI_SIG_BGRT, acpi_invalidate_bgrt);
+#ifdef CONFIG_NVDIMM_PMEM
+ acpi_nfit_init();
+#endif
+
return 0;
}
diff --git a/xen/drivers/acpi/nfit.c b/xen/drivers/acpi/nfit.c
index e099378ee0..b88a587b8d 100644
--- a/xen/drivers/acpi/nfit.c
+++ b/xen/drivers/acpi/nfit.c
@@ -31,11 +31,143 @@ static const uint8_t nfit_spa_pmem_guid[] =
0xac, 0x43, 0x0d, 0x33, 0x18, 0xb7, 0x8c, 0xdb,
};
+struct nfit_spa_desc {
+ struct list_head link;
+ struct acpi_nfit_system_address *acpi_table;
+};
+
+struct nfit_memdev_desc {
+ struct list_head link;
+ struct acpi_nfit_memory_map *acpi_table;
+ struct nfit_spa_desc *spa_desc;
+};
+
struct acpi_nfit_desc {
struct acpi_table_nfit *acpi_table;
+ struct list_head spa_list;
+ struct list_head memdev_list;
};
-static struct acpi_nfit_desc nfit_desc;
+static struct acpi_nfit_desc nfit_desc = {
+ .spa_list = LIST_HEAD_INIT(nfit_desc.spa_list),
+ .memdev_list = LIST_HEAD_INIT(nfit_desc.memdev_list),
+};
+
+static void __init acpi_nfit_del_subtables(struct acpi_nfit_desc *desc)
+{
+ struct nfit_spa_desc *spa, *spa_next;
+ struct nfit_memdev_desc *memdev, *memdev_next;
+
+ list_for_each_entry_safe(spa, spa_next, &desc->spa_list, link)
+ {
+ list_del(&spa->link);
+ xfree(spa);
+ }
+ list_for_each_entry_safe (memdev, memdev_next, &desc->memdev_list, link)
+ {
+ list_del(&memdev->link);
+ xfree(memdev);
+ }
+}
+
+static int __init acpi_nfit_add_subtables(struct acpi_nfit_desc *desc)
+{
+ struct acpi_table_nfit *nfit_table = desc->acpi_table;
+ uint32_t hdr_offset = sizeof(*nfit_table);
+ uint32_t nfit_length = nfit_table->header.length;
+ struct acpi_nfit_header *hdr;
+ struct nfit_spa_desc *spa_desc;
+ struct nfit_memdev_desc *memdev_desc;
+ int ret = 0;
+
+#define INIT_DESC(desc, acpi_hdr, acpi_type, desc_list) \
+ do { \
+ (desc) = xzalloc(typeof(*(desc))); \
+ if ( unlikely(!(desc)) ) { \
+ ret = -ENOMEM; \
+ goto nomem; \
+ } \
+ (desc)->acpi_table = (acpi_type *)(acpi_hdr); \
+ INIT_LIST_HEAD(&(desc)->link); \
+ list_add_tail(&(desc)->link, (desc_list)); \
+ } while ( 0 )
+
+ while ( hdr_offset < nfit_length )
+ {
+ hdr = (void *)nfit_table + hdr_offset;
+ hdr_offset += hdr->length;
+
+ switch ( hdr->type )
+ {
+ case ACPI_NFIT_TYPE_SYSTEM_ADDRESS:
+ INIT_DESC(spa_desc, hdr, struct acpi_nfit_system_address,
+ &desc->spa_list);
+ break;
+
+ case ACPI_NFIT_TYPE_MEMORY_MAP:
+ INIT_DESC(memdev_desc, hdr, struct acpi_nfit_memory_map,
+ &desc->memdev_list);
+ break;
+
+ default:
+ continue;
+ }
+ }
+
+#undef INIT_DESC
+
+ return 0;
+
+ nomem:
+ acpi_nfit_del_subtables(desc);
+
+ return ret;
+}
+
+static void __init acpi_nfit_link_subtables(struct acpi_nfit_desc *desc)
+{
+ struct nfit_spa_desc *spa_desc;
+ struct nfit_memdev_desc *memdev_desc;
+ uint16_t spa_idx;
+
+ list_for_each_entry(memdev_desc, &desc->memdev_list, link)
+ {
+ spa_idx = memdev_desc->acpi_table->range_index;
+ list_for_each_entry(spa_desc, &desc->spa_list, link)
+ {
+ if ( spa_desc->acpi_table->range_index == spa_idx )
+ break;
+ }
+ memdev_desc->spa_desc = spa_desc;
+ }
+}
+
+static void __init acpi_nfit_register_pmem(struct acpi_nfit_desc *desc)
+{
+ struct nfit_spa_desc *spa_desc;
+ struct nfit_memdev_desc *memdev_desc;
+ struct acpi_nfit_system_address *spa;
+ unsigned long smfn, emfn;
+
+ list_for_each_entry(memdev_desc, &desc->memdev_list, link)
+ {
+ spa_desc = memdev_desc->spa_desc;
+
+ if ( !spa_desc ||
+ (memdev_desc->acpi_table->flags &
+ (ACPI_NFIT_MEM_SAVE_FAILED | ACPI_NFIT_MEM_RESTORE_FAILED |
+ ACPI_NFIT_MEM_FLUSH_FAILED | ACPI_NFIT_MEM_NOT_ARMED |
+ ACPI_NFIT_MEM_MAP_FAILED)) )
+ continue;
+
+ spa = spa_desc->acpi_table;
+ if ( memcmp(spa->range_guid, nfit_spa_pmem_guid, 16) )
+ continue;
+ smfn = paddr_to_pfn(spa->address);
+ emfn = paddr_to_pfn(spa->address + spa->length);
+ printk(XENLOG_INFO "NFIT: PMEM MFNs 0x%lx - 0x%lx\n", smfn, emfn);
+ }
+}
void __init acpi_nfit_boot_init(void)
{
@@ -53,6 +185,25 @@ void __init acpi_nfit_boot_init(void)
PAGE_HYPERVISOR);
}
+void __init acpi_nfit_init(void)
+{
+ if ( !nfit_desc.acpi_table )
+ return;
+
+ /* Collect all SPA and memory map sub-tables. */
+ if ( acpi_nfit_add_subtables(&nfit_desc) )
+ {
+ printk(XENLOG_ERR "NFIT: no memory for NFIT management\n");
+ return;
+ }
+
+ /* Link descriptors of SPA and memory map sub-tables. */
+ acpi_nfit_link_subtables(&nfit_desc);
+
+ /* Register valid pmem regions to Xen hypervisor. */
+ acpi_nfit_register_pmem(&nfit_desc);
+}
+
/**
* Search pmem regions overlapped with the specified address range.
*
diff --git a/xen/include/acpi/actbl1.h b/xen/include/acpi/actbl1.h
index 94d8d7775c..037652916a 100644
--- a/xen/include/acpi/actbl1.h
+++ b/xen/include/acpi/actbl1.h
@@ -946,6 +946,32 @@ struct acpi_nfit_system_address {
u64 memory_mapping;
};
+/* 1: Memory Device to System Address Range Map Structure */
+struct acpi_nfit_memory_map {
+ struct acpi_nfit_header header;
+ u32 device_handle;
+ u16 physical_id;
+ u16 region_id;
+ u16 range_index;
+ u16 region_index;
+ u64 region_size;
+ u64 region_offset;
+ u64 address;
+ u16 interleave_index;
+ u16 interleave_ways;
+ u16 flags;
+ u16 reserved; /* Reserved, must be zero */
+};
+
+/* Flags in struct acpi_nfit_memory_map */
+#define ACPI_NFIT_MEM_SAVE_FAILED (1) /* 00: Last SAVE to Memory Device failed */
+#define ACPI_NFIT_MEM_RESTORE_FAILED (1<<1) /* 01: Last RESTORE from Memory Device failed */
+#define ACPI_NFIT_MEM_FLUSH_FAILED (1<<2) /* 02: Platform flush failed */
+#define ACPI_NFIT_MEM_NOT_ARMED (1<<3) /* 03: Memory Device is not armed */
+#define ACPI_NFIT_MEM_HEALTH_OBSERVED (1<<4) /* 04: Memory Device observed SMART/health events */
+#define ACPI_NFIT_MEM_HEALTH_ENABLED (1<<5) /* 05: SMART/health events enabled */
+#define ACPI_NFIT_MEM_MAP_FAILED (1<<6) /* 06: Mapping to SPA failed */
+
/*******************************************************************************
*
* SBST - Smart Battery Specification Table
diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h
index 1bd8f9f4e4..088f01255d 100644
--- a/xen/include/xen/acpi.h
+++ b/xen/include/xen/acpi.h
@@ -185,6 +185,7 @@ void acpi_nfit_boot_init(void);
bool acpi_nfit_boot_search_pmem(unsigned long smfn, unsigned long emfn,
unsigned long *ret_smfn,
unsigned long *ret_emfn);
+void acpi_nfit_init(void);
#endif /* CONFIG_NVDIMM_PMEM */
#endif /*_LINUX_ACPI_H*/
--
2.14.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-09-11 4:37 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 4:37 [RFC XEN PATCH v3 00/39] Add vNVDIMM support to HVM domains Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 01/39] x86_64/mm: fix the PDX group check in mem_hotadd_check() Haozhong Zhang
2017-10-27 6:49 ` Chao Peng
2017-10-27 7:02 ` Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 02/39] x86_64/mm: drop redundant MFN to page conventions in cleanup_frame_table() Haozhong Zhang
2017-10-27 6:58 ` Chao Peng
2017-10-27 9:24 ` Andrew Cooper
2017-10-30 2:21 ` Chao Peng
2017-09-11 4:37 ` [RFC XEN PATCH v3 03/39] x86_64/mm: avoid cleaning the unmapped frame table Haozhong Zhang
2017-10-27 8:10 ` Chao Peng
2017-09-11 4:37 ` [RFC XEN PATCH v3 04/39] xen/common: add Kconfig item for pmem support Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 05/39] x86/mm: exclude PMEM regions from initial frametable Haozhong Zhang
2017-11-03 5:58 ` Chao Peng
2017-11-03 6:39 ` Haozhong Zhang
2017-09-11 4:37 ` Haozhong Zhang [this message]
2017-11-03 6:15 ` [RFC XEN PATCH v3 06/39] acpi: probe valid PMEM regions via NFIT Chao Peng
2017-11-03 7:14 ` Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 07/39] xen/pmem: register valid PMEM regions to Xen hypervisor Haozhong Zhang
2017-11-03 6:26 ` Chao Peng
2017-09-11 4:37 ` [RFC XEN PATCH v3 08/39] xen/pmem: hide NFIT and deny access to PMEM from Dom0 Haozhong Zhang
2017-11-03 6:51 ` Chao Peng
2017-11-03 7:24 ` Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 09/39] xen/pmem: add framework for hypercall XEN_SYSCTL_nvdimm_op Haozhong Zhang
2017-11-03 7:40 ` Chao Peng
2017-11-03 8:54 ` Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 10/39] xen/pmem: add XEN_SYSCTL_nvdimm_pmem_get_rgions_nr Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 11/39] xen/pmem: add XEN_SYSCTL_nvdimm_pmem_get_regions Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 12/39] tools/xen-ndctl: add NVDIMM management util 'xen-ndctl' Haozhong Zhang
2017-09-11 5:10 ` Dan Williams
2017-09-11 5:39 ` Haozhong Zhang
2017-09-11 16:35 ` Dan Williams
2017-09-11 21:24 ` Konrad Rzeszutek Wilk
2017-09-13 17:45 ` Dan Williams
2017-09-11 4:37 ` [RFC XEN PATCH v3 13/39] tools/xen-ndctl: add command 'list' Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 14/39] x86_64/mm: refactor memory_add() Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 15/39] x86_64/mm: allow customized location of extended frametable and M2P table Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 16/39] xen/pmem: add XEN_SYSCTL_nvdimm_pmem_setup to setup management PMEM region Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 17/39] tools/xen-ndctl: add command 'setup-mgmt' Haozhong Zhang
2017-09-11 4:37 ` [RFC XEN PATCH v3 18/39] xen/pmem: support PMEM_REGION_TYPE_MGMT for XEN_SYSCTL_nvdimm_pmem_get_regions_nr Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 19/39] xen/pmem: support PMEM_REGION_TYPE_MGMT for XEN_SYSCTL_nvdimm_pmem_get_regions Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 20/39] tools/xen-ndctl: add option '--mgmt' to command 'list' Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 21/39] xen/pmem: support setup PMEM region for guest data usage Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 22/39] tools/xen-ndctl: add command 'setup-data' Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 23/39] xen/pmem: support PMEM_REGION_TYPE_DATA for XEN_SYSCTL_nvdimm_pmem_get_regions_nr Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 24/39] xen/pmem: support PMEM_REGION_TYPE_DATA for XEN_SYSCTL_nvdimm_pmem_get_regions Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 25/39] tools/xen-ndctl: add option '--data' to command 'list' Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 26/39] xen/pmem: add function to map PMEM pages to HVM domain Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 27/39] xen/pmem: release PMEM pages on HVM domain destruction Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 28/39] xen: add hypercall XENMEM_populate_pmem_map Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 29/39] tools: reserve guest memory for ACPI from device model Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 30/39] tools/libacpi: expose the minimum alignment used by mem_ops.alloc Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 31/39] tools/libacpi: add callback to translate GPA to GVA Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 32/39] tools/libacpi: add callbacks to access XenStore Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 33/39] tools/libacpi: add a simple AML builder Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 34/39] tools/libacpi: add DM ACPI blacklists Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 35/39] tools/libacpi: load ACPI built by the device model Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 36/39] tools/xl: add xl domain configuration for virtual NVDIMM devices Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 37/39] tools/libxl: allow aborting domain creation on fatal QMP init errors Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 38/39] tools/libxl: initiate PMEM mapping via QMP callback Haozhong Zhang
2017-09-11 4:38 ` [RFC XEN PATCH v3 39/39] tools/libxl: build qemu options from xl vNVDIMM configs Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 00/10] Implement vNVDIMM for Xen HVM guest Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 01/10] nvdimm: do not intiailize nvdimm->label_data if label size is zero Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 02/10] hw/xen-hvm: create the hotplug memory region on Xen Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 03/10] hostmem-xen: add a host memory backend for Xen Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 04/10] nvdimm acpi: do not use fw_cfg on Xen Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 05/10] hw/xen-hvm: initialize DM ACPI Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 06/10] hw/xen-hvm: add function to copy ACPI into guest memory Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 07/10] nvdimm acpi: copy NFIT to Xen guest Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 08/10] nvdimm acpi: copy ACPI namespace device of vNVDIMM " Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 09/10] nvdimm acpi: do not build _FIT method on Xen Haozhong Zhang
2017-09-11 4:41 ` [RFC QEMU PATCH v3 10/10] hw/xen-hvm: enable building DM ACPI if vNVDIMM is enabled Haozhong Zhang
2017-09-11 4:53 ` [Qemu-devel] [RFC QEMU PATCH v3 00/10] Implement vNVDIMM for Xen HVM guest no-reply
2017-09-11 14:08 ` Igor Mammedov
2017-09-11 18:52 ` Stefano Stabellini
2017-09-12 3:15 ` Haozhong Zhang
2017-10-10 16:05 ` Konrad Rzeszutek Wilk
2017-10-12 12:45 ` [Qemu-devel] " Haozhong Zhang
2017-10-12 15:45 ` Paolo Bonzini
2017-10-13 7:53 ` Haozhong Zhang
2017-10-13 8:44 ` Igor Mammedov
2017-10-13 11:13 ` Haozhong Zhang
2017-10-13 12:13 ` Jan Beulich
2017-10-13 22:46 ` Stefano Stabellini
2017-10-15 0:31 ` Michael S. Tsirkin
2017-10-16 14:49 ` Konrad Rzeszutek Wilk
2017-10-17 11:45 ` Paolo Bonzini
2017-10-17 12:16 ` Haozhong Zhang
2017-10-18 8:32 ` Roger Pau Monné
2017-10-18 8:46 ` Paolo Bonzini
2017-10-18 8:55 ` Roger Pau Monné
2017-10-15 0:35 ` Michael S. Tsirkin
2017-10-12 17:39 ` Konrad Rzeszutek Wilk
2017-10-13 8:00 ` Haozhong Zhang
2017-10-27 3:26 ` [RFC XEN PATCH v3 00/39] Add vNVDIMM support to HVM domains Chao Peng
2017-10-27 4:25 ` Haozhong Zhang
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=20170911043820.14617-7-haozhong.zhang@intel.com \
--to=haozhong.zhang@intel.com \
--cc=andrew.cooper3@citrix.com \
--cc=chao.p.peng@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=jbeulich@suse.com \
--cc=xen-devel@lists.xen.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).