From owner-svn-src-stable-9@FreeBSD.ORG Tue Nov 11 08:00:51 2014 Return-Path: Delivered-To: svn-src-stable-9@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 163FA360; Tue, 11 Nov 2014 08:00:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EABB235C; Tue, 11 Nov 2014 08:00:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAB80o58013422; Tue, 11 Nov 2014 08:00:50 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAB80oGi013420; Tue, 11 Nov 2014 08:00:50 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201411110800.sAB80oGi013420@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 11 Nov 2014 08:00:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r274373 - in stable: 10/contrib/llvm/lib/MC/MCParser 10/contrib/llvm/patches 9/contrib/llvm/lib/MC/MCParser 9/contrib/llvm/patches X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Nov 2014 08:00:51 -0000 Author: dim Date: Tue Nov 11 08:00:49 2014 New Revision: 274373 URL: https://svnweb.freebsd.org/changeset/base/274373 Log: MFC r274286: Pull in r201784 from upstream llvm trunk (by Benjamin Kramer): AsmParser: Disable Darwin-style macro argument expansion on non-darwin targets. There is code in the wild that relies on $0 not being expanded. This fixes some cases of using $ signs in literals being incorrectly assembled. Reported by: Richard Henderson Upstream PR: http://llvm.org/PR21500 MFC r274294: Add llvm patch corresponding to r274286. Added: stable/9/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff - copied unchanged from r274294, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Modified: stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Directory Properties: stable/9/contrib/llvm/ (props changed) Changes in other areas also in this revision: Added: stable/10/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff - copied unchanged from r274294, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Modified: stable/10/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Directory Properties: stable/10/ (props changed) Modified: stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp ============================================================================== --- stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Tue Nov 11 05:55:37 2014 (r274372) +++ stable/9/contrib/llvm/lib/MC/MCParser/AsmParser.cpp Tue Nov 11 08:00:49 2014 (r274373) @@ -1695,7 +1695,7 @@ bool AsmParser::expandMacro(raw_svector_ const MCAsmMacroParameters &Parameters, const MCAsmMacroArguments &A, const SMLoc &L) { unsigned NParameters = Parameters.size(); - if (NParameters != 0 && NParameters != A.size()) + if ((!IsDarwin || NParameters != 0) && NParameters != A.size()) return Error(L, "Wrong number of arguments"); // A macro without parameters is handled differently on Darwin: @@ -1705,7 +1705,7 @@ bool AsmParser::expandMacro(raw_svector_ std::size_t End = Body.size(), Pos = 0; for (; Pos != End; ++Pos) { // Check for a substitution or escape. - if (!NParameters) { + if (IsDarwin && !NParameters) { // This macro has no parameters, look for $0, $1, etc. if (Body[Pos] != '$' || Pos + 1 == End) continue; @@ -1728,7 +1728,7 @@ bool AsmParser::expandMacro(raw_svector_ if (Pos == End) break; - if (!NParameters) { + if (IsDarwin && !NParameters) { switch (Body[Pos + 1]) { // $$ => $ case '$': Copied: stable/9/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff (from r274294, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Tue Nov 11 08:00:49 2014 (r274373, copy of r274294, head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff) @@ -0,0 +1,55 @@ +Pull in r201784 from upstream llvm trunk (by Benjamin Kramer): + + AsmParser: Disable Darwin-style macro argument expansion on non-darwin targets. + + There is code in the wild that relies on $0 not being expanded. + +This fixes some cases of using $ signs in literals being incorrectly +assembled. + +Reported by: Richard Henderson +Upstream PR: http://llvm.org/PR21500 + +Introduced here: http://svnweb.freebsd.org/changeset/base/274286 + +Index: lib/MC/MCParser/AsmParser.cpp +=================================================================== +--- lib/MC/MCParser/AsmParser.cpp ++++ lib/MC/MCParser/AsmParser.cpp +@@ -1695,7 +1695,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &O + const MCAsmMacroParameters &Parameters, + const MCAsmMacroArguments &A, const SMLoc &L) { + unsigned NParameters = Parameters.size(); +- if (NParameters != 0 && NParameters != A.size()) ++ if ((!IsDarwin || NParameters != 0) && NParameters != A.size()) + return Error(L, "Wrong number of arguments"); + + // A macro without parameters is handled differently on Darwin: +@@ -1705,7 +1705,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &O + std::size_t End = Body.size(), Pos = 0; + for (; Pos != End; ++Pos) { + // Check for a substitution or escape. +- if (!NParameters) { ++ if (IsDarwin && !NParameters) { + // This macro has no parameters, look for $0, $1, etc. + if (Body[Pos] != '$' || Pos + 1 == End) + continue; +@@ -1728,7 +1728,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &O + if (Pos == End) + break; + +- if (!NParameters) { ++ if (IsDarwin && !NParameters) { + switch (Body[Pos + 1]) { + // $$ => $ + case '$': +Index: test/MC/AsmParser/exprs.s +=================================================================== +--- test/MC/AsmParser/exprs.s ++++ test/MC/AsmParser/exprs.s +@@ -1,4 +1,4 @@ +-// RUN: llvm-mc -triple i386-unknown-unknown %s > %t ++// RUN: llvm-mc -triple i386-apple-darwin %s + + .macro check_expr + .if ($0) != ($1) From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 12 19:56:52 2014 Return-Path: Delivered-To: svn-src-stable-9@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 2EDBF4DD; Wed, 12 Nov 2014 19:56:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B61EF47; Wed, 12 Nov 2014 19:56:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sACJupnx061203; Wed, 12 Nov 2014 19:56:51 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sACJupw3061202; Wed, 12 Nov 2014 19:56:51 GMT (envelope-from np@FreeBSD.org) Message-Id: <201411121956.sACJupw3061202@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Wed, 12 Nov 2014 19:56:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r274441 - stable/9/sys/dev/cxgbe X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2014 19:56:52 -0000 Author: np Date: Wed Nov 12 19:56:51 2014 New Revision: 274441 URL: https://svnweb.freebsd.org/changeset/base/274441 Log: MFC r272190: cxgbe(4): explicitly set various if_hw_tso* values. Modified: stable/9/sys/dev/cxgbe/t4_main.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/9/sys/dev/cxgbe/t4_main.c Wed Nov 12 19:53:35 2014 (r274440) +++ stable/9/sys/dev/cxgbe/t4_main.c Wed Nov 12 19:56:51 2014 (r274441) @@ -992,6 +992,10 @@ cxgbe_attach(device_t dev) ifp->if_hwassist = CSUM_TCP | CSUM_UDP | CSUM_IP | CSUM_TSO | CSUM_UDP_IPV6 | CSUM_TCP_IPV6; + ifp->if_hw_tsomax = 65536 - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); + ifp->if_hw_tsomaxsegcount = TX_SGL_SEGS; + ifp->if_hw_tsomaxsegsize = 65536; + /* Initialize ifmedia for this port */ ifmedia_init(&pi->media, IFM_IMASK, cxgbe_media_change, cxgbe_media_status); From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 12 20:09:20 2014 Return-Path: Delivered-To: svn-src-stable-9@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 E5B2F95B; Wed, 12 Nov 2014 20:09:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D1EB9B0; Wed, 12 Nov 2014 20:09:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sACK9K7Y066558; Wed, 12 Nov 2014 20:09:20 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sACK9Kvd066557; Wed, 12 Nov 2014 20:09:20 GMT (envelope-from np@FreeBSD.org) Message-Id: <201411122009.sACK9Kvd066557@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Wed, 12 Nov 2014 20:09:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r274444 - stable/9/sys/dev/cxgb/common X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2014 20:09:21 -0000 Author: np Date: Wed Nov 12 20:09:20 2014 New Revision: 274444 URL: https://svnweb.freebsd.org/changeset/base/274444 Log: MFC r273280: cxgb(4): reset the PHY if it generates an interrupt for no apparent reason. Modified: stable/9/sys/dev/cxgb/common/cxgb_ael1002.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/cxgb/common/cxgb_ael1002.c ============================================================================== --- stable/9/sys/dev/cxgb/common/cxgb_ael1002.c Wed Nov 12 20:07:43 2014 (r274443) +++ stable/9/sys/dev/cxgb/common/cxgb_ael1002.c Wed Nov 12 20:09:20 2014 (r274444) @@ -1345,8 +1345,10 @@ static int ael2005_intr_handler(struct c return ret; ret |= cause; - if (!ret) + if (!ret) { + (void) ael2005_reset(phy, 0); ret |= cphy_cause_link_change; + } return ret; } From owner-svn-src-stable-9@FreeBSD.ORG Wed Nov 12 20:26:24 2014 Return-Path: Delivered-To: svn-src-stable-9@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 11BB322D; Wed, 12 Nov 2014 20:26:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F21652D2; Wed, 12 Nov 2014 20:26:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sACKQNgB075906; Wed, 12 Nov 2014 20:26:23 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sACKQNhs075904; Wed, 12 Nov 2014 20:26:23 GMT (envelope-from np@FreeBSD.org) Message-Id: <201411122026.sACKQNhs075904@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Wed, 12 Nov 2014 20:26:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r274447 - stable/9/sys/dev/cxgbe/firmware X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2014 20:26:24 -0000 Author: np Date: Wed Nov 12 20:26:22 2014 New Revision: 274447 URL: https://svnweb.freebsd.org/changeset/base/274447 Log: MFC r273615: cxgbe(4): bump up PF4's share of some global resources. This increases the size of the per-port RSS slice and also allows the driver to use a larger number of tx and rx queues. Modified: stable/9/sys/dev/cxgbe/firmware/t4fw_cfg.txt stable/9/sys/dev/cxgbe/firmware/t5fw_cfg.txt Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/cxgbe/firmware/t4fw_cfg.txt ============================================================================== --- stable/9/sys/dev/cxgbe/firmware/t4fw_cfg.txt Wed Nov 12 20:24:14 2014 (r274446) +++ stable/9/sys/dev/cxgbe/firmware/t4fw_cfg.txt Wed Nov 12 20:26:22 2014 (r274447) @@ -41,26 +41,34 @@ [function "0"] nvf = 16 nvi = 1 + rssnvi = 0 [function "0/*"] nvi = 1 + rssnvi = 0 [function "1"] nvf = 16 nvi = 1 + rssnvi = 0 [function "1/*"] nvi = 1 + rssnvi = 0 [function "2"] nvf = 16 nvi = 1 + rssnvi = 0 [function "2/*"] nvi = 1 + rssnvi = 0 [function "3"] nvf = 16 nvi = 1 + rssnvi = 0 [function "3/*"] nvi = 1 + rssnvi = 0 # PF4 is the resource-rich PF that the bus/nexus driver attaches to. # It gets 32 MSI/128 MSI-X vectors. @@ -68,9 +76,10 @@ wx_caps = all r_caps = all nvi = 32 - niqflint = 256 - nethctrl = 128 - neq = 256 + rssnvi = 8 + niqflint = 512 + nethctrl = 1024 + neq = 2048 nexactf = 328 cmask = all pmask = all @@ -94,11 +103,13 @@ # Not used right now. [function "5"] nvi = 1 + rssnvi = 0 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors. # Not used right now. [function "6"] nvi = 1 + rssnvi = 0 # The following function, 1023, is not an actual PCIE function but is used to # configure and reserve firmware internal resources that come from the global @@ -107,6 +118,7 @@ wx_caps = all r_caps = all nvi = 4 + rssnvi = 0 cmask = all pmask = all nexactf = 8 @@ -148,7 +160,7 @@ [fini] version = 0x1 - checksum = 0x6f516705 + checksum = 0x6a1f8858 # # $FreeBSD$ # Modified: stable/9/sys/dev/cxgbe/firmware/t5fw_cfg.txt ============================================================================== --- stable/9/sys/dev/cxgbe/firmware/t5fw_cfg.txt Wed Nov 12 20:24:14 2014 (r274446) +++ stable/9/sys/dev/cxgbe/firmware/t5fw_cfg.txt Wed Nov 12 20:26:22 2014 (r274447) @@ -5,7 +5,7 @@ # niqflint = 1023 ingress queues with freelists and/or interrupts # nethctrl = 64K Ethernet or ctrl egress queues # neq = 64K egress queues of all kinds, including freelists -# nexactf = 336 MPS TCAM entries, can oversubscribe. +# nexactf = 512 MPS TCAM entries, can oversubscribe. # [global] @@ -54,26 +54,34 @@ [function "0"] nvf = 16 nvi = 1 + rssnvi = 0 [function "0/*"] nvi = 1 + rssnvi = 0 [function "1"] nvf = 16 nvi = 1 + rssnvi = 0 [function "1/*"] nvi = 1 + rssnvi = 0 [function "2"] nvf = 16 nvi = 1 + rssnvi = 0 [function "2/*"] nvi = 1 + rssnvi = 0 [function "3"] nvf = 16 nvi = 1 + rssnvi = 0 [function "3/*"] nvi = 1 + rssnvi = 0 # PF4 is the resource-rich PF that the bus/nexus driver attaches to. # It gets 32 MSI/128 MSI-X vectors. @@ -81,9 +89,10 @@ wx_caps = all r_caps = all nvi = 32 - niqflint = 256 - nethctrl = 128 - neq = 256 + rssnvi = 8 + niqflint = 512 + nethctrl = 1024 + neq = 2048 nexactf = 328 cmask = all pmask = all @@ -107,11 +116,13 @@ # Not used right now. [function "5"] nvi = 1 + rssnvi = 0 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors. # Not used right now. [function "6"] nvi = 1 + rssnvi = 0 # The following function, 1023, is not an actual PCIE function but is used to # configure and reserve firmware internal resources that come from the global @@ -120,6 +131,7 @@ wx_caps = all r_caps = all nvi = 4 + rssnvi = 0 cmask = all pmask = all nexactf = 8 @@ -161,7 +173,7 @@ [fini] version = 0x1 - checksum = 0x9f27febc + checksum = 0xa0ee1715 # # $FreeBSD$ # From owner-svn-src-stable-9@FreeBSD.ORG Sat Nov 15 05:35:25 2014 Return-Path: Delivered-To: svn-src-stable-9@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 6675040B; Sat, 15 Nov 2014 05:35:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 526819AD; Sat, 15 Nov 2014 05:35:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAF5ZPCu094597; Sat, 15 Nov 2014 05:35:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAF5ZPiS094596; Sat, 15 Nov 2014 05:35:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411150535.sAF5ZPiS094596@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 15 Nov 2014 05:35:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r274544 - stable/9/tools/regression/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Nov 2014 05:35:25 -0000 Author: ngie Date: Sat Nov 15 05:35:24 2014 New Revision: 274544 URL: https://svnweb.freebsd.org/changeset/base/274544 Log: MFC r273627,r273628: r273627: - Print out "Bail out!" in die(..) so prove terminates immediately - Handle the output from newer versions of openssl md5, similar to what pjd@ did in r248304 Sponsored by: EMC / Isilon Storage Division r273628: Move the redirection to stderr out of the cmd variable assignment Putting 2>/dev/null in cmd= escapes the redirection operation, which causes mdconfig to think it's a filename Sponsored by: EMC / Isilon Storage Division Modified: stable/9/tools/regression/zfs/misc.sh Directory Properties: stable/9/ (props changed) stable/9/tools/ (props changed) stable/9/tools/regression/ (props changed) Modified: stable/9/tools/regression/zfs/misc.sh ============================================================================== --- stable/9/tools/regression/zfs/misc.sh Sat Nov 15 05:16:16 2014 (r274543) +++ stable/9/tools/regression/zfs/misc.sh Sat Nov 15 05:35:24 2014 (r274544) @@ -39,6 +39,7 @@ fi die() { echo "${1}" > /dev/stderr + echo "Bail out!" exit 1 } @@ -166,8 +167,8 @@ create_memdisk() if [ -n "${devname}" ]; then devparam="-u ${devname}" fi - cmd="mdconfig -a -t swap -s ${size} ${devparam} 2>/dev/null" - DISKNAME=`${cmd}` || die "failed: ${cmd}" + cmd="mdconfig -a -t swap -s ${size} ${devparam}" + DISKNAME=`$cmd 2>/dev/null` || die "failed: ${cmd}" if [ -n "${devname}" ]; then DISKNAME="${devname}" fi @@ -363,7 +364,7 @@ files_destroy() name_create() { - echo "zfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | cut -b -8`" + echo "zfstest_`dd if=/dev/urandom bs=1k count=1 2>/dev/null | openssl md5 | awk '{ print $NF }'`" } names_create()