From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755074AbbINMXj (ORCPT ); Mon, 14 Sep 2015 08:23:39 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35154 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755006AbbINMXh (ORCPT ); Mon, 14 Sep 2015 08:23:37 -0400 Date: Mon, 14 Sep 2015 05:22:32 -0700 From: tip-bot for Dave Hansen Message-ID: Cc: bp@alien8.de, luto@amacapital.net, mingo@kernel.org, brgerst@gmail.com, tglx@linutronix.de, fenghua.yu@intel.com, tim.c.chen@linux.intel.com, peterz@infradead.org, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, hpa@zytor.com, dave.hansen@linux.intel.com Reply-To: tim.c.chen@linux.intel.com, fenghua.yu@intel.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, torvalds@linux-foundation.org, dave.hansen@linux.intel.com, hpa@zytor.com, bp@alien8.de, luto@amacapital.net, mingo@kernel.org, tglx@linutronix.de, brgerst@gmail.com In-Reply-To: <20150902233129.B1534F86@viggo.jf.intel.com> References: <20150902233129.B1534F86@viggo.jf.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu: Add xfeature_enabled() helper instead of test_bit() Git-Commit-ID: 633d54c47a5bedfb42f10e6a63eeeebd35abdb4c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 633d54c47a5bedfb42f10e6a63eeeebd35abdb4c Gitweb: http://git.kernel.org/tip/633d54c47a5bedfb42f10e6a63eeeebd35abdb4c Author: Dave Hansen AuthorDate: Wed, 2 Sep 2015 16:31:29 -0700 Committer: Ingo Molnar CommitDate: Mon, 14 Sep 2015 12:21:59 +0200 x86/fpu: Add xfeature_enabled() helper instead of test_bit() We currently use test_bit() in a few places to see if an xfeature is enabled. It ends up being a bit ugly because 'xfeatures_mask' is a u64 and test_bit wants an 'unsigned long' so it requires a cast. The *_bit() functions are also techincally atomic, which we have no need for here. So, remove the test_bit()s and replace with the new xfeature_enabled() helper. This also provides a central place to add a comment about the future need to support 'system xstates'. Signed-off-by: Dave Hansen Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tim Chen Cc: dave@sr71.net Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/20150902233129.B1534F86@viggo.jf.intel.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/fpu/xstate.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index 61ec60b..ba6b6e0 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -226,6 +226,16 @@ static void __init print_xstate_features(void) } /* + * Note that in the future we will likely need a pair of + * functions here: one for user xstates and the other for + * system xstates. For now, they are the same. + */ +static int xfeature_enabled(enum xfeature xfeature) +{ + return !!(xfeatures_mask & (1UL << xfeature)); +} + +/* * This function sets up offsets and sizes of all extended states in * xsave area. This supports both standard format and compacted format * of the xsave aread. @@ -245,7 +255,7 @@ static void __init setup_xstate_comp(void) if (!cpu_has_xsaves) { for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) { - if (test_bit(i, (unsigned long *)&xfeatures_mask)) { + if (xfeature_enabled(i)) { xstate_comp_offsets[i] = xstate_offsets[i]; xstate_comp_sizes[i] = xstate_sizes[i]; } @@ -257,7 +267,7 @@ static void __init setup_xstate_comp(void) FXSAVE_SIZE + XSAVE_HDR_SIZE; for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) { - if (test_bit(i, (unsigned long *)&xfeatures_mask)) + if (xfeature_enabled(i)) xstate_comp_sizes[i] = xstate_sizes[i]; else xstate_comp_sizes[i] = 0; @@ -319,7 +329,7 @@ static unsigned int __init calculate_xstate_size(void) calculated_xstate_size = FXSAVE_SIZE + XSAVE_HDR_SIZE; for (i = FIRST_EXTENDED_XFEATURE; i < 64; i++) { - if (test_bit(i, (unsigned long *)&xfeatures_mask)) { + if (xfeature_enabled(i)) { cpuid_count(XSTATE_CPUID, i, &eax, &ebx, &ecx, &edx); calculated_xstate_size += eax; }