lkml.org 
[lkml]   [2018]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14 07/19] x86/fault: x86/mm/pkeys: relocate stale comment regarding OSPKE
    Date
    From: Sean Christopherson <sean.j.christopherson@intel.com>

    The code being referenced was moved to a separate helper function
    but the comment was left behind.

    Fixes: 33a709b25a76 ("mm/gup, x86/mm/pkeys: Check VMAs and PTEs for protection keys")
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    ---
    arch/x86/mm/fault.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
    index 47bebfe6efa7..85d20516b2f3 100644
    --- a/arch/x86/mm/fault.c
    +++ b/arch/x86/mm/fault.c
    @@ -940,6 +940,11 @@ static inline bool bad_area_access_from_pkeys(unsigned long error_code,
    /* This code is always called on the current mm */
    bool foreign = false;

    + /*
    + * This OSPKE check is not strictly necessary at runtime.
    + * But, doing it this way allows compiler optimizations
    + * if pkeys are compiled out.
    + */
    if (!boot_cpu_has(X86_FEATURE_OSPKE))
    return false;
    if (error_code & X86_PF_PK)
    @@ -955,11 +960,6 @@ static noinline void
    bad_area_access_error(struct pt_regs *regs, unsigned long error_code,
    unsigned long address, struct vm_area_struct *vma)
    {
    - /*
    - * This OSPKE check is not strictly necessary at runtime.
    - * But, doing it this way allows compiler optimizations
    - * if pkeys are compiled out.
    - */
    if (bad_area_access_from_pkeys(error_code, vma))
    __bad_area(regs, error_code, address, vma, SEGV_PKUERR);
    else
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-09-25 15:14    [W:5.569 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site