[PATCH] overlay/080: cycle base fs in prepare_midlayer to exercise lazy verity load

[PATCH] overlay/080: cycle base fs in prepare_midlayer to exercise lazy verity load

[Colin Walters]

This reproduces the regression reported at:
https://github.com/bootc-dev/bootc/issues/2174

Assisted-by: OpenCode (Claude Sonnet 4.6)
Signed-off-by: Colin Walters <walters@verbum.org>
---
 tests/overlay/080 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/overlay/080 b/tests/overlay/080
index ce5c2375..ede04dab 100755
--- a/tests/overlay/080
+++ b/tests/overlay/080
@@ -21,6 +21,8 @@ _require_scratch_nocheck
 _require_scratch_overlay_features redirect_dir metacopy
 _require_scratch_overlay_lowerdata_layers
 _require_scratch_overlay_verity
+_fixed_by_kernel_commit 0c8c88b8eb82a2a41bec5f17c076d6312dc40316 \
+    "ovl: fix verity lazy-load guard broken by fsverity_active() semantic change"
 
 # remove all files from previous tests
 _scratch_mkfs
@@ -222,6 +224,11 @@ prepare_midlayer()
        echo -n "changed" > $lowerdir/$subdir$wrongverityname
        _fsv_enable $lowerdir/$subdir$wrongverityname
        echo "$lowerdata4" > $lowerdir/$subdir$missingverityname
+
+       # Cycle the base fs to evict cached inodes, so the overlay mount
+       # that follows exercises the lazy verity load path from disk.
+       _overlay_base_unmount "$OVL_BASE_SCRATCH_DEV" "$OVL_BASE_SCRATCH_MNT"
+       _overlay_base_scratch_mount
 }
 
 test_common()
-- 
2.52.0

Re: [PATCH] overlay/080: cycle base fs in prepare_midlayer to exercise lazy verity load

[Amir Goldstein]

On Fri, May 8, 2026 at 10:08 PM Colin Walters <walters@verbum.org> wrote:
>
> This reproduces the regression reported at:

Make the test closer to real composefs workloads, so it will reproduce
the regression reported at:
> https://github.com/bootc-dev/bootc/issues/2174
>
> Assisted-by: OpenCode (Claude Sonnet 4.6)
> Signed-off-by: Colin Walters <walters@verbum.org>
> ---
>  tests/overlay/080 | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/tests/overlay/080 b/tests/overlay/080
> index ce5c2375..ede04dab 100755
> --- a/tests/overlay/080
> +++ b/tests/overlay/080
> @@ -21,6 +21,8 @@ _require_scratch_nocheck
>  _require_scratch_overlay_features redirect_dir metacopy
>  _require_scratch_overlay_lowerdata_layers
>  _require_scratch_overlay_verity
> +_fixed_by_kernel_commit 0c8c88b8eb82a2a41bec5f17c076d6312dc40316 \

I do not see this commit in the upstream kernel.
I do not think that Eric has already sent the PR.
Please wait until commit is merged upstream and then
use the abbreviated commit id.

When you do that and post v2 patch, you may add:

Reviewed-by: Amir Goldstein <amir73il@gmail.com>

Thanks,
Amir.

> +    "ovl: fix verity lazy-load guard broken by fsverity_active() semantic change"
>
>  # remove all files from previous tests
>  _scratch_mkfs
> @@ -222,6 +224,11 @@ prepare_midlayer()
>         echo -n "changed" > $lowerdir/$subdir$wrongverityname
>         _fsv_enable $lowerdir/$subdir$wrongverityname
>         echo "$lowerdata4" > $lowerdir/$subdir$missingverityname
> +
> +       # Cycle the base fs to evict cached inodes, so the overlay mount
> +       # that follows exercises the lazy verity load path from disk.
> +       _overlay_base_unmount "$OVL_BASE_SCRATCH_DEV" "$OVL_BASE_SCRATCH_MNT"
> +       _overlay_base_scratch_mount
>  }
>
>  test_common()
> --
> 2.52.0
>

Re: [PATCH] overlay/080: cycle base fs in prepare_midlayer to exercise lazy verity load

[Zorro Lang]

On Fri, May 08, 2026 at 04:07:39PM -0400, Colin Walters wrote:
> This reproduces the regression reported at:
> https://github.com/bootc-dev/bootc/issues/2174
> 
> Assisted-by: OpenCode (Claude Sonnet 4.6)
> Signed-off-by: Colin Walters <walters@verbum.org>
> ---
>  tests/overlay/080 | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/tests/overlay/080 b/tests/overlay/080
> index ce5c2375..ede04dab 100755
> --- a/tests/overlay/080
> +++ b/tests/overlay/080
> @@ -21,6 +21,8 @@ _require_scratch_nocheck
>  _require_scratch_overlay_features redirect_dir metacopy
>  _require_scratch_overlay_lowerdata_layers
>  _require_scratch_overlay_verity
> +_fixed_by_kernel_commit 0c8c88b8eb82a2a41bec5f17c076d6312dc40316 \
                           ^^^^^^^^
A short id is enough, e.g. 0c8c88b8eb82 :)

> +    "ovl: fix verity lazy-load guard broken by fsverity_active() semantic change"
>  
>  # remove all files from previous tests
>  _scratch_mkfs
> @@ -222,6 +224,11 @@ prepare_midlayer()
>         echo -n "changed" > $lowerdir/$subdir$wrongverityname
>         _fsv_enable $lowerdir/$subdir$wrongverityname
>         echo "$lowerdata4" > $lowerdir/$subdir$missingverityname
> +
> +       # Cycle the base fs to evict cached inodes, so the overlay mount
> +       # that follows exercises the lazy verity load path from disk.
> +       _overlay_base_unmount "$OVL_BASE_SCRATCH_DEV" "$OVL_BASE_SCRATCH_MNT"
> +       _overlay_base_scratch_mount
>  }
>  
>  test_common()
> -- 
> 2.52.0
> 
>