x86/mm/kmmio: Remove redundant preempt_disable()
Subsystems (3)
Steven Rostedt
maintainerPATCH 1/1 x86/mm/kmmio: Remove redundant preempt_disable()
From: "Steven Rostedt (Google)" <[email protected]>
Now that kmmio uses rcu_read_lock_sched_notrace() there's no reason to call preempt_disable() as the read_lock_sched_notrace() already does that and is redundant.
This also removes the preempt_enable_no_resched() as the "no_resched()" portion was bogus as there's no reason to do that.
Signed-off-by Steven Rostedt (Google) <[email protected]>
--- arch/x86/mm/kmmio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/x86/mm/kmmio.c +5 -8
@@ -246,14 +246,13 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr) page_base &=page_level_mask (l);/* -* Preemption is now disabled to prevent process switch during -* single stepping. We can only handle one active kmmio trace +* Hold the RCU read lock over single stepping to avoid looking +* up the probe and kmmio_fault_page again. The rcu_read_lock_sched() +* also disables preemption and prevents process switch during +* the single stepping. We can only handle one active kmmio trace * per cpu, so ensure that we finish it before something else -* gets to run. We also hold the RCU read lock over single -* stepping to avoid looking up the probe and kmmio_fault_page -* again. +* gets to run. */ -preempt_disable ();rcu_read_lock_sched_notrace (); faultpage =get_kmmio_fault_page (page_base);
@@ -324,7 +323,6 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr) no_kmmio:rcu_read_unlock_sched_notrace (); -preempt_enable_no_resched ();return ret; }
@@ -364,7 +362,6 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) ctx->active--;BUG_ON (ctx->active);rcu_read_unlock_sched_notrace (); -preempt_enable_no_resched ();/* * if somebody else is singlestepping across a probe point, flags
Signature · 1 line
2.35.1