1 files changed, 11 insertions, 4 deletions

diff --git a/tools/testing/selftests/rseq/rseq-x86.h b/tools/testing/selftests/rseq/rseq-x86.h
index 03095236f6fa..b2da6004fe30 100644
--- a/tools/testing/selftests/rseq/rseq-x86.h
+++ b/tools/testing/selftests/rseq/rseq-x86.h
@@ -7,6 +7,13 @@
 
 #include <stdint.h>
 
+/*
+ * RSEQ_SIG is used with the following reserved undefined instructions, which
+ * trap in user-space:
+ *
+ * x86-32:    0f b9 3d 53 30 05 53      ud1    0x53053053,%edi
+ * x86-64:    0f b9 3d 53 30 05 53      ud1    0x53053053(%rip),%edi
+ */
 #define RSEQ_SIG        0x53053053
 
 /*
@@ -88,8 +95,8 @@ do {									\
 
 #define RSEQ_ASM_DEFINE_ABORT(label, teardown, abort_label)             \
                 ".pushsection __rseq_failure, \"ax\"\n\t"               \
-                /* Disassembler-friendly signature: nopl <sig>(%rip). */\
-                ".byte 0x0f, 0x1f, 0x05\n\t"                            \
+                /* Disassembler-friendly signature: ud1 <sig>(%rip),%edi. */ \
+                ".byte 0x0f, 0xb9, 0x3d\n\t"                            \
                 ".long " __rseq_str(RSEQ_SIG) "\n\t"                    \
                 __rseq_str(label) ":\n\t"                               \
                 teardown                                                \
@@ -609,8 +616,8 @@ do {									\
 
 #define RSEQ_ASM_DEFINE_ABORT(label, teardown, abort_label)             \
                 ".pushsection __rseq_failure, \"ax\"\n\t"               \
-                /* Disassembler-friendly signature: nopl <sig>. */      \
-                ".byte 0x0f, 0x1f, 0x05\n\t"                            \
+                /* Disassembler-friendly signature: ud1 <sig>,%edi. */  \
+                ".byte 0x0f, 0xb9, 0x3d\n\t"                            \
                 ".long " __rseq_str(RSEQ_SIG) "\n\t"                    \
                 __rseq_str(label) ":\n\t"                               \
                 teardown                                                \