On 7/11/16 8:00 PM, Sasha Levin wrote:
> From: Nitin Gupta <nitin.m.gupta@xxxxxxxxxx>
>
> This patch has been added to the 3.18 stable tree. If you have any
> objections, please let us know.
>
> ===============
>
> [ Upstream commit 36beca6571c941b28b0798667608239731f9bc3a ]
>
This port of upstream patch (36beca6) looks incorrect. This patch
must be applied after upstream patch 52708d69. So, the correct
order of porting upstream patches is:
sparc64: Fix numa distance values
52708d690b8be132ba9d294464625dbbdb9fa5df
and then:
sparc64: Fix numa node distance initialization
36beca6571c941b28b0798667608239731f9bc3a
Thanks,
Nitin
> Orabug: 22495713
>
> Currently, NUMA node distance matrix is initialized only
> when a machine descriptor (MD) exists. However, sun4u
> machines (e.g. Sun Blade 2500) do not have an MD and thus
> distance values were left uninitialized. The initialization
> is now moved such that it happens on both sun4u and sun4v.
>
> Signed-off-by: Nitin Gupta <nitin.m.gupta@xxxxxxxxxx>
> Tested-by: Mikael Pettersson <mikpelinux@xxxxxxxxx>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
> ---
> arch/sparc/mm/init_64.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
> index 2d91c62..24e907b 100644
> --- a/arch/sparc/mm/init_64.c
> +++ b/arch/sparc/mm/init_64.c
> @@ -1300,10 +1300,18 @@ static int __init numa_parse_sun4u(void)
>
> static int __init bootmem_init_numa(void)
> {
> + int i, j;
> int err = -1;
>
> numadbg("bootmem_init_numa()\n");
>
> + /* Some sane defaults for numa latency values */
> + for (i = 0; i < MAX_NUMNODES; i++) {
> + for (j = 0; j < MAX_NUMNODES; j++)
> + numa_latency[i][j] = (i == j) ?
> + LOCAL_DISTANCE : REMOTE_DISTANCE;
> + }
> +
> if (numa_enabled) {
> if (tlb_type == hypervisor)
> err = numa_parse_mdesc();
>
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html