Skip to contentSkip to conversation

powerpc/hotplug: assign hot added LMB to the right node

PATCH In review Laurent Dufour 2 participants 3 messages Dec 3, 2020 – Dec 4, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/hotplug: assign hot added LMB to the right node

This patch applies to 5.9 and earlier kernels only.

Since 5.10, this has been fortunately fixed by the commit e5e179aa3a39 ("pseries/drmem: don't cache node id in drmem_lmb struct").

When LMBs are added to a running system, the node id assigned to the LMB is fetched from the temporary DT node provided by the hypervisor.

However, LMBs added are always assigned to the first online node. This is a mistake and this is because hot_add_drconf_scn_to_nid() called by lmb_set_nid() is checking for the LMB flags DRCONF_MEM_ASSIGNED which is set later in dlpar_add_lmb().

To fix this issue, simply set that flag earlier in dlpar_add_lmb().

Note, this code has been rewrote in 5.10 and thus this fix has no meaning since this version.

Cc Michael Ellerman <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Nathan Lynch <[email protected]>
Cc Scott Cheloha <[email protected]>
---
 arch/powerpc/platforms/pseries/hotplug-memory.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/powerpc/platforms/pseries/hotplug-memory.c +3 -2
index e54dcbd04b2f..92d83915c629 100644
@@ -663,12 +663,14 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb)
 		return rc;
 	}
 
+	lmb->flags |= DRCONF_MEM_ASSIGNED;
 	lmb_set_nid(lmb);
 	block_sz = memory_block_size_bytes();
 
 	/* Add the memory */
 	rc = __add_memory(lmb->nid, lmb->base_addr, block_sz);
 	if (rc) {
+		lmb->flags &= ~DRCONF_MEM_ASSIGNED;
 		invalidate_lmb_associativity_index(lmb);
 		return rc;
 	}
@@ -676,10 +678,9 @@ static int dlpar_add_lmb(struct drmem_lmb *lmb)
 	rc = dlpar_online_lmb(lmb);
 	if (rc) {
 		__remove_memory(lmb->nid, lmb->base_addr, block_sz);
+		lmb->flags &= ~DRCONF_MEM_ASSIGNED;
 		invalidate_lmb_associativity_index(lmb);
 		lmb_clear_nid(lmb);
-	} else {
-		lmb->flags |= DRCONF_MEM_ASSIGNED;
 	}
 
 	return rc;
Signature · 1 line
2.29.2
maintainer
#1 lore raw
Quoted 4 lines · Laurent Dufour

This patch applies to 5.9 and earlier kernels only.

Since 5.10, this has been fortunately fixed by the commit e5e179aa3a39 ("pseries/drmem: don't cache node id in drmem_lmb struct").

Why can't we just backport that patch instead? It's almost always better to do that than to have a one-off patch, as almost always those have bugs in them.

thanks,

greg k-h

#2 lore raw

Le 03/12/2020 à 19:25, Greg KH a écrit :

Quoted 9 lines · Laurent Dufour
Quoted 4 lines

This patch applies to 5.9 and earlier kernels only.

Since 5.10, this has been fortunately fixed by the commit e5e179aa3a39 ("pseries/drmem: don't cache node id in drmem_lmb struct").

Why can't we just backport that patch instead? It's almost always better to do that than to have a one-off patch, as almost always those have bugs in them.

That's a good option too.
I was thinking that this 5.10 patch was not matching the stable release's guidelines since it was targeting performance issue, but since it is also fixing this issue, I'm certainly wrong.

So, forget that patch.

Thanks,
Laurent.