Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754632AbYKZIo7 (ORCPT ); Wed, 26 Nov 2008 03:44:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753936AbYKZImW (ORCPT ); Wed, 26 Nov 2008 03:42:22 -0500 Received: from nf-out-0910.google.com ([64.233.182.187]:9241 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753924AbYKZImT (ORCPT ); Wed, 26 Nov 2008 03:42:19 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=to:cc:subject:from:date:message-id; b=J8ImCbiVKTfk1xJY40g8wKbDyo9PCeML9UKtw8CRhlSPhoKl3UDjuOniJyh+XljXRb uAJ97MLnqFaoObZfibHEVRc6wUjhGs2hg2DRR864CBfVJrmBQQI3s9hUwzaBhXFQ/U0N cpEGdf0VERIV8XdDRtR5aU4dOjETVuuy4T6mo= To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, mingo@elte.hu, x86@kernel.org, andi@firstfloor.org, eranian@gmail.com, sfr@canb.auug.org.au Subject: [patch 08/24] perfmon: X86 64-bit hooks (x86) From: eranian@googlemail.com Date: Wed, 26 Nov 2008 00:42:18 -0800 (PST) Message-ID: <492d0bea.170e660a.15b6.4ace@mx.google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3810 Lines: 129 This patch adds the necessary hooks to the X86 64-bit code to support initialization, interrupts, context switching, and termination of a perfmon session. Signed-off-by: Stephane Eranian - Index: o3/arch/x86/kernel/entry_64.S =================================================================== --- o3.orig/arch/x86/kernel/entry_64.S 2008-11-03 11:34:00.000000000 +0100 +++ o3/arch/x86/kernel/entry_64.S 2008-11-03 11:35:19.000000000 +0100 @@ -869,7 +869,13 @@ ENTRY(spurious_interrupt) apicinterrupt SPURIOUS_APIC_VECTOR,smp_spurious_interrupt END(spurious_interrupt) - + +#ifdef CONFIG_PERFMON +ENTRY(pmu_interrupt) + apicinterrupt LOCAL_PERFMON_VECTOR,smp_pmu_interrupt +END(pmu_interrupt) +#endif + /* * Exception entry points. */ Index: o3/arch/x86/kernel/process_64.c =================================================================== --- o3.orig/arch/x86/kernel/process_64.c 2008-11-03 11:34:01.000000000 +0100 +++ o3/arch/x86/kernel/process_64.c 2008-11-03 12:53:35.000000000 +0100 @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -243,6 +244,7 @@ ds_free(t->ds_ctx); } #endif /* CONFIG_X86_DS */ + pfm_exit_thread(); } void flush_thread(void) @@ -347,6 +349,8 @@ savesegment(es, p->thread.es); savesegment(ds, p->thread.ds); + pfm_copy_thread(p); + if (unlikely(test_tsk_thread_flag(me, TIF_IO_BITMAP))) { p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL); if (!p->thread.io_bitmap_ptr) { @@ -475,6 +479,9 @@ prev = &prev_p->thread, next = &next_p->thread; + if (test_tsk_thread_flag(prev_p, TIF_PERFMON_CTXSW)) + pfm_ctxsw_out(prev_p, next_p); + debugctl = prev->debugctlmsr; #ifdef CONFIG_X86_DS @@ -501,6 +508,9 @@ if (next->debugctlmsr != debugctl) update_debugctlmsr(next->debugctlmsr); + if (test_tsk_thread_flag(next_p, TIF_PERFMON_CTXSW)) + pfm_ctxsw_in(prev_p, next_p); + if (test_tsk_thread_flag(next_p, TIF_DEBUG)) { loaddebug(next, 0); loaddebug(next, 1); Index: o3/arch/x86/kernel/signal_64.c =================================================================== --- o3.orig/arch/x86/kernel/signal_64.c 2008-11-03 11:34:00.000000000 +0100 +++ o3/arch/x86/kernel/signal_64.c 2008-11-03 11:35:19.000000000 +0100 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -485,6 +486,10 @@ mce_notify_user(); #endif /* CONFIG_X86_64 && CONFIG_X86_MCE */ + /* process perfmon asynchronous work (e.g. block thread or reset) */ + if (thread_info_flags & _TIF_PERFMON_WORK) + pfm_handle_work(regs); + /* deal with pending signal delivery */ if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); Index: o3/arch/x86/kernel/irqinit_64.c =================================================================== --- o3.orig/arch/x86/kernel/irqinit_64.c 2008-11-03 11:34:01.000000000 +0100 +++ o3/arch/x86/kernel/irqinit_64.c 2008-11-03 11:35:19.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -224,6 +225,10 @@ apic_intr_init(); +#ifdef CONFIG_PERFMON + alloc_intr_gate(LOCAL_PERFMON_VECTOR, pmu_interrupt); +#endif + if (!acpi_ioapic) setup_irq(2, &irq2); } -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/