Skip to contentSkip to conversation

x86-kmsan-use-c-versions-of-memset16-memset32-memset64.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Mar 28, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: x86: kmsan: use C versions of memset16/memset32/memset64
has been removed from the -mm tree. Its filename was

     x86-kmsan-use-c-versions-of-memset16-memset32-memset64.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Alexander Potapenko <[email protected]>
Subject: x86: kmsan: use C versions of memset16/memset32/memset64
Date: Fri, 3 Mar 2023 15:14:32 +0100

KMSAN must see as many memory accesses as possible to prevent false positive reports. Fall back to versions of memset16()/memset32()/memset64() implemented in lib/string.c instead of those written in assembly.

---

 arch/x86/include/asm/string_64.h |    6 ++++++
 1 file changed, 6 insertions(+)
arch/x86/include/asm/string_64.h renamed from arch/x86/include/asm/string_64.h~x86-kmsan-use-c-versions-of-memset16-memset32-memset64 +6 -0
@@ -22,6 +22,11 @@ extern void *__memcpy(void *to, const vo
 void *memset(void *s, int c, size_t n);
 void *__memset(void *s, int c, size_t n);
 
+/*
+ * KMSAN needs to instrument as much code as possible. Use C versions of
+ * memsetXX() from lib/string.c under KMSAN.
+ */
+#if !defined(CONFIG_KMSAN)
 #define __HAVE_ARCH_MEMSET16
 static inline void *memset16(uint16_t *s, uint16_t v, size_t n)
 {
@@ -57,6 +62,7 @@ static inline void *memset64(uint64_t *s
 		     : "memory");
 	return s;
 }
+#endif
 
 #define __HAVE_ARCH_MEMMOVE
 void *memmove(void *dest, const void *src, size_t count);

_

Patches currently in -mm which might be from [email protected] are