linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Hildenbrand <dahi@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@redhat.com, yang.shi@windriver.com, bigeasy@linutronix.de,
	benh@kernel.crashing.org, paulus@samba.org,
	akpm@linux-foundation.org, heiko.carstens@de.ibm.com,
	schwidefsky@de.ibm.com, borntraeger@de.ibm.com, mst@redhat.com,
	tglx@linutronix.de, David.Laight@ACULAB.COM, hughd@google.com,
	hocko@suse.cz, ralf@linux-mips.org, herbert@gondor.apana.org.au,
	linux@arm.linux.org.uk, airlied@linux.ie,
	daniel.vetter@intel.com, linux-mm@kvack.org,
	linux-arch@vger.kernel.org, peterz@infradead.org,
	dahi@linux.vnet.ibm.com
Subject: [PATCH v1 14/15] mips: properly lock access to the fpu
Date: Mon, 11 May 2015 17:52:19 +0200	[thread overview]
Message-ID: <1431359540-32227-15-git-send-email-dahi@linux.vnet.ibm.com> (raw)
In-Reply-To: <1431359540-32227-1-git-send-email-dahi@linux.vnet.ibm.com>

Let's always disable preemption and pagefaults when locking the fpu,
so we can be sure that the owner won't change in between.

This is a preparation for pagefault_disable() not touching preemption
anymore.

Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
---
 arch/mips/kernel/signal-common.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index 06805e0..0b85f82 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -28,12 +28,7 @@ extern void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
 extern int fpcsr_pending(unsigned int __user *fpcsr);
 
 /* Make sure we will not lose FPU ownership */
-#ifdef CONFIG_PREEMPT
-#define lock_fpu_owner()	preempt_disable()
-#define unlock_fpu_owner()	preempt_enable()
-#else
-#define lock_fpu_owner()	pagefault_disable()
-#define unlock_fpu_owner()	pagefault_enable()
-#endif
+#define lock_fpu_owner()	({ preempt_disable(); pagefault_disable(); })
+#define unlock_fpu_owner()	({ pagefault_enable(); preempt_enable(); })
 
 #endif	/* __SIGNAL_COMMON_H */
-- 
2.1.4


  parent reply	other threads:[~2015-05-11 15:53 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-11 15:52 [PATCH v1 00/15] decouple pagefault_disable() from preempt_disable() David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 01/15] uaccess: count pagefault_disable() levels in pagefault_disabled David Hildenbrand
2015-05-19  7:18   ` [tip:sched/core] sched/preempt, mm/fault: Count pagefault_disable () " tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 02/15] mm, uaccess: trigger might_sleep() in might_fault() with disabled pagefaults David Hildenbrand
2015-05-19  7:18   ` [tip:sched/core] sched/preempt, mm/fault: Trigger " tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 03/15] uaccess: clarify that uaccess may only sleep if pagefaults are enabled David Hildenbrand
2015-05-19  7:18   ` [tip:sched/core] mm/uaccess, mm/fault: Clarify " tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 04/15] mm: explicitly disable/enable preemption in kmap_atomic_* David Hildenbrand
2015-05-19  7:19   ` [tip:sched/core] sched/preempt, mm/kmap: Explicitly disable/ enable " tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 05/15] mips: kmap_coherent relies on disabled preemption David Hildenbrand
2015-05-19  7:19   ` [tip:sched/core] sched/preempt, mm/kmap, MIPS: Disable preemption in kmap_coherent() explicitly tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 06/15] mm: use pagefault_disable() to check for disabled pagefaults in the handler David Hildenbrand
2015-05-19  7:19   ` [tip:sched/core] mm/fault, arch: Use " tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 07/15] drm/i915: use pagefault_disabled() to check for disabled pagefaults David Hildenbrand
2015-05-19  7:20   ` [tip:sched/core] mm/fault, drm/i915: Use " tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 08/15] futex: UP futex_atomic_op_inuser() relies on disabled preemption David Hildenbrand
2015-05-19  7:20   ` [tip:sched/core] sched/preempt, futex: Disable preemption in UP futex_atomic_op_inuser() explicitly tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 09/15] futex: UP futex_atomic_cmpxchg_inatomic() relies on disabled preemption David Hildenbrand
2015-05-19  7:20   ` [tip:sched/core] sched/preempt, futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 10/15] arm/futex: UP futex_atomic_cmpxchg_inatomic() relies on disabled preemption David Hildenbrand
2015-05-19  7:21   ` [tip:sched/core] sched/preempt, arm/futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 11/15] arm/futex: UP futex_atomic_op_inuser() relies on disabled preemption David Hildenbrand
2015-05-12 19:00   ` Sebastian Andrzej Siewior
2015-05-13  7:38     ` David Hildenbrand
2015-05-13  8:19       ` Sebastian Andrzej Siewior
2015-05-13  8:55         ` David Hildenbrand
2015-05-19  7:21   ` [tip:sched/core] sched/preempt, arm/futex: Disable preemption in UP futex_atomic_op_inuser() explicitly tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 12/15] futex: clarify that preemption doesn't have to be disabled David Hildenbrand
2015-05-19  7:21   ` [tip:sched/core] sched/preempt, futex: Update comments to " tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 13/15] powerpc: enable_kernel_altivec() requires disabled preemption David Hildenbrand
2015-05-19  7:22   ` [tip:sched/core] sched/preempt, powerpc: Disable preemption in enable_kernel_altivec() explicitly tip-bot for David Hildenbrand
2015-05-11 15:52 ` David Hildenbrand [this message]
2015-05-19  7:22   ` [tip:sched/core] sched/preempt, MIPS: Properly lock access to the FPU tip-bot for David Hildenbrand
2015-05-11 15:52 ` [PATCH v1 15/15] uaccess: decouple preemption from the pagefault logic David Hildenbrand
2015-05-19  7:22   ` [tip:sched/core] sched/preempt, mm/fault: Decouple preemption from the page fault logic tip-bot for David Hildenbrand
2015-05-15 14:23 ` [PATCH v1 00/15] decouple pagefault_disable() from preempt_disable() Thomas Gleixner
2015-05-18 12:46   ` David Hildenbrand
2015-05-18 13:04     ` Peter Zijlstra

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=1431359540-32227-15-git-send-email-dahi@linux.vnet.ibm.com \
    --to=dahi@linux.vnet.ibm.com \
    --cc=David.Laight@ACULAB.COM \
    --cc=airlied@linux.ie \
    --cc=akpm@linux-foundation.org \
    --cc=benh@kernel.crashing.org \
    --cc=bigeasy@linutronix.de \
    --cc=borntraeger@de.ibm.com \
    --cc=daniel.vetter@intel.com \
    --cc=heiko.carstens@de.ibm.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=hocko@suse.cz \
    --cc=hughd@google.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux@arm.linux.org.uk \
    --cc=mingo@redhat.com \
    --cc=mst@redhat.com \
    --cc=paulus@samba.org \
    --cc=peterz@infradead.org \
    --cc=ralf@linux-mips.org \
    --cc=schwidefsky@de.ibm.com \
    --cc=tglx@linutronix.de \
    --cc=yang.shi@windriver.com \
    /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).