From owner-svn-src-head@freebsd.org Thu Dec 14 18:11:47 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 825DAE89D15; Thu, 14 Dec 2017 18:11:47 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59E6570EB5; Thu, 14 Dec 2017 18:11:47 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id vBEIBcMn098115; Thu, 14 Dec 2017 10:11:38 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id vBEIBcWR098114; Thu, 14 Dec 2017 10:11:38 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201712141811.vBEIBcWR098114@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r326857 - in head: . share/mk stand/i386/zfsboot In-Reply-To: <201712141700.vBEH0O87072941@repo.freebsd.org> To: Warner Losh Date: Thu, 14 Dec 2017 10:11:38 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Dec 2017 18:11:47 -0000 > Author: imp > Date: Thu Dec 14 17:00:24 2017 > New Revision: 326857 > URL: https://svnweb.freebsd.org/changeset/base/326857 > > Log: > Turn loader GELI support in the boot loaders off by default as a > temporary workaround. This fixes zfs booting generally, but breaks all > GELI booting by default. Add note to UPDATING to this effect. When the > GELI issues are resolved, this will be reverted. > > Modified: > head/UPDATING > head/share/mk/src.opts.mk > head/stand/i386/zfsboot/zfsldr.S Was the change to this an unintentional oops merge, as This looks to be doing more than what you document in the log entry. > Modified: head/UPDATING > ============================================================================== > --- head/UPDATING Thu Dec 14 16:51:43 2017 (r326856) > +++ head/UPDATING Thu Dec 14 17:00:24 2017 (r326857) > @@ -51,6 +51,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: > > ****************************** SPECIAL WARNING: ****************************** > > +20171214: > + r362593 broke ZFS + GELI support for reasons unknown. However, > + it also broke ZFS support generally, so GELI has been turned off > + by default as the lessor evil in r326857. If you boot off ZFS and/or > + GELI, it might not be a good time to update. > + > 20171125: > PowerPC users must update loader(8) by rebuilding world before > installing a new kernel, as the protocol connecting them has > > Modified: head/share/mk/src.opts.mk > ============================================================================== > --- head/share/mk/src.opts.mk Thu Dec 14 16:51:43 2017 (r326856) > +++ head/share/mk/src.opts.mk Thu Dec 14 17:00:24 2017 (r326857) > @@ -119,7 +119,6 @@ __DEFAULT_YES_OPTIONS = \ > LIB32 \ > LIBPTHREAD \ > LIBTHR \ > - LOADER_GELI \ > LOCALES \ > LOCATE \ > LPR \ > @@ -183,6 +182,7 @@ __DEFAULT_NO_OPTIONS = \ > LIBSOFT \ > LOADER_FIREWIRE \ > LOADER_FORCE_LE \ > + LOADER_GELI \ > NAND \ > OFED \ > OPENLDAP \ > > Modified: head/stand/i386/zfsboot/zfsldr.S > ============================================================================== > --- head/stand/i386/zfsboot/zfsldr.S Thu Dec 14 16:51:43 2017 (r326856) > +++ head/stand/i386/zfsboot/zfsldr.S Thu Dec 14 17:00:24 2017 (r326857) > @@ -33,7 +33,7 @@ > .set SIZ_PAG,0x1000 # Page size > .set SIZ_SEC,0x200 # Sector size > .set COPY_BLKS,0x8 # Number of blocks > - # to copy for boot2 > + # to copy for boot2 (<= 15) This seems to match a commit you just made to other parts of the code. > .set COPY_BLK_SZ,0x8000 # Copy in 32k blocks; must be > # a multiple of 16 bytes > .set NSECT,(COPY_BLK_SZ / SIZ_SEC * COPY_BLKS) -- Rod Grimes rgrimes@freebsd.org