From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2928CC433FE for ; Fri, 1 Oct 2021 22:46:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 14C6261ADF for ; Fri, 1 Oct 2021 22:46:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356152AbhJAWsE (ORCPT ); Fri, 1 Oct 2021 18:48:04 -0400 Received: from mga17.intel.com ([192.55.52.151]:38147 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356046AbhJAWrh (ORCPT ); Fri, 1 Oct 2021 18:47:37 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10124"; a="205756683" X-IronPort-AV: E=Sophos;i="5.85,340,1624345200"; d="scan'208";a="205756683" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2021 15:44:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,340,1624345200"; d="scan'208";a="565344007" Received: from chang-linux-3.sc.intel.com ([172.25.66.175]) by fmsmga002.fm.intel.com with ESMTP; 01 Oct 2021 15:44:18 -0700 From: "Chang S. Bae" To: bp@suse.de, luto@kernel.org, tglx@linutronix.de, mingo@kernel.org, x86@kernel.org Cc: len.brown@intel.com, lenb@kernel.org, dave.hansen@intel.com, thiago.macieira@intel.com, jing2.liu@intel.com, ravi.v.shankar@intel.com, linux-kernel@vger.kernel.org, chang.seok.bae@intel.com Subject: [PATCH v11 18/29] x86/fpu/xstate: Disable XSTATE support if an inconsistent state is detected Date: Fri, 1 Oct 2021 15:37:17 -0700 Message-Id: <20211001223728.9309-19-chang.seok.bae@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211001223728.9309-1-chang.seok.bae@intel.com> References: <20211001223728.9309-1-chang.seok.bae@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The kernel has a sanity check between two methods to calculate XSTATE size. In the unlikely event that they disagree, disable the use of XSTATE. Suggested-by: Thomas Gleixner Signed-off-by: Chang S. Bae Reviewed-by: Len Brown Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org --- Changes from v4: * Added as a new patch. (Thomas Gleixner) --- arch/x86/kernel/fpu/xstate.c | 40 ++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c index b6bf32cb650d..e5a734d88660 100644 --- a/arch/x86/kernel/fpu/xstate.c +++ b/arch/x86/kernel/fpu/xstate.c @@ -608,11 +608,11 @@ static void __xstate_dump_leaves(void) } while (0) #define XCHECK_SZ(sz, nr, nr_macro, __struct) do { \ - if ((nr == nr_macro) && \ - WARN_ONCE(sz != sizeof(__struct), \ - "%s: struct is %zu bytes, cpu state %d bytes\n", \ - __stringify(nr_macro), sizeof(__struct), sz)) { \ + if ((nr == nr_macro) && (sz != sizeof(__struct))) { \ + pr_err("%s: struct is %zu bytes, cpu state %d bytes\n", \ + __stringify(nr_macro), sizeof(__struct), sz); \ __xstate_dump_leaves(); \ + return -EINVAL; \ } \ } while (0) @@ -621,7 +621,7 @@ static void __xstate_dump_leaves(void) * that our software representation matches what the CPU * tells us about the state's size. */ -static void check_xstate_against_struct(int nr) +static int check_xstate_against_struct(int nr) { /* * Ask the CPU for the size of the state. @@ -649,9 +649,12 @@ static void check_xstate_against_struct(int nr) (nr >= XFEATURE_MAX) || (nr == XFEATURE_PT_UNIMPLEMENTED_SO_FAR) || ((nr >= XFEATURE_RSRVD_COMP_11) && (nr <= XFEATURE_LBR))) { - WARN_ONCE(1, "no structure for xstate: %d\n", nr); + pr_err("no structure for xstate: %d\n", nr); XSTATE_WARN_ON(1); + return -EINVAL; } + + return 0; } /** @@ -664,13 +667,14 @@ static void check_xstate_against_struct(int nr) * excluded. Only the size of the buffer for task->fpu is checked here. * * @include_dynamic_states: A knob to include dynamic states or not. + * @size: A pointer to record the size. * - * Return: The calculated xstate size. + * Return: 0 if successful; otherwise, error code. */ -static unsigned int calculate_xstate_size(bool include_dynamic_states) +static int calculate_xstate_size(bool include_dynamic_states, unsigned int *size) { unsigned int xstate_size = FXSAVE_SIZE + XSAVE_HDR_SIZE; - int i; + int i, err; for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) { if (!xfeature_enabled(i)) @@ -679,7 +683,10 @@ static unsigned int calculate_xstate_size(bool include_dynamic_states) if ((xfeatures_mask_user_dynamic & BIT_ULL(i)) && !include_dynamic_states) continue; - check_xstate_against_struct(i); + err = check_xstate_against_struct(i); + if (err) + return err; + /* * Supervisor state components can be managed only by * XSAVES. @@ -705,7 +712,9 @@ static unsigned int calculate_xstate_size(bool include_dynamic_states) xstate_size += xfeature_size(i); } - return xstate_size; + if (size) + *size = xstate_size; + return 0; } /* @@ -791,6 +800,7 @@ static int __init init_xstate_size(void) /* Recompute the context size for enabled features: */ unsigned int possible_xstate_size, xstate_size; unsigned int xsave_size; + int err; xsave_size = get_xsave_size(); @@ -803,14 +813,18 @@ static int __init init_xstate_size(void) * Calculate the maximum xstate size, including the dynamic states. */ fpu_buf_cfg.max_size = possible_xstate_size; - xstate_size = calculate_xstate_size(true); + err = calculate_xstate_size(true, &xstate_size); + if (err) + return err; XSTATE_WARN_ON(possible_xstate_size != xstate_size); /* * Calculate the minimum xstate size, i.e., excluding the dynamic * xstates. */ - xstate_size = calculate_xstate_size(false); + err = calculate_xstate_size(false, &xstate_size); + if (err) + return err; if (!is_supported_xstate_size(xstate_size)) return -EINVAL; -- 2.17.1