From patchwork Tue Apr 26 22:40:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Burkov X-Patchwork-Id: 12828021 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 743E3C4332F for ; Tue, 26 Apr 2022 22:40:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355897AbiDZWnb (ORCPT ); Tue, 26 Apr 2022 18:43:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345860AbiDZWna (ORCPT ); Tue, 26 Apr 2022 18:43:30 -0400 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FEAE13EB2; Tue, 26 Apr 2022 15:40:20 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 92EE05C016C; Tue, 26 Apr 2022 18:40:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 26 Apr 2022 18:40:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bur.io; h=cc :content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm1; t=1651012818; x=1651099218; bh=GVOxxF6CxDAlP5EYgy6Xe7pqM H8D9OEw6NHfUbYlWWs=; b=I0oHZmcDseCahMm1HT/Y5PsPjprLi8ZOo68s5EGkL pgpgXrwai0KVQ/E0FfMdqTkpVvRGCaMHPi6pE1MqZkrPLdx8z01o+Ha/wOaR+V6S +YsVB5BUJuanH5OxsX2E1ZMUWi5mFtNpfiVXbjRwblfBF9gag/2S+dd4LX9dCz/i fIRyYdGCKE7/UMU4MZS/bLandDDOG+uciELxUdzP2KTkGj/QULYHPgyewinhxy37 LU4grM4gV9wmzKvM8E6V+kf5254I2s8tS4UUxXbxYFtF1FgEijis3w17YNYEs9B2 W+1eWR2h552CXJJkfj8tkfwSJOhDR670hhsy7TP/R4BCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; t=1651012818; x=1651099218; bh=G VOxxF6CxDAlP5EYgy6Xe7pqMH8D9OEw6NHfUbYlWWs=; b=XB1CMYF3ozQV0+zNp 5YLeQmDkGwAANhWmnw7Q+oHDVX45SmdwcbtfOASuukehsHvUJcAUtlW2Dic2eiXZ 9DteTzjNUWe9WKbxw50zxgrELTJ2GE23nqfQ+pTD9/GN08nzAy4+0IXX0mu1dDN8 5QPjm8o5M94U5kQ6ZJFXNvoVr8CKeMdgY9b3jHvxtgdgy+6wnJ+N5g6Lh3YCb04k 5AmyXIlx/zMxyd/KkKwpsEPiOrwj0wItA/Upzn3MVnBGxtrYjW6USAq8yPp9w7uJ aJtKcotvOq7pmNzAhbohdPHUiqwHM+4pF5eWqb1bfoyfHsAz9ZK7APgPLUzNc9Id J52Wg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudeggddugecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpeeuohhrihhsuceuuhhrkhhovhcuoegsohhrihhssegsuhhrrdhioheq necuggftrfgrthhtvghrnhepudeitdelueeijeefleffveelieefgfejjeeigeekuddute efkefffeethfdvjeevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepsghorhhishessghurhdrihho X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 26 Apr 2022 18:40:18 -0400 (EDT) From: Boris Burkov To: fstests@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v9 0/5] tests for btrfs fsverity Date: Tue, 26 Apr 2022 15:40:11 -0700 Message-Id: X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org This patchset provides tests for fsverity support in btrfs. It includes modifications for generic tests to pass with btrfs as well as new tests. --- v9: - use nodatasum for btrfs corruption tests. - modify eof block corruption test to allow all zeroes rather than requiring an error. v8: - reorganize to have a patch for enabling generic tests followed by the patches with new and specific tests. - fix some rebasing miscues from v7. - fix a chunk of space characters instead of a tab in the new requires function. v7: - add a new patch to make the new corruption requires more clear - require corruption in generic/576 - require only btrfs_corrupt_block in btrfs/290 - add missing xfs_io requirements in btrfs/290 - remove unneeded zero byte check from btrfs corruption function - fix sloppy extras in generic/690 v6: - refactor "requires" for verity corruption tests so that other verity tests can run on btrfs even without the corruption command available. Also, explictly require xfs_io fiemap for all corruption tests. - simplify and clarify "non-trivial EFBIG" calculation and documentation per suggestions by Eric Biggers. - remove unnecessary adjustment to max file size in the new EFBIG test; the bug it worked around has been fixed. v5: - more idiomatic requires structure for making efbig test generic - make efbig test use truncate instead of pwrite for making a big file - improve documentation for efbig test approximation - fix underscores vs dashes in btrfs_requires_corrupt_block - improvements in missing/redundant requires invocations - move orphan test image file to $TEST_DIR - make orphan test replay/snapshot device size depend on log device instead of hard-coding it. - rebase (signicant: no more "groups" file; use preamble) v4: - mark local variables - get rid of redundant mounts and syncs - use '_' in function names correctly - add a test for the EFBIG case - reduce usage of requires_btrfs_corrupt_block - handle variable input when corrupting merkle tree v3: rebase onto xfstests master branch v2: pass generic tests, add logwrites test Boris Burkov (5): common/verity: require corruption functionality common/verity: support btrfs in generic fsverity tests btrfs: test btrfs specific fsverity corruption btrfs: test verity orphans with dmlogwrites generic: test fs-verity EFBIG scenarios common/btrfs | 5 ++ common/config | 1 + common/verity | 45 +++++++++++ tests/btrfs/290 | 168 ++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/290.out | 25 +++++++ tests/btrfs/291 | 161 ++++++++++++++++++++++++++++++++++++++++ tests/btrfs/291.out | 2 + tests/generic/574 | 40 +++++++++- tests/generic/574.out | 12 +-- tests/generic/576 | 1 + tests/generic/690 | 64 ++++++++++++++++ tests/generic/690.out | 7 ++ 12 files changed, 520 insertions(+), 11 deletions(-) create mode 100755 tests/btrfs/290 create mode 100644 tests/btrfs/290.out create mode 100755 tests/btrfs/291 create mode 100644 tests/btrfs/291.out create mode 100755 tests/generic/690 create mode 100644 tests/generic/690.out