lkml.org 
[lkml]   [2018]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 163/189] x86/pkeys/selftests: Save off prot for allocations
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dave Hansen <dave.hansen@linux.intel.com>

    [ Upstream commit acb25d761d6f2f64e785ccefc71e54f244f1eda4 ]

    This makes it possible to to tell what 'prot' a given allocation
    is supposed to have. That way, if we want to change just the
    pkey, we know what 'prot' to pass to mprotect_pkey().

    Also, keep a record of the most recent allocation so the tests
    can easily find it.

    Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Dave Hansen <dave.hansen@intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Michael Ellermen <mpe@ellerman.id.au>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Ram Pai <linuxram@us.ibm.com>
    Cc: Shuah Khan <shuah@kernel.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: linux-mm@kvack.org
    Link: http://lkml.kernel.org/r/20180509171354.AA23E228@viggo.jf.intel.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/testing/selftests/x86/protection_keys.c | 14 +++++++++-----
    1 file changed, 9 insertions(+), 5 deletions(-)

    --- a/tools/testing/selftests/x86/protection_keys.c
    +++ b/tools/testing/selftests/x86/protection_keys.c
    @@ -677,10 +677,12 @@ int mprotect_pkey(void *ptr, size_t size
    struct pkey_malloc_record {
    void *ptr;
    long size;
    + int prot;
    };
    struct pkey_malloc_record *pkey_malloc_records;
    +struct pkey_malloc_record *pkey_last_malloc_record;
    long nr_pkey_malloc_records;
    -void record_pkey_malloc(void *ptr, long size)
    +void record_pkey_malloc(void *ptr, long size, int prot)
    {
    long i;
    struct pkey_malloc_record *rec = NULL;
    @@ -712,6 +714,8 @@ void record_pkey_malloc(void *ptr, long
    (int)(rec - pkey_malloc_records), rec, ptr, size);
    rec->ptr = ptr;
    rec->size = size;
    + rec->prot = prot;
    + pkey_last_malloc_record = rec;
    nr_pkey_malloc_records++;
    }

    @@ -756,7 +760,7 @@ void *malloc_pkey_with_mprotect(long siz
    pkey_assert(ptr != (void *)-1);
    ret = mprotect_pkey((void *)ptr, PAGE_SIZE, prot, pkey);
    pkey_assert(!ret);
    - record_pkey_malloc(ptr, size);
    + record_pkey_malloc(ptr, size, prot);
    rdpkru();

    dprintf1("%s() for pkey %d @ %p\n", __func__, pkey, ptr);
    @@ -777,7 +781,7 @@ void *malloc_pkey_anon_huge(long size, i
    size = ALIGN_UP(size, HPAGE_SIZE * 2);
    ptr = mmap(NULL, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
    pkey_assert(ptr != (void *)-1);
    - record_pkey_malloc(ptr, size);
    + record_pkey_malloc(ptr, size, prot);
    mprotect_pkey(ptr, size, prot, pkey);

    dprintf1("unaligned ptr: %p\n", ptr);
    @@ -850,7 +854,7 @@ void *malloc_pkey_hugetlb(long size, int
    pkey_assert(ptr != (void *)-1);
    mprotect_pkey(ptr, size, prot, pkey);

    - record_pkey_malloc(ptr, size);
    + record_pkey_malloc(ptr, size, prot);

    dprintf1("mmap()'d hugetlbfs for pkey %d @ %p\n", pkey, ptr);
    return ptr;
    @@ -872,7 +876,7 @@ void *malloc_pkey_mmap_dax(long size, in

    mprotect_pkey(ptr, size, prot, pkey);

    - record_pkey_malloc(ptr, size);
    + record_pkey_malloc(ptr, size, prot);

    dprintf1("mmap()'d for pkey %d @ %p\n", pkey, ptr);
    close(fd);

    \
     
     \ /
      Last update: 2018-06-18 10:40    [W:2.991 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site