From patchwork Mon May 30 17:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 12864817 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 B78FBC433EF for ; Mon, 30 May 2022 17:31:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231893AbiE3RbT (ORCPT ); Mon, 30 May 2022 13:31:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230490AbiE3RbS (ORCPT ); Mon, 30 May 2022 13:31:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D16A0954B0; Mon, 30 May 2022 10:31:16 -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 4EBB261198; Mon, 30 May 2022 17:31:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98532C385B8; Mon, 30 May 2022 17:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653931875; bh=Lqoz8g+/Df334TjGWa8JLWKaskhep6JFCaaHhQgSDug=; h=From:To:Cc:Subject:Date:From; b=mq4ev+ThK8kYSfsAMqil5aTM7IfQfcjAdlYgwaD5JWV0Lub3WXTT7sUXchF9uITkB yb0tgVR7InfSwFlkRIi24ygmbv3qrL4Zg1vBAQ7zn7L2fzwy5iaX9Qzeg019pcbb5l nLa8wyASzu6oNfluLfasin0DVscMtbXVQBKr1jyRs0Lf+cBIlIULCX81evuY3Zbl7S ho7KKtqEzMta70iDDPU8Ze++Oin5pCNlRvSVb3b4/o+g5wLTHt+6ovwO5gWnuEr8eN eLR500xFjYD92JM3zUrXAfgmhVjiqw4mpo7i2B0ZFJry2elujrmMcRGZZLAxi1QnZD rH8HmuROkPLXQ== From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Lukas Czerner Subject: [PATCH v2] ext4/053: update the test_dummy_encryption tests Date: Mon, 30 May 2022 10:30:44 -0700 Message-Id: <20220530173044.156375-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Eric Biggers Kernel commit 5f41fdaea63d ("ext4: only allow test_dummy_encryption when supported") tightened the requirements on when the test_dummy_encryption mount option is accepted. Update ext4/053 accordingly. Move the test cases to later in the file to group them with the other test cases that use do_mkfs to add custom mkfs options instead of using the "default" filesystem that the test creates at the beginning. Reviewed-by: Lukas Czerner Signed-off-by: Eric Biggers --- v2: mention the commit ID now that it is merged, and add a Reviewed-by tests/ext4/053 | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) base-commit: d3cc66012a287b6db81aad408b6970a4a96a67da diff --git a/tests/ext4/053 b/tests/ext4/053 index 187a2515..23e553c5 100755 --- a/tests/ext4/053 +++ b/tests/ext4/053 @@ -511,20 +511,6 @@ for fstype in ext2 ext3 ext4; do mnt noinit_itable mnt max_dir_size_kb=4096 - if _has_kernel_config CONFIG_FS_ENCRYPTION; then - mnt test_dummy_encryption - mnt test_dummy_encryption=v1 - mnt test_dummy_encryption=v2 - not_mnt test_dummy_encryption=v3 - not_mnt test_dummy_encryption= - else - mnt test_dummy_encryption ^test_dummy_encryption - mnt test_dummy_encryption=v1 ^test_dummy_encryption=v1 - mnt test_dummy_encryption=v2 ^test_dummy_encryption=v2 - mnt test_dummy_encryption=v3 ^test_dummy_encryption=v3 - not_mnt test_dummy_encryption= - fi - if _has_kernel_config CONFIG_FS_ENCRYPTION_INLINE_CRYPT; then mnt inlinecrypt else @@ -686,6 +672,27 @@ for fstype in ext2 ext3 ext4; do mnt_then_not_remount defaults jqfmt=vfsv1 remount defaults grpjquota=,usrjquota= ignored + echo "== Testing the test_dummy_encryption option" >> $seqres.full + # Since kernel commit 5f41fdaea63d ("ext4: only allow + # test_dummy_encryption when supported"), the test_dummy_encryption + # option is only allowed when the filesystem has the encrypt feature and + # the kernel has CONFIG_FS_ENCRYPTION. The encrypt feature requirement + # implies that this option is never allowed on ext2 or ext3 mounts. + if [[ $fstype == ext4 ]] && _has_kernel_config CONFIG_FS_ENCRYPTION; then + do_mkfs -O encrypt $SCRATCH_DEV ${SIZE}k + mnt test_dummy_encryption + mnt test_dummy_encryption=v1 + mnt test_dummy_encryption=v2 + not_mnt test_dummy_encryption=bad + not_mnt test_dummy_encryption= + do_mkfs -O ^encrypt $SCRATCH_DEV ${SIZE}k + fi + not_mnt test_dummy_encryption + not_mnt test_dummy_encryption=v1 + not_mnt test_dummy_encryption=v2 + not_mnt test_dummy_encryption=bad + not_mnt test_dummy_encryption= + done #for fstype in ext2 ext3 ext4; do $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1