lkml.org 
[lkml]   [2020]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 05/75] x86/traps: Move pf error codes to <asm/trap_pf.h>
    Date
    From: Joerg Roedel <jroedel@suse.de>

    Move the definition of the x86 page-fault error code bits to the new
    header file asm/trap_pf.h. This makes it easier to include them into
    pre-decompression boot code. No functional changes.

    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    ---
    arch/x86/include/asm/trap_pf.h | 24 ++++++++++++++++++++++++
    arch/x86/include/asm/traps.h | 19 +------------------
    2 files changed, 25 insertions(+), 18 deletions(-)
    create mode 100644 arch/x86/include/asm/trap_pf.h

    diff --git a/arch/x86/include/asm/trap_pf.h b/arch/x86/include/asm/trap_pf.h
    new file mode 100644
    index 000000000000..305bc1214aef
    --- /dev/null
    +++ b/arch/x86/include/asm/trap_pf.h
    @@ -0,0 +1,24 @@
    +/* SPDX-License-Identifier: GPL-2.0 */
    +#ifndef _ASM_X86_TRAP_PF_H
    +#define _ASM_X86_TRAP_PF_H
    +
    +/*
    + * Page fault error code bits:
    + *
    + * bit 0 == 0: no page found 1: protection fault
    + * bit 1 == 0: read access 1: write access
    + * bit 2 == 0: kernel-mode access 1: user-mode access
    + * bit 3 == 1: use of reserved bit detected
    + * bit 4 == 1: fault was an instruction fetch
    + * bit 5 == 1: protection keys block access
    + */
    +enum x86_pf_error_code {
    + X86_PF_PROT = 1 << 0,
    + X86_PF_WRITE = 1 << 1,
    + X86_PF_USER = 1 << 2,
    + X86_PF_RSVD = 1 << 3,
    + X86_PF_INSTR = 1 << 4,
    + X86_PF_PK = 1 << 5,
    +};
    +
    +#endif /* _ASM_X86_TRAP_PF_H */
    diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
    index 714b1a30e7b0..6a308355ea29 100644
    --- a/arch/x86/include/asm/traps.h
    +++ b/arch/x86/include/asm/traps.h
    @@ -8,6 +8,7 @@
    #include <asm/debugreg.h>
    #include <asm/idtentry.h>
    #include <asm/siginfo.h> /* TRAP_TRACE, ... */
    +#include <asm/trap_pf.h>

    #ifdef CONFIG_X86_64
    asmlinkage __visible notrace struct pt_regs *sync_regs(struct pt_regs *eregs);
    @@ -41,22 +42,4 @@ void __noreturn handle_stack_overflow(const char *message,
    unsigned long fault_address);
    #endif

    -/*
    - * Page fault error code bits:
    - *
    - * bit 0 == 0: no page found 1: protection fault
    - * bit 1 == 0: read access 1: write access
    - * bit 2 == 0: kernel-mode access 1: user-mode access
    - * bit 3 == 1: use of reserved bit detected
    - * bit 4 == 1: fault was an instruction fetch
    - * bit 5 == 1: protection keys block access
    - */
    -enum x86_pf_error_code {
    - X86_PF_PROT = 1 << 0,
    - X86_PF_WRITE = 1 << 1,
    - X86_PF_USER = 1 << 2,
    - X86_PF_RSVD = 1 << 3,
    - X86_PF_INSTR = 1 << 4,
    - X86_PF_PK = 1 << 5,
    -};
    #endif /* _ASM_X86_TRAPS_H */
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-07-24 18:12    [W:4.125 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site