lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 45/51] selftest/vm: fix an assertion in test_pkey_alloc_exhaust()
    Date
    The maximum number of keys that can be allocated has to
    take into consideration, that some keys are reserved by
    the architecture for specific purpose. Hence cannot
    be allocated.

    Fix the assertion in test_pkey_alloc_exhaust()

    Signed-off-by: Ram Pai <linuxram@us.ibm.com>
    ---
    tools/testing/selftests/vm/pkey-helpers.h | 14 ++++++++++++++
    tools/testing/selftests/vm/protection_keys.c | 9 ++++-----
    2 files changed, 18 insertions(+), 5 deletions(-)

    diff --git a/tools/testing/selftests/vm/pkey-helpers.h b/tools/testing/selftests/vm/pkey-helpers.h
    index f764d66..3ea3e06 100644
    --- a/tools/testing/selftests/vm/pkey-helpers.h
    +++ b/tools/testing/selftests/vm/pkey-helpers.h
    @@ -388,4 +388,18 @@ static inline int get_start_key(void)
    #endif /* arch */
    }

    +static inline int arch_reserved_keys(void)
    +{
    +#if defined(__i386__) || defined(__x86_64__) /* arch */
    + return NR_RESERVED_PKEYS;
    +#elif __powerpc64__ /* arch */
    + if (sysconf(_SC_PAGESIZE) == 4096)
    + return NR_RESERVED_PKEYS_4K;
    + else
    + return NR_RESERVED_PKEYS_64K;
    +#else /* arch */
    + NOT SUPPORTED
    +#endif /* arch */
    +}
    +
    #endif /* _PKEYS_HELPER_H */
    diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
    index 4fe42cc..8f0dd94 100644
    --- a/tools/testing/selftests/vm/protection_keys.c
    +++ b/tools/testing/selftests/vm/protection_keys.c
    @@ -1166,12 +1166,11 @@ void test_pkey_alloc_exhaust(int *ptr, u16 pkey)
    pkey_assert(i < NR_PKEYS*2);

    /*
    - * There are 16 pkeys supported in hardware. One is taken
    - * up for the default (0) and another can be taken up by
    - * an execute-only mapping. Ensure that we can allocate
    - * at least 14 (16-2).
    + * There are NR_PKEYS pkeys supported in hardware. arch_reserved_keys()
    + * are reserved. One can be taken up by an execute-only mapping.
    + * Ensure that we can allocate at least the remaining.
    */
    - pkey_assert(i >= NR_PKEYS-2);
    + pkey_assert(i >= (NR_PKEYS-arch_reserved_keys()-1));

    for (i = 0; i < nr_allocated_pkeys; i++) {
    err = sys_pkey_free(allocated_pkeys[i]);
    --
    1.7.1
    \
     
     \ /
      Last update: 2017-11-06 10:06    [W:4.037 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site