From owner-svn-src-head@freebsd.org Wed Mar 14 21:22:40 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71594F4AB8A for ; Wed, 14 Mar 2018 21:22:40 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com [IPv6:2a00:1450:400c:c09::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0CE677C27 for ; Wed, 14 Mar 2018 21:22:39 +0000 (UTC) (envelope-from steven.hartland@multiplay.co.uk) Received: by mail-wm0-x22b.google.com with SMTP id e194so6709814wmd.3 for ; Wed, 14 Mar 2018 14:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=multiplay-co-uk.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=IOJ67JowcSbu0ggXrBXDO807fyXCOGPEsmjm+hgKSIg=; b=I1D08fEG2BZ2nhHb5z2q2257H6yDmeFkLnFL2Sf23Jhho9DAJS1pxmpGijOPcPT9GW GRHYCRDZ/i/NVuYyH1ipTbnKVgmASnuM5mXWaWlCXd6BdA26gZ2AJHrv88KVkaMJw6KP HBduwFy8LiThZF0J3To3dRRKhZZNJC9DdRogTGl7j3xm5bEX7NpWBE3xjJL6/3h9EXcN 11l59q46Cbh6ROK26xuyBLSaTqwCBCi8BH96NU22w77dr+WJ9dQy30GV8+9lP3DqRXCA QO4VhNlHybSAVXYZhNfgPd4d/MVoHJF67RkFbsVhPwId8jRSPpvXga6/dgDddM7bNRnq tBcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=IOJ67JowcSbu0ggXrBXDO807fyXCOGPEsmjm+hgKSIg=; b=rapma/GaYTy40upo5cIgYLB8fWtYFEKNMsjc37fbIG4w+LOfsQm/yFxJxSVCpSP06j b87K71O95EqIy9Gh9bkBGWc8vtuKXvZCh6GrCQQhyv576Npxexzb4jw1UP5D/BLQSY5f oqLYZJ1bwbc78yv+xlXMsTy7hTweIm7y+D47U2wuHDPhl25ZWgjHpF01HkNDPS1DBdCV E+RQnAV3t4npGuHXg7B6DLRdsnmIMy383yQEIw0Fn2sEYfs6ECGp8nc6Ny3IUqZdgphJ z+0BU/vmBS50/VbtX6dN3xCSgmYDN1dIHPULCTO6vMTDAGbb3zoN0Au9ID1jXUPmIbTb YYow== X-Gm-Message-State: AElRT7Ha/JEncXifiWcnY1mmoijDuoXksBtONOxz+LTIz7MAGiIvJz/y uGy/fnfv/EMBr+Dwh/6KGYHWRO6ists= X-Google-Smtp-Source: AG47ELuCy6IKRETs38CRj8xZubXt0LujoPZ6uwPty/ZmkzIN7fyvOt6u269AbRa05QDAl3K5IQlMQg== X-Received: by 10.28.158.205 with SMTP id h196mr2632268wme.25.1521062558297; Wed, 14 Mar 2018 14:22:38 -0700 (PDT) Received: from [10.10.1.111] ([185.97.61.1]) by smtp.gmail.com with ESMTPSA id 93sm3478941wrh.46.2018.03.14.14.22.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 14:22:37 -0700 (PDT) Subject: Re: svn commit: r330950 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs To: Steven Hartland , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201803142121.w2ELL3XX088649@repo.freebsd.org> From: Steven Hartland Message-ID: Date: Wed, 14 Mar 2018 21:22:59 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <201803142121.w2ELL3XX088649@repo.freebsd.org> Content-Language: en-US Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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: Wed, 14 Mar 2018 21:22:40 -0000 Missed the differential review: https://reviews.freebsd.org/D14695 On 14/03/2018 21:21, Steven Hartland wrote: > Author: smh > Date: Wed Mar 14 21:21:03 2018 > New Revision: 330950 > URL: https://svnweb.freebsd.org/changeset/base/330950 > > Log: > Prevent ZFS TRIM breaking VTOC8 partitions > > Update the ZFS TRIM code to ensure it respects VTOC8 partition headers as > documented by the ZFS On-Disk Specification section 1.3 > > Before this a zpool create on a VTOC8 partitioned device would overwrite the > partition metadata. > > Reported by: marius > Reviewed by: marius agv > MFC after: 1 week > Sponsored by: Multiplay > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c > > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c > ============================================================================== > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c Wed Mar 14 21:11:41 2018 (r330949) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c Wed Mar 14 21:21:03 2018 (r330950) > @@ -802,7 +802,9 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_label > } > > /* > - * TRIM the whole thing so that we start with a clean slate. > + * TRIM the whole thing, excluding the blank space and boot header > + * as specified by ZFS On-Disk Specification (section 1.3), so that > + * we start with a clean slate. > * It's just an optimization, so we don't care if it fails. > * Don't TRIM if removing so that we don't interfere with zpool > * disaster recovery. > @@ -810,7 +812,8 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_label > if (zfs_trim_enabled && vdev_trim_on_init && !vd->vdev_notrim && > (reason == VDEV_LABEL_CREATE || reason == VDEV_LABEL_SPARE || > reason == VDEV_LABEL_L2CACHE)) > - zio_wait(zio_trim(NULL, spa, vd, 0, vd->vdev_psize)); > + zio_wait(zio_trim(NULL, spa, vd, VDEV_SKIP_SIZE, > + vd->vdev_psize - VDEV_SKIP_SIZE)); > > /* > * Initialize its label. >