From 1049f4bd25251603508962caa4b8d2dee55006fe Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Tue, 23 Jun 2020 16:41:25 +0200 Subject: [PATCH] Drop "x86/cpu: Add a steppings field to struct x86_cpu_id" --- debian/changelog | 1 - ...steppings-field-to-struct-x86_cpu_id.patch | 120 ------------------ debian/patches/series | 1 - 3 files changed, 122 deletions(-) delete mode 100644 debian/patches/bugfix/x86/srbds/0001-x86-cpu-Add-a-steppings-field-to-struct-x86_cpu_id.patch diff --git a/debian/changelog b/debian/changelog index e9454052d..d0c9ca862 100644 --- a/debian/changelog +++ b/debian/changelog @@ -480,7 +480,6 @@ linux (4.19.128-1) UNRELEASED; urgency=medium - staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK - CDC-ACM: heed quirk also in error handling - nvmem: qfprom: remove incorrect write support - - x86/cpu: Add a steppings field to struct x86_cpu_id - x86/cpu: Add 'table' argument to cpu_matches() - x86/speculation: Add Special Register Buffer Data Sampling (SRBDS) mitigation - x86/speculation: Add SRBDS vulnerability and mitigation documentation diff --git a/debian/patches/bugfix/x86/srbds/0001-x86-cpu-Add-a-steppings-field-to-struct-x86_cpu_id.patch b/debian/patches/bugfix/x86/srbds/0001-x86-cpu-Add-a-steppings-field-to-struct-x86_cpu_id.patch deleted file mode 100644 index dcbbf2f29..000000000 --- a/debian/patches/bugfix/x86/srbds/0001-x86-cpu-Add-a-steppings-field-to-struct-x86_cpu_id.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Mark Gross -Date: Thu, 16 Apr 2020 17:23:10 +0200 -Subject: [1/5] x86/cpu: Add a steppings field to struct x86_cpu_id -Origin: https://git.kernel.org/linus/e9d7144597b10ff13ff2264c059f7d4a7fbc89ac -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2020-0543 - -Intel uses the same family/model for several CPUs. Sometimes the -stepping must be checked to tell them apart. - -On x86 there can be at most 16 steppings. Add a steppings bitmask to -x86_cpu_id and a X86_MATCH_VENDOR_FAMILY_MODEL_STEPPING_FEATURE macro -and support for matching against family/model/stepping. - - [ bp: Massage. - tglx: Lightweight variant for backporting ] - -Signed-off-by: Mark Gross -Signed-off-by: Borislav Petkov -Signed-off-by: Thomas Gleixner -Reviewed-by: Tony Luck -Reviewed-by: Josh Poimboeuf ---- - arch/x86/include/asm/cpu_device_id.h | 27 +++++++++++++++++++++++++++ - arch/x86/kernel/cpu/match.c | 7 ++++++- - include/linux/mod_devicetable.h | 6 ++++++ - 3 files changed, 39 insertions(+), 1 deletion(-) - -diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h -index baeba0567126..884466592943 100644 ---- a/arch/x86/include/asm/cpu_device_id.h -+++ b/arch/x86/include/asm/cpu_device_id.h -@@ -9,6 +9,33 @@ - - #include - -+#define X86_STEPPINGS(mins, maxs) GENMASK(maxs, mins) -+ -+/** -+ * X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE - Base macro for CPU matching -+ * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY -+ * The name is expanded to X86_VENDOR_@_vendor -+ * @_family: The family number or X86_FAMILY_ANY -+ * @_model: The model number, model constant or X86_MODEL_ANY -+ * @_steppings: Bitmask for steppings, stepping constant or X86_STEPPING_ANY -+ * @_feature: A X86_FEATURE bit or X86_FEATURE_ANY -+ * @_data: Driver specific data or NULL. The internal storage -+ * format is unsigned long. The supplied value, pointer -+ * etc. is casted to unsigned long internally. -+ * -+ * Backport version to keep the SRBDS pile consistant. No shorter variants -+ * required for this. -+ */ -+#define X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(_vendor, _family, _model, \ -+ _steppings, _feature, _data) { \ -+ .vendor = X86_VENDOR_##_vendor, \ -+ .family = _family, \ -+ .model = _model, \ -+ .steppings = _steppings, \ -+ .feature = _feature, \ -+ .driver_data = (unsigned long) _data \ -+} -+ - extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match); - - #endif -diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c -index 3fed38812eea..751e59057466 100644 ---- a/arch/x86/kernel/cpu/match.c -+++ b/arch/x86/kernel/cpu/match.c -@@ -34,13 +34,18 @@ const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match) - const struct x86_cpu_id *m; - struct cpuinfo_x86 *c = &boot_cpu_data; - -- for (m = match; m->vendor | m->family | m->model | m->feature; m++) { -+ for (m = match; -+ m->vendor | m->family | m->model | m->steppings | m->feature; -+ m++) { - if (m->vendor != X86_VENDOR_ANY && c->x86_vendor != m->vendor) - continue; - if (m->family != X86_FAMILY_ANY && c->x86 != m->family) - continue; - if (m->model != X86_MODEL_ANY && c->x86_model != m->model) - continue; -+ if (m->steppings != X86_STEPPING_ANY && -+ !(BIT(c->x86_stepping) & m->steppings)) -+ continue; - if (m->feature != X86_FEATURE_ANY && !cpu_has(c, m->feature)) - continue; - return m; -diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h -index 867db9b9384c..84e4e20352d9 100644 ---- a/include/linux/mod_devicetable.h -+++ b/include/linux/mod_devicetable.h -@@ -621,6 +621,10 @@ struct mips_cdmm_device_id { - /* - * MODULE_DEVICE_TABLE expects this struct to be called x86cpu_device_id. - * Although gcc seems to ignore this error, clang fails without this define. -+ * -+ * Note: The ordering of the struct is different from upstream because the -+ * static initializers in kernels < 5.7 still use C89 style while upstream -+ * has been converted to proper C99 initializers. - */ - #define x86cpu_device_id x86_cpu_id - struct x86_cpu_id { -@@ -629,6 +633,7 @@ struct x86_cpu_id { - __u16 model; - __u16 feature; /* bit index */ - kernel_ulong_t driver_data; -+ __u16 steppings; - }; - - #define X86_FEATURE_MATCH(x) \ -@@ -637,6 +642,7 @@ struct x86_cpu_id { - #define X86_VENDOR_ANY 0xffff - #define X86_FAMILY_ANY 0 - #define X86_MODEL_ANY 0 -+#define X86_STEPPING_ANY 0 - #define X86_FEATURE_ANY 0 /* Same as FPU, you can't test for that */ - - /* diff --git a/debian/patches/series b/debian/patches/series index 1642f66e6..df28748fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -296,7 +296,6 @@ features/arm/staging-vc04_services-Use-correct-cache-line-size.patch # Security fixes debian/i386-686-pae-pci-set-pci-nobios-by-default.patch debian/ntfs-mark-it-as-broken.patch -bugfix/x86/srbds/0001-x86-cpu-Add-a-steppings-field-to-struct-x86_cpu_id.patch bugfix/x86/srbds/0002-x86-cpu-Add-table-argument-to-cpu_matches.patch bugfix/x86/srbds/0003-x86-speculation-Add-Special-Register-Buffer-Data-Sam.patch bugfix/x86/srbds/0004-x86-speculation-Add-SRBDS-vulnerability-and-mitigati.patch