From owner-svn-src-head@FreeBSD.ORG Tue Jul 31 16:20:25 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D19A3106566C; Tue, 31 Jul 2012 16:20:25 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 2404A8FC16; Tue, 31 Jul 2012 16:20:25 +0000 (UTC) Received: by vbmv11 with SMTP id v11so7284090vbm.13 for ; Tue, 31 Jul 2012 09:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=r8cuMQNKtDwdN/hQywc6f7D3EA7RRKEyMcAeCCFr14g=; b=TFdaDTqLCEx6VsOvr+iPoplOjY98OjmghLn3dg4vwVKdqqXy5MA/4N84EfH5u8L6FT Ax0F4qwqkumLKdfbRLIlv9vm4uk0nf9+/GHOBAZ+VzhkvUE8EOS+1zrHG0wUjP0ctb2+ RDcucnuZqqd/ZeZWvh0dYtBpFN5nAU3F/LwdWMc1FGqJFOwzhrCRr846uXfELP2g9DVk kkqc7tetOXTzrzuV63AbxaiYgKzviR5Vn0VId5zcv0miFPiFJxgTJCV5L7FYm5aHta3q 9b+PRu6+KbS8AZ26+m9nTrVhlUkgpZLS6MsdNQGQlmUvy2Hghnd4qGmSjIlvMm/ZDMCg BYtQ== MIME-Version: 1.0 Received: by 10.52.95.116 with SMTP id dj20mr12793577vdb.39.1343751624558; Tue, 31 Jul 2012 09:20:24 -0700 (PDT) Received: by 10.58.187.225 with HTTP; Tue, 31 Jul 2012 09:20:24 -0700 (PDT) In-Reply-To: <201207311212.21496.jhb@freebsd.org> References: <201207251128.q6PBSFlt052575@svn.freebsd.org> <5017F614.1010304@zonov.org> <201207311212.21496.jhb@freebsd.org> Date: Tue, 31 Jul 2012 09:20:24 -0700 Message-ID: From: Jack Vogel To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Adrian Chadd , src-committers@freebsd.org, Garrett Cooper , svn-src-all@freebsd.org, Andrey Zonov , Luigi Rizzo , svn-src-head@freebsd.org Subject: Re: svn commit: r238765 - head/sys/dev/e1000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2012 16:20:25 -0000 Yes, I agree John, that was ugly, I'm already taking care of it with my changes, I'll send you a copy to check out. Jack On Tue, Jul 31, 2012 at 9:12 AM, John Baldwin wrote: > On Tuesday, July 31, 2012 11:16:07 am Garrett Cooper wrote: > > On Tue, Jul 31, 2012 at 8:13 AM, Andrey Zonov wrote: > > > On 7/28/12 2:09 AM, Adrian Chadd wrote: > > >> > > >> Hi, > > >> > > >> Can you please revert this commit for now? > > >> > > >> * it has some netmap stuff in it that isn't related to the commit; > > >> * it's causing panics due to lock recursion; > > > > > > > > > I can confirm panics with the latest HEAD running under ESX. > > > > > > _mtx_lock_sleep: recursed on non-recursive mutex em0 @ > > > /usr/src/sys/dev/e1000/if_lem.c:881 > > > > > > Tracing pid 12 tid 100030 td 0xfffffe0002960480 > > > kdb_enter() at kdb_enter+0x3b > > > panic() at panic+0x1d1 > > > _mtx_lock_sleep() at _mtx_lock_sleep+0x35f > > > _mtx_lock_flags() at _mtx_lock_flags+0x111 > > > lem_start() at lem_start+0x34 > > > if_transmit() at if_transmit+0xd6 > > > ether_output_frame() at ether_output_frame+0x45 > > > ether_output() at ether_output+0x548 > > > arpintr() at arpintr+0x10c1 > > > netisr_dispatch_src() at netisr_dispatch_src+0x152 > > > ether_demux() at ether_demux+0x18d > > > ether_nh_input() at ether_nh_input+0x290 > > > netisr_dispatch_src() at netisr_dispatch_src+0x152 > > > lem_intr() at lem_intr+0x3ba > > > intr_event_execute_handlers() at intr_event_execute_handlers+0x6a > > > ithread_loop() at ithread_loop+0xab > > > fork_exit() at fork_exit+0x135 > > > fork_trampoline() at fork_trampoline+0xe > > > --- trap 0, rip = 0, rsp = 0xffffff8000301cb0, rbp = 0 --- > > > > > http://lists.freebsd.org/pipermail/freebsd-current/2012-July/035593.html > > I'd prefer you not add the 'locked' variable, but instead have the normal > code > path just return before the 'out' label. > > -- > John Baldwin >