From owner-freebsd-net@FreeBSD.ORG Tue Jan 27 20:24:19 2015 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 952EE497; Tue, 27 Jan 2015 20:24:19 +0000 (UTC) Received: from mail-we0-x231.google.com (mail-we0-x231.google.com [IPv6:2a00:1450:400c:c03::231]) (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 2B0D43D8; Tue, 27 Jan 2015 20:24:19 +0000 (UTC) Received: by mail-we0-f177.google.com with SMTP id l61so16983723wev.8; Tue, 27 Jan 2015 12:24:17 -0800 (PST) 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=pbMbzLEDi6JhHG4gY0NsQBqmUXi8ZkQ1X+Sz1RlGO/s=; b=l4WqMvo1miz96ejKWFQzpVG+2NsNQoqVyqJuSnPRcha/9mQ3qx9r8iNWhVngzmrVX0 sFNFNnOaMGHHqRP2T6TMs3mXaI0PjpRBd3kx1gTKzm3BGw1oLch7YJydwO0queV0h/qT kGYvq0qughOfrYjb06fPOY56xHUbJE93VT1jJvHFqODie4gLzcxjzyc3tu14CXFIu9Lr g+4qK8LhJnlSuOHjNLheR5IU8rSpEz5riOZ5ON1FW1lL5fnL2TmCMb5o869qL2JGUqHj QCxsWyY4paO982M6owwOaLrXqvSjyuN3xoSqob07mGUBBjI3UTP3SEh+mqF2YZ0YGoIj Ci0w== MIME-Version: 1.0 X-Received: by 10.180.74.114 with SMTP id s18mr9585769wiv.29.1422390257550; Tue, 27 Jan 2015 12:24:17 -0800 (PST) Received: by 10.194.101.106 with HTTP; Tue, 27 Jan 2015 12:24:17 -0800 (PST) In-Reply-To: <26266AD2-4743-4A7B-A87D-F68E2E2425A0@juniper.net> References: <20150127192814.GA63990@strugglingcoder.info> <26266AD2-4743-4A7B-A87D-F68E2E2425A0@juniper.net> Date: Tue, 27 Jan 2015 12:24:17 -0800 Message-ID: Subject: Re: Double cleanup in igb_attach From: Jack Vogel To: Sreekanth Rupavatharam Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: "jfv@freebsd.org" , "freebsd-net@freebsd.org" , 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:24:19 -0000 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 >> >> >