From owner-p4-projects@FreeBSD.ORG Tue Feb 5 06:50:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37C1E16A468; Tue, 5 Feb 2008 06:50:25 +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 D8EDD16A417 for ; Tue, 5 Feb 2008 06:50:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5CA313C442 for ; Tue, 5 Feb 2008 06:50:24 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m156oOgm003803 for ; Tue, 5 Feb 2008 06:50:24 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m156oOKk003800 for perforce@freebsd.org; Tue, 5 Feb 2008 06:50:24 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 5 Feb 2008 06:50:24 GMT Message-Id: <200802050650.m156oOKk003800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Feb 2008 06:50:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=134821 Change 134821 by kmacy@kmacy:storage:toehead on 2008/02/05 06:49:56 ensure that all locks get destroyed at unload Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/cxgb_l2t.c#4 edit .. //depot/projects/toehead/sys/dev/cxgb/cxgb_offload.c#5 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/cxgb_l2t.c#4 (text+ko) ==== @@ -543,6 +543,12 @@ void t3_free_l2t(struct l2t_data *d) { + int i; + + rw_destroy(&d->lock); + for (i = 0; i < d->nentries; ++i) + mtx_destroy(&d->l2tab[i].lock); + cxgb_free_mem(d); } ==== //depot/projects/toehead/sys/dev/cxgb/cxgb_offload.c#5 (text+ko) ==== @@ -1166,7 +1166,6 @@ free(addr, M_CXGB); } - /* * Allocate and initialize the TID tables. Returns 0 on success. */ @@ -1215,6 +1214,8 @@ static void free_tid_maps(struct tid_info *t) { + mtx_destroy(&t->stid_lock); + mtx_destroy(&t->atid_lock); cxgb_free_mem(t->tid_tab); } @@ -1234,11 +1235,6 @@ rw_wunlock(&adapter_list_lock); } -/* - * XXX - */ -#define t3_free_l2t(...) - int cxgb_offload_activate(struct adapter *adapter) { @@ -1272,8 +1268,6 @@ device_printf(adapter->dev, "%s: t3_init_l2t failed\n", __FUNCTION__); goto out_free; } - - natids = min(tid_range.num / 2, MAX_ATIDS); err = init_tid_tabs(&t->tid_maps, tid_range.num, natids, stid_range.num, ATID_BASE, stid_range.base); @@ -1337,6 +1331,7 @@ T3C_DATA(tdev) = NULL; t3_free_l2t(L2DATA(tdev)); L2DATA(tdev) = NULL; + mtx_destroy(&t->tid_release_lock); free(t, M_CXGB); }