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 S1751638AbcJILlZ (ORCPT <rfc822;w@1wt.eu>);
        Sun, 9 Oct 2016 07:41:25 -0400
Received: from mx2.suse.de ([195.135.220.15]:60804 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751008AbcJILlY (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 9 Oct 2016 07:41:24 -0400
Date: Sun, 9 Oct 2016 13:41:16 +0200
From: Borislav Petkov <bp@suse.de>
To: Fenghua Yu <fenghua.yu@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
        "H. Peter Anvin" <h.peter.anvin@intel.com>,
        Ingo Molnar <mingo@elte.hu>, Tony Luck <tony.luck@intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Stephane Eranian <eranian@google.com>,
        Dave Hansen <dave.hansen@intel.com>,
        Nilay Vaish <nilayvaish@gmail.com>, Shaohua Li <shli@fb.com>,
        David Carrillo-Cisneros <davidcc@google.com>,
        Ravi V Shankar <ravi.v.shankar@intel.com>,
        Sai Prakhya <sai.praneeth.prakhya@intel.com>,
        Vikas Shivappa <vikas.shivappa@linux.intel.com>,
        linux-kernel <linux-kernel@vger.kernel.org>, x86 <x86@kernel.org>
Subject: Re: [PATCH v3 07/18] x86/intel_rdt: Add Haswell feature discovery
Message-ID: <20161009114116.js3cevxzbuucjeni@pd.tnic>
References: <1475894763-64683-1-git-send-email-fenghua.yu@intel.com>
 <1475894763-64683-8-git-send-email-fenghua.yu@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1475894763-64683-8-git-send-email-fenghua.yu@intel.com>
User-Agent: NeoMutt/ (1.7.0)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, Oct 07, 2016 at 07:45:52PM -0700, Fenghua Yu wrote:
> From: Fenghua Yu <fenghua.yu@intel.com>
> 
> Some Haswell generation CPUs support RDT, but they don't enumerate this
> using CPUID.  Use rdmsr_safe() and wrmsr_safe() to probe the MSRs on
> cpu model 63 (INTEL_FAM6_HASWELL_X)
> 
> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> ---
>  arch/x86/events/intel/cqm.c             |  2 +-
>  arch/x86/include/asm/intel_rdt_common.h |  6 ++++++
>  arch/x86/kernel/cpu/intel_rdt.c         | 38 +++++++++++++++++++++++++++++++++
>  3 files changed, 45 insertions(+), 1 deletion(-)
>  create mode 100644 arch/x86/include/asm/intel_rdt_common.h

...

> +static inline bool cache_alloc_hsw_probe(void)
> +{
> +	u32 l, h_old, h_new, h_tmp;
> +
> +	if (rdmsr_safe(MSR_IA32_PQR_ASSOC, &l, &h_old))
> +		return false;
> +
> +	/*
> +	 * Default value is always 0 if feature is present.
> +	 */
> +	h_tmp = h_old ^ 0x1U;
> +	if (wrmsr_safe(MSR_IA32_PQR_ASSOC, l, h_tmp))

I don't understand - you do the family/model check below and yet still
use the _safe() variants. Isn't the presence of that MSR guaranteed on
those machines?

> +		return false;
> +	rdmsr(MSR_IA32_PQR_ASSOC, l, h_new);
> +
> +	if (h_tmp != h_new)
> +		return false;
> +
> +	wrmsr(MSR_IA32_PQR_ASSOC, l, h_old);
> +
> +	return true;
> +}
>  
>  static inline bool get_rdt_resources(struct cpuinfo_x86 *c)
>  {
>  	bool ret = false;
>  
> +	if (c->x86_vendor == X86_VENDOR_INTEL && c->x86 == 6 &&
> +	    c->x86_model == INTEL_FAM6_HASWELL_X)
> +		return cache_alloc_hsw_probe();
> +
>  	if (!cpu_has(c, X86_FEATURE_RDT_A))
>  		return false;
>  	if (cpu_has(c, X86_FEATURE_CAT_L3))
> -- 
> 2.5.0
> 

-- 
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--