diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-11-10 11:01:15 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2021-12-11 09:09:48 +0100 |
| commit | 5fc77b916cb82fe476ae2344e0ec37445227a4f8 (patch) | |
| tree | 732ca13b188a5188bd7c9d05e0cadf925345f1c8 | |
| parent | 1c3b9091d084d92c70a4260553853509637276b9 (diff) | |
| download | linux-5fc77b916cb82fe476ae2344e0ec37445227a4f8.tar.gz linux-5fc77b916cb82fe476ae2344e0ec37445227a4f8.tar.bz2 linux-5fc77b916cb82fe476ae2344e0ec37445227a4f8.zip | |
x86/segment: Remove .fixup usage
Create and use EX_TYPE_ZERO_REG to clear the register and retry the
segment load on exception.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lore.kernel.org/r/20211110101325.663529463@infradead.org
| -rw-r--r-- | arch/x86/include/asm/extable_fixup_types.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/segment.h | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/include/asm/extable_fixup_types.h b/arch/x86/include/asm/extable_fixup_types.h index 7469038de100..a43b8c128e74 100644 --- a/arch/x86/include/asm/extable_fixup_types.h +++ b/arch/x86/include/asm/extable_fixup_types.h @@ -45,5 +45,6 @@ #define EX_TYPE_IMM_REG 17 /* reg := (long)imm */ #define EX_TYPE_EFAULT_REG (EX_TYPE_IMM_REG | EX_DATA_IMM(-EFAULT)) +#define EX_TYPE_ZERO_REG (EX_TYPE_IMM_REG | EX_DATA_IMM(0)) #endif diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h index 8dd8e8ec9fa5..b228c9d44ee7 100644 --- a/arch/x86/include/asm/segment.h +++ b/arch/x86/include/asm/segment.h @@ -307,14 +307,7 @@ do { \ \ asm volatile(" \n" \ "1: movl %k0,%%" #seg " \n" \ - \ - ".section .fixup,\"ax\" \n" \ - "2: xorl %k0,%k0 \n" \ - " jmp 1b \n" \ - ".previous \n" \ - \ - _ASM_EXTABLE(1b, 2b) \ - \ + _ASM_EXTABLE_TYPE_REG(1b, 1b, EX_TYPE_ZERO_REG, %k0)\ : "+r" (__val) : : "memory"); \ } while (0) |