From: tip-bot for Valentin Schneider <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, bp@alien8.de, mingo@kernel.org,
linux-kernel@vger.kernel.org, luto@kernel.org,
tglx@linutronix.de, valentin.schneider@arm.com
Subject: [tip:x86/entry] x86/entry: Remove unneeded need_resched() loop
Date: Fri, 5 Apr 2019 06:13:19 -0700 [thread overview]
Message-ID: <tip-b5b447b6b4e899e0978b95cb42d272978f8c7b4d@git.kernel.org> (raw)
In-Reply-To: <20190311224752.8337-14-valentin.schneider@arm.com>
Commit-ID: b5b447b6b4e899e0978b95cb42d272978f8c7b4d
Gitweb: https://git.kernel.org/tip/b5b447b6b4e899e0978b95cb42d272978f8c7b4d
Author: Valentin Schneider <valentin.schneider@arm.com>
AuthorDate: Mon, 11 Mar 2019 22:47:51 +0000
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 5 Apr 2019 15:08:03 +0200
x86/entry: Remove unneeded need_resched() loop
Since the enabling and disabling of IRQs within preempt_schedule_irq() is
contained in a need_resched() loop, there is no need for the outer
architecture specific loop.
Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Link: https://lkml.kernel.org/r/20190311224752.8337-14-valentin.schneider@arm.com
---
arch/x86/entry/entry_32.S | 3 +--
arch/x86/entry/entry_64.S | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index d309f30cf7af..b1856fe9decf 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -766,13 +766,12 @@ END(ret_from_exception)
#ifdef CONFIG_PREEMPT
ENTRY(resume_kernel)
DISABLE_INTERRUPTS(CLBR_ANY)
-.Lneed_resched:
cmpl $0, PER_CPU_VAR(__preempt_count)
jnz restore_all_kernel
testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ?
jz restore_all_kernel
call preempt_schedule_irq
- jmp .Lneed_resched
+ jmp restore_all_kernel
END(resume_kernel)
#endif
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 1f0efdb7b629..e7e270603fe7 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -645,10 +645,9 @@ retint_kernel:
/* Check if we need preemption */
btl $9, EFLAGS(%rsp) /* were interrupts off? */
jnc 1f
-0: cmpl $0, PER_CPU_VAR(__preempt_count)
+ cmpl $0, PER_CPU_VAR(__preempt_count)
jnz 1f
call preempt_schedule_irq
- jmp 0b
1:
#endif
/*
next prev parent reply other threads:[~2019-04-05 13:13 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 22:47 [PATCH 00/14] entry: preempt_schedule_irq() callers scrub Valentin Schneider
2019-03-11 22:47 ` [PATCH 01/14] sched/core: Fix preempt_schedule() interrupt return comment Valentin Schneider
2019-03-11 22:47 ` [PATCH 02/14] c6x: entry: Remove unneeded need_resched() loop Valentin Schneider
2019-03-13 17:21 ` Mark Salter
2019-03-11 22:47 ` [PATCH 03/14] csky: " Valentin Schneider
2019-03-11 22:47 ` [PATCH 04/14] h8300: " Valentin Schneider
2019-03-11 22:47 ` [PATCH 05/14] microblaze: " Valentin Schneider
2019-03-11 22:47 ` [PATCH 06/14] MIPS: " Valentin Schneider
2019-03-14 18:13 ` Paul Burton
2019-03-14 18:38 ` Valentin Schneider
2019-05-10 16:16 ` Maciej W. Rozycki
2019-03-15 16:31 ` [PATCH v2] " Valentin Schneider
2019-03-19 23:18 ` Paul Burton
2019-03-11 22:47 ` [PATCH 07/14] nds32: ex-exit: " Valentin Schneider
2019-04-24 7:18 ` Greentime Hu
2019-03-11 22:47 ` [PATCH 08/14] powerpc: entry: " Valentin Schneider
2019-05-03 6:59 ` Michael Ellerman
2019-03-11 22:47 ` [PATCH 09/14] RISC-V: " Valentin Schneider
2019-03-11 22:47 ` [PATCH 10/14] sh: " Valentin Schneider
2019-03-11 22:47 ` [PATCH 11/14] sh64: " Valentin Schneider
2019-03-11 22:47 ` [PATCH 12/14] sparc64: rtrap: " Valentin Schneider
2019-03-11 23:13 ` David Miller
2019-03-12 9:43 ` Valentin Schneider
2019-03-11 22:47 ` [PATCH 13/14] x86/entry: " Valentin Schneider
2019-04-05 13:13 ` tip-bot for Valentin Schneider [this message]
2019-03-11 22:47 ` [PATCH 14/14] xtensa: entry: " Valentin Schneider
2019-03-12 1:10 ` Max Filippov
2019-03-12 9:45 ` Valentin Schneider
2019-03-12 18:03 ` [PATCH 00/14] entry: preempt_schedule_irq() callers scrub Vineet Gupta
2019-03-12 18:18 ` Valentin Schneider
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=tip-b5b447b6b4e899e0978b95cb42d272978f8c7b4d@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=valentin.schneider@arm.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
Powered by JetHome