From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751023AbWDSTOE (ORCPT ); Wed, 19 Apr 2006 15:14:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751181AbWDSTOA (ORCPT ); Wed, 19 Apr 2006 15:14:00 -0400 Received: from mga06.intel.com ([134.134.136.21]:60840 "EHLO orsmga101.jf.intel.com") by vger.kernel.org with ESMTP id S1751184AbWDSTNf (ORCPT ); Wed, 19 Apr 2006 15:13:35 -0400 X-IronPort-AV: i="4.04,136,1144047600"; d="scan'208"; a="25113904:sNHT32705638" X-IronPort-AV: i="4.04,136,1144047600"; d="scan'208"; a="25113886:sNHT45595046" TrustExchangeSourcedMail: True X-IronPort-AV: i="4.04,136,1144047600"; d="scan'208"; a="25902694:sNHT32351718" Message-Id: <20060419190135.215455186@csdlinux-2.jf.intel.com> References: <20060419190059.452500615@csdlinux-2.jf.intel.com> Date: Wed, 19 Apr 2006 12:01:03 -0700 From: Anil S Keshavamurthy To: Anderw Morton Cc: LKML , Keith Owens , Dean Nelson , Tony Luck , Ananth Mavinakayanahalli , Prasanna Panchamukhi , Dave M Subject: [patch 4/6] Notify page fault call chain for powerpc Content-Disposition: inline; filename=notify_page_fault_powerpc.patch X-OriginalArrivalTime: 19 Apr 2006 19:10:24.0290 (UTC) FILETIME=[E9351020:01C663E4] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org --- arch/powerpc/kernel/traps.c | 11 +++++++++++ arch/powerpc/mm/fault.c | 2 +- include/asm-powerpc/kdebug.h | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) Index: linux-2.6.17-rc1-mm3/arch/powerpc/kernel/traps.c =================================================================== --- linux-2.6.17-rc1-mm3.orig/arch/powerpc/kernel/traps.c +++ linux-2.6.17-rc1-mm3/arch/powerpc/kernel/traps.c @@ -75,6 +75,7 @@ EXPORT_SYMBOL(__debugger_fault_handler); #endif ATOMIC_NOTIFIER_HEAD(powerpc_die_chain); +ATOMIC_NOTIFIER_HEAD(notify_page_fault_chain); int register_die_notifier(struct notifier_block *nb) { @@ -88,6 +89,16 @@ int unregister_die_notifier(struct notif } EXPORT_SYMBOL(unregister_die_notifier); +int register_page_fault_notifier(struct notifier_block *nb) +{ + return atomic_notifier_chain_register(¬ify_page_fault_chain, nb); +} + +int unregister_page_fault_notifier(struct notifier_block *nb) +{ + return atomic_notifier_chain_unregister(¬ify_page_fault_chain, nb); +} + /* * Trap & Exception support */ Index: linux-2.6.17-rc1-mm3/arch/powerpc/mm/fault.c =================================================================== --- linux-2.6.17-rc1-mm3.orig/arch/powerpc/mm/fault.c +++ linux-2.6.17-rc1-mm3/arch/powerpc/mm/fault.c @@ -142,7 +142,7 @@ int __kprobes do_page_fault(struct pt_re is_write = error_code & ESR_DST; #endif /* CONFIG_4xx || CONFIG_BOOKE */ - if (notify_die(DIE_PAGE_FAULT, "page_fault", regs, error_code, + if (notify_page_fault(DIE_PAGE_FAULT, "page_fault", regs, error_code, 11, SIGSEGV) == NOTIFY_STOP) return 0; Index: linux-2.6.17-rc1-mm3/include/asm-powerpc/kdebug.h =================================================================== --- linux-2.6.17-rc1-mm3.orig/include/asm-powerpc/kdebug.h +++ linux-2.6.17-rc1-mm3/include/asm-powerpc/kdebug.h @@ -18,7 +18,10 @@ struct die_args { extern int register_die_notifier(struct notifier_block *); extern int unregister_die_notifier(struct notifier_block *); +extern int register_page_fault_notifier(struct notifier_block *); +extern int unregister_page_fault_notifier(struct notifier_block *); extern struct atomic_notifier_head powerpc_die_chain; +extern struct atomic_notifier_head notify_page_fault_chain; /* Grossly misnamed. */ enum die_val { @@ -36,5 +39,11 @@ static inline int notify_die(enum die_va return atomic_notifier_call_chain(&powerpc_die_chain, val, &args); } +static inline int notify_page_fault(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig) +{ + struct die_args args = { .regs=regs, .str=str, .err=err, .trapnr=trap,.signr=sig }; + return atomic_notifier_call_chain(¬ify_page_fault_chain, val, &args); +} + #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_KDEBUG_H */ --