From owner-svn-src-stable@FreeBSD.ORG Sat Mar 20 14:55:22 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DE59106564A; Sat, 20 Mar 2010 14:55:22 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6B32D8FC0C; Sat, 20 Mar 2010 14:55:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2KEtMet004610; Sat, 20 Mar 2010 14:55:22 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2KEtMjn004607; Sat, 20 Mar 2010 14:55:22 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201003201455.o2KEtMjn004607@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 20 Mar 2010 14:55:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205375 - in stable/8/sys/powerpc: aim booke X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2010 14:55:22 -0000 Author: nwhitehorn Date: Sat Mar 20 14:55:22 2010 New Revision: 205375 URL: http://svn.freebsd.org/changeset/base/205375 Log: MFC r204903: Place interrupt handling in a critical section and remove double counting in incrementing the interrupt nesting level. This fixes a number of bugs in which the interrupt thread could be preempted by an IPI, indefinitely delaying acknowledgement of the interrupt to the PIC, causing interrupt starvation and hangs. Reported by: linimon Reviewed by: marcel, jhb Modified: stable/8/sys/powerpc/aim/interrupt.c stable/8/sys/powerpc/booke/interrupt.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/powerpc/aim/interrupt.c ============================================================================== --- stable/8/sys/powerpc/aim/interrupt.c Sat Mar 20 14:53:52 2010 (r205374) +++ stable/8/sys/powerpc/aim/interrupt.c Sat Mar 20 14:55:22 2010 (r205375) @@ -80,15 +80,17 @@ powerpc_interrupt(struct trapframe *fram switch (framep->exc) { case EXC_EXI: - atomic_add_int(&td->td_intr_nesting_level, 1); + critical_enter(); PIC_DISPATCH(pic, framep); - atomic_subtract_int(&td->td_intr_nesting_level, 1); + critical_exit(); break; case EXC_DECR: + critical_enter(); atomic_add_int(&td->td_intr_nesting_level, 1); decr_intr(framep); atomic_subtract_int(&td->td_intr_nesting_level, 1); + critical_exit(); break; default: Modified: stable/8/sys/powerpc/booke/interrupt.c ============================================================================== --- stable/8/sys/powerpc/booke/interrupt.c Sat Mar 20 14:53:52 2010 (r205374) +++ stable/8/sys/powerpc/booke/interrupt.c Sat Mar 20 14:55:22 2010 (r205375) @@ -118,9 +118,11 @@ powerpc_decr_interrupt(struct trapframe struct thread *td; td = PCPU_GET(curthread); + critical_enter(); atomic_add_int(&td->td_intr_nesting_level, 1); decr_intr(framep); atomic_subtract_int(&td->td_intr_nesting_level, 1); + critical_exit(); } /* @@ -129,10 +131,8 @@ powerpc_decr_interrupt(struct trapframe void powerpc_extr_interrupt(struct trapframe *framep) { - struct thread *td; - td = PCPU_GET(curthread); - atomic_add_int(&td->td_intr_nesting_level, 1); + critical_enter(); PIC_DISPATCH(pic, framep); - atomic_subtract_int(&td->td_intr_nesting_level, 1); + critical_exit(); }