From patchwork Sun Jun 25 13:50:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 13291978 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 3EC7DC001B0 for ; Sun, 25 Jun 2023 13:50:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229611AbjFYNup (ORCPT ); Sun, 25 Jun 2023 09:50:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229480AbjFYNun (ORCPT ); Sun, 25 Jun 2023 09:50:43 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D31CE44; Sun, 25 Jun 2023 06:50:42 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-313e23d0a28so2111196f8f.3; Sun, 25 Jun 2023 06:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687701040; x=1690293040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GBM/EWhwMuZ1XRJmi/1V0Z9WYMWNQhMD5ksKEQBVpfY=; b=Z4amqywiMvgpG3vNE6U125NRBlqxowHBM8Clph1D/BngSOgqGsc0tiZMgHKmCeP0Iy a4v5hNSE7Y1/eLanAAk0hupk14RvY3a266OmeRiVQpO/lBRpksiUTARGH0r7V2NT3CAs A/+yvbzGZ1Wq/8peC0GgDajQeR1TKLLa240Dutki+j0+SRgmtkc5hd93Fetb4vIgGooY 1rWbr/4fYnEyRwFdYRWD0v46qHOI9qrK/Gad3BJPlR9bVMhb0s70QL+xJuo1+taqzfxM MLPaM+nrg4oY4Mle/yYS2p0G25623a4UWIc1FzS1zjmjZ0G1XfQ2ktGfLVGz+RArUPEs gUIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687701040; x=1690293040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GBM/EWhwMuZ1XRJmi/1V0Z9WYMWNQhMD5ksKEQBVpfY=; b=NXsw3EvTJp2ykndI5oNHgHrEN59rMNsjn/ruBeaq/32DyOIbQKVLZXf2zqX4XntcV6 3p42k8gRXOTcqwZIbVw4HbOqWsFo8zbYZk/jkZd1DCtjC1N9CX47+u75R3j2MhmClA2O LkvhXDPqSGIxFxehfh9qYJFdyHPhUKypzWQEBq+JNO4ZPZUtZI7AhOjWN7REiAncLOcw ZsdGlPw4MhDAye2iNVW5IiMKnVo+CmmeAlC5mP3HKfchcvQ9ptRCVS05zBGjScyRg7i2 JF7HQio/4TW3FifaEBH+kTJZHw5WP3hpPwpbf11d0Ypc5TX7v6An/kCFDRAmJuizg98C jZCA== X-Gm-Message-State: AC+VfDxRq2l59XkmdkXB4ZHTDJmPTKvl8OKJof0My/ynfFs85pV0QkBa nW9r4V/yQTxOik/OqhviYNc= X-Google-Smtp-Source: ACHHUZ6Y89YMOkyJMla3mePKPk8UF65qyn6Y7DBAOI16Sw39REE2qo2BgmDoGkLBd3+zddfKgi53sA== X-Received: by 2002:a5d:6889:0:b0:30f:ba36:ea41 with SMTP id h9-20020a5d6889000000b0030fba36ea41mr27658468wru.34.1687701040254; Sun, 25 Jun 2023 06:50:40 -0700 (PDT) Received: from amir-ThinkPad-T480.lan ([5.29.249.86]) by smtp.gmail.com with ESMTPSA id b3-20020adff243000000b003112b38fe90sm4667166wrp.79.2023.06.25.06.50.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 06:50:39 -0700 (PDT) From: Amir Goldstein To: Theodore Ts'o Cc: Eric Biggers , Alexander Larsson , Leah Rumancik , fstests@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: [PATCH 1/3] test-appliance: enable verity for testing overlay over ext4 Date: Sun, 25 Jun 2023 16:50:31 +0300 Message-Id: <20230625135033.3205742-2-amir73il@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230625135033.3205742-1-amir73il@gmail.com> References: <20230625135033.3205742-1-amir73il@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Add -O verity for ext4 formatted for overlay tests, so that overlay verity feature could be tested. Signed-off-by: Amir Goldstein --- test-appliance/files/root/fs/overlay/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-appliance/files/root/fs/overlay/config b/test-appliance/files/root/fs/overlay/config index 7c50b19..f252a70 100644 --- a/test-appliance/files/root/fs/overlay/config +++ b/test-appliance/files/root/fs/overlay/config @@ -55,7 +55,7 @@ function __mkfs() case "$BASE_FSTYPE" in ext4) - /sbin/mke2fs -F -q -t ext4 "$dev" + /sbin/mke2fs -F -q -t ext4 -O verity "$dev" ;; xfs) mkfs.xfs -f -m rmapbt=1,reflink=1 "$dev" From patchwork Sun Jun 25 13:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 13291980 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 61124EB64DC for ; Sun, 25 Jun 2023 13:50:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229634AbjFYNur (ORCPT ); Sun, 25 Jun 2023 09:50:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbjFYNup (ORCPT ); Sun, 25 Jun 2023 09:50:45 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B9E51B1; Sun, 25 Jun 2023 06:50:43 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-313f18f5295so30086f8f.3; Sun, 25 Jun 2023 06:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687701041; x=1690293041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tuIT3teTWVx1Ew+sE+FI2WXyDQcNmGaKrzdhreicHHA=; b=PvVfaksoAKpRZPpqzhc9Z1JO34UF5gDwawXtacIo5t3iKpcQpAJ/1QV802ZvxTob5I kNwlr58iKcTyA/JZ9Rkv7UDewrFwAzQu2bijL/qDMY+TsLRFQrxm0dDB+ZVQi2oESAaV RD/gI1f6onwc3s53g0EMbuSgLuyqpaBgiwryXJAiwfsA6tvHn2IMaNdxomVww/GzMtye 4Arh1StYwqnPTzwzWbe7pTPly7DclkncJYN92Y7FMFhd6ghcUxoPOAKO7jQfriw8VEcb MB/rxd0h7/LT+n/P5LzLxQiNVsld9+IQderDXfi8BX+P70oY6lPwbGsXWkKbVZoDPDNb 0yqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687701041; x=1690293041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tuIT3teTWVx1Ew+sE+FI2WXyDQcNmGaKrzdhreicHHA=; b=LQ5O92ALKIqXRcv0B59ZvLMt2Rf7fUHlK1Z2CFvsjdSs7mJJ/8cR+qdSiC6cl23Fz4 PeY5zkiVzDbQqf0LXG9XhvCey0CeLZbkVONhv8dBfxaXikCBi31uqVJzuFVbWpOYhIiJ Fhxy+x/qGwmdZOL1YYSSMIwdpaLwb5XrxCe7rnzBYxl02/7JmcXNUry6ZwsbfHfmcLQQ reEQqebXMCpWBXrzzV4NkOrYOm30nl5gX3ZuHQLONfGLdIqTdjzSAWm8te34F18PW/UU B1VS9ocBVnNncpRGA+u9UPCWT1Yfy3J7WlsvuToxlR7CJq9mMpJcWZkXMcntYDayPEOY bu1Q== X-Gm-Message-State: AC+VfDx7U+3WhmIHmPFfyZyxsR9QaMLzV0uPknNLzd9H7oVMxRGcAUj5 obsztItCrGEfquTBAcQ2GJU= X-Google-Smtp-Source: ACHHUZ7Xl9clLEm3wMxOBrREBRlGAmjsixhdBEBy3VYGUQUVzWJ2uMcLTz3if8uVf8f3v7fKKPPq8w== X-Received: by 2002:adf:f34f:0:b0:30f:b1ee:5cd0 with SMTP id e15-20020adff34f000000b0030fb1ee5cd0mr23268862wrp.50.1687701041369; Sun, 25 Jun 2023 06:50:41 -0700 (PDT) Received: from amir-ThinkPad-T480.lan ([5.29.249.86]) by smtp.gmail.com with ESMTPSA id b3-20020adff243000000b003112b38fe90sm4667166wrp.79.2023.06.25.06.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 06:50:41 -0700 (PDT) From: Amir Goldstein To: Theodore Ts'o Cc: Eric Biggers , Alexander Larsson , Leah Rumancik , fstests@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: [PATCH 2/3] test-appliance: remove redudant overlay configs Date: Sun, 25 Jun 2023 16:50:32 +0300 Message-Id: <20230625135033.3205742-3-amir73il@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230625135033.3205742-1-amir73il@gmail.com> References: <20230625135033.3205742-1-amir73il@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Since the introduction of syntax "-c ext4:overlay/small" - 5fec599 ("test-appliance: update config syntax to specify primary fstype"), there is no need for the -ext4 and -xfs ovelray config file variants, so remove them. Signed-off-by: Amir Goldstein --- .../files/root/fs/overlay/cfg/large-ext4 | 14 -------------- test-appliance/files/root/fs/overlay/cfg/large-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4 | 14 -------------- .../files/root/fs/overlay/cfg/small-ext4.exclude | 1 - test-appliance/files/root/fs/overlay/cfg/small-xfs | 14 -------------- .../files/root/fs/overlay/cfg/small-xfs.exclude | 1 - 6 files changed, 58 deletions(-) delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/large-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4 delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs delete mode 100644 test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude diff --git a/test-appliance/files/root/fs/overlay/cfg/large-ext4 b/test-appliance/files/root/fs/overlay/cfg/large-ext4 deleted file mode 100644 index e401147..0000000 --- a/test-appliance/files/root/fs/overlay/cfg/large-ext4 +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -SIZE=large -FSTESTTYP=ext4 -TESTNAME="overlayfs large" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/large-xfs b/test-appliance/files/root/fs/overlay/cfg/large-xfs deleted file mode 100644 index 627dc29..0000000 --- a/test-appliance/files/root/fs/overlay/cfg/large-xfs +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$LG_TST_DEV" "$LG_TST_MNT" "$LG_SCR_DEV" "$LG_SCR_MNT" -} - -SIZE=large -FSTESTTYP=xfs -TESTNAME="overlayfs large" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/small-ext4 b/test-appliance/files/root/fs/overlay/cfg/small-ext4 deleted file mode 100644 index ce750e5..0000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-ext4 +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -SIZE=small -FSTESTTYP=ext4 -TESTNAME="overlayfs small" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude b/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude deleted file mode 100644 index a314778..0000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-ext4.exclude +++ /dev/null @@ -1 +0,0 @@ -overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV. diff --git a/test-appliance/files/root/fs/overlay/cfg/small-xfs b/test-appliance/files/root/fs/overlay/cfg/small-xfs deleted file mode 100644 index d0d8433..0000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-xfs +++ /dev/null @@ -1,14 +0,0 @@ -function check_filesystem() -{ - __check_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -function format_filesystem() -{ - __format_filesystem "$SM_TST_DEV" "$SM_TST_MNT" "$SM_SCR_DEV" "$SM_SCR_MNT" -} - -FSTESTTYP=xfs -SIZE=small -TESTNAME="overlayfs small" -mkdir -p /test/tmp /test/scratch diff --git a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude b/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude deleted file mode 100644 index a314778..0000000 --- a/test-appliance/files/root/fs/overlay/cfg/small-xfs.exclude +++ /dev/null @@ -1 +0,0 @@ -overlay/001 // requires (2*4G + 8k) free space on $SCRATCH_DEV. From patchwork Sun Jun 25 13:50:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 13291979 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 9E303C001DF for ; Sun, 25 Jun 2023 13:50:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229635AbjFYNur (ORCPT ); Sun, 25 Jun 2023 09:50:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229619AbjFYNup (ORCPT ); Sun, 25 Jun 2023 09:50:45 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D498E43; Sun, 25 Jun 2023 06:50:44 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3112f5ab0b1so2024485f8f.0; Sun, 25 Jun 2023 06:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687701042; x=1690293042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P7VbWMcVfLlMGS294VQBKxs+cceTb60lOKU6u9n6d5M=; b=INja7tWaDJF4bTH8g1ETMVbH2hoOfKq69Du3tAasFbWM/8B4Q599VsBsAXD6dAjgmZ VCXsEX5JiTway541SQdbg3EaotldI0aBknICrU0WURaqsZ1hMTOgZfbgxquhdFe+2Lur VGrStqdeJbNfFgnx/BA6b2WfAzNeGeOyZdbCptZNxHEEE01p4/vKWlA8TMN1aTRxp060 8FGNSxeiK4A8wLXlaK50WYTaa/M/2t6HgOA/4xZRmuJA0HMO1iu4oFH3ydJt5nnqSPFt a9Cy8l7271/8c6FNgBC6NLk4TLWdid7BPlLq/wEUycSplAp7fbMYhJhXqBtaH0HRe26y QIBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687701042; x=1690293042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7VbWMcVfLlMGS294VQBKxs+cceTb60lOKU6u9n6d5M=; b=DsSq5lOeWlC0ciBnxj5RctMKn1TZRl3+QuExdVWxMKf/Xf3nXW5ZKUJJ+I1c++svnl Vuy2rk3Y3LhZbctciNBU+ryVdJ1eXscSkUIhK9lEhV/jKVGGqBWX3oh1NplD6LND03pC vzSrfmwC9Tg1O6L60Cc+1uoglXgHxqRS1Pob+akHNwx4l6Nll6r9Ag2JkNp5/RUezvhk R+quSFI1jqRnY2SZO4u1nkvpQtQcQTX4Bjt+IcZ4i3FNxR0zpOSdMKngUwM8zjV1Ei01 LJv8wM7tZXdqhsjvMog554bPLBox3By8nUccrt4pMWbR5slVV/MbTEGumMWByIIFreQx 4OZw== X-Gm-Message-State: AC+VfDwD18zVNsg4mIipG7mO2usfvM/7sYsFo91H1sGX+5GvqI/tBVDe UqzacDdRnIOw487P3M8uE5M= X-Google-Smtp-Source: ACHHUZ5iI8CTLxPU/CsgLy0G3o6rGvNrcQpSOkh+Z+absLtZKWtZDr43zwitnWx5FxuVWfbZp1AF0g== X-Received: by 2002:adf:f203:0:b0:311:19df:dac7 with SMTP id p3-20020adff203000000b0031119dfdac7mr18687225wro.28.1687701042562; Sun, 25 Jun 2023 06:50:42 -0700 (PDT) Received: from amir-ThinkPad-T480.lan ([5.29.249.86]) by smtp.gmail.com with ESMTPSA id b3-20020adff243000000b003112b38fe90sm4667166wrp.79.2023.06.25.06.50.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jun 2023 06:50:42 -0700 (PDT) From: Amir Goldstein To: Theodore Ts'o Cc: Eric Biggers , Alexander Larsson , Leah Rumancik , fstests@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: [PATCH 3/3] test-appliance: skip overlayfs tests from base fs exclude list Date: Sun, 25 Jun 2023 16:50:33 +0300 Message-Id: <20230625135033.3205742-4-amir73il@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230625135033.3205742-1-amir73il@gmail.com> References: <20230625135033.3205742-1-amir73il@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org when running overlayfs test with syntax "-c ext4:overlay/small" skip tests that are listed in the base fs exclude list (ext4/exclude). Signed-off-by: Amir Goldstein --- test-appliance/files/root/runtests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test-appliance/files/root/runtests.sh b/test-appliance/files/root/runtests.sh index c4ddb73..4052481 100755 --- a/test-appliance/files/root/runtests.sh +++ b/test-appliance/files/root/runtests.sh @@ -544,6 +544,7 @@ do files=() for i in "/root/fs/global_exclude" \ "/root/fs/$FS/exclude" \ + "/root/fs/$BASE_FSTYPE/exclude" \ "/root/fs/$FS/cfg/$TC.exclude" \ "/root/fs/exclude.$XFSTESTS_FLAVOR" ; do test -f "$i" && files+=("$i")