Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-28 16:53:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kmsan: add iomap support

Browse Source 
Functions from lib/iomap.c interact with hardware, so KMSAN must ensure
that:
 - every read function returns an initialized value
 - every write function checks values before sending them to hardware.

Link: https://lkml.kernel.org/r/20220915150417.722975-20-glider@google.com
Signed-off-by: Alexander Potapenko <glider@google.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Eric Biggers <ebiggers@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Marco Elver <elver@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Alexander Potapenko 2022-09-15 17:03:53 +02:00 committed by Andrew Morton
parent 75cf029027
commit a28a4d4723
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/iomap.c
View File

@ -6,6 +6,7 @@
*/ */
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/kmsan-checks.h>
#include <linux/export.h> #include <linux/export.h>
@ -70,26 +71,35 @@ static void bad_io_access(unsigned long port, const char *access)
#define mmio_read64be(addr) swab64(readq(addr)) #define mmio_read64be(addr) swab64(readq(addr))
#endif #endif
/*
* Here and below, we apply __no_kmsan_checks to functions reading data from
* hardware, to ensure that KMSAN marks their return values as initialized.
*/
__no_kmsan_checks
unsigned int ioread8(const void __iomem *addr) unsigned int ioread8(const void __iomem *addr)
{ {
IO_COND(addr, return inb(port), return readb(addr)); IO_COND(addr, return inb(port), return readb(addr));
return 0xff; return 0xff;
} }
__no_kmsan_checks
unsigned int ioread16(const void __iomem *addr) unsigned int ioread16(const void __iomem *addr)
{ {
IO_COND(addr, return inw(port), return readw(addr)); IO_COND(addr, return inw(port), return readw(addr));
return 0xffff; return 0xffff;
} }
__no_kmsan_checks
unsigned int ioread16be(const void __iomem *addr) unsigned int ioread16be(const void __iomem *addr)
{ {
IO_COND(addr, return pio_read16be(port), return mmio_read16be(addr)); IO_COND(addr, return pio_read16be(port), return mmio_read16be(addr));
return 0xffff; return 0xffff;
} }
__no_kmsan_checks
unsigned int ioread32(const void __iomem *addr) unsigned int ioread32(const void __iomem *addr)
{ {
IO_COND(addr, return inl(port), return readl(addr)); IO_COND(addr, return inl(port), return readl(addr));
return 0xffffffff; return 0xffffffff;
} }
__no_kmsan_checks
unsigned int ioread32be(const void __iomem *addr) unsigned int ioread32be(const void __iomem *addr)
{ {
IO_COND(addr, return pio_read32be(port), return mmio_read32be(addr)); IO_COND(addr, return pio_read32be(port), return mmio_read32be(addr));
@ -142,18 +152,21 @@ static u64 pio_read64be_hi_lo(unsigned long port)
return lo | (hi << 32); return lo | (hi << 32);
} }
__no_kmsan_checks
u64 ioread64_lo_hi(const void __iomem *addr) u64 ioread64_lo_hi(const void __iomem *addr)
{ {
IO_COND(addr, return pio_read64_lo_hi(port), return readq(addr)); IO_COND(addr, return pio_read64_lo_hi(port), return readq(addr));
return 0xffffffffffffffffULL; return 0xffffffffffffffffULL;
} }
__no_kmsan_checks
u64 ioread64_hi_lo(const void __iomem *addr) u64 ioread64_hi_lo(const void __iomem *addr)
{ {
IO_COND(addr, return pio_read64_hi_lo(port), return readq(addr)); IO_COND(addr, return pio_read64_hi_lo(port), return readq(addr));
return 0xffffffffffffffffULL; return 0xffffffffffffffffULL;
} }
__no_kmsan_checks
u64 ioread64be_lo_hi(const void __iomem *addr) u64 ioread64be_lo_hi(const void __iomem *addr)
{ {
IO_COND(addr, return pio_read64be_lo_hi(port), IO_COND(addr, return pio_read64be_lo_hi(port),
@ -161,6 +174,7 @@ u64 ioread64be_lo_hi(const void __iomem *addr)
return 0xffffffffffffffffULL; return 0xffffffffffffffffULL;
} }
__no_kmsan_checks
u64 ioread64be_hi_lo(const void __iomem *addr) u64 ioread64be_hi_lo(const void __iomem *addr)
{ {
IO_COND(addr, return pio_read64be_hi_lo(port), IO_COND(addr, return pio_read64be_hi_lo(port),
@ -188,22 +202,32 @@ EXPORT_SYMBOL(ioread64be_hi_lo);
void iowrite8(u8 val, void __iomem *addr) void iowrite8(u8 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, outb(val,port), writeb(val, addr)); IO_COND(addr, outb(val,port), writeb(val, addr));
} }
void iowrite16(u16 val, void __iomem *addr) void iowrite16(u16 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, outw(val,port), writew(val, addr)); IO_COND(addr, outw(val,port), writew(val, addr));
} }
void iowrite16be(u16 val, void __iomem *addr) void iowrite16be(u16 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, pio_write16be(val,port), mmio_write16be(val, addr)); IO_COND(addr, pio_write16be(val,port), mmio_write16be(val, addr));
} }
void iowrite32(u32 val, void __iomem *addr) void iowrite32(u32 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, outl(val,port), writel(val, addr)); IO_COND(addr, outl(val,port), writel(val, addr));
} }
void iowrite32be(u32 val, void __iomem *addr) void iowrite32be(u32 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, pio_write32be(val,port), mmio_write32be(val, addr)); IO_COND(addr, pio_write32be(val,port), mmio_write32be(val, addr));
} }
EXPORT_SYMBOL(iowrite8); EXPORT_SYMBOL(iowrite8);
@ -239,24 +263,32 @@ static void pio_write64be_hi_lo(u64 val, unsigned long port)
void iowrite64_lo_hi(u64 val, void __iomem *addr) void iowrite64_lo_hi(u64 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, pio_write64_lo_hi(val, port), IO_COND(addr, pio_write64_lo_hi(val, port),
writeq(val, addr)); writeq(val, addr));
} }
void iowrite64_hi_lo(u64 val, void __iomem *addr) void iowrite64_hi_lo(u64 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, pio_write64_hi_lo(val, port), IO_COND(addr, pio_write64_hi_lo(val, port),
writeq(val, addr)); writeq(val, addr));
} }
void iowrite64be_lo_hi(u64 val, void __iomem *addr) void iowrite64be_lo_hi(u64 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, pio_write64be_lo_hi(val, port), IO_COND(addr, pio_write64be_lo_hi(val, port),
mmio_write64be(val, addr)); mmio_write64be(val, addr));
} }
void iowrite64be_hi_lo(u64 val, void __iomem *addr) void iowrite64be_hi_lo(u64 val, void __iomem *addr)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(&val, sizeof(val));
IO_COND(addr, pio_write64be_hi_lo(val, port), IO_COND(addr, pio_write64be_hi_lo(val, port),
mmio_write64be(val, addr)); mmio_write64be(val, addr));
} }
@ -328,14 +360,20 @@ static inline void mmio_outsl(void __iomem *addr, const u32 *src, int count)
void ioread8_rep(const void __iomem *addr, void *dst, unsigned long count) void ioread8_rep(const void __iomem *addr, void *dst, unsigned long count)
{ {
IO_COND(addr, insb(port,dst,count), mmio_insb(addr, dst, count)); IO_COND(addr, insb(port,dst,count), mmio_insb(addr, dst, count));
/* KMSAN must treat values read from devices as initialized. */
kmsan_unpoison_memory(dst, count);
} }
void ioread16_rep(const void __iomem *addr, void *dst, unsigned long count) void ioread16_rep(const void __iomem *addr, void *dst, unsigned long count)
{ {
IO_COND(addr, insw(port,dst,count), mmio_insw(addr, dst, count)); IO_COND(addr, insw(port,dst,count), mmio_insw(addr, dst, count));
/* KMSAN must treat values read from devices as initialized. */
kmsan_unpoison_memory(dst, count * 2);
} }
void ioread32_rep(const void __iomem *addr, void *dst, unsigned long count) void ioread32_rep(const void __iomem *addr, void *dst, unsigned long count)
{ {
IO_COND(addr, insl(port,dst,count), mmio_insl(addr, dst, count)); IO_COND(addr, insl(port,dst,count), mmio_insl(addr, dst, count));
/* KMSAN must treat values read from devices as initialized. */
kmsan_unpoison_memory(dst, count * 4);
} }
EXPORT_SYMBOL(ioread8_rep); EXPORT_SYMBOL(ioread8_rep);
EXPORT_SYMBOL(ioread16_rep); EXPORT_SYMBOL(ioread16_rep);
@ -343,14 +381,20 @@ EXPORT_SYMBOL(ioread32_rep);
void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count) void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(src, count);
IO_COND(addr, outsb(port, src, count), mmio_outsb(addr, src, count)); IO_COND(addr, outsb(port, src, count), mmio_outsb(addr, src, count));
} }
void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count) void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(src, count * 2);
IO_COND(addr, outsw(port, src, count), mmio_outsw(addr, src, count)); IO_COND(addr, outsw(port, src, count), mmio_outsw(addr, src, count));
} }
void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count) void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
{ {
/* Make sure uninitialized memory isn't copied to devices. */
kmsan_check_memory(src, count * 4);
IO_COND(addr, outsl(port, src,count), mmio_outsl(addr, src, count)); IO_COND(addr, outsl(port, src,count), mmio_outsl(addr, src, count));
} }
EXPORT_SYMBOL(iowrite8_rep); EXPORT_SYMBOL(iowrite8_rep);