Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1216490

[PATCH 15/15] x86, fpu: check CPU-provided sizes against struct declarations

Show all headers | View raw

From: Dave Hansen <dave.hansen@linux.intel.com>

Changes from v2:
 * remove XSTATE_RESERVED check, since it is gone now

--

From: Dave Hansen <dave.hansen@linux.intel.com>

We now have C structures defined for each of the XSAVE state
components that we support.  This patch adds checks during our
verification pass to ensure that the CPU-provided data
enumerated in CPUID leaves matches our C structures.

If not, we warn and dump all the XSAVE CPUID leaves.

Note: this *actually* found an inconsistency with the MPX
'bndcsr' state.  The hardware pads it out differently from
our C structures.  This patch caught it and warned.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: x86@kernel.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: linux-kernel@vger.kernel.org
---

 b/arch/x86/kernel/fpu/xstate.c |   45 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff -puN arch/x86/kernel/fpu/xstate.c~x86-fpu-check-against-struct-declarations arch/x86/kernel/fpu/xstate.c
--- a/arch/x86/kernel/fpu/xstate.c~x86-fpu-check-against-struct-declarations	2015-08-31 15:17:37.593028476 -0700
+++ b/arch/x86/kernel/fpu/xstate.c	2015-08-31 15:17:37.597028659 -0700
@@ -432,6 +432,49 @@ 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 %ld bytes, cpu state %d bytes\n",	\
+		__stringify(nr_macro), sizeof(__struct), sz)) {		\
+		__xstate_dump_leaves();					\
+	}								\
+} while (0)
+
+/*
+ * We have a C struct for each 'xstate'.  We need to ensure
+ * that our software representation matches what the CPU
+ * tells us about the state's size.
+ */
+static void check_xstate_against_struct(int nr)
+{
+	/*
+	 * Ask the CPU for the size of the state.
+	 */
+	int sz = xfeature_size(nr);
+	/*
+	 * Match each CPU state with the corresponding software
+	 * structure.
+	 */
+	XCHECK_SZ(sz, nr, XFEATURE_YMM,       struct ymmh_struct);
+	XCHECK_SZ(sz, nr, XFEATURE_BNDREGS,   struct mpx_bndreg_state);
+	XCHECK_SZ(sz, nr, XFEATURE_BNDCSR,    struct mpx_bndcsr_state);
+	XCHECK_SZ(sz, nr, XFEATURE_OPMASK,    struct avx_512_opmask_state);
+	XCHECK_SZ(sz, nr, XFEATURE_ZMM_Hi256, struct avx_512_zmm_uppers_state);
+	XCHECK_SZ(sz, nr, XFEATURE_Hi16_ZMM,  struct avx_512_hi16_state);
+
+	/*
+	 * Make *SURE* to add any feature numbers in below if
+	 * there are "holes" in the xsave state component
+	 * numbers.
+	 */
+	if ((nr < XFEATURE_YMM) ||
+	    (nr >= XFEATURE_MAX)) {
+		WARN_ONCE(1, "no structure for xstate: %d\n", nr);
+		XSTATE_WARN_ON(1);
+	}
+}
+
 /*
  * This essentially double-checks what the cpu told us about
  * how large the XSAVE buffer needs to be.  We are recalculating
@@ -445,6 +488,8 @@ static void do_extra_xstate_size_checks(
 	for (i = FIRST_EXTENDED_XFEATURE; i < XFEATURE_MAX; i++) {
 		if (!xfeature_enabled(i))
 			continue;
+
+		check_xstate_against_struct(i);
 		/*
 		 * Supervisor state components can be managed only by
 		 * XSAVES, which is compacted-format only.
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/15] [v3] x86, fpu: XSAVE cleanups and sanity checks Dave Hansen <dave@sr71.net> - 2015-09-01 00:30 +0200
  [PATCH 10/15] x86, fpu: rework MPX 'xstate' types Dave Hansen <dave@sr71.net> - 2015-09-01 00:30 +0200
  [PATCH 15/15] x86, fpu: check CPU-provided sizes against struct declarations Dave Hansen <dave@sr71.net> - 2015-09-01 00:30 +0200
  [PATCH 02/15] x86, fpu: move XSAVE-disabling code to a helper Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 13/15] x86, fpu: correct and check XSAVE xstate size calculations Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 05/15] x86, fpu: XSAVE macro renames Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
    Re: [PATCH 05/15] x86, fpu: XSAVE macro renames Dave Hansen <dave@sr71.net> - 2015-09-01 01:50 +0200
  [PATCH 11/15] x86, fpu: rework YMM definition Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 06/15] x86, fpu: rename XFEATURES_NR_MAX Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 04/15] x86, fpu: kill LWP support Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 09/15] x86, fpu: add helper xfeature_enabled() instead of test_bit() Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 07/15] x86, fpu: rework XSTATE_* macros to remove magic '2' Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 12/15] x86, fpu: add C structures for AVX-512 state components Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 03/15] x86, fpu: remove XSTATE_RESERVE Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200
  [PATCH 08/15] x86, fpu: remove xfeature_nr Dave Hansen <dave@sr71.net> - 2015-09-01 00:40 +0200

csiph-web