From owner-svn-src-all@freebsd.org Tue Jun 20 18:55:13 2017 Return-Path: Delivered-To: svn-src-all@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 7C607D9F7CB; Tue, 20 Jun 2017 18:55:13 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E5F566EE38; Tue, 20 Jun 2017 18:55:11 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from thor.intern.walstatt.dynvpn.de ([92.225.8.42]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M54L0-1diuV71o0U-00zDfB; Tue, 20 Jun 2017 20:55:03 +0200 Date: Tue, 20 Jun 2017 20:55:02 +0200 From: "O. Hartmann" To: Andriy Gapon Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r320153 - in head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys Message-ID: <20170620205502.443284f7@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201706201655.v5KGtUDS034789@repo.freebsd.org> References: <201706201655.v5KGtUDS034789@repo.freebsd.org> Organization: WALSTATT User-Agent: OutScare 3.1415926 X-Operating-System: ImNotAnOperatingSystem 3.141592527 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/y/6PUfwYjouMG3Jbe0Sa7Vf"; protocol="application/pgp-signature" X-Provags-ID: V03:K0:2jnjTyOkKhfup1pWmCsDp8bGB+KanvTz+3MrSEHhCtOPjp+2Al6 wBMY3bbTH1zgeqtvj9ZFpWhgoVccv8prL1KCzX9F1DsiIZkrD2EloAwoCW2vqSPOqtdEgtO G5DGmrQbuasrGpS2alRBvjRc95Swq36w74/QQtWXN7YRWtWoCwv/CaYgNWVrmK33BuFg8tG w0+0loSGNNrBNwhPSXukA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ccppYQ3xW0o=:vPNmCJE8GOFlvrmnUG6aI5 IddEaaAoKmGktXKCNx05rBpDF4O63rd/c158JweMFD6VA9DuRrSc93RRgNLGwJihaSfAqyM7h BsvPMdeB949ekz5EGguMpqDu8dXOnhMLFWrOz7YcX0eUHioF36mjdtXtlknW4tzZPBflhNDh1 ebqgKiSMDdKTsQpL/2NsypbSk/ViSdp8HD0bwhyjwIdYrnWKDAmCzXZfKN0jz845O5BKRx+nC RZW9yTZeDpjD5SCSkm0O8JRsIqF7vUwCjxtLIVCv9vFeczBB7vX+TT0jwA1ZGKssSfO9Id1VE 7CkFQ2MKHyAXydtDuViR02bPEnMwe65VhGKz3jGxELaOQ+Vn8YSMuk98reWArMSvI6SUiM9sz rGL0Dln4KNgT7W6SwzngjIbapuOR+EOCdGPn30RRx4MjcLic+U38d5Fz0mCB1B/tyJX6vDndC RvqOftxOhgryDk/Nl3hkYGLFtdar5rE+ZFr6ajsqcY6lglYZ00KrqilInQjsFdCazbVNCXZwB 7gNZ7sJfnLm6+j4tsS6tAUPvM92J9LZwfiqJrU+k2VJiMh/d+kp1ia7+fQOCg0CVZwb/GmfWo EQMbxe+l0g2g2h3g9P4ijPVLxoCAGoGja//qiBvP1l5VYCzmGKqxWjyDYMtWndIMfGLkVQdJn J2ket1aKqqsDcjQW4uCD+oHIuUDYZoFSqAW/cCtykUzGTZRUHFpkqR3igmvcTkBIaeu0RMYW4 6jjzn6XZ95EfFbu+F6QRYMJx90cZh6bVsqpZT7OSeOF1FalTHX6Jl9lUAqU= X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jun 2017 18:55:13 -0000 --Sig_/y/6PUfwYjouMG3Jbe0Sa7Vf Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Tue, 20 Jun 2017 16:55:30 +0000 (UTC) Andriy Gapon schrieb: > Author: avg > Date: Tue Jun 20 16:55:30 2017 > New Revision: 320153 > URL: https://svnweb.freebsd.org/changeset/base/320153 >=20 > Log: > revert r315852 which introduced zio_buf_alloc_nowait for use in vdev_qu= eue_aggregate > =20 > I think that the change is still good, but reconciling it with a planned > merge of the ARC buf data scatter-ization is a bit more tedious > than I can handle. > =20 > MFC after: 17 days >=20 > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c >=20 > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Tue Jun= 20 > 16:45:48 2017 (r320152) +++ > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Tue Jun 20 > 16:55:30 2017 (r320153) @@ -555,7 +555,6 @@ extern zio_t > *zio_unique_parent(zio_t *cio); extern void zio_add_child(zio_t *pio, zio= _t *cio);=20 > extern void *zio_buf_alloc(size_t size); > -extern void *zio_buf_alloc_nowait(size_t size); > extern void zio_buf_free(void *buf, size_t size); > extern void *zio_data_buf_alloc(size_t size); > extern void zio_data_buf_free(void *buf, size_t size); >=20 > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Tue = Jun 20 > 16:45:48 2017 (r320152) +++ > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Tue Jun = 20 > 16:55:30 2017 (r320153) @@ -647,7 +647,6 @@ static zio_t * > vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio) { > zio_t *first, *last, *aio, *dio, *mandatory, *nio; > - void *abuf; > uint64_t maxgap =3D 0; > uint64_t size; > boolean_t stretch; > @@ -766,12 +765,8 @@ vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio) > size =3D IO_SPAN(first, last); > ASSERT3U(size, <=3D, SPA_MAXBLOCKSIZE); > =20 > - abuf =3D zio_buf_alloc_nowait(size); > - if (abuf =3D=3D NULL) > - return (NULL); > - > aio =3D zio_vdev_delegated_io(first->io_vd, first->io_offset, > - abuf, size, first->io_type, zio->io_priority, > + zio_buf_alloc(size), size, first->io_type, zio->io_priority, > flags | ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_QUEUE, > vdev_queue_agg_io_done, NULL); > aio->io_timestamp =3D first->io_timestamp; >=20 > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Tue Jun 20 > 16:45:48 2017 (r320152) +++ > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Tue Jun 20 16:5= 5:30 > 2017 (r320153) @@ -272,33 +272,18 @@ zio_fini(void) > * useful to inspect ZFS metadata, but if possible, we should avoid keep= ing > * excess / transient data in-core during a crashdump. > */ > -static void * > -zio_buf_alloc_impl(size_t size, boolean_t canwait) > +void * > +zio_buf_alloc(size_t size) > { > size_t c =3D (size - 1) >> SPA_MINBLOCKSHIFT; > int flags =3D zio_exclude_metadata ? KM_NODEBUG : 0; > =20 > VERIFY3U(c, <, SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT); > =20 > - if (zio_use_uma) { > - return (kmem_cache_alloc(zio_buf_cache[c], > - canwait ? KM_PUSHPAGE : KM_NOSLEEP)); > - } else { > - return (kmem_alloc(size, > - (canwait ? KM_SLEEP : KM_NOSLEEP) | flags)); > - } > -} > - > -void * > -zio_buf_alloc(size_t size) > -{ > - return (zio_buf_alloc_impl(size, B_TRUE)); > -} > - > -void * > -zio_buf_alloc_nowait(size_t size) > -{ > - return (zio_buf_alloc_impl(size, B_FALSE)); > + if (zio_use_uma) > + return (kmem_cache_alloc(zio_buf_cache[c], KM_PUSHPAGE)); > + else > + return (kmem_alloc(size, KM_SLEEP|flags)); > } > =20 > /* > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" Running r320138, which is stable for me, My systems crash immediately when = booting with r320158. Since I use ZFS compiled into the kernel and it seems to be the on= ly change so far of importance involving the kernel, I suspect the ZFS changes to be the= source of the crash. At the moment, I have no debugging kernel running, so this guess is more ou= t of the blue. Kind regards, Oliver --=20 O. Hartmann Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Abs.= 4 BDSG). --Sig_/y/6PUfwYjouMG3Jbe0Sa7Vf Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWUlvhgAKCRDS528fyFhY lJ8EAfsHVgmuWR4InfxI8yz+2WS8IJV80W6zoIr463NfiIVinBI8bCcYn9eRsApJ ozc7aRl9zYfr2f4VhHEpYWKIFgBEAf9YdU3Kg5vWjfPMNzGlqfXXbUNeJQjnaizE 1U+DrSNENKjXMWin+4IwU4O3h4aYs5CHf/6LqHGTqybdf7RPUIbj =2D9a -----END PGP SIGNATURE----- --Sig_/y/6PUfwYjouMG3Jbe0Sa7Vf--