From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 792B1C43334 for ; Mon, 25 Jul 2022 18:41:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231523AbiGYSln (ORCPT ); Mon, 25 Jul 2022 14:41:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230468AbiGYSlm (ORCPT ); Mon, 25 Jul 2022 14:41:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E3B065F6; Mon, 25 Jul 2022 11:41:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B7DE660B08; Mon, 25 Jul 2022 18:41:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3189C341C6; Mon, 25 Jul 2022 18:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1658774501; bh=lQGgDSz3+cGUuGPCfuYaCnTtlQX+yRwOAyABp+OtEKc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JY9BWaRWzP8pPurtbLJvNDWinRzYyoVYM9Xb0wlwj1UhrA5ZWCdDg+H4crJo9dppF 1i7QE2FTY6weObQkPp2z6n6iQbm3BOist5gJT550B9TwGmxnkwqrr84qBKuptcYUqv GM3B0ni1RcJNODcsk3VwSN41SSSJJlyeQ1m676SobgNWq2FsZ2LjZsNYEZF7qdxBAV gRs1nQya8woaA9lTnyY3KH9Vj6F6HpzCATh7Dl71Z9e27g43w6bnVQBW4ZBRrly5Nb 0J31AHJxdloeszTeSGlHu30LZDUIFECDVTUv75qYjtFdrJlmkBSFmkuFvYqLHnIF6i SrLBN37+Y5ztg== Date: Mon, 25 Jul 2022 11:41:39 -0700 From: Eric Biggers To: Boris Burkov Cc: fstests@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: Re: [PATCH v13 2/5] common/verity: support btrfs in generic fsverity tests Message-ID: References: <2bbb68b90691a82b8143ba4612ea2cc761e44ecb.1658277755.git.boris@bur.io> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2bbb68b90691a82b8143ba4612ea2cc761e44ecb.1658277755.git.boris@bur.io> Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org On Tue, Jul 19, 2022 at 05:49:47PM -0700, Boris Burkov wrote: > generic/572-579 have tests for fsverity. Now that btrfs supports > fsverity, make these tests function as well. For a majority of the tests > that pass, simply adding the case to mkfs a btrfs filesystem with no > extra options is sufficient. > > However, generic/574 has tests for corrupting the merkle tree itself. > Since btrfs uses a different scheme from ext4 and f2fs for storing this > data, the existing logic for corrupting it doesn't work out of the box. > Adapt it to properly corrupt btrfs merkle items. > > 576 does not run because btrfs does not support transparent encryption. > > This test relies on the btrfs implementation of fsverity in the patch: > btrfs: initial fsverity support > > and on btrfs-corrupt-block for corruption in the patches titled: > btrfs-progs: corrupt generic item data with btrfs-corrupt-block > btrfs-progs: expand corrupt_file_extent in btrfs-corrupt-block > > Signed-off-by: Boris Burkov > Reviewed-by: Sweet Tea Dorminy > --- > common/btrfs | 5 +++++ > common/config | 1 + > common/verity | 31 +++++++++++++++++++++++++++++++ > tests/generic/574 | 37 ++++++++++++++++++++++++++++++++++--- > tests/generic/574.out | 13 ++++--------- > 5 files changed, 75 insertions(+), 12 deletions(-) Reviewed-by: Eric Biggers - Eric