pseries/drmem: update LMBs after LPM

After a LPM, the device tree node ibm,dynamic-reconfiguration-memory may be
updated by the hypervisor in the case the NUMA topology of the LPAR's
memory is updated.

This is handled by the kernel, but the memory's node is not updated because
there is no way to move a memory block between nodes from the Linux kernel
point of view.

If later a memory block is added or removed, drmem_update_dt() is called
and it is overwriting the DT node ibm,dynamic-reconfiguration-memory to
match the added or removed LMB. But the LMB's associativity node has not
been updated after the DT node update and thus the node is overwritten by
the Linux's topology instead of the hypervisor one.

Introduce a hook called when the ibm,dynamic-reconfiguration-memory node is
updated to force an update of the LMB's associativity. However, ignore the
call to that hook when the update has been triggered by drmem_update_dt().
Because, in that case, the LMB tree has been used to set the DT property
and thus it doesn't need to be updated back. Since drmem_update_dt() is
called under the protection of the device_hotplug_lock and the hook is
called in the same context, use a simple boolean variable to detect that
call.

Signed-off-by: Laurent Dufour <ldufour@linux.ibm.com>
Reviewed-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210517090606.56930-1-ldufour@linux.ibm.com

diff --git a/arch/powerpc/include/asm/drmem.h b/arch/powerpc/include/asm/drmem.h
index bf2402f..4265d5e 100644 (file)
--- a/arch/powerpc/include/asm/drmem.h
+++ b/arch/powerpc/include/asm/drmem.h
@@ -111,6 +111,7 @@ int drmem_update_dt(void);
 int __init
 walk_drmem_lmbs_early(unsigned long node, void *data,
                      int (*func)(struct drmem_lmb *, const __be32 **, void *));
+void drmem_update_lmbs(struct property *prop);
 #endif
 
 static inline void invalidate_lmb_associativity_index(struct drmem_lmb *lmb)

diff --git a/arch/powerpc/mm/drmem.c b/arch/powerpc/mm/drmem.c
index 9af3832..22197b1 100644 (file)
--- a/arch/powerpc/mm/drmem.c
+++ b/arch/powerpc/mm/drmem.c
@@ -18,6 +18,7 @@ static int n_root_addr_cells, n_root_size_cells;
 
 static struct drmem_lmb_info __drmem_info;
 struct drmem_lmb_info *drmem_info = &__drmem_info;
+static bool in_drmem_update;
 
 u64 drmem_lmb_memory_max(void)
 {
@@ -178,6 +179,11 @@ int drmem_update_dt(void)
        if (!memory)
                return -1;
 
+       /*
+        * Set in_drmem_update to prevent the notifier callback to process the
+        * DT property back since the change is coming from the LMB tree.
+        */
+       in_drmem_update = true;
        prop = of_find_property(memory, "ibm,dynamic-memory", NULL);
        if (prop) {
                rc = drmem_update_dt_v1(memory, prop);
@@ -186,6 +192,7 @@ int drmem_update_dt(void)
                if (prop)
                        rc = drmem_update_dt_v2(memory, prop);
        }
+       in_drmem_update = false;
 
        of_node_put(memory);
        return rc;
@@ -307,6 +314,45 @@ int __init walk_drmem_lmbs_early(unsigned long node, void *data,
        return ret;
 }
 
+/*
+ * Update the LMB associativity index.
+ */
+static int update_lmb(struct drmem_lmb *updated_lmb,
+                     __maybe_unused const __be32 **usm,
+                     __maybe_unused void *data)
+{
+       struct drmem_lmb *lmb;
+
+       for_each_drmem_lmb(lmb) {
+               if (lmb->drc_index != updated_lmb->drc_index)
+                       continue;
+
+               lmb->aa_index = updated_lmb->aa_index;
+               break;
+       }
+       return 0;
+}
+
+/*
+ * Update the LMB associativity index.
+ *
+ * This needs to be called when the hypervisor is updating the
+ * dynamic-reconfiguration-memory node property.
+ */
+void drmem_update_lmbs(struct property *prop)
+{
+       /*
+        * Don't update the LMBs if triggered by the update done in
+        * drmem_update_dt(), the LMB values have been used to the update the DT
+        * property in that case.
+        */
+       if (in_drmem_update)
+               return;
+       if (!strcmp(prop->name, "ibm,dynamic-memory"))
+               __walk_drmem_v1_lmbs(prop->value, NULL, NULL, update_lmb);
+       else if (!strcmp(prop->name, "ibm,dynamic-memory-v2"))
+               __walk_drmem_v2_lmbs(prop->value, NULL, NULL, update_lmb);
+}
 #endif
 
 static int init_drmem_lmb_size(struct device_node *dn)

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 377d852..0beb3ca 100644 (file)
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -979,6 +979,10 @@ static int pseries_memory_notifier(struct notifier_block *nb,
        case OF_RECONFIG_DETACH_NODE:
                err = pseries_remove_mem_node(rd->dn);
                break;
+       case OF_RECONFIG_UPDATE_PROPERTY:
+               if (!strcmp(rd->dn->name,
+                           "ibm,dynamic-reconfiguration-memory"))
+                       drmem_update_lmbs(rd->prop);
        }
        return notifier_from_errno(err);
 }