From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=wZlq=MS=lists.ozlabs.org=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,
	INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED
	autolearn=ham autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 3C0CAC4338F
	for <linuxppc-dev@archiver.kernel.org>; Mon, 26 Jul 2021 02:42:51 +0000 (UTC)
Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mail.kernel.org (Postfix) with ESMTPS id AA3CB60EB2
	for <linuxppc-dev@archiver.kernel.org>; Mon, 26 Jul 2021 02:42:50 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AA3CB60EB2
Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au
Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.ozlabs.org
Received: from boromir.ozlabs.org (localhost [IPv6:::1])
	by lists.ozlabs.org (Postfix) with ESMTP id 4GY43D6qSGz3d3p
	for <linuxppc-dev@archiver.kernel.org>; Mon, 26 Jul 2021 12:42:48 +1000 (AEST)
Authentication-Results: lists.ozlabs.org;
	dkim=pass (1024-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=201602 header.b=Sa1czTBS;
	dkim-atps=neutral
Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized)
 smtp.mailfrom=ozlabs.org (client-ip=2401:3900:2:1::2; helo=ozlabs.org;
 envelope-from=dgibson@ozlabs.org; receiver=<UNKNOWN>)
Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key;
 secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au
 header.a=rsa-sha256 header.s=201602 header.b=Sa1czTBS; 
 dkim-atps=neutral
Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
 (No client certificate requested)
 by lists.ozlabs.org (Postfix) with ESMTPS id 4GY41y6tFMz30C6
 for <linuxppc-dev@lists.ozlabs.org>; Mon, 26 Jul 2021 12:41:42 +1000 (AEST)
Received: by ozlabs.org (Postfix, from userid 1007)
 id 4GY41s4J0gz9sjJ; Mon, 26 Jul 2021 12:41:37 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gibson.dropbear.id.au; s=201602; t=1627267297;
 bh=VgIY9QgOPPAGh2jLIrnwdNeyHQBS5wPshb0VbibJpa8=;
 h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
 b=Sa1czTBSv+TxDFSUVJXe9XZaAS7Jlz4UPekcFXjyHJtc8G8qiXhr1Un+jzaVRYqsq
 5gXHdoLIh4ZEO3lQbyfasg+fc1ls8WLX8vnhZhINd8nZjUevYYrvjSuek2uIvHtAIu
 WZ0Cr2VO02MsAeWhoMsQBePp91fwYTcZWEMtA+5Q=
Date: Mon, 26 Jul 2021 12:37:34 +1000
From: David Gibson <david@gibson.dropbear.id.au>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Subject: Re: [PATCH v5 4/6] powerpc/pseries: Consolidate different NUMA
 distance update code paths
Message-ID: <YP4f7lj9p4f/h77f@yekko>
References: <20210628151117.545935-1-aneesh.kumar@linux.ibm.com>
 <20210628151117.545935-5-aneesh.kumar@linux.ibm.com>
 <YPjMkQ5W1fSQdzNe@yekko> <87zgueu8ql.fsf@linux.ibm.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="K4krqMQhK+kY8e8h"
Content-Disposition: inline
In-Reply-To: <87zgueu8ql.fsf@linux.ibm.com>
X-BeenThere: linuxppc-dev@lists.ozlabs.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/>
List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>
Cc: Nathan Lynch <nathanl@linux.ibm.com>,
 Daniel Henrique Barboza <danielhb413@gmail.com>, linuxppc-dev@lists.ozlabs.org
Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org
Sender: "Linuxppc-dev"
 <linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org>


--K4krqMQhK+kY8e8h
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Jul 22, 2021 at 12:37:46PM +0530, Aneesh Kumar K.V wrote:
> David Gibson <david@gibson.dropbear.id.au> writes:
>=20
> > On Mon, Jun 28, 2021 at 08:41:15PM +0530, Aneesh Kumar K.V wrote:
> >> The associativity details of the newly added resourced are collected f=
rom
> >> the hypervisor via "ibm,configure-connector" rtas call. Update the numa
> >> distance details of the newly added numa node after the above call.
> >>=20
> >> Instead of updating NUMA distance every time we lookup a node id
> >> from the associativity property, add helpers that can be used
> >> during boot which does this only once. Also remove the distance
> >> update from node id lookup helpers.
> >>=20
> >> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
> >> ---
> >>  arch/powerpc/mm/numa.c                        | 173 +++++++++++++-----
> >>  arch/powerpc/platforms/pseries/hotplug-cpu.c  |   2 +
> >>  .../platforms/pseries/hotplug-memory.c        |   2 +
> >>  arch/powerpc/platforms/pseries/pseries.h      |   1 +
> >>  4 files changed, 132 insertions(+), 46 deletions(-)
> >>=20
> >> diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
> >> index 0ec16999beef..7b142f79d600 100644
> >> --- a/arch/powerpc/mm/numa.c
> >> +++ b/arch/powerpc/mm/numa.c
> >> @@ -208,22 +208,6 @@ int __node_distance(int a, int b)
> >>  }
> >>  EXPORT_SYMBOL(__node_distance);
> >> =20
> >> -static void initialize_distance_lookup_table(int nid,
> >> -		const __be32 *associativity)
> >> -{
> >> -	int i;
> >> -
> >> -	if (affinity_form !=3D FORM1_AFFINITY)
> >> -		return;
> >> -
> >> -	for (i =3D 0; i < max_associativity_domain_index; i++) {
> >> -		const __be32 *entry;
> >> -
> >> -		entry =3D &associativity[be32_to_cpu(distance_ref_points[i]) - 1];
> >> -		distance_lookup_table[nid][i] =3D of_read_number(entry, 1);
> >> -	}
> >> -}
> >> -
> >>  /*
> >>   * Returns nid in the range [0..nr_node_ids], or -1 if no useful NUMA
> >>   * info is found.
> >> @@ -241,15 +225,6 @@ static int associativity_to_nid(const __be32 *ass=
ociativity)
> >>  	/* POWER4 LPAR uses 0xffff as invalid node */
> >>  	if (nid =3D=3D 0xffff || nid >=3D nr_node_ids)
> >>  		nid =3D NUMA_NO_NODE;
> >> -
> >> -	if (nid > 0 &&
> >> -		of_read_number(associativity, 1) >=3D max_associativity_domain_inde=
x) {
> >> -		/*
> >> -		 * Skip the length field and send start of associativity array
> >> -		 */
> >> -		initialize_distance_lookup_table(nid, associativity + 1);
> >> -	}
> >> -
> >>  out:
> >>  	return nid;
> >>  }
> >> @@ -287,6 +262,49 @@ int of_node_to_nid(struct device_node *device)
> >>  }
> >>  EXPORT_SYMBOL(of_node_to_nid);
> >> =20
> >> +static void __initialize_form1_numa_distance(const __be32 *associativ=
ity)
> >> +{
> >> +	int i, nid;
> >> +
> >> +	if (affinity_form !=3D FORM1_AFFINITY)
> >
> > Since this shouldn't be called on a !form1 system, this could be a WARN=
_ON().
>=20
> The way we call functions currently, instead of doing
>=20
> if (affinity_form =3D=3D FORM1_AFFINITY)
>     __initialize_form1_numa_distance()
>=20
> We avoid doing the if check in multiple places. For example
> parse_numa_properties will fetch the associativity array to find the
> details of online node and set it online. We use the same code path to
> initialize distance.
>=20
> 		if (__vphn_get_associativity(i, vphn_assoc) =3D=3D 0) {
> 			nid =3D associativity_to_nid(vphn_assoc);
> 			__initialize_form1_numa_distance(vphn_assoc);
> 		} else {
>=20
> 			cpu =3D of_get_cpu_node(i, NULL);
> 			BUG_ON(!cpu);
>=20
> 			associativity =3D of_get_associativity(cpu);
> 			if (associativity) {
> 				nid =3D associativity_to_nid(associativity);
> 				__initialize_form1_numa_distance(associativity);
> 			}
>=20
> We avoid the the if (affinity_form =3D=3D FORM1_AFFINITY) check there by
> moving the check inside __initialize_form1_numa_distance().

Oh.. ok.  The only caller I spotted was already doing a test against
affinity_form.

> >> +		return;
> >> +
> >> +	if (of_read_number(associativity, 1) >=3D primary_domain_index) {
> >> +		nid =3D of_read_number(&associativity[primary_domain_index], 1);
> >
> > This computes the nid from the assoc array independently of
> > associativity_to_nid, which doesn't seem like a good idea.  Wouldn't
> > it be better to call assocaitivity_to_nid(), then make the next bit
> > conditional on nid !=3D=3D NUMA_NO_NODE?
>=20
> @@ -302,9 +302,8 @@ static void __initialize_form1_numa_distance(const __=
be32 *associativity)
>  	if (affinity_form !=3D FORM1_AFFINITY)
>  		return;
> =20
> -	if (of_read_number(associativity, 1) >=3D primary_domain_index) {
> -		nid =3D of_read_number(&associativity[primary_domain_index], 1);
> -
> +	nid =3D associativity_to_nid(associativity);
> +	if (nid !=3D NUMA_NO_NODE) {
>  		for (i =3D 0; i < distance_ref_points_depth; i++) {
>  			const __be32 *entry;

Right.

> >
> >> +
> >> +		for (i =3D 0; i < max_associativity_domain_index; i++) {
> >> +			const __be32 *entry;
> >> +
> >> +			entry =3D &associativity[be32_to_cpu(distance_ref_points[i])];
> >> +			distance_lookup_table[nid][i] =3D of_read_number(entry, 1);
> >> +		}
> >> +	}
> >> +}
> >> +
> >> +static void initialize_form1_numa_distance(struct device_node *node)
> >> +{
> >> +	const __be32 *associativity;
> >> +
> >> +	associativity =3D of_get_associativity(node);
> >> +	if (!associativity)
> >> +		return;
> >> +
> >> +	__initialize_form1_numa_distance(associativity);
> >> +}
> >> +
> >> +/*
> >> + * Used to update distance information w.r.t newly added node.
> >> + */
> >> +void update_numa_distance(struct device_node *node)
> >> +{
> >> +	if (affinity_form =3D=3D FORM0_AFFINITY)
> >> +		return;
> >> +	else if (affinity_form =3D=3D FORM1_AFFINITY) {
> >> +		initialize_form1_numa_distance(node);
> >> +		return;
> >> +	}
> >> +}
> >> +
> >>  static int __init find_primary_domain_index(void)
> >>  {
> >>  	int index;
> >> @@ -433,6 +451,48 @@ static int of_get_assoc_arrays(struct assoc_array=
s *aa)
> >>  	return 0;
> >>  }
> >> =20
> >> +static int get_nid_and_numa_distance(struct drmem_lmb *lmb)
> >> +{
> >> +	struct assoc_arrays aa =3D { .arrays =3D NULL };
> >> +	int default_nid =3D NUMA_NO_NODE;
> >> +	int nid =3D default_nid;
> >> +	int rc, index;
> >> +
> >> +	if ((primary_domain_index < 0) || !numa_enabled)
> >
> > Under what circumstances could you get primary_domain_index < 0?
>=20
> IIUC that is to handle failure to parse device tree.
> ea9f5b702fe0215188fba2eda117419e4ae90a67

Ok.

> >
> >> +		return default_nid;

Returning NUMA_NO_NODE explicitly, rather than an alias to it might be
clearer here, but it's not a big detail.

> >> +
> >> +	rc =3D of_get_assoc_arrays(&aa);
> >> +	if (rc)
> >> +		return default_nid;
> >> +
> >> +	if (primary_domain_index <=3D aa.array_sz &&
> >> +	    !(lmb->flags & DRCONF_MEM_AI_INVALID) && lmb->aa_index < aa.n_ar=
rays) {
> >> +		index =3D lmb->aa_index * aa.array_sz + primary_domain_index - 1;
> >
> > Does anywhere verify that primary_domain_index <=3D aa.array_sz?
>=20
> That is the first part of the check?

Oh, sorry, missed that.  I think I was expecting it to be an early
exit, rather than folded into the rest of this complex condition.

>=20
> >
> >> +		nid =3D of_read_number(&aa.arrays[index], 1);
> >> +
> >> +		if (nid =3D=3D 0xffff || nid >=3D nr_node_ids)
> >> +			nid =3D default_nid;
> >> +		if (nid > 0 && affinity_form =3D=3D FORM1_AFFINITY) {
> >> +			int i;
> >> +			const __be32 *associativity;
> >> +
> >> +			index =3D lmb->aa_index * aa.array_sz;
> >> +			associativity =3D &aa.arrays[index];
> >> +			/*
> >> +			 * lookup array associativity entries have different format
> >> +			 * There is no length of the array as the first element.
> >
> > The difference it very small, and this is not a hot path.  Couldn't
> > you reduce a chunk of code by prepending aa.array_sz, then re-using
> > __initialize_form1_numa_distance.  Or even making
> > __initialize_form1_numa_distance() take the length as a parameter.
>=20
> The changes are small but confusing w.r.t how we look at the
> associativity-lookup-arrays. The way we interpret associativity array
> and associativity lookup array using primary_domain_index is different.
> Hence the '-1' in the node lookup here.

They're really not, though.  It's exactly the same interpretation of
the associativity array itself - it's just that one of them has the
array prepended with a (redundant) length.  So you can make
__initialize_form1_numa_distance() work on the "bare" associativity
array, with a given length.  Here you call it with aa.array_sz as the
length, and in the other place you call it with prop[0] as the length.

>=20
> 	index =3D lmb->aa_index * aa.array_sz + primary_domain_index - 1;
> 	nid =3D of_read_number(&aa.arrays[index], 1);
>=20
>=20
> >
> >> +			 */
> >> +			for (i =3D 0; i < max_associativity_domain_index; i++) {
> >> +				const __be32 *entry;
> >> +
> >> +				entry =3D &associativity[be32_to_cpu(distance_ref_points[i]) - 1];
> >
> > Does anywhere verify that distance_ref_points[i] <=3D aa.array_size for
> > every i?
>=20
> We do check for=20
>=20
> 	if (primary_domain_index <=3D aa.array_sz &&

Right, but that doesn't check the other distance_ref_points entries.
Not that there's any reason to have extra entries with Form2, but we
still don't want stray array accesses.

>=20
> >
> >> +				distance_lookup_table[nid][i] =3D of_read_number(entry, 1);
> >> +			}
> >> +		}
> >> +	}
> >> +	return nid;
> >> +}
> >> +
> >>  /*
> >>   * This is like of_node_to_nid_single() for memory represented in the
> >>   * ibm,dynamic-reconfiguration-memory node.
> >> @@ -458,21 +518,14 @@ int of_drconf_to_nid_single(struct drmem_lmb *lm=
b)
> >> =20
> >>  		if (nid =3D=3D 0xffff || nid >=3D nr_node_ids)
> >>  			nid =3D default_nid;
> >> -
> >> -		if (nid > 0) {
> >> -			index =3D lmb->aa_index * aa.array_sz;
> >> -			initialize_distance_lookup_table(nid,
> >> -							&aa.arrays[index]);
> >> -		}
> >>  	}
> >> -
> >>  	return nid;
> >>  }
> >> =20
> >>  #ifdef CONFIG_PPC_SPLPAR
> >> -static int vphn_get_nid(long lcpu)
> >> +
> >> +static int __vphn_get_associativity(long lcpu, __be32 *associativity)
> >>  {
> >> -	__be32 associativity[VPHN_ASSOC_BUFSIZE] =3D {0};
> >>  	long rc, hwid;
> >> =20
> >>  	/*
> >> @@ -492,10 +545,22 @@ static int vphn_get_nid(long lcpu)
> >> =20
> >>  		rc =3D hcall_vphn(hwid, VPHN_FLAG_VCPU, associativity);
> >>  		if (rc =3D=3D H_SUCCESS)
> >> -			return associativity_to_nid(associativity);
> >> +			return 0;
> >>  	}
> >> =20
> >> +	return -1;
> >> +}
> >> +
> >> +static int vphn_get_nid(long lcpu)
> >> +{
> >> +	__be32 associativity[VPHN_ASSOC_BUFSIZE] =3D {0};
> >> +
> >> +
> >> +	if (!__vphn_get_associativity(lcpu, associativity))
> >> +		return associativity_to_nid(associativity);
> >> +
> >>  	return NUMA_NO_NODE;
> >> +
> >>  }
> >>  #else
> >>  static int vphn_get_nid(long unused)
> >> @@ -692,7 +757,7 @@ static int __init numa_setup_drmem_lmb(struct drme=
m_lmb *lmb,
> >>  			size =3D read_n_cells(n_mem_size_cells, usm);
> >>  		}
> >> =20
> >> -		nid =3D of_drconf_to_nid_single(lmb);
> >> +		nid =3D get_nid_and_numa_distance(lmb);
> >>  		fake_numa_create_new_node(((base + size) >> PAGE_SHIFT),
> >>  					  &nid);
> >>  		node_set_online(nid);
> >> @@ -709,6 +774,7 @@ static int __init parse_numa_properties(void)
> >>  	struct device_node *memory;
> >>  	int default_nid =3D 0;
> >>  	unsigned long i;
> >> +	const __be32 *associativity;
> >> =20
> >>  	if (numa_enabled =3D=3D 0) {
> >>  		printk(KERN_WARNING "NUMA disabled by user\n");
> >> @@ -734,18 +800,30 @@ static int __init parse_numa_properties(void)
> >>  	 * each node to be onlined must have NODE_DATA etc backing it.
> >>  	 */
> >>  	for_each_present_cpu(i) {
> >> +		__be32 vphn_assoc[VPHN_ASSOC_BUFSIZE];
> >>  		struct device_node *cpu;
> >> -		int nid =3D vphn_get_nid(i);
> >> +		int nid =3D NUMA_NO_NODE;
> >> =20
> >> -		/*
> >> -		 * Don't fall back to default_nid yet -- we will plug
> >> -		 * cpus into nodes once the memory scan has discovered
> >> -		 * the topology.
> >> -		 */
> >> -		if (nid =3D=3D NUMA_NO_NODE) {
> >> +		memset(vphn_assoc, 0, VPHN_ASSOC_BUFSIZE * sizeof(__be32));
> >
> > What's the memset() for?  AFAICT you only look at vphn_assoc in the
> > branch where __vphn_get_associativity() succeeds.
>=20
> That was done to match the existing code. We do use a zero filled array
> when making that hcall in this code path. I don't see us doing that
> everywhere. But didn't want to change that behaviour in this patch.
>=20
> -static int vphn_get_nid(long lcpu)
> +
> +static int __vphn_get_associativity(long lcpu, __be32 *associativity)
>  {
>  -	__be32 associativity[VPHN_ASSOC_BUFSIZE] =3D {0};
>   	long rc, hwid;

Ok, that makes sense.

>=20
> >
> >> +
> >> +		if (__vphn_get_associativity(i, vphn_assoc) =3D=3D 0) {
> >> +			nid =3D associativity_to_nid(vphn_assoc);
> >> +			__initialize_form1_numa_distance(vphn_assoc);
> >> +		} else {
> >> +
> >> +			/*
> >> +			 * Don't fall back to default_nid yet -- we will plug
> >> +			 * cpus into nodes once the memory scan has discovered
> >> +			 * the topology.
> >> +			 */
> >>  			cpu =3D of_get_cpu_node(i, NULL);
> >>  			BUG_ON(!cpu);
> >> -			nid =3D of_node_to_nid_single(cpu);
> >> +
> >> +			associativity =3D of_get_associativity(cpu);
> >> +			if (associativity) {
> >> +				nid =3D associativity_to_nid(associativity);
> >> +				__initialize_form1_numa_distance(associativity);
> >> +			}
> >>  			of_node_put(cpu);
> >>  		}
> >> =20
> >> @@ -781,8 +859,11 @@ static int __init parse_numa_properties(void)
> >>  		 * have associativity properties.  If none, then
> >>  		 * everything goes to default_nid.
> >>  		 */
> >> -		nid =3D of_node_to_nid_single(memory);
> >> -		if (nid < 0)
> >> +		associativity =3D of_get_associativity(memory);
> >> +		if (associativity) {
> >> +			nid =3D associativity_to_nid(associativity);
> >> +			__initialize_form1_numa_distance(associativity);
> >> +		} else
> >>  			nid =3D default_nid;
> >> =20
> >>  		fake_numa_create_new_node(((start + size) >> PAGE_SHIFT), &nid);
> >> diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/power=
pc/platforms/pseries/hotplug-cpu.c
> >> index 7e970f81d8ff..778b6ab35f0d 100644
> >> --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
> >> +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
> >> @@ -498,6 +498,8 @@ static ssize_t dlpar_cpu_add(u32 drc_index)
> >>  		return saved_rc;
> >>  	}
> >> =20
> >> +	update_numa_distance(dn);
> >> +
> >>  	rc =3D dlpar_online_cpu(dn);
> >>  	if (rc) {
> >>  		saved_rc =3D rc;
> >> diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/po=
werpc/platforms/pseries/hotplug-memory.c
> >> index 36f66556a7c6..40d350f31a34 100644
> >> --- a/arch/powerpc/platforms/pseries/hotplug-memory.c
> >> +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
> >> @@ -180,6 +180,8 @@ static int update_lmb_associativity_index(struct d=
rmem_lmb *lmb)
> >>  		return -ENODEV;
> >>  	}
> >> =20
> >> +	update_numa_distance(lmb_node);
> >> +
> >>  	dr_node =3D of_find_node_by_path("/ibm,dynamic-reconfiguration-memor=
y");
> >>  	if (!dr_node) {
> >>  		dlpar_free_cc_nodes(lmb_node);
> >> diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/p=
latforms/pseries/pseries.h
> >> index 1f051a786fb3..663a0859cf13 100644
> >> --- a/arch/powerpc/platforms/pseries/pseries.h
> >> +++ b/arch/powerpc/platforms/pseries/pseries.h
> >> @@ -113,4 +113,5 @@ extern u32 pseries_security_flavor;
> >>  void pseries_setup_security_mitigations(void);
> >>  void pseries_lpar_read_hblkrm_characteristics(void);
> >> =20
> >> +void update_numa_distance(struct device_node *node);
> >>  #endif /* _PSERIES_PSERIES_H */
> >
>=20

--=20
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

--K4krqMQhK+kY8e8h
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmD+H+4ACgkQbDjKyiDZ
s5JwSA//ak+SZxAGDZu5OxAYehURbHbvs+5QgdYkty/aK+vZYdbn/XmHpLosAbzP
NfhMUbUbTNIpQNcVpPAo3doNbaralJoQJQP7OdtFvf1tIEu50pSnFmM8w8YYUnCx
bcqYVxnZPDetU/gWDzBY1u6wmtMVyl5ommiEEvEbNipmVTgOM085WpPMGO2K8kQd
1mwUzB6lxGl4751LbEnYg5nfJBsq7YPIxy1i9WVwUTk76c83IYcDdSr4uFElvQ+t
r/kdLK4/q2yf8FUrH7WBnfY3c8Q+6mxzHCBId7TbircZ08+RWqWcrW0JHrrg/425
bzw3txoPltEriSOowYS/mOnd1E6YaNccGgNTzrgqCQdP815DpObPk6CyvrB3Yz1P
cpiL7vHWR3vEoX2d+L6Wd9M2iaf2WmobmK56kKzWTswnxcr81fuGIjYfD17UqfVp
EMNTJb/xlcjMArJT0L5defPq3p+YgR5Fiwr2L8Zre4/kNHgCwgI03LvGMBUutDLY
PTFZ+Qbyory5wvhMER7dBnCD2ElHLwWkdP0YaPwPIBCWHD5AwBGp9c8IHHa1fYSx
Uz5lIRSANJaruo6JYP3H3QXIiRkRbz25+ytEQGubpm8ulZYvjOzbQ6fuevAAPFPd
9SjVwIn/8Y7v0YrMfsYibz9ZDE4Q4O1fLVrcU4fP7uJ2a0T1Gt4=
=07Gx
-----END PGP SIGNATURE-----

--K4krqMQhK+kY8e8h--