From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754992AbdKAQ45 (ORCPT <rfc822;w@1wt.eu>);
        Wed, 1 Nov 2017 12:56:57 -0400
Received: from Galois.linutronix.de ([146.0.238.70]:50281 "EHLO
        Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754618AbdKAQ44 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 1 Nov 2017 12:56:56 -0400
Date: Wed, 1 Nov 2017 17:56:45 +0100 (CET)
From: Thomas Gleixner <tglx@linutronix.de>
To: Prarit Bhargava <prarit@redhat.com>
cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>,
        Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
        x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
        Dave Hansen <dave.hansen@intel.com>, Piotr Luc <piotr.luc@intel.com>,
        Kan Liang <kan.liang@intel.com>, Borislav Petkov <bp@suse.de>,
        Stephane Eranian <eranian@google.com>,
        Arvind Yadav <arvind.yadav.cs@gmail.com>,
        Andy Lutomirski <luto@kernel.org>,
        Christian Borntraeger <borntraeger@de.ibm.com>,
        "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        Mathias Krause <minipli@googlemail.com>,
        Tim Chen <tim.c.chen@linux.intel.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>
Subject: Re: [PATCH 2/3 v4] x86/topology: Avoid wasting 128k for package id
 array
In-Reply-To: <20171025120940.15721-3-prarit@redhat.com>
Message-ID: <alpine.DEB.2.20.1711011748390.1942@nanos>
References: <20171025120940.15721-1-prarit@redhat.com> <20171025120940.15721-3-prarit@redhat.com>
User-Agent: Alpine 2.20 (DEB 67 2015-01-07)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
X-Linutronix-Spam-Score: -1.0
X-Linutronix-Spam-Level: -
X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required,  ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, 25 Oct 2017, Prarit Bhargava wrote:
> diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
> index b390ff76e58f..f4ab1edf4e24 100644
> --- a/arch/x86/include/asm/processor.h
> +++ b/arch/x86/include/asm/processor.h
> @@ -124,8 +124,10 @@ struct cpuinfo_x86 {
>  	u16			booted_cores;
>  	/* Physical processor id: */
>  	u16			phys_proc_id;
> -	/* Logical processor id: */
> +	/* Logical processor (package) id: */
>  	u16			logical_proc_id;
> +	/* Physical package ID */
> +	u16			phys_pkg_id;

How is this new field used aside of being written to and how is it
different from phys_proc_id? AFAICT, it's the same as all callers to
topology_update_package_map() are handing in cpu_data->phys_proc_id.

> +/**
> + * topology_phys_to_logical_pkg - Map a physical package id to a logical
> + *
> + * Returns logical package id or -1 if not found
> + */
> +int topology_phys_to_logical_pkg(unsigned int phys_pkg)
> +{
> +	int log_pkg;
> +
> +	for (log_pkg = 0; log_pkg < logical_packages; log_pkg++)
> +		if (logical_to_physical_pkg_map[log_pkg] == phys_pkg)
> +			return log_pkg;
> +
> +	return -1;
> +}
> +EXPORT_SYMBOL(topology_phys_to_logical_pkg);

....

> +
> +	/* Allocate and copy a new array */
> +	ltp_pkg_map_new = kmalloc(logical_packages * sizeof(u16), GFP_KERNEL);
> +	BUG_ON(!ltp_pkg_map_new);
> +	if (logical_to_physical_pkg_map) {
> +		memcpy(ltp_pkg_map_new, logical_to_physical_pkg_map,
> +		       logical_packages * sizeof(u16));
> +		kfree(logical_to_physical_pkg_map);
>  	}
> -	physical_to_logical_pkg[pkg] = new;
> +	logical_to_physical_pkg_map = ltp_pkg_map_new;

This lacks serialization and is therefore broken against a concurrent
topology_phys_to_logical_pkg() call for obvious reasons. The current user
is probably safe, but this really needs to be fixed now.

Thanks,

	tglx