From owner-freebsd-current@FreeBSD.ORG Fri Aug 3 20:43:28 2012 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A773106566B; Fri, 3 Aug 2012 20:43:28 +0000 (UTC) (envelope-from mike@sentex.net) Received: from smarthost1.sentex.ca (smarthost1-6.sentex.ca [IPv6:2607:f3e0:0:1::12]) by mx1.freebsd.org (Postfix) with ESMTP id E026D8FC08; Fri, 3 Aug 2012 20:43:27 +0000 (UTC) Received: from [192.168.43.26] (pyroxene.sentex.ca [199.212.134.18]) by smarthost1.sentex.ca (8.14.5/8.14.5) with ESMTP id q73KhRel088794; Fri, 3 Aug 2012 16:43:27 -0400 (EDT) (envelope-from mike@sentex.net) Message-ID: <501C37D3.5040704@sentex.net> Date: Fri, 03 Aug 2012 16:42:59 -0400 From: Mike Tancsa Organization: Sentex Communications User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: John Baldwin References: <201208031418.57941.jhb@freebsd.org> <201208031539.47735.jhb@freebsd.org> In-Reply-To: <201208031539.47735.jhb@freebsd.org> X-Enigmail-Version: 1.4.2 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.72 on 64.7.153.18 Cc: current@freebsd.org Subject: Re: [PATCH] Add locking to twe(4) so it no longer uses Giant X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Aug 2012 20:43:28 -0000 On 8/3/2012 3:39 PM, John Baldwin wrote: > On Friday, August 03, 2012 2:56:00 pm Kevin Oberman wrote: >> I'll try to find time to try it later today, but I'm in the middle of >> budget wrangling and I can't make any promises. >> >> Before I try, will these patches apply to the twe driver in >> 9.1-PRERELEASE? My system with twe was updated to RELENG_9 on July 18. >> I really don't have time to install current right now. > > I believe the patches should apply fine on 8 and 9. If you use it on 8 or 9 > please make sure to enable INVARIANTS and INVARIANT_SUPPORT at least for > initial testing. Thanks! Seems to apply to RELENG_9 just fine. Are there any stress tests you suggest I run that might expose some bugs ? The machine is not production yet, so its ok to crash it. {offsite2}# patch -p9 < twe_locking.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- //depot/vendor/freebsd/src/sys/dev/twe/twe.c 2009-12-25 17:35:14.000000000 0000 |+++ //depot/user/jhb/cleanup/sys/dev/twe/twe.c 2012-08-03 04:00:49.000000000 0000 -------------------------- Patching file twe.c using Plan A... Hunk #1 succeeded at 151. Hunk #2 succeeded at 167. Hunk #3 succeeded at 189. Hunk #4 succeeded at 208. Hunk #5 succeeded at 226. Hunk #6 succeeded at 234. Hunk #7 succeeded at 271. Hunk #8 succeeded at 288. Hunk #9 succeeded at 310. Hunk #10 succeeded at 337. Hunk #11 succeeded at 349. Hunk #12 succeeded at 405. Hunk #13 succeeded at 521. Hunk #14 succeeded at 557. Hunk #15 succeeded at 580. Hunk #16 succeeded at 595. Hunk #17 succeeded at 608. Hunk #18 succeeded at 646. Hunk #19 succeeded at 769. Hunk #20 succeeded at 863. Hunk #21 succeeded at 921. Hunk #22 succeeded at 952. Hunk #23 succeeded at 1038. Hunk #24 succeeded at 1051. Hunk #25 succeeded at 1082. Hunk #26 succeeded at 1104. Hunk #27 succeeded at 1140. Hunk #28 succeeded at 1151. Hunk #29 succeeded at 1177. Hunk #30 succeeded at 1206. Hunk #31 succeeded at 1309. Hunk #32 succeeded at 1447. Hunk #33 succeeded at 1469. Hunk #34 succeeded at 1499. Hunk #35 succeeded at 1513. Hunk #36 succeeded at 1531. Hunk #37 succeeded at 1554. Hunk #38 succeeded at 1589. Hunk #39 succeeded at 1618. Hunk #40 succeeded at 1644. Hunk #41 succeeded at 1696. Hunk #42 succeeded at 1778. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- //depot/vendor/freebsd/src/sys/dev/twe/twe_compat.h 2005-05-29 04:45:51.000000000 0000 |+++ //depot/user/jhb/cleanup/sys/dev/twe/twe_compat.h 2012-08-03 03:58:12.000000000 0000 -------------------------- Patching file twe_compat.h using Plan A... Hunk #1 succeeded at 43. Hunk #2 succeeded at 68. Hunk #3 succeeded at 82. Hunk #4 succeeded at 92. Hunk #5 succeeded at 108. Hunk #6 succeeded at 128. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- //depot/vendor/freebsd/src/sys/dev/twe/twe_freebsd.c 2012-03-12 08:05:24.000000000 0000 |+++ //depot/user/jhb/cleanup/sys/dev/twe/twe_freebsd.c 2012-08-03 18:10:04.000000000 0000 -------------------------- Patching file twe_freebsd.c using Plan A... Hunk #1 succeeded at 69. Hunk #2 succeeded at 83. Hunk #3 succeeded at 101. Hunk #4 succeeded at 180. Hunk #5 succeeded at 188. Hunk #6 succeeded at 211. Hunk #7 succeeded at 241. Hunk #8 succeeded at 292. Hunk #9 succeeded at 414. Hunk #10 succeeded at 425. Hunk #11 succeeded at 461. Hunk #12 succeeded at 496. Hunk #13 succeeded at 518. Hunk #14 succeeded at 533. Hunk #15 succeeded at 566. Hunk #16 succeeded at 585. Hunk #17 succeeded at 604. Hunk #18 succeeded at 680. Hunk #19 succeeded at 729. Hunk #20 succeeded at 834. Hunk #21 succeeded at 857. Hunk #22 succeeded at 876. Hunk #23 succeeded at 1038. Hunk #24 succeeded at 1097. Hunk #25 succeeded at 1151. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |--- //depot/vendor/freebsd/src/sys/dev/twe/twevar.h 2009-12-25 17:35:14.000000000 0000 |+++ //depot/user/jhb/cleanup/sys/dev/twe/twevar.h 2012-08-03 04:00:49.000000000 0000 -------------------------- Patching file twevar.h using Plan A... Hunk #1 succeeded at 134. Hunk #2 succeeded at 210. Hunk #3 succeeded at 255. done 0{offsite2}# -- ------------------- Mike Tancsa, tel +1 519 651 3400 Sentex Communications, mike@sentex.net Providing Internet services since 1994 www.sentex.net Cambridge, Ontario Canada http://www.tancsa.com/