From: Thomas Gleixner <tglx@linutronix.de>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-arch@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
x86@kernel.org, Dave Hansen <dave.hansen@linux.intel.com>
Subject: Re: [REVIEW][PATCH 16/20] signal/x86: Pass pkey not vma into __bad_area
Date: Tue, 18 Sep 2018 22:48:14 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1809182247010.1468@nanos.tec.linutronix.de> (raw)
In-Reply-To: <20180918000546.12552-16-ebiederm@xmission.com>
On Tue, 18 Sep 2018, Eric W. Biederman wrote:
> There is only one caller of __bad_area that passes in PKUERR and thus
> will generate a siginfo with si_pkey set. Therefore simplify the
> logic and hoist reading of vma_pkey up into that caller, and just
> pass *pkey into __bad_area.
>
> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
> ---
> arch/x86/mm/fault.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
> index f82106578364..11a93f14a674 100644
> --- a/arch/x86/mm/fault.c
> +++ b/arch/x86/mm/fault.c
> @@ -904,22 +904,16 @@ bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
>
> static void
> __bad_area(struct pt_regs *regs, unsigned long error_code,
> - unsigned long address, struct vm_area_struct *vma, int si_code)
> + unsigned long address, u32 *pkey, int si_code)
> {
> struct mm_struct *mm = current->mm;
> - u32 pkey;
> -
> - if (vma)
> - pkey = vma_pkey(vma);
> -
> /*
> * Something tried to access memory that isn't in our memory map..
> * Fix it, but check if it's kernel or user first..
> */
> up_read(&mm->mmap_sem);
>
> - __bad_area_nosemaphore(regs, error_code, address,
> - (vma) ? &pkey : NULL, si_code);
> + __bad_area_nosemaphore(regs, error_code, address, pkey, si_code);
> }
>
> static noinline void
> @@ -954,10 +948,12 @@ bad_area_access_error(struct pt_regs *regs, unsigned long error_code,
> * 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);
> + if (bad_area_access_from_pkeys(error_code, vma)) {
> + u32 pkey = vma_pkey(vma);
> + __bad_area(regs, error_code, address, &pkey, SEGV_PKUERR);
> + }
> else
> - __bad_area(regs, error_code, address, vma, SEGV_ACCERR);
> + __bad_area(regs, error_code, address, NULL, SEGV_ACCERR);
Please make that:
} else {
__bad_area(regs, error_code, address, NULL, SEGV_ACCERR);
}
With that fixed:
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
next prev parent reply other threads:[~2018-09-18 20:48 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 0:03 [REVIEW][PATCH 00/20] siginfo cleanups for x86 Eric W. Biederman
2018-09-18 0:05 ` [REVIEW][PATCH 01/20] signal: Simplify tracehook_report_syscall_exit Eric W. Biederman
2018-09-18 20:15 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 02/20] signal/x86: Inline fill_sigtrap_info in it's only caller send_sigtrap Eric W. Biederman
2018-09-18 20:16 ` Thomas Gleixner
2018-09-19 5:46 ` Christoph Hellwig
2018-09-19 6:46 ` Eric W. Biederman
2018-09-18 0:05 ` [REVIEW][PATCH 03/20] signal/x86: Move MCE error reporting out of force_sig_info_fault Eric W. Biederman
2018-09-18 20:19 ` Thomas Gleixner
2018-09-19 13:49 ` Eric W. Biederman
2018-09-18 0:05 ` [REVIEW][PATCH 04/20] signal/x86: Use send_sig_mceerr as apropriate Eric W. Biederman
2018-09-18 20:21 ` Thomas Gleixner
2018-10-01 13:04 ` Paolo Bonzini
2018-09-18 0:05 ` [REVIEW][PATCH 05/20] signal/x86: In trace_mpx_bounds_register_exception add __user annotations Eric W. Biederman
2018-09-18 20:22 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 06/20] signal/x86: Move mpx siginfo generation into do_bounds Eric W. Biederman
2018-09-18 20:25 ` Thomas Gleixner
2018-09-19 5:48 ` Christoph Hellwig
2018-09-19 13:52 ` Eric W. Biederman
2018-09-18 0:05 ` [REVIEW][PATCH 07/20] signal/x86/traps: Factor out show_signal Eric W. Biederman
2018-09-18 20:28 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 08/20] signal/x86/traps: Move setting error_code and trap_nr into do_trap_no_signal Eric W. Biederman
2018-09-18 20:33 ` Thomas Gleixner
2018-09-18 20:37 ` Thomas Gleixner
2018-09-21 12:45 ` Eric W. Biederman
2018-09-21 13:39 ` Eric W. Biederman
2018-09-18 0:05 ` [REVIEW][PATCH 09/20] signal/x86/traps: Use force_sig_bnderr Eric W. Biederman
2018-09-18 20:34 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 10/20] signal/x86/traps: Use force_sig instead of open coding it Eric W. Biederman
2018-09-18 20:34 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 11/20] signal/x86/traps: Simplify trap generation Eric W. Biederman
2018-09-18 20:37 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 12/20] signal/x86: Remove pkey parameter from bad_area_nosemaphore Eric W. Biederman
2018-09-18 20:44 ` Thomas Gleixner
2018-09-19 16:33 ` Dave Hansen
2018-09-21 12:34 ` Eric W. Biederman
2018-09-18 0:05 ` [REVIEW][PATCH 13/20] signal/x86: Remove the pkey parameter from do_sigbus Eric W. Biederman
2018-09-18 20:45 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 14/20] signal/x86: Remove pkey parameter from mm_fault_error Eric W. Biederman
2018-09-18 20:46 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 15/20] signal/x86: Don't compute pkey in __do_page_fault Eric W. Biederman
2018-09-18 20:46 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 16/20] signal/x86: Pass pkey not vma into __bad_area Eric W. Biederman
2018-09-18 20:48 ` Thomas Gleixner [this message]
2018-09-18 0:05 ` [REVIEW][PATCH 17/20] signal/x86: Call force_sig_pkuerr from __bad_area_nosemaphore Eric W. Biederman
2018-09-18 20:50 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 18/20] signal/x86: Replace force_sig_info_fault with force_sig_fault Eric W. Biederman
2018-09-18 20:51 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 19/20] signal/x86: Pass pkey by value Eric W. Biederman
2018-09-18 20:52 ` Thomas Gleixner
2018-09-18 0:05 ` [REVIEW][PATCH 20/20] signal/x86: Use force_sig_fault where appropriate Eric W. Biederman
2018-09-18 20:53 ` Thomas Gleixner
2018-09-18 20:55 ` [REVIEW][PATCH 00/20] siginfo cleanups for x86 Thomas Gleixner
2018-09-18 21:10 ` Eric W. Biederman
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=alpine.DEB.2.21.1809182247010.1468@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=dave.hansen@linux.intel.com \
--cc=ebiederm@xmission.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.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).