@@ -12,7 +12,7 @@ obj-y += power/
obj-$(CONFIG_ISA_BUS_API) += isa.o
obj-y += firmware_loader/
obj-$(CONFIG_NUMA) += node.o
-obj-$(CONFIG_HMS) += hms.o
+obj-$(CONFIG_HMS) += hms.o hms-target.o
obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
ifeq ($(CONFIG_SYSFS),y)
obj-$(CONFIG_MODULES) += module.o
new file mode 100644
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2018 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * Authors:
+ * Jérôme Glisse <jglisse@redhat.com>
+ */
+/* Heterogeneous memory system (HMS) see Documentation/vm/hms.rst */
+#include <linux/capability.h>
+#include <linux/topology.h>
+#include <linux/uaccess.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/hms.h>
+
+
+static DEFINE_MUTEX(hms_target_mutex);
+
+
+static inline struct hms_target *hms_object_to_target(struct hms_object *object)
+{
+ if (object == NULL)
+ return NULL;
+
+ if (object->type != HMS_TARGET)
+ return NULL;
+ return container_of(object, struct hms_target, object);
+}
+
+static inline struct hms_target *device_to_hms_target(struct device *device)
+{
+ if (device == NULL)
+ return NULL;
+
+ return hms_object_to_target(to_hms_object(device));
+}
+
+struct hms_target *hms_target_find_locked(unsigned uid)
+{
+ struct hms_object *object = hms_object_find_locked(uid);
+ struct hms_target *target;
+
+ target = hms_object_to_target(object);
+ if (target)
+ return target;
+ hms_object_put(object);
+ return NULL;
+}
+
+struct hms_target *hms_target_find(unsigned uid)
+{
+ struct hms_object *object = hms_object_find(uid);
+ struct hms_target *target;
+
+ target = hms_object_to_target(object);
+ if (target)
+ return target;
+ hms_object_put(object);
+ return NULL;
+}
+
+static void hms_target_release(struct device *device)
+{
+ struct hms_target *target = device_to_hms_target(device);
+
+ hms_object_release(&target->object);
+ kfree(target);
+}
+
+static ssize_t hms_target_show_size(struct device *device,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct hms_target *target = device_to_hms_target(device);
+
+ if (target == NULL)
+ return -EINVAL;
+
+ return sprintf(buf, "%ld\n", target->size);
+}
+
+static ssize_t hms_target_show_nid(struct device *device,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct hms_target *target = device_to_hms_target(device);
+
+ if (target == NULL)
+ return -EINVAL;
+
+ return sprintf(buf, "%d\n", target->nid);
+}
+
+static ssize_t hms_target_show_uid(struct device *device,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct hms_target *target = device_to_hms_target(device);
+
+ if (target == NULL)
+ return -EINVAL;
+
+ return sprintf(buf, "%d\n", target->object.uid);
+}
+
+static DEVICE_ATTR(size, 0444, hms_target_show_size, NULL);
+static DEVICE_ATTR(nid, 0444, hms_target_show_nid, NULL);
+static DEVICE_ATTR(uid, 0444, hms_target_show_uid, NULL);
+
+static struct attribute *hms_target_attrs[] = {
+ &dev_attr_size.attr,
+ &dev_attr_nid.attr,
+ &dev_attr_uid.attr,
+ NULL
+};
+
+static struct attribute_group hms_target_attr_group = {
+ .attrs = hms_target_attrs,
+};
+
+static const struct attribute_group *hms_target_attr_groups[] = {
+ &hms_target_attr_group,
+ NULL,
+};
+
+void hms_target_register(struct hms_target **targetp, struct device *parent,
+ int nid, const struct hms_target_hbind *hbind,
+ unsigned long size, unsigned version)
+{
+ struct hms_target *target;
+
+ *targetp = NULL;
+ target = kzalloc(sizeof(*target), GFP_KERNEL);
+ if (target == NULL)
+ return;
+
+ target->nid = nid;
+ target->size = size;
+ target->hbind = hbind;
+
+ if (hms_object_init(&target->object, parent, HMS_TARGET, version,
+ hms_target_release, hms_target_attr_groups)) {
+ kfree(target);
+ target = NULL;
+ }
+
+ *targetp = target;
+}
+EXPORT_SYMBOL(hms_target_register);
+
+void hms_target_add_memory(struct hms_target *target, unsigned long size)
+{
+ if (target) {
+ mutex_lock(&hms_target_mutex);
+ target->size += size;
+ mutex_unlock(&hms_target_mutex);
+ }
+}
+EXPORT_SYMBOL(hms_target_add_memory);
+
+void hms_target_remove_memory(struct hms_target *target, unsigned long size)
+{
+ if (target) {
+ mutex_lock(&hms_target_mutex);
+ target->size = size < target->size ? target->size - size : 0;
+ mutex_unlock(&hms_target_mutex);
+ }
+}
+EXPORT_SYMBOL(hms_target_remove_memory);
+
+void hms_target_unregister(struct hms_target **targetp)
+{
+ struct hms_target *target = *targetp;
+
+ *targetp = NULL;
+ if (target == NULL)
+ return;
+
+ hms_object_unregister(&target->object);
+}
+EXPORT_SYMBOL(hms_target_unregister);
@@ -17,10 +17,21 @@
/* Heterogeneous memory system (HMS) see Documentation/vm/hms.rst */
#ifndef HMS_H
#define HMS_H
-#if IS_ENABLED(CONFIG_HMS)
-
#include <linux/device.h>
+#include <linux/types.h>
+
+
+struct hms_target;
+
+struct hms_target_hbind {
+ int (*migrate)(struct hms_target *target, struct mm_struct *mm,
+ unsigned long start, unsigned long end,
+ unsigned natoms, uint32_t *atoms);
+};
+
+
+#if IS_ENABLED(CONFIG_HMS)
#define to_hms_object(device) container_of(device, struct hms_object, device)
@@ -56,12 +67,40 @@ struct hms_object *hms_object_find_locked(unsigned uid);
struct hms_object *hms_object_find(unsigned uid);
+struct hms_target {
+ const struct hms_target_hbind *hbind;
+ struct hms_object object;
+ unsigned long size;
+ void *private;
+ int nid;
+};
+
+void hms_target_add_memory(struct hms_target *target, unsigned long size);
+void hms_target_remove_memory(struct hms_target *target, unsigned long size);
+void hms_target_register(struct hms_target **targetp, struct device *parent,
+ int nid, const struct hms_target_hbind *hbind,
+ unsigned long size, unsigned version);
+void hms_target_unregister(struct hms_target **targetp);
+struct hms_target *hms_target_find(unsigned uid);
+
+static inline void hms_target_put(struct hms_target *target)
+{
+ hms_object_put(&target->object);
+}
+
+
int hms_init(void);
#else /* IS_ENABLED(CONFIG_HMS) */
+#define hms_target_add_memory(target, size)
+#define hms_target_remove_memory(target, size)
+#define hms_target_register(targetp, nid, size)
+#define hms_target_unregister(targetp)
+
+
static inline int hms_init(void)
{
return 0;