From nobody Thu Apr 13 23:40:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PyGKH08wnz44t95; Thu, 13 Apr 2023 23:40:19 +0000 (UTC) (envelope-from pawel@dawidek.net) Received: from mail.dawidek.net (mail.dawidek.net [94.130.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 4PyGKF6pFxz3w5S; Thu, 13 Apr 2023 23:40:17 +0000 (UTC) (envelope-from pawel@dawidek.net) Authentication-Results: mx1.freebsd.org; dkim=none ("invalid DKIM record") header.d=dawidek.net header.s=202110 header.b=xgg5z6pt; spf=pass (mx1.freebsd.org: domain of pawel@dawidek.net designates 94.130.64.56 as permitted sender) smtp.mailfrom=pawel@dawidek.net; dmarc=none Received: from [10.20.1.26] (211.188.237.160.cyberhome.jp [160.237.188.211]) by mail.dawidek.net (Postfix) with ESMTPSA id CBD634F4D8; Fri, 14 Apr 2023 01:40:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=dawidek.net; s=202110; t=1681429216; bh=SqwUsizydQcta5Wjpkj6VoDOZw/5n3s6/HX2E/f8BXY=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=xgg5z6ptnqLQ8OW39rF/ksVsUvrrmgeXCZwHAp1QCHGKjC84iRzG3YTlK1d109n+/ HLAlpGH5fYeTEhoiIjI1L42+kgAKeJvNNw7IymW4IfLXbkiKbXZMqsp/GoFaNoNLuO lcRqK2pgJx8vY1nPq9nhaXqE8U7VPwHIyZBp68hY= Message-ID: <5e67bfbc-1e9c-432b-ac03-61839bd47e20@dawidek.net> Date: Fri, 14 Apr 2023 08:40:09 +0900 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: git: 2a58b312b62f - main - zfs: merge openzfs/zfs@431083f75 Content-Language: en-US To: Cy Schubert Cc: Mateusz Guzik , Mark Millard , vishwin@freebsd.org, dev-commits-src-main@freebsd.org, Current FreeBSD , Shawn Webb References: <20230413071032.18BFF31F@slippy.cwsent.com> <20230413063321.60344b1f@cschubert.com> <20230413135635.6B62F354@slippy.cwsent.com> <20230413140504.nnm23cjjv65mwzjr@mutt-hbsd> <060e8793-cca7-9301-57ac-9c73a187db3f@dawidek.net> From: Pawel Jakub Dawidek In-Reply-To: <060e8793-cca7-9301-57ac-9c73a187db3f@dawidek.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-3.20 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; R_DKIM_PERMFAIL(0.00)[dawidek.net:s=202110]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,freebsd-current@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_CC(0.00)[gmail.com,yahoo.com,freebsd.org,hardenedbsd.org]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; RCPT_COUNT_SEVEN(0.00)[7]; DKIM_TRACE(0.00)[dawidek.net:~]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FREEFALL_USER(0.00)[pawel]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[dawidek.net]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4PyGKF6pFxz3w5S X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On 4/14/23 07:36, Pawel Jakub Dawidek wrote: > On 4/13/23 23:05, Shawn Webb wrote: >> I've learned over the years downstream that it's not really my place >> to tell upstream what to do or how to do it. However, I think given >> the seriousness of this, upstream might do well to revert the commit >> until a solid fix is in place. Upstream might want to consider the >> impacts this is having not just with downstream projects, but also >> regular users. >> >> Really bad timing to have a lot of new tax documentation that I really >> don't want to lose. I'd really like to have an up-to-date, security >> patched OS, but I guess I'll stay behind so that I don't risk losing >> critical financial documentation. > > Shawn, > > I'm working on a patch to safely revert this that would also work for > people who already upgraded their pools. > > I'm sorry for this mess. > Here is the change that reverts most of the modifications and disables cloning new blocks. It does retain ability to free existing cloned blocks and keeps block_cloning feature around, so upgraded pools can be imported and existing cloned blocks freed. It does not handle replaying ZIL with block-cloning logs, so make sure you import pools that were cleanly exported. I'd appreciate if someone who can reproduce those corruptions could try it. https://github.com/pjd/openzfs/commit/f2cfbcf76a733c44e25cba8c649162ef68047103 Thank you guys for your help! -- Pawel Jakub Dawidek