From owner-freebsd-net@FreeBSD.ORG Tue Jan 27 20:54:09 2015 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20D8B2A2; Tue, 27 Jan 2015 20:54:09 +0000 (UTC) Received: from mail-ig0-x232.google.com (mail-ig0-x232.google.com [IPv6:2607:f8b0:4001:c05::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DB4B0960; Tue, 27 Jan 2015 20:54:08 +0000 (UTC) Received: by mail-ig0-f178.google.com with SMTP id hl2so7186542igb.5; Tue, 27 Jan 2015 12:54:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=AtJpnTOPi9tqb+rQvd4pytR/cqGpyOFnLjAGvuMO+Fs=; b=gdkSNZTHgdv4WoYcB3+rmRgIAbXyINNH4Z4eyNbZty9ZI634YLDdBvRY4fDqY7/lNS ymSyWMsUqpgPA9nFPZGXDeauOc15cscIFj6EWxCBhdLePoE0BbBIyYOCRyoEA/PuxsPI G5sduqlTpUGl+ZULP+bjhCORDq8+FJJeNJ6uhu2HEHXCwLddhK9Y3s26zaaoGiQ69XRy cuWO56055hvHtPpn0HJPYyQIBhll4C3gyEfiX0LXq5Ph9MgDX0Xz5T7eOTEBXoWiYLcW XHGVIznOLKvQ2K9+bWkMwsuAtPFh2dcUHfNuxTc3wuc2fiRuCvDG38UOsO/w0FjtUBG6 tdxw== MIME-Version: 1.0 X-Received: by 10.42.62.71 with SMTP id x7mr4329871ich.61.1422392048335; Tue, 27 Jan 2015 12:54:08 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.36.78.14 with HTTP; Tue, 27 Jan 2015 12:54:08 -0800 (PST) In-Reply-To: References: <20150127192814.GA63990@strugglingcoder.info> <26266AD2-4743-4A7B-A87D-F68E2E2425A0@juniper.net> Date: Tue, 27 Jan 2015 12:54:08 -0800 X-Google-Sender-Auth: MEDbf5ev9z7Fe8xrAaE86EjPNvY Message-ID: Subject: Re: Double cleanup in igb_attach From: Adrian Chadd To: Jack Vogel Content-Type: text/plain; charset=UTF-8 Cc: "jfv@freebsd.org" , "freebsd-net@freebsd.org" , Sreekanth Rupavatharam , hiren panchasara X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jan 2015 20:54:09 -0000 Hi! Sreekanth - this does look like it is valid and needs fixing. Just file a FreeBSD PR (bugs.freebsd.org/submit/) and we'll assign it to the intel team. Thanks! -a On 27 January 2015 at 12:42, Jack Vogel wrote: > Yes, I will look them over. > > Jack > > > On Tue, Jan 27, 2015 at 12:38 PM, Sreekanth Rupavatharam < > rupavath@juniper.net> wrote: > >> Thanks jack, >> Now, can you please review these changes? And commit if you deem it >> fit? >> >> Thanks, >> >> -Sreekanth >> >> On Jan 27, 2015, at 12:24 PM, "Jack Vogel" wrote: >> >> Errrr, I am one of those people :) (jack.vogel@intel.com) >> >> Jack >> >> >> On Tue, Jan 27, 2015 at 12:21 PM, Sreekanth Rupavatharam < >> rupavath@juniper.net> wrote: >> >>> Definitely, but I didn't have the contact info of those people. >>> >>> Thanks, >>> >>> -Sreekanth >>> >>> On Jan 27, 2015, at 12:15 PM, "Jack Vogel" wrote: >>> >>> If you want something committed to an Intel driver, asking Intel might >>> be the >>> courteous thing to do, don't you think? >>> >>> Jack >>> >>> >>> On Tue, Jan 27, 2015 at 11:51 AM, Sreekanth Rupavatharam < >>> rupavath@juniper.net> wrote: >>> >>>> Hiren, >>>> Can you help commit this? >>>> >>>> Index: if_igb.c >>>> >>>> =================================================================== >>>> >>>> --- if_igb.c (revision 298053) >>>> >>>> +++ if_igb.c (working copy) >>>> >>>> @@ -723,7 +723,8 @@ igb_attach(device_t dev) >>>> >>>> return (0); >>>> >>>> >>>> >>>> err_late: >>>> >>>> - igb_detach(dev); >>>> >>>> + if(igb_detach(dev) == 0) /* igb_detach did the cleanup */ >>>> >>>> + return(error); >>>> >>>> igb_free_transmit_structures(adapter); >>>> >>>> igb_free_receive_structures(adapter); >>>> >>>> igb_release_hw_control(adapter); >>>> >>>> -- Thanks, >>>> >>>> Sreekanth >>>> >>>> >>>> >>>> >>>> >>>> >>>> On 1/27/15, 11:28 AM, "hiren panchasara" >>>> wrote: >>>> >>>> + Jack >>>> On Tue, Jan 27, 2015 at 12:00:19AM +0000, Sreekanth Rupavatharam wrote: >>>> >>>> Apologies if this is not the right forum. In igb_attach function, we >>>> have this code. >>>> err_late: >>>> igb_detach(dev); >>>> igb_free_transmit_structures(adapter); >>>> igb_free_receive_structures(adapter); >>>> igb_release_hw_control(adapter); >>>> err_pci: >>>> igb_free_pci_resources(adapter); >>>> if (adapter->ifp != NULL) >>>> if_free(adapter->ifp); >>>> free(adapter->mta, M_DEVBUF); >>>> IGB_CORE_LOCK_DESTROY(adapter); >>>> The problem is that igb_detach also does the same cleanup in it?s >>>> body. Only exception is this case where it just returns EBUSY >>>> /* Make sure VLANS are not using driver */ >>>> if (if_vlantrunkinuse(ifp)) { >>>> device_printf(dev,"Vlan in use, detach first\n"); >>>> return (EBUSY); >>>> } >>>> I think the code in igb_attach should be changed to free up resources >>>> only if the igb_detach returns an error. Here?s the patch for it. >>>> Index: if_igb.c >>>> =================================================================== >>>> --- if_igb.c (revision 298025) >>>> +++ if_igb.c (working copy) >>>> @@ -723,7 +723,8 @@ igb_attach(device_t dev) >>>> return (0); >>>> err_late: >>>> - igb_detach(dev); >>>> + if(igb_detach(dev) == 0) /* igb_detach did the cleanup */ >>>> + return; >>>> igb_free_transmit_structures(adapter); >>>> Can anyone comment on it and tell me if my understanding is >>>> incorrect? >>>> >>>> >>>> Seems reasonable to me at the first glance. >>>> >>>> We need to call IGB_CORE_LOCK_DESTROY(adapter) before returning though. >>>> >>>> cheers, >>>> Hiren >>>> >>>> >>> >> > _______________________________________________ > freebsd-net@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-net > To unsubscribe, send any mail to "freebsd-net-unsubscribe@freebsd.org"