From owner-p4-projects@FreeBSD.ORG Fri Feb 3 15:50:56 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3B941065673; Fri, 3 Feb 2012 15:50:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 862771065670 for ; Fri, 3 Feb 2012 15:50:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 54AE08FC13 for ; Fri, 3 Feb 2012 15:50:56 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q13FouiL006722 for ; Fri, 3 Feb 2012 15:50:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q13FouDw006719 for perforce@freebsd.org; Fri, 3 Feb 2012 15:50:56 GMT (envelope-from jhb@freebsd.org) Date: Fri, 3 Feb 2012 15:50:56 GMT Message-Id: <201202031550.q13FouDw006719@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 205637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Feb 2012 15:50:57 -0000 http://p4web.freebsd.org/@@205637?ac=10 Change 205637 by jhb@jhb_jhbbsd on 2012/02/03 15:50:53 Revert these hacks as they are superseded by the SCHEDULER_STOPPED stuff in HEAD. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#55 edit .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#103 edit .. //depot/projects/smpng/sys/kern/kern_mutex.c#162 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#55 (text+ko) ==== @@ -515,7 +515,6 @@ { cpuset_t tcrp; - disable_intr(); cpu_reset_proxy_active = 1; while (cpu_reset_proxy_active == 1) ; /* Wait for other cpu to see that we've started */ @@ -534,7 +533,6 @@ cpuset_t map; u_int cnt; - disable_intr(); if (smp_active) { map = all_cpus; CPU_CLR(PCPU_GET(cpuid), &map); ==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#103 (text+ko) ==== @@ -575,7 +575,6 @@ { cpuset_t tcrp; - disable_intr(); cpu_reset_proxy_active = 1; while (cpu_reset_proxy_active == 1) ; /* Wait for other cpu to see that we've started */ @@ -602,7 +601,6 @@ cpuset_t map; u_int cnt; - disable_intr(); if (smp_active) { map = all_cpus; CPU_CLR(PCPU_GET(cpuid), &map); ==== //depot/projects/smpng/sys/kern/kern_mutex.c#162 (text+ko) ==== @@ -349,15 +349,6 @@ return; } - /* - * If we have already panic'd and this is the thread that called - * panic(), then don't block on any mutexes but silently succeed. - * Otherwise, the kernel will deadlock since the scheduler isn't - * going to run the thread that holds the lock we need. - */ - if (panicstr != NULL && curthread->td_flags & TDF_INPANIC) - return; - lock_profile_obtain_lock_failed(&m->lock_object, &contested, &waittime); if (LOCK_LOG_TEST(&m->lock_object, opts)) @@ -674,15 +665,6 @@ } /* - * If we failed to unlock this lock and we are a thread that has - * called panic(), it may be due to the bypass in _mtx_lock_sleep() - * above. In that case, just return and leave the lock alone to - * avoid changing the state. - */ - if (panicstr != NULL && curthread->td_flags & TDF_INPANIC) - return; - - /* * We have to lock the chain before the turnstile so this turnstile * can be removed from the hash list if it is empty. */