Skip to content

Commit f0dd8e8

Browse files
committed
fix: clear private flag after freeing gmem folio
Not clearing the private flag causes it to stick around after freeing, potentially confusing subsequent users of the folio that assign meaning to the private flag. Signed-off-by: Patrick Roy <[email protected]>
1 parent 7f78d60 commit f0dd8e8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

resources/hiding_ci/linux_patches/10-direct-map-removal/0011-KVM-guest_memfd-Add-flag-to-remove-from-direct-map.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ index fbf89e643add..a2b96bc51391 100644
121121
kvm_pfn_t pfn = page_to_pfn(page);
122122
int order = folio_order(folio);
123123

124-
+ if (folio_test_private(folio))
124+
+ if (folio_test_private(folio)) {
125125
+ WARN_ON_ONCE(set_direct_map_valid_noflush(folio_page(folio, 0),
126-
+ folio_nr_pages(folio), true));
126+
+ folio_nr_pages(folio), true)); folio_clear_private(folio); }
127127
+
128128
kvm_arch_gmem_invalidate(pfn, pfn + (1ul << order));
129129
}

resources/hiding_ci/linux_patches/10-direct-map-removal/0012-fixup-for-direct-map-removal-v4.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ index a2b96bc51391..291d647a5c80 100644
2626
int order = folio_order(folio);
2727
+#endif
2828

29-
if (folio_test_private(folio))
30-
WARN_ON_ONCE(set_direct_map_valid_noflush(folio_page(folio, 0),
31-
folio_nr_pages(folio), true));
29+
if (folio_test_private(folio)) {
30+
WARN_ON_ONCE(set_direct_map_valid_noflush(folio_page(folio, 0),
31+
folio_nr_pages(folio), true)); folio_clear_private(folio); }
3232

3333
+#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE
3434
kvm_arch_gmem_invalidate(pfn, pfn + (1ul << order));

0 commit comments

Comments
 (0)