Skip to contentSkip to conversation

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

PATCH In review Colin Walters 3 participants 3 messages May 8 – May 9

lore
Share & tools
lore
#0 lore raw

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

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

Assisted-by OpenCode (Claude Sonnet 4.6)
---
 tests/overlay/080 | 7 +++++++
 1 file changed, 7 insertions(+)
tests/overlay/080 +7 -0
index ce5c2375..ede04dab 100755
@@ -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()
Signature · 1 line
2.52.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Colin Walters

This reproduces the regression reported at:

Make the test closer to real composefs workloads, so it will reproduce the regression reported at:

Quoted 13 lines

https://github.com/bootc-dev/bootc/issues/2174

Assisted-by OpenCode (Claude Sonnet 4.6)
---
 tests/overlay/080 | 7 +++++++
 1 file changed, 7 insertions(+)
tests/overlay/080 +0 -0
index ce5c2375..ede04dab 100755

tests/overlay/080 _require_scratch_nocheck · line 24

Quoted 4 lines
tests/overlay/080 +1 -0
@@ -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:

Thanks,
Amir.

Quoted 19 lines
tests/overlay/080 +6 -1
+    "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

#2 lore raw
In reply to Colin Walters
Quoted 14 lines · Colin Walters

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

Assisted-by OpenCode (Claude Sonnet 4.6)
---
 tests/overlay/080 | 7 +++++++
 1 file changed, 7 insertions(+)
tests/overlay/080 +0 -0
index ce5c2375..ede04dab 100755

tests/overlay/080 _require_scratch_nocheck · line 24

Quoted 4 lines
tests/overlay/080 +1 -0
@@ -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 :)

Quoted 20 lines
tests/overlay/080 +6 -0
+    "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()
Signature · 1 line
2.52.0