From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: mpe@ellerman.id.au, Gavin Shan <gwshan@linux.vnet.ibm.com>
Subject: [PATCH 1/2] powerpc/mm: Remove duplicated check in do_page_fault()
Date: Fri, 26 Feb 2016 11:26:25 +1100 [thread overview]
Message-ID: <1456446386-28619-1-git-send-email-gwshan@linux.vnet.ibm.com> (raw)
When the page fault happened in user space, we need check it's
caused by stack frame pointer update instruction and update
local variable @flag with FAULT_FLAG_USER. Currently, the code
has two separate check for the same condition. That's unnecessary.
This removes one of the duplicated check. No functinal changes
introduced.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
arch/powerpc/mm/fault.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index a67c6d7..935f386 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -294,11 +294,10 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
* can result in fault, which will cause a deadlock when called with
* mmap_sem held
*/
- if (user_mode(regs))
- store_update_sp = store_updates_sp(regs);
-
- if (user_mode(regs))
+ if (user_mode(regs)) {
flags |= FAULT_FLAG_USER;
+ store_update_sp = store_updates_sp(regs);
+ }
/* When running in the kernel we expect faults to occur only to
* addresses in user space. All other faults represent errors in the
--
2.1.0
next reply other threads:[~2016-02-26 0:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 0:26 Gavin Shan [this message]
2016-02-26 0:26 ` [PATCH 2/2] powerpc/mm: Improve readability of update_mmu_cache() Gavin Shan
2016-05-10 21:48 ` [2/2] " Michael Ellerman
2016-05-09 10:03 ` [1/2] powerpc/mm: Remove duplicated check in do_page_fault() Michael Ellerman
2016-05-10 0:38 ` Gavin Shan
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=1456446386-28619-1-git-send-email-gwshan@linux.vnet.ibm.com \
--to=gwshan@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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).