mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 04:34:08 +08:00
cxl/region: Add memory hotplug notifier for cxl region
When the CXL region is formed, the driver computes the performance data for the region. However this data is not available at the node data collection that has been populated by the HMAT during kernel initialization. Add a memory hotplug notifier to update the access coordinates to the 'struct memory_target' context kept by the HMAT_REPORTING code. Add CXL_CALLBACK_PRI for a memory hotplug callback priority. Set the priority number to be called before HMAT_CALLBACK_PRI. The CXL update must happen before hmat_callback(). A new HMAT_REPORTING helper hmat_update_target_coordinates() is added in order to allow CXL to update the memory_target access coordinates. A new ext_updated member is added to the memory_target to indicate that the access coordinates within the memory_target has been updated by an external agent such as CXL. This prevents data being overwritten by the hmat_update_target_attrs() triggered by hmat_callback(). Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Rafael J. Wysocki <rafael@kernel.org> Reviewed-by: Huang, Ying <ying.huang@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Dave Jiang <dave.jiang@intel.com> Link: https://lore.kernel.org/r/20240308220055.2172956-12-dave.jiang@intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
parent
c20eaf4411
commit
067353a46d
@ -74,6 +74,7 @@ struct memory_target {
|
|||||||
struct node_cache_attrs cache_attrs;
|
struct node_cache_attrs cache_attrs;
|
||||||
u8 gen_port_device_handle[ACPI_SRAT_DEVICE_HANDLE_SIZE];
|
u8 gen_port_device_handle[ACPI_SRAT_DEVICE_HANDLE_SIZE];
|
||||||
bool registered;
|
bool registered;
|
||||||
|
bool ext_updated; /* externally updated */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct memory_initiator {
|
struct memory_initiator {
|
||||||
@ -328,6 +329,35 @@ static void hmat_update_target_access(struct memory_target *target,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int hmat_update_target_coordinates(int nid, struct access_coordinate *coord,
|
||||||
|
enum access_coordinate_class access)
|
||||||
|
{
|
||||||
|
struct memory_target *target;
|
||||||
|
int pxm;
|
||||||
|
|
||||||
|
if (nid == NUMA_NO_NODE)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
pxm = node_to_pxm(nid);
|
||||||
|
guard(mutex)(&target_lock);
|
||||||
|
target = find_mem_target(pxm);
|
||||||
|
if (!target)
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
|
hmat_update_target_access(target, ACPI_HMAT_READ_LATENCY,
|
||||||
|
coord->read_latency, access);
|
||||||
|
hmat_update_target_access(target, ACPI_HMAT_WRITE_LATENCY,
|
||||||
|
coord->write_latency, access);
|
||||||
|
hmat_update_target_access(target, ACPI_HMAT_READ_BANDWIDTH,
|
||||||
|
coord->read_bandwidth, access);
|
||||||
|
hmat_update_target_access(target, ACPI_HMAT_WRITE_BANDWIDTH,
|
||||||
|
coord->write_bandwidth, access);
|
||||||
|
target->ext_updated = true;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(hmat_update_target_coordinates);
|
||||||
|
|
||||||
static __init void hmat_add_locality(struct acpi_hmat_locality *hmat_loc)
|
static __init void hmat_add_locality(struct acpi_hmat_locality *hmat_loc)
|
||||||
{
|
{
|
||||||
struct memory_locality *loc;
|
struct memory_locality *loc;
|
||||||
@ -699,6 +729,10 @@ static void hmat_update_target_attrs(struct memory_target *target,
|
|||||||
u32 best = 0;
|
u32 best = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
/* Don't update if an external agent has changed the data. */
|
||||||
|
if (target->ext_updated)
|
||||||
|
return;
|
||||||
|
|
||||||
/* Don't update for generic port if there's no device handle */
|
/* Don't update for generic port if there's no device handle */
|
||||||
if ((access == NODE_ACCESS_CLASS_GENPORT_SINK_LOCAL ||
|
if ((access == NODE_ACCESS_CLASS_GENPORT_SINK_LOCAL ||
|
||||||
access == NODE_ACCESS_CLASS_GENPORT_SINK_CPU) &&
|
access == NODE_ACCESS_CLASS_GENPORT_SINK_CPU) &&
|
||||||
|
@ -580,3 +580,9 @@ void cxl_region_perf_data_calculate(struct cxl_region *cxlr,
|
|||||||
DIV_ROUND_UP(cxlr->coord[i].write_latency, 1000);
|
DIV_ROUND_UP(cxlr->coord[i].write_latency, 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int cxl_update_hmat_access_coordinates(int nid, struct cxl_region *cxlr,
|
||||||
|
enum access_coordinate_class access)
|
||||||
|
{
|
||||||
|
return hmat_update_target_coordinates(nid, &cxlr->coord[access], access);
|
||||||
|
}
|
||||||
|
@ -90,4 +90,7 @@ enum cxl_poison_trace_type {
|
|||||||
|
|
||||||
long cxl_pci_get_latency(struct pci_dev *pdev);
|
long cxl_pci_get_latency(struct pci_dev *pdev);
|
||||||
|
|
||||||
|
int cxl_update_hmat_access_coordinates(int nid, struct cxl_region *cxlr,
|
||||||
|
enum access_coordinate_class access);
|
||||||
|
|
||||||
#endif /* __CXL_CORE_H__ */
|
#endif /* __CXL_CORE_H__ */
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#include <linux/genalloc.h>
|
#include <linux/genalloc.h>
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
|
#include <linux/memory.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/uuid.h>
|
#include <linux/uuid.h>
|
||||||
#include <linux/sort.h>
|
#include <linux/sort.h>
|
||||||
@ -116,12 +117,22 @@ static const struct attribute_group cxl_region_access0_coordinate_group = {
|
|||||||
.is_visible = cxl_region_access0_coordinate_visible,
|
.is_visible = cxl_region_access0_coordinate_visible,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct attribute_group *get_cxl_region_access0_group(void)
|
||||||
|
{
|
||||||
|
return &cxl_region_access0_coordinate_group;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct attribute_group cxl_region_access1_coordinate_group = {
|
static const struct attribute_group cxl_region_access1_coordinate_group = {
|
||||||
.name = "access1",
|
.name = "access1",
|
||||||
.attrs = access1_coordinate_attrs,
|
.attrs = access1_coordinate_attrs,
|
||||||
.is_visible = cxl_region_access1_coordinate_visible,
|
.is_visible = cxl_region_access1_coordinate_visible,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct attribute_group *get_cxl_region_access1_group(void)
|
||||||
|
{
|
||||||
|
return &cxl_region_access1_coordinate_group;
|
||||||
|
}
|
||||||
|
|
||||||
static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
|
static ssize_t uuid_show(struct device *dev, struct device_attribute *attr,
|
||||||
char *buf)
|
char *buf)
|
||||||
{
|
{
|
||||||
@ -2216,6 +2227,7 @@ static void unregister_region(void *_cxlr)
|
|||||||
struct cxl_region_params *p = &cxlr->params;
|
struct cxl_region_params *p = &cxlr->params;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
unregister_memory_notifier(&cxlr->memory_notifier);
|
||||||
device_del(&cxlr->dev);
|
device_del(&cxlr->dev);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -2260,6 +2272,58 @@ static struct cxl_region *cxl_region_alloc(struct cxl_root_decoder *cxlrd, int i
|
|||||||
return cxlr;
|
return cxlr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool cxl_region_update_coordinates(struct cxl_region *cxlr, int nid)
|
||||||
|
{
|
||||||
|
int cset = 0;
|
||||||
|
int rc;
|
||||||
|
|
||||||
|
for (int i = 0; i < ACCESS_COORDINATE_MAX; i++) {
|
||||||
|
if (cxlr->coord[i].read_bandwidth) {
|
||||||
|
rc = cxl_update_hmat_access_coordinates(nid, cxlr, i);
|
||||||
|
if (rc == 0)
|
||||||
|
cset++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!cset)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
rc = sysfs_update_group(&cxlr->dev.kobj, get_cxl_region_access0_group());
|
||||||
|
if (rc)
|
||||||
|
dev_dbg(&cxlr->dev, "Failed to update access0 group\n");
|
||||||
|
|
||||||
|
rc = sysfs_update_group(&cxlr->dev.kobj, get_cxl_region_access1_group());
|
||||||
|
if (rc)
|
||||||
|
dev_dbg(&cxlr->dev, "Failed to update access1 group\n");
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int cxl_region_perf_attrs_callback(struct notifier_block *nb,
|
||||||
|
unsigned long action, void *arg)
|
||||||
|
{
|
||||||
|
struct cxl_region *cxlr = container_of(nb, struct cxl_region,
|
||||||
|
memory_notifier);
|
||||||
|
struct cxl_region_params *p = &cxlr->params;
|
||||||
|
struct cxl_endpoint_decoder *cxled = p->targets[0];
|
||||||
|
struct cxl_decoder *cxld = &cxled->cxld;
|
||||||
|
struct memory_notify *mnb = arg;
|
||||||
|
int nid = mnb->status_change_nid;
|
||||||
|
int region_nid;
|
||||||
|
|
||||||
|
if (nid == NUMA_NO_NODE || action != MEM_ONLINE)
|
||||||
|
return NOTIFY_DONE;
|
||||||
|
|
||||||
|
region_nid = phys_to_target_node(cxld->hpa_range.start);
|
||||||
|
if (nid != region_nid)
|
||||||
|
return NOTIFY_DONE;
|
||||||
|
|
||||||
|
if (!cxl_region_update_coordinates(cxlr, nid))
|
||||||
|
return NOTIFY_DONE;
|
||||||
|
|
||||||
|
return NOTIFY_OK;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* devm_cxl_add_region - Adds a region to a decoder
|
* devm_cxl_add_region - Adds a region to a decoder
|
||||||
* @cxlrd: root decoder
|
* @cxlrd: root decoder
|
||||||
@ -2307,6 +2371,10 @@ static struct cxl_region *devm_cxl_add_region(struct cxl_root_decoder *cxlrd,
|
|||||||
if (rc)
|
if (rc)
|
||||||
goto err;
|
goto err;
|
||||||
|
|
||||||
|
cxlr->memory_notifier.notifier_call = cxl_region_perf_attrs_callback;
|
||||||
|
cxlr->memory_notifier.priority = CXL_CALLBACK_PRI;
|
||||||
|
register_memory_notifier(&cxlr->memory_notifier);
|
||||||
|
|
||||||
rc = devm_add_action_or_reset(port->uport_dev, unregister_region, cxlr);
|
rc = devm_add_action_or_reset(port->uport_dev, unregister_region, cxlr);
|
||||||
if (rc)
|
if (rc)
|
||||||
return ERR_PTR(rc);
|
return ERR_PTR(rc);
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
#include <linux/libnvdimm.h>
|
#include <linux/libnvdimm.h>
|
||||||
#include <linux/bitfield.h>
|
#include <linux/bitfield.h>
|
||||||
|
#include <linux/notifier.h>
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include <linux/log2.h>
|
#include <linux/log2.h>
|
||||||
#include <linux/node.h>
|
#include <linux/node.h>
|
||||||
@ -518,6 +519,7 @@ struct cxl_region_params {
|
|||||||
* @flags: Region state flags
|
* @flags: Region state flags
|
||||||
* @params: active + config params for the region
|
* @params: active + config params for the region
|
||||||
* @coord: QoS access coordinates for the region
|
* @coord: QoS access coordinates for the region
|
||||||
|
* @memory_notifier: notifier for setting the access coordinates to node
|
||||||
*/
|
*/
|
||||||
struct cxl_region {
|
struct cxl_region {
|
||||||
struct device dev;
|
struct device dev;
|
||||||
@ -529,6 +531,7 @@ struct cxl_region {
|
|||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
struct cxl_region_params params;
|
struct cxl_region_params params;
|
||||||
struct access_coordinate coord[ACCESS_COORDINATE_MAX];
|
struct access_coordinate coord[ACCESS_COORDINATE_MAX];
|
||||||
|
struct notifier_block memory_notifier;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct cxl_nvdimm_bridge {
|
struct cxl_nvdimm_bridge {
|
||||||
|
@ -1547,4 +1547,16 @@ static inline void acpi_use_parent_companion(struct device *dev)
|
|||||||
ACPI_COMPANION_SET(dev, ACPI_COMPANION(dev->parent));
|
ACPI_COMPANION_SET(dev, ACPI_COMPANION(dev->parent));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_ACPI_HMAT
|
||||||
|
int hmat_update_target_coordinates(int nid, struct access_coordinate *coord,
|
||||||
|
enum access_coordinate_class access);
|
||||||
|
#else
|
||||||
|
static inline int hmat_update_target_coordinates(int nid,
|
||||||
|
struct access_coordinate *coord,
|
||||||
|
enum access_coordinate_class access)
|
||||||
|
{
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /*_LINUX_ACPI_H*/
|
#endif /*_LINUX_ACPI_H*/
|
||||||
|
@ -114,6 +114,7 @@ struct mem_section;
|
|||||||
#define DEFAULT_CALLBACK_PRI 0
|
#define DEFAULT_CALLBACK_PRI 0
|
||||||
#define SLAB_CALLBACK_PRI 1
|
#define SLAB_CALLBACK_PRI 1
|
||||||
#define HMAT_CALLBACK_PRI 2
|
#define HMAT_CALLBACK_PRI 2
|
||||||
|
#define CXL_CALLBACK_PRI 5
|
||||||
#define MM_COMPUTE_BATCH_PRI 10
|
#define MM_COMPUTE_BATCH_PRI 10
|
||||||
#define CPUSET_CALLBACK_PRI 10
|
#define CPUSET_CALLBACK_PRI 10
|
||||||
#define MEMTIER_HOTPLUG_PRI 100
|
#define MEMTIER_HOTPLUG_PRI 100
|
||||||
|
Loading…
Reference in New Issue
Block a user