@@ -1,15 +1,6 @@
-/*
- * Copyright(c) 2013-2016 Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2013-2018 Intel Corporation. All rights reserved. */
+#include <linux/memory_hotplug.h>
#include <linux/memremap.h>
#include <linux/blkdev.h>
#include <linux/device.h>
@@ -103,6 +94,39 @@ static ssize_t mode_store(struct device *dev,
}
static DEVICE_ATTR_RW(mode);
+static ssize_t memmap_state_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
+ struct memmap_async_state *async = &nd_pfn->async;
+
+ return sprintf(buf, "%s\n", bitmap_weight(async->active,
+ NR_MEMMAP_THREADS) ? "active" : "idle");
+}
+
+static ssize_t memmap_state_store(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t len)
+{
+ int i;
+ struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev);
+ struct memmap_async_state *async = &nd_pfn->async;
+
+ if (!sysfs_streq(buf, "sync"))
+ return -EINVAL;
+
+ for (i = 0; i < NR_MEMMAP_THREADS; i++) {
+ struct memmap_init_pages *thread = &async->page_init[i];
+
+ if (!test_bit(i, async->active))
+ continue;
+ async_synchronize_cookie_domain(thread->cookie,
+ &memmap_pages_domain);
+ }
+
+ return len;
+}
+static DEVICE_ATTR_RW(memmap_state);
+
static ssize_t align_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -279,6 +303,7 @@ static struct attribute *nd_pfn_attributes[] = {
&dev_attr_resource.attr,
&dev_attr_size.attr,
&dev_attr_supported_alignments.attr,
+ &dev_attr_memmap_state.attr,
NULL,
};
@@ -5457,6 +5457,7 @@ void __ref build_all_zonelists(pg_data_t *pgdat)
ASYNC_DOMAIN_EXCLUSIVE(memmap_init_domain);
ASYNC_DOMAIN_EXCLUSIVE(memmap_pages_domain);
+EXPORT_SYMBOL_GPL(memmap_pages_domain);
static void __meminit memmap_init_one(unsigned long pfn, unsigned long zone,
int nid, enum memmap_context context, struct dev_pagemap *pgmap)
Applications may want to know that page structure initialization is complete rather than be subject to delays at first DAX fault. Also, page structure initialization consumes CPU resources impacting application performance, so a environment may want to wait before considering the system fully initialized. Provide a sysfs attribute to display the current state, and when written with 'sync' complete memmap initialization. Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Vishal Verma <vishal.l.verma@intel.com> Cc: Dave Jiang <dave.jiang@intel.com> Cc: Johannes Thumshirn <jthumshirn@suse.de> Cc: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/nvdimm/pfn_devs.c | 49 ++++++++++++++++++++++++++++++++++----------- mm/page_alloc.c | 1 + 2 files changed, 38 insertions(+), 12 deletions(-)