From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752754AbdH2LN1 (ORCPT ); Tue, 29 Aug 2017 07:13:27 -0400 Received: from terminus.zytor.com ([65.50.211.136]:56177 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751843AbdH2LNZ (ORCPT ); Tue, 29 Aug 2017 07:13:25 -0400 Date: Tue, 29 Aug 2017 04:08:33 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, rostedt@goodmis.org, bp@alien8.de, luto@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, rostedt@goodmis.org, bp@alien8.de, luto@kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <20170828064957.064746737@linutronix.de> References: <20170828064957.064746737@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/irqwork: Get rid of duplicated tracing interrupt code Git-Commit-ID: daabb8eb9a55af90d0a55d93547a51cc6921389f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: daabb8eb9a55af90d0a55d93547a51cc6921389f Gitweb: http://git.kernel.org/tip/daabb8eb9a55af90d0a55d93547a51cc6921389f Author: Thomas Gleixner AuthorDate: Mon, 28 Aug 2017 08:47:27 +0200 Committer: Ingo Molnar CommitDate: Tue, 29 Aug 2017 11:42:26 +0200 x86/irqwork: Get rid of duplicated tracing interrupt code Two NOP5s are a reasonable tradeoff to avoid duplicated code and the requirement to switch the IDT. Signed-off-by: Thomas Gleixner Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170828064957.064746737@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/include/asm/hw_irq.h | 2 +- arch/x86/kernel/irq_work.c | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index b094b87..fd7e7e6 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -48,13 +48,13 @@ extern asmlinkage void call_function_single_interrupt(void); #ifdef CONFIG_TRACING /* Interrupt handlers registered during init_IRQ */ -extern void trace_irq_work_interrupt(void); extern void trace_thermal_interrupt(void); extern void trace_reschedule_interrupt(void); extern void trace_threshold_interrupt(void); extern void trace_deferred_error_interrupt(void); extern void trace_call_function_interrupt(void); extern void trace_call_function_single_interrupt(void); +#define trace_irq_work_interrupt irq_work_interrupt #define trace_error_interrupt error_interrupt #define trace_spurious_interrupt spurious_interrupt #define trace_x86_platform_ipi x86_platform_ipi diff --git a/arch/x86/kernel/irq_work.c b/arch/x86/kernel/irq_work.c index 2754878..8054cae 100644 --- a/arch/x86/kernel/irq_work.c +++ b/arch/x86/kernel/irq_work.c @@ -11,24 +11,12 @@ #include #include -static inline void __smp_irq_work_interrupt(void) -{ - inc_irq_stat(apic_irq_work_irqs); - irq_work_run(); -} - __visible void __irq_entry smp_irq_work_interrupt(struct pt_regs *regs) { ipi_entering_ack_irq(); - __smp_irq_work_interrupt(); - exiting_irq(); -} - -__visible void __irq_entry smp_trace_irq_work_interrupt(struct pt_regs *regs) -{ - ipi_entering_ack_irq(); trace_irq_work_entry(IRQ_WORK_VECTOR); - __smp_irq_work_interrupt(); + inc_irq_stat(apic_irq_work_irqs); + irq_work_run(); trace_irq_work_exit(IRQ_WORK_VECTOR); exiting_irq(); }