Skip to contentSkip to conversation

Revert "kmsan: unpoison @tlb in arch_tlb_gather_mmu()"

PATCH Applied Alexander Potapenko 1 participant 1 message Nov 10, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "kmsan: unpoison @tlb in arch_tlb_gather_mmu()"

This reverts commit ac801e7e252c5588325e3c983c7d4167fc68c024.

The patch in question was picked to -mm from the KMSAN v6 patch series
(https://lore.kernel.org/linux-mm/[email protected]/)
and sneaked into mainline despite its removal from the v7 series
(https://lore.kernel.org/linux-mm/[email protected]/)

Currently KMSAN does not warn about origin chains hitting the maximum depth, so keeping @tlb poisoned won't result in any inconveniences.

Cc Andrew Morton <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Eric Biggers <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Marco Elver <[email protected]>
Cc Peter Zijlstra (Intel) <[email protected]>
Cc Will Deacon <[email protected]>
---
 mm/mmu_gather.c | 10 ----------
 1 file changed, 10 deletions(-)
mm/mmu_gather.c +0 -10
index add4244e5790d..a71924bd38c0d 100644
@@ -1,7 +1,6 @@
 #include <linux/gfp.h>
 #include <linux/highmem.h>
 #include <linux/kernel.h>
-#include <linux/kmsan-checks.h>
 #include <linux/mmdebug.h>
 #include <linux/mm_types.h>
 #include <linux/mm_inline.h>
@@ -266,15 +265,6 @@ void tlb_flush_mmu(struct mmu_gather *tlb)
 static void __tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm,
 			     bool fullmm)
 {
-	/*
-	 * struct mmu_gather contains 7 1-bit fields packed into a 32-bit
-	 * unsigned int value. The remaining 25 bits remain uninitialized
-	 * and are never used, but KMSAN updates the origin for them in
-	 * zap_pXX_range() in mm/memory.c, thus creating very long origin
-	 * chains. This is technically correct, but consumes too much memory.
-	 * Unpoisoning the whole structure will prevent creating such chains.
-	 */
-	kmsan_unpoison_memory(tlb, sizeof(*tlb));
 	tlb->mm = mm;
 	tlb->fullmm = fullmm;
 
Signature · 1 line
2.38.1.431.g37b22c650d-goog