From: Dave Hansen <dave.hansen@intel.com>
To: Ram Pai <linuxram@us.ibm.com>,
shuahkh@osg.samsung.com, linux-kselftest@vger.kernel.org
Cc: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org,
linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org,
mingo@redhat.com, mhocko@kernel.org, bauerman@linux.vnet.ibm.com,
fweimer@redhat.com, msuchanek@suse.de,
aneesh.kumar@linux.vnet.ibm.com
Subject: Re: [PATCH v13 15/24] selftests/vm: powerpc implementation for generic abstraction
Date: Wed, 20 Jun 2018 08:06:25 -0700 [thread overview]
Message-ID: <04cdd1a3-94d3-e99b-6e19-699c790383cd@intel.com> (raw)
In-Reply-To: <1528937115-10132-16-git-send-email-linuxram@us.ibm.com>
> +static inline u32 *siginfo_get_pkey_ptr(siginfo_t *si)
> +{
> +#ifdef si_pkey
> + return &si->si_pkey;
> +#else
> + return (u32 *)(((u8 *)si) + si_pkey_offset);
> +#endif
> }
FWIW, this isn't ppc-specific.
> diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c
> index f43a319..88dfa40 100644
> --- a/tools/testing/selftests/vm/protection_keys.c
> +++ b/tools/testing/selftests/vm/protection_keys.c
> @@ -197,17 +197,18 @@ void dump_mem(void *dumpme, int len_bytes)
>
> int pkey_faults;
> int last_si_pkey = -1;
> +void pkey_access_allow(int pkey);
> void signal_handler(int signum, siginfo_t *si, void *vucontext)
> {
> ucontext_t *uctxt = vucontext;
> int trapno;
> unsigned long ip;
> char *fpregs;
> +#if defined(__i386__) || defined(__x86_64__) /* arch */
> pkey_reg_t *pkey_reg_ptr;
> - u64 siginfo_pkey;
> +#endif /* defined(__i386__) || defined(__x86_64__) */
> + u32 siginfo_pkey;
> u32 *si_pkey_ptr;
> - int pkey_reg_offset;
> - fpregset_t fpregset;
>
> dprint_in_signal = 1;
> dprintf1(">>>>===============SIGSEGV============================\n");
> @@ -217,12 +218,14 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext)
>
> trapno = uctxt->uc_mcontext.gregs[REG_TRAPNO];
> ip = uctxt->uc_mcontext.gregs[REG_IP_IDX];
> - fpregset = uctxt->uc_mcontext.fpregs;
> - fpregs = (void *)fpregset;
> + fpregs = (char *) uctxt->uc_mcontext.fpregs;
>
> dprintf2("%s() trapno: %d ip: 0x%016lx info->si_code: %s/%d\n",
> __func__, trapno, ip, si_code_str(si->si_code),
> si->si_code);
> +
> +#if defined(__i386__) || defined(__x86_64__) /* arch */
> +
> #ifdef __i386__
> /*
> * 32-bit has some extra padding so that userspace can tell whether
> @@ -230,20 +233,28 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext)
> * state. We just assume that it is here.
> */
> fpregs += 0x70;
> -#endif
> - pkey_reg_offset = pkey_reg_xstate_offset();
> - pkey_reg_ptr = (void *)(&fpregs[pkey_reg_offset]);
> +#endif /* __i386__ */
>
> - dprintf1("siginfo: %p\n", si);
> - dprintf1(" fpregs: %p\n", fpregs);
> + pkey_reg_ptr = (void *)(&fpregs[pkey_reg_xstate_offset()]);
> /*
> - * If we got a PKEY fault, we *HAVE* to have at least one bit set in
> + * If we got a key fault, we *HAVE* to have at least one bit set in
> * here.
> */
> dprintf1("pkey_reg_xstate_offset: %d\n", pkey_reg_xstate_offset());
> if (DEBUG_LEVEL > 4)
> dump_mem(pkey_reg_ptr - 128, 256);
> pkey_assert(*pkey_reg_ptr);
> +#endif /* defined(__i386__) || defined(__x86_64__) */
The series up to this point has been looking pretty nice and broken out
and easy to read. It goes off the rails a bit here. Adding #ifdefs and..
> + dprintf1("siginfo: %p\n", si);
> + dprintf1(" fpregs: %p\n", fpregs);
> +
> + si_pkey_ptr = siginfo_get_pkey_ptr(si);
> + dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr);
> + dump_mem(si_pkey_ptr - 8, 24);
> + siginfo_pkey = *si_pkey_ptr;
> + pkey_assert(siginfo_pkey < NR_PKEYS);
> + last_si_pkey = siginfo_pkey;
>
> if ((si->si_code == SEGV_MAPERR) ||
> (si->si_code == SEGV_ACCERR) ||
> @@ -252,22 +263,21 @@ void signal_handler(int signum, siginfo_t *si, void *vucontext)
> exit(4);
> }
>
> - si_pkey_ptr = (u32 *)(((u8 *)si) + si_pkey_offset);
> - dprintf1("si_pkey_ptr: %p\n", si_pkey_ptr);
> - dump_mem((u8 *)si_pkey_ptr - 8, 24);
> - siginfo_pkey = *si_pkey_ptr;
> - pkey_assert(siginfo_pkey < NR_PKEYS);
> - last_si_pkey = siginfo_pkey;
Moving random code around with no explanation.
> - dprintf1("signal pkey_reg from xsave: "PKEY_REG_FMT"\n", *pkey_reg_ptr);
> /*
> * need __read_pkey_reg() version so we do not do shadow_pkey_reg
> * checking
> */
> dprintf1("signal pkey_reg from pkey_reg: "PKEY_REG_FMT"\n",
> __read_pkey_reg());
> - dprintf1("pkey from siginfo: %jx\n", siginfo_pkey);
> - *(u64 *)pkey_reg_ptr = 0x00000000;
> +#if defined(__i386__) || defined(__x86_64__) /* arch */
> + dprintf1("signal pkey_reg from xsave: "PKEY_REG_FMT"\n", *pkey_reg_ptr);
> + *(u64 *)pkey_reg_ptr &= clear_pkey_flags(siginfo_pkey,
> + PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE);
> +#elif __powerpc64__
> + pkey_access_allow(siginfo_pkey);
> +#endif
> + shadow_pkey_reg &= clear_pkey_flags(siginfo_pkey,
> + PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE);
> dprintf1("WARNING: set PKEY_REG=0 to allow faulting instruction "
> "to continue\n");
> pkey_faults++;
> @@ -1331,9 +1341,8 @@ void test_executing_on_unreadable_memory(int *ptr, u16 pkey)
> madvise(p1, PAGE_SIZE, MADV_DONTNEED);
> lots_o_noops_around_write(&scratch);
> do_not_expect_pkey_fault("executing on PROT_EXEC memory");
> - ptr_contents = read_ptr(p1);
> - dprintf2("ptr (%p) contents@%d: %x\n", p1, __LINE__, ptr_contents);
> - expected_pkey_fault(pkey);
> +
> + expect_fault_on_read_execonly_key(p1, pkey);
> }
While none of this is a deal-breaker (as I said, I feel like the
selftests/ rules are a bit more lax) this does kinda break the illusion
of a nice, broken out series.
Could you address this a bit in the changelog at least, please?
next prev parent reply other threads:[~2018-06-20 15:06 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-14 0:44 [PATCH v13 00/24] selftests, powerpc, x86 : Memory Protection Keys Ram Pai
2018-06-14 0:44 ` [PATCH v13 01/24] selftests/x86: Move protecton key selftest to arch neutral directory Ram Pai
2018-06-14 0:44 ` [PATCH v13 02/24] selftests/vm: rename all references to pkru to a generic name Ram Pai
2018-06-14 0:44 ` [PATCH v13 03/24] selftests/vm: move generic definitions to header file Ram Pai
2018-06-14 0:44 ` [PATCH v13 04/24] selftests/vm: move arch-specific definitions to arch-specific header Ram Pai
2018-06-14 0:44 ` [PATCH v13 05/24] selftests/vm: Make gcc check arguments of sigsafe_printf() Ram Pai
2018-06-14 0:44 ` [PATCH v13 06/24] selftests/vm: typecast the pkey register Ram Pai
2018-06-14 0:44 ` [PATCH v13 07/24] selftests/vm: generic function to handle shadow key register Ram Pai
2018-06-14 0:44 ` [PATCH v13 08/24] selftests/vm: fix the wrong assert in pkey_disable_set() Ram Pai
2018-06-20 14:47 ` Dave Hansen
2018-07-17 15:58 ` Ram Pai
2018-07-17 17:53 ` Dave Hansen
2018-06-14 0:45 ` [PATCH v13 09/24] selftests/vm: fixed bugs in pkey_disable_clear() Ram Pai
2018-06-14 0:45 ` [PATCH v13 10/24] selftests/vm: clear the bits in shadow reg when a pkey is freed Ram Pai
2018-06-20 14:49 ` Dave Hansen
2018-07-17 16:00 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 11/24] selftests/vm: fix alloc_random_pkey() to make it really random Ram Pai
2018-06-14 0:45 ` [PATCH v13 12/24] selftests/vm: introduce two arch independent abstraction Ram Pai
2018-06-14 0:45 ` [PATCH v13 13/24] selftests/vm: pkey register should match shadow pkey Ram Pai
2018-06-20 14:53 ` Dave Hansen
2018-07-17 16:02 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 14/24] selftests/vm: generic cleanup Ram Pai
2018-06-20 14:57 ` Dave Hansen
2018-06-14 0:45 ` [PATCH v13 15/24] selftests/vm: powerpc implementation for generic abstraction Ram Pai
2018-06-20 15:06 ` Dave Hansen [this message]
2018-06-14 0:45 ` [PATCH v13 16/24] selftests/vm: clear the bits in shadow reg when a pkey is freed Ram Pai
2018-06-20 15:07 ` Dave Hansen
2018-07-17 16:03 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 17/24] selftests/vm: powerpc implementation to check support for pkey Ram Pai
2018-06-20 15:09 ` Dave Hansen
2018-07-17 16:05 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 18/24] selftests/vm: fix an assertion in test_pkey_alloc_exhaust() Ram Pai
2018-06-20 15:11 ` Dave Hansen
2018-07-17 16:08 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 19/24] selftests/vm: associate key on a mapped page and detect access violation Ram Pai
2018-06-20 15:16 ` Dave Hansen
2018-07-17 16:13 ` Ram Pai
2018-07-17 17:56 ` Dave Hansen
2018-07-17 19:10 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 20/24] selftests/vm: associate key on a mapped page and detect write violation Ram Pai
2018-06-14 0:45 ` [PATCH v13 21/24] selftests/vm: detect write violation on a mapped access-denied-key page Ram Pai
2018-06-14 0:45 ` [PATCH v13 22/24] selftests/vm: testcases must restore pkey-permissions Ram Pai
2018-06-20 15:20 ` Dave Hansen
2018-07-17 16:09 ` Ram Pai
2018-06-14 0:45 ` [PATCH v13 23/24] selftests/vm: sub-page allocator Ram Pai
2018-06-14 0:45 ` [PATCH v13 24/24] selftests/vm: test correct behavior of pkey-0 Ram Pai
2018-06-20 15:22 ` Dave Hansen
2018-06-14 20:19 ` [PATCH v13 00/24] selftests, powerpc, x86 : Memory Protection Keys Florian Weimer
2018-06-15 0:58 ` Ram Pai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04cdd1a3-94d3-e99b-6e19-699c790383cd@intel.com \
--to=dave.hansen@intel.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=bauerman@linux.vnet.ibm.com \
--cc=fweimer@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=linuxram@us.ibm.com \
--cc=mhocko@kernel.org \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=msuchanek@suse.de \
--cc=shuahkh@osg.samsung.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).