在 2024/1/31 5:09, Borislav Petkov 写道:
On Thu, Jan 11, 2024 at 09:55:46PM +0800, Tong Tiangen wrote:
In commit 034ff37d3407 ("x86: rewrite '__copy_user_nocache' function"),
rewrited __copy_user_nocache() uses EX_TYPE_UACCESS instead of
EX_TYPE_COPY，this change does not broken the MC safe copy for
__copy_user_nocache(), but as a result, there's no place for EX_TYPE_COPY
to use. Therefore, we remove the definition of EX_TYPE_COPY.
Please use passive voice in your commit message: no "we" or "I", etc,
and describe your changes in imperative mood.
Also, pls read section "2) Describe your changes" in
Documentation/process/submitting-patches.rst for more details.
Also, see section "Changelog" in
Documentation/process/maintainer-tip.rst
OK, thanks, Improved in the next release.
diff --git a/arch/x86/include/asm/extable_fixup_types.h b/arch/x86/include/asm/extable_fixup_types.h
index fe6312045042..787916ec1e12 100644
--- a/arch/x86/include/asm/extable_fixup_types.h
+++ b/arch/x86/include/asm/extable_fixup_types.h
@@ -36,18 +36,17 @@
#define EX_TYPE_DEFAULT 1
#define EX_TYPE_FAULT 2
#define EX_TYPE_UACCESS 3
-#define EX_TYPE_COPY 4
-#define EX_TYPE_CLEAR_FS 5
-#define EX_TYPE_FPU_RESTORE 6
-#define EX_TYPE_BPF 7
-#define EX_TYPE_WRMSR 8
-#define EX_TYPE_RDMSR 9
-#define EX_TYPE_WRMSR_SAFE 10 /* reg := -EIO */
-#define EX_TYPE_RDMSR_SAFE 11 /* reg := -EIO */
-#define EX_TYPE_WRMSR_IN_MCE 12
-#define EX_TYPE_RDMSR_IN_MCE 13
-#define EX_TYPE_DEFAULT_MCE_SAFE 14
-#define EX_TYPE_FAULT_MCE_SAFE 15
+#define EX_TYPE_CLEAR_FS 4
+#define EX_TYPE_FPU_RESTORE 5
+#define EX_TYPE_BPF 6
+#define EX_TYPE_WRMSR 7
+#define EX_TYPE_RDMSR 8
+#define EX_TYPE_WRMSR_SAFE 9 /* reg := -EIO */
+#define EX_TYPE_RDMSR_SAFE 10 /* reg := -EIO */
+#define EX_TYPE_WRMSR_IN_MCE 11
+#define EX_TYPE_RDMSR_IN_MCE 12
+#define EX_TYPE_DEFAULT_MCE_SAFE 13
+#define EX_TYPE_FAULT_MCE_SAFE 14
You don't need to renumber them - all you need to do is to comment it
out:
/* unused, was: #define EX_TYPE_COPY 4 */
OK.
Thanks.
Tong.
