acpi-hmat-refactor-hmat_register_target_initiators.patch removed from -mm tree
The quilt patch titled
Subject: acpi, hmat: refactor hmat_register_target_initiators()
has been removed from the -mm tree. Its filename was
acpi-hmat-refactor-hmat_register_target_initiators.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Huang Ying <[email protected]>
Subject: acpi, hmat: refactor hmat_register_target_initiators()
Date: Tue, 26 Sep 2023 14:06:26 +0800
Previously, in hmat_register_target_initiators(), the performance attributes are calculated and the corresponding sysfs links and files are created too. Which is called during memory onlining.
But now, to calculate the abstract distance of a memory target before memory onlining, we need to calculate the performance attributes for a memory target without creating sysfs links and files.
To do that, hmat_register_target_initiators() is refactored to make it possible to calculate performance attributes separately.
---
drivers/acpi/numa/hmat.c | 81 +++++++++++++------------------------ 1 file changed, 30 insertions(+), 51 deletions(-)
drivers/acpi/numa/hmat.c renamed from drivers/acpi/numa/hmat.c~acpi-hmat-refactor-hmat_register_target_initiators +30 -51
@@ -582,28 +582,25 @@ static int initiators_to_nodemask(unsignreturn 0 ; } -static void hmat_register_target_initiators (struct memory_target *target) +static void hmat_update_target_attrs (struct memory_target *target, +unsigned long *p_nodes,int access) { - static DECLARE_BITMAP(p_nodes, MAX_NUMNODES);struct memory_initiator *initiator; -unsigned int mem_nid, cpu_nid; +unsigned int cpu_nid;struct memory_locality *loc =NULL ;u32 best =0 ; -bool access0done = false;int i; - mem_nid =pxm_to_node (target->memory_pxm); +bitmap_zero (p_nodes,MAX_NUMNODES );/* -* If the Address Range Structure provides a local processor pxm, link +* If the Address Range Structure provides a local processor pxm, set * only that one. Otherwise, find the best performance attributes and -* register all initiators that match. +* collect all initiators that match. */ if (target->processor_pxm !=PXM_INVAL ) { cpu_nid =pxm_to_node (target->processor_pxm); -register_memory_node_under_compute_node (mem_nid, cpu_nid,0 ); - access0done = true; -if (node_state (cpu_nid,N_CPU )) { -register_memory_node_under_compute_node (mem_nid, cpu_nid,1 ); +if (access ==0 ||node_state (cpu_nid,N_CPU )) { +set_bit (target->processor_pxm, p_nodes);return ; } }
@@ -617,47 +614,10 @@ static void hmat_register_target_initiat* We'll also use the sorting to prime the candidate nodes with known * initiators. */ -bitmap_zero (p_nodes,MAX_NUMNODES );list_sort (NULL , &initiators, initiator_cmp);if (initiators_to_nodemask (p_nodes) <0 )return ; -if (!access0done) { -for (i =WRITE_LATENCY ; i <=READ_BANDWIDTH ; i++) { - loc = localities_types[i]; -if (!loc) -continue ; - - best =0 ; -list_for_each_entry (initiator, &initiators, node) { -u32 value; - -if (!test_bit (initiator->processor_pxm, p_nodes)) -continue ; - - value =hmat_initiator_perf (target, initiator, - loc->hmat_loc); -if (hmat_update_best (loc->hmat_loc->data_type, value, &best)) -bitmap_clear (p_nodes,0 , initiator->processor_pxm); -if (value != best) -clear_bit (initiator->processor_pxm, p_nodes); - } -if (best) -hmat_update_target_access (target, loc->hmat_loc->data_type, - best,0 ); - } - -for_each_set_bit (i, p_nodes,MAX_NUMNODES ) { - cpu_nid =pxm_to_node (i); -register_memory_node_under_compute_node (mem_nid, cpu_nid,0 ); - } - } - -/* Access 1 ignores Generic Initiators */ -bitmap_zero (p_nodes,MAX_NUMNODES ); -if (initiators_to_nodemask (p_nodes) <0 ) -return ; -for (i =WRITE_LATENCY ; i <=READ_BANDWIDTH ; i++) { loc = localities_types[i];if (!loc)
@@ -667,7 +627,7 @@ static void hmat_register_target_initiatlist_for_each_entry (initiator, &initiators, node) {u32 value; -if (!initiator->has_cpu) { +if (access ==1 && !initiator->has_cpu) {clear_bit (initiator->processor_pxm, p_nodes);continue ; }
@@ -681,14 +641,33 @@ static void hmat_register_target_initiatclear_bit (initiator->processor_pxm, p_nodes); }if (best) -hmat_update_target_access (target, loc->hmat_loc->data_type, best,1 ); +hmat_update_target_access (target, loc->hmat_loc->data_type, best, access); } +} + +static void __hmat_register_target_initiators (struct memory_target *target, +unsigned long *p_nodes, +int access) +{ +unsigned int mem_nid, cpu_nid; +int i; + + mem_nid =pxm_to_node (target->memory_pxm); +hmat_update_target_attrs (target, p_nodes, access);for_each_set_bit (i, p_nodes,MAX_NUMNODES ) { cpu_nid =pxm_to_node (i); -register_memory_node_under_compute_node (mem_nid, cpu_nid,1 ); +register_memory_node_under_compute_node (mem_nid, cpu_nid, access); } } +static void hmat_register_target_initiators (struct memory_target *target) +{ + static DECLARE_BITMAP(p_nodes, MAX_NUMNODES); + +__hmat_register_target_initiators (target, p_nodes,0 ); +__hmat_register_target_initiators (target, p_nodes,1 ); +} +static void hmat_register_target_cache (struct memory_target *target) {unsigned mem_nid =pxm_to_node (target->memory_pxm);
_
Patches currently in -mm which might be from [email protected] are
mm-fix-draining-remote-pageset.patch