Add and use a generic version of devmem_is_allowed()
Subsystems (5)
Palmer Dabbelt
maintainerAs part of adding STRICT_DEVMEM support to the RISC-V port, Zong provided an implementation of devmem_is_allowed() that's exactly the same as the version in a handful of other ports. Rather than duplicate code, I've put a generic version of this in lib/ and used it for the RISC-V port.
I've put those first two patches on riscv/for-next, which I'm targeting for 5.9 (though this is the first version, so they're unreviewed). The other three obviously depend on the first one going on, but I'm not putting them in the RISC-V tree as I don't want to step on anyone's toes. If you want me to take yours along with the others then please say something, as otherwise I'll probably forget.
I've put the whole thing at ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git -b generic-devmem .
Changes since v1 [<[email protected]]:
* Don't have GENERIC_LIB_DEVMEM_IS_ALLOWED select ARCH_HAS_DEVMEM_IS_ALLOWED, instead just adapt the users.
* Remove ARCH_HAS_DEVMEM_IS_ALLOWED from the arch Kconfigs, as I forgot to do so the first time.
Palmer Dabbelt
maintainerPATCH v2 1/5 lib: Add a generic version of devmem_is_allowed()
From: Palmer Dabbelt <[email protected]>
As part of adding support for STRICT_DEVMEM to the RISC-V port, Zong provided a devmem_is_allowed() implementation that's exactly the same as all the others I checked. Instead I'm adding a generic version, which will soon be used.
--- include/asm-generic/io.h | 4 ++++ lib/Kconfig | 3 +++ lib/Kconfig.debug | 2 +- lib/Makefile | 2 ++ lib/devmem_is_allowed.c | 27 +++++++++++++++++++++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 lib/devmem_is_allowed.c
include/asm-generic/io.h +4 -0
@@ -1122,6 +1122,10 @@ static inline void memcpy_toio(volatile void __iomem *addr, const void *buffer, }#endif +#ifndef CONFIG_GENERIC_DEVMEM_IS_ALLOWED +extern int devmem_is_allowed (unsigned long pfn); +#endif +#endif /* __KERNEL__ */ #endif /* __ASM_GENERIC_IO_H */
lib/Kconfig +3 -0
@@ -676,3 +676,6 @@ config GENERIC_LIB_CMPDI2 config GENERIC_LIB_UCMPDI2 bool + +config GENERIC_LIB_DEVMEM_IS_ALLOWED + bool
lib/Kconfig.debug +1 -1
@@ -1577,7 +1577,7 @@ config ARCH_HAS_DEVMEM_IS_ALLOWED config STRICT_DEVMEM bool "Filter access to /dev/mem" depends on MMU && DEVMEM - depends on ARCH_HAS_DEVMEM_IS_ALLOWED + depends on ARCH_HAS_DEVMEM_IS_ALLOWED || GENERIC_LIB_DEVMEM_IS_ALLOWED default y if PPC || X86 || ARM64 help If this option is disabled, you allow userspace (root) access to all
lib/Makefile +2 -0
@@ -318,3 +318,5 @@ obj-$(CONFIG_OBJAGG) += objagg.o # KUnit tests obj-$(CONFIG_LIST_KUNIT_TEST) += list-test.o obj-$(CONFIG_LINEAR_RANGES_TEST) += test_linear_ranges.o + +obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) += devmem_is_allowed.o
lib/devmem_is_allowed.c new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* A generic version of devmem_is_allowed. +* +* Based on arch/arm64/mm/mmap.c +* +* Copyright (C) 2020 Google, Inc. +* Copyright (C) 2012 ARM Ltd. +*/ + +#include <linux/mm.h> +#include <linux/ioport.h> + +/* +* devmem_is_allowed() checks to see if /dev/mem access to a certain address +* is valid. The argument is a physical page number. We mimic x86 here by +* disallowing access to system RAM as well as device-exclusive MMIO regions. +* This effectively disable read()/write() on /dev/mem. +*/ +int devmem_is_allowed (unsigned long pfn) +{ +if (iomem_is_exclusive (pfn <<PAGE_SHIFT )) +return 0 ; +if (!page_is_ram (pfn)) +return 1 ; +return 0 ; +}
Signature · 1 line
2.27.0.383.g050319c2ae-goog
Palmer Dabbelt
maintainerPATCH v2 2/5 RISC-V: Use the new generic devmem_is_allowed()
In reply to Palmer DabbeltFrom: Palmer Dabbelt <[email protected]>
This allows us to enable STRICT_DEVMEM.
--- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/riscv/Kconfig +1 -0
@@ -37,6 +37,7 @@ config RISCV select GENERIC_IOREMAP select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW + select GENERIC_LIB_DEVMEM_IS_ALLOWED select GENERIC_PCI_IOMAP select GENERIC_PTDUMP if MMU select GENERIC_SCHED_CLOCK
Signature · 1 line
2.27.0.383.g050319c2ae-goog
Palmer Dabbelt
maintainerPATCH v2 3/5 arm: Use the generic devmem_is_allowed()
In reply to Palmer DabbeltFrom: Palmer Dabbelt <[email protected]>
This is exactly the same as the arm64 version, which I recently copied into lib/ for use by the RISC-V port.
[I haven't even build tested this. The lib/ patch is on riscv/for-next, which I'm targeting for 5.9, so this won't work alone. See the cover letter for more details.]
--- arch/arm/Kconfig | 2 +- arch/arm/include/asm/io.h | 1 - arch/arm/mm/mmap.c | 22 ---------------------- 3 files changed, 1 insertion(+), 24 deletions(-)
arch/arm/Kconfig +1 -1
@@ -5,7 +5,6 @@ config ARM select ARCH_32BIT_OFF_T select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU - select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_FORTIFY_SOURCE
@@ -54,6 +53,7 @@ config ARM select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL + select GENERIC_LIB_DEVMEM_IS_ALLOWED select GENERIC_PCI_IOMAP select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD
arch/arm/include/asm/io.h +0 -1
@@ -441,7 +441,6 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr);#define ARCH_HAS_VALID_PHYS_ADDR_RANGE extern int valid_phys_addr_range (phys_addr_t addr,size_t size);extern int valid_mmap_phys_addr_range (unsigned long pfn,size_t size); -extern int devmem_is_allowed (unsigned long pfn);#endif /*
arch/arm/mm/mmap.c +0 -22
@@ -165,25 +165,3 @@ int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) {return (pfn + (size >>PAGE_SHIFT )) <= (1 + (PHYS_MASK >>PAGE_SHIFT )); } - -#ifdef CONFIG_STRICT_DEVMEM - -#include <linux/ioport.h> - -/* -* devmem_is_allowed() checks to see if /dev/mem access to a certain -* address is valid. The argument is a physical page number. -* We mimic x86 here by disallowing access to system RAM as well as -* device-exclusive MMIO regions. This effectively disable read()/write() -* on /dev/mem. -*/ -int devmem_is_allowed (unsigned long pfn) -{ -if (iomem_is_exclusive (pfn <<PAGE_SHIFT )) -return 0 ; -if (!page_is_ram (pfn)) -return 1 ; -return 0 ; -} - -#endif
Signature · 1 line
2.27.0.383.g050319c2ae-goog
Palmer Dabbelt
maintainerPATCH v2 4/5 arm64: Use the generic devmem_is_allowed()
In reply to Palmer DabbeltFrom: Palmer Dabbelt <[email protected]>
I recently copied this into lib/ for use by the RISC-V port.
[I haven't even build tested this. The lib/ patch is on riscv/for-next, which I'm targeting for 5.9, so this won't work alone. See the cover letter for more details.]
--- arch/arm64/Kconfig | 2 +- arch/arm64/include/asm/io.h | 2 -- arch/arm64/mm/mmap.c | 21 --------------------- 3 files changed, 1 insertion(+), 24 deletions(-)
arch/arm64/Kconfig +1 -1
@@ -13,7 +13,6 @@ config ARM64 select ARCH_BINFMT_ELF_STATE select ARCH_HAS_DEBUG_VIRTUAL select ARCH_HAS_DEBUG_VM_PGTABLE - select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI select ARCH_HAS_FAST_MULTIPLIER
@@ -110,6 +109,7 @@ config ARM64 select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL + select GENERIC_LIB_DEVMEM_IS_ALLOWED select GENERIC_PCI_IOMAP select GENERIC_PTDUMP select GENERIC_SCHED_CLOCK
arch/arm64/include/asm/io.h +0 -2
@@ -200,6 +200,4 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);extern int valid_phys_addr_range (phys_addr_t addr,size_t size);extern int valid_mmap_phys_addr_range (unsigned long pfn,size_t size); -extern int devmem_is_allowed (unsigned long pfn); -#endif /* __ASM_IO_H */
arch/arm64/mm/mmap.c +0 -21
@@ -47,24 +47,3 @@ int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) {return !(((pfn <<PAGE_SHIFT ) + size) & ~PHYS_MASK ); } - -#ifdef CONFIG_STRICT_DEVMEM - -#include <linux/ioport.h> - -/* -* devmem_is_allowed() checks to see if /dev/mem access to a certain address -* is valid. The argument is a physical page number. We mimic x86 here by -* disallowing access to system RAM as well as device-exclusive MMIO regions. -* This effectively disable read()/write() on /dev/mem. -*/ -int devmem_is_allowed (unsigned long pfn) -{ -if (iomem_is_exclusive (pfn <<PAGE_SHIFT )) -return 0 ; -if (!page_is_ram (pfn)) -return 1 ; -return 0 ; -} - -#endif
Signature · 1 line
2.27.0.383.g050319c2ae-goog
Re: [PATCH v2 4/5] arm64: Use the generic devmem_is_allowed()
Quoted 9 lines · Palmer Dabbelt
From: Palmer Dabbelt <[email protected]>
I recently copied this into
lib/for use by the RISC-V port.[I haven't even build tested this. The
lib/patch is on riscv/for-next, which I'm targeting for 5.9, so this won't work alone. See the cover letter for more details.]Signed-off-by Palmer Dabbelt <[email protected]>
Palmer Dabbelt
maintainerPATCH v2 5/5 unicore32: Use the generic devmem_is_allowed()
In reply to Palmer DabbeltFrom: Palmer Dabbelt <[email protected]>
Aside from being inlineable, this is exactly the same as the arm64 version, which I recently copied into lib/ for use by the RISC-V port.
[I haven't even build tested this. The lib/ patch is on riscv/for-next, which I'm targeting for 5.9, so this won't work alone. See the cover letter for more details.]
--- arch/unicore32/Kconfig | 2 +- arch/unicore32/include/asm/io.h | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-)
arch/unicore32/Kconfig +1 -1
@@ -2,7 +2,6 @@ config UNICORE32 def_bool y select ARCH_32BIT_OFF_T - select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_KEEPINITRD select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO
@@ -12,6 +11,7 @@ config UNICORE32 select HAVE_KERNEL_LZO select HAVE_KERNEL_LZMA select HAVE_PCI + select GENERIC_LIB_DEVMEM_IS_ALLOWED select VIRT_TO_BUS select ARCH_HAVE_CUSTOM_GPIO_H select GENERIC_FIND_FIRST_BIT
arch/unicore32/include/asm/io.h +0 -23
@@ -42,28 +42,5 @@ extern void __uc32_iounmap(volatile void __iomem *addr);#define PIO_MASK (unsigned int)(IO_SPACE_LIMIT)#define PIO_RESERVED (PIO_OFFSET + PIO_MASK + 1) -#ifdef CONFIG_STRICT_DEVMEM - -#include <linux/ioport.h> -#include <linux/mm.h> - -/* -* devmem_is_allowed() checks to see if /dev/mem access to a certain -* address is valid. The argument is a physical page number. -* We mimic x86 here by disallowing access to system RAM as well as -* device-exclusive MMIO regions. This effectively disable read()/write() -* on /dev/mem. -*/ -static inline int devmem_is_allowed (unsigned long pfn) -{ -if (iomem_is_exclusive (pfn <<PAGE_SHIFT )) -return 0 ; -if (!page_is_ram (pfn)) -return 1 ; -return 0 ; -} - -#endif /* CONFIG_STRICT_DEVMEM */ -#endif /* __KERNEL__ */ #endif /* __UNICORE_IO_H__ */
Signature · 1 line
2.27.0.383.g050319c2ae-goog
Mike Rapoport
Acked-byQuoted 11 lines · Palmer Dabbelt
As part of adding
STRICT_DEVMEMsupport to the RISC-V port, Zong provided an implementation ofdevmem_is_allowed()that's exactly the same as the version in a handful of other ports. Rather than duplicate code, I've put a generic version of this inlib/and used it for the RISC-V port.I've put those first two patches on riscv/for-next, which I'm targeting for 5.9 (though this is the first version, so they're unreviewed). The other three obviously depend on the first one going on, but I'm not putting them in the RISC-V tree as I don't want to step on anyone's toes. If you want me to take yours along with the others then please say something, as otherwise I'll probably forget.
For the series
Quoted 12 lines
I've put the whole thing at ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git -b generic-devmem .
Changes since v1 [<[email protected]]:
* Don't have
GENERIC_LIB_DEVMEM_IS_ALLOWEDselectARCH_HAS_DEVMEM_IS_ALLOWED, instead just adapt the users.
* RemoveARCH_HAS_DEVMEM_IS_ALLOWEDfrom the arch Kconfigs, as I forgot to do so the first time.
Signature · 2 lines
Sincerely yours, Mike.
Luis Chamberlain
Reviewed-byQuoted 12 lines · Palmer Dabbelt
As part of adding
STRICT_DEVMEMsupport to the RISC-V port, Zong provided an implementation ofdevmem_is_allowed()that's exactly the same as the version in a handful of other ports. Rather than duplicate code, I've put a generic version of this inlib/and used it for the RISC-V port.I've put those first two patches on riscv/for-next, which I'm targeting for 5.9 (though this is the first version, so they're unreviewed). The other three obviously depend on the first one going on, but I'm not putting them in the RISC-V tree as I don't want to step on anyone's toes. If you want me to take yours along with the others then please say something, as otherwise I'll probably forget.
Quoted 3 lines
I've put the whole thing at ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git -b generic-devmem .
Luis
Palmer Dabbelt
maintainerQuoted 13 lines · On Tue, 28 Jul 2020 17:00:30 PDT (-0700), [email protected] wrote:
Quoted 12 lines · Palmer Dabbelt
As part of adding
STRICT_DEVMEMsupport to the RISC-V port, Zong provided an implementation ofdevmem_is_allowed()that's exactly the same as the version in a handful of other ports. Rather than duplicate code, I've put a generic version of this inlib/and used it for the RISC-V port.I've put those first two patches on riscv/for-next, which I'm targeting for 5.9 (though this is the first version, so they're unreviewed). The other three obviously depend on the first one going on, but I'm not putting them in the RISC-V tree as I don't want to step on anyone's toes. If you want me to take yours along with the others then please say something, as otherwise I'll probably forget.
Quoted 5 lines
Quoted 3 lines
I've put the whole thing at ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git -b generic-devmem .
Reviewed-by Luis Chamberlain <[email protected]>
Thanks. Davoid pointed out that I forgot about this, so I just rebased it onto 5.9 and merged it into my for-next.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv