From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: catalin.marinas@arm.com, james.morse@arm.com, joey.gouly@arm.com,
mark.rutland@arm.com, maz@kernel.org, will@kernel.org
Subject: [PATCH v3 04/20] arm64: entry: move arm64_preempt_schedule_irq to entry-common.c
Date: Tue, 25 May 2021 19:32:46 +0100 [thread overview]
Message-ID: <20210525183302.56293-5-mark.rutland@arm.com> (raw)
In-Reply-To: <20210525183302.56293-1-mark.rutland@arm.com>
Subsequent patches will pull more of the IRQ entry handling into C. To
keep this in one place, let's move arm64_preempt_schedule_irq() into
entry-common.c along with the other entry management functions.
We no longer need to include <linux/lockdep.h> in process.c, so the
include directive is removed.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
---
arch/arm64/kernel/entry-common.c | 20 ++++++++++++++++++++
arch/arm64/kernel/process.c | 17 -----------------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index 3b7943721077..1fe60578e556 100644
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@ -6,7 +6,11 @@
*/
#include <linux/context_tracking.h>
+#include <linux/linkage.h>
+#include <linux/lockdep.h>
#include <linux/ptrace.h>
+#include <linux/sched.h>
+#include <linux/sched/debug.h>
#include <linux/thread_info.h>
#include <asm/cpufeature.h>
@@ -113,6 +117,22 @@ asmlinkage void noinstr exit_el1_irq_or_nmi(struct pt_regs *regs)
exit_to_kernel_mode(regs);
}
+asmlinkage void __sched arm64_preempt_schedule_irq(void)
+{
+ lockdep_assert_irqs_disabled();
+
+ /*
+ * Preempting a task from an IRQ means we leave copies of PSTATE
+ * on the stack. cpufeature's enable calls may modify PSTATE, but
+ * resuming one of these preempted tasks would undo those changes.
+ *
+ * Only allow a task to be preempted once cpufeatures have been
+ * enabled.
+ */
+ if (system_capabilities_finalized())
+ preempt_schedule_irq();
+}
+
#ifdef CONFIG_ARM64_ERRATUM_1463225
static DEFINE_PER_CPU(int, __in_cortex_a76_erratum_1463225_wa);
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index b4bb67f17a2c..2e7337709155 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -18,7 +18,6 @@
#include <linux/sched/task.h>
#include <linux/sched/task_stack.h>
#include <linux/kernel.h>
-#include <linux/lockdep.h>
#include <linux/mman.h>
#include <linux/mm.h>
#include <linux/nospec.h>
@@ -724,22 +723,6 @@ static int __init tagged_addr_init(void)
core_initcall(tagged_addr_init);
#endif /* CONFIG_ARM64_TAGGED_ADDR_ABI */
-asmlinkage void __sched arm64_preempt_schedule_irq(void)
-{
- lockdep_assert_irqs_disabled();
-
- /*
- * Preempting a task from an IRQ means we leave copies of PSTATE
- * on the stack. cpufeature's enable calls may modify PSTATE, but
- * resuming one of these preempted tasks would undo those changes.
- *
- * Only allow a task to be preempted once cpufeatures have been
- * enabled.
- */
- if (system_capabilities_finalized())
- preempt_schedule_irq();
-}
-
#ifdef CONFIG_BINFMT_ELF
int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state,
bool has_interp, bool is_interp)
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-25 18:37 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 18:32 [PATCH v3 00/20] arm64: entry: migrate more code to C Mark Rutland
2021-05-25 18:32 ` [PATCH v3 01/20] arm64: remove redundant local_daif_mask() in bad_mode() Mark Rutland
2021-05-27 12:34 ` Marc Zyngier
2021-05-25 18:32 ` [PATCH v3 02/20] arm64: entry: unmask IRQ+FIQ after EL0 handling Mark Rutland
2021-06-04 16:47 ` Will Deacon
2021-05-25 18:32 ` [PATCH v3 03/20] arm64: entry: convert SError handlers to C Mark Rutland
2021-05-25 18:32 ` Mark Rutland [this message]
2021-05-25 18:32 ` [PATCH v3 05/20] arm64: entry: move preempt logic " Mark Rutland
2021-06-04 15:43 ` Will Deacon
2021-06-04 16:54 ` Mark Rutland
2021-05-25 18:32 ` [PATCH v3 06/20] arm64: entry: add a call_on_irq_stack helper Mark Rutland
2021-05-25 18:32 ` [PATCH v3 07/20] arm64: entry: convert IRQ+FIQ handlers to C Mark Rutland
2021-05-25 18:32 ` [PATCH v3 08/20] arm64: entry: organise entry handlers consistently Mark Rutland
2021-06-04 16:51 ` Will Deacon
2021-06-04 17:39 ` Mark Rutland
2021-06-04 17:44 ` Will Deacon
2021-06-04 18:01 ` Mark Rutland
2021-05-25 18:32 ` [PATCH v3 09/20] arm64: entry: organise entry vectors consistently Mark Rutland
2021-05-25 18:32 ` [PATCH v3 10/20] arm64: entry: consolidate EL1 exception returns Mark Rutland
2021-05-25 18:32 ` [PATCH v3 11/20] arm64: entry: move bad_mode() to entry-common.c Mark Rutland
2021-06-04 16:57 ` Will Deacon
2021-06-04 17:42 ` Mark Rutland
2021-06-04 17:43 ` Will Deacon
2021-05-25 18:32 ` [PATCH v3 12/20] arm64: entry: improve bad_mode() Mark Rutland
2021-05-25 18:32 ` [PATCH v3 13/20] arm64: entry: template the entry asm functions Mark Rutland
2021-05-25 18:32 ` [PATCH v3 14/20] arm64: entry: handle all vectors with C Mark Rutland
2021-06-04 17:13 ` Will Deacon
2021-05-25 18:32 ` [PATCH v3 15/20] arm64: entry: fold el1_inv() into el1h_64_sync_handler() Mark Rutland
2021-05-25 18:32 ` [PATCH v3 16/20] arm64: entry: split bad stack entry Mark Rutland
2021-05-25 18:32 ` [PATCH v3 17/20] arm64: entry: split SDEI entry Mark Rutland
2021-05-25 18:33 ` [PATCH v3 18/20] arm64: entry: make NMI entry/exit functions static Mark Rutland
2021-05-25 18:33 ` [PATCH v3 19/20] arm64: entry: don't instrument entry code with KCOV Mark Rutland
2021-06-04 17:16 ` Will Deacon
2021-06-04 17:49 ` Mark Rutland
2021-05-25 18:33 ` [PATCH v3 20/20] arm64: idle: don't instrument idle " Mark Rutland
2021-05-27 14:06 ` [PATCH v3 00/20] arm64: entry: migrate more code to C Catalin Marinas
2021-05-27 15:31 ` Marc Zyngier
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=20210525183302.56293-5-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=joey.gouly@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@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).