Add STRICT_DEVMEM support on RISC-V
cover Add STRICT_DEVMEM support on RISC-V
This patchset include two parts, the first one is that register System RAM as iomem resources, it is needed for page_is_ram API which checks the specified address whether registered as System RAM in iomem_resource list. The second patch is that add devmem_is_allowed to support STRICT_DEVMEM, and it would invoke page_is_ram to check the addresses.
Zong Li (2):
riscv: Register System RAM as iomem resources
riscv: Support CONFIG_STRICT_DEVMEM
arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 41 +++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+)
Signature · 1 line
2.27.0
PATCH 1/2 riscv: Register System RAM as iomem resources
Add System RAM to /proc/iomem, various tools expect it such as kdump. It is also needed for page_is_ram API which checks the specified address whether registered as System RAM in iomem_resource list.
--- arch/riscv/mm/init.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/riscv/mm/init.c +22 -0
@@ -517,6 +517,27 @@ void mark_rodata_ro(void) }#endif +void __init resource_init (void ) +{ +struct memblock_region *region; + +for_each_memblock (memory, region) { +struct resource *res; + + res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES ); +if (!res) +panic ("%s: Failed to allocate %zu bytes\n" , __func__, +sizeof (struct resource )); + + res->name ="System RAM" ; + res->start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); + res->end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; + res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ; + +request_resource (&iomem_resource, res); + } +} +void __init paging_init (void ) {setup_vm_final ();
@@ -524,6 +545,7 @@ void __init paging_init(void)sparse_init ();setup_zero_page ();zone_sizes_init (); +resource_init (); }#ifdef CONFIG_SPARSEMEM_VMEMMAP
Signature · 1 line
2.27.0
PATCH 2/2 riscv: Support CONFIG_STRICT_DEVMEM
In reply to Zong LiImplement the 'devmem_is_allowed()' interface for RISC-V, like some of other architectures have done. It will be called from range_is_allowed() when userpsace attempts to access /dev/mem.
Access to exclusive IOMEM and kernel RAM is denied unless CONFIG_STRICT_DEVMEM is set to 'n'.
Test it by devmem, the result as follows:
- CONFIG_STRICT_DEVMEM=y
$ devmem 0x10010000 0x00000000 $ devmem 0x80200000 0x0000106F
- CONFIG_STRICT_DEVMEM is not set
$ devmem 0x10010000 devmem: mmap: Operation not permitted $ devmem 0x80200000 devmem: mmap: Operation not permitted
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+)
arch/riscv/Kconfig +1 -0
@@ -16,6 +16,7 @@ config RISCV select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_WX + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_MMIOWB
arch/riscv/include/asm/io.h +2 -0
@@ -147,4 +147,6 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +extern int devmem_is_allowed (unsigned long pfn); +#endif /* _ASM_RISCV_IO_H */
arch/riscv/mm/init.c +19 -0
@@ -517,6 +517,25 @@ void mark_rodata_ro(void) }#endif +#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. +* +* Disallow 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 +void __init resource_init (void ) {struct memblock_region *region;
Signature · 1 line
2.27.0
Re: [PATCH 1/2] riscv: Register System RAM as iomem resources
In reply to Zong LiΣτις 2020-06-16 10:45, Zong Li έγραψε:
Quoted 43 lines
Add System RAM to
/proc/iomem, various tools expect it such as kdump. It is also needed forpage_is_ramAPI which checks the specified address whether registered as System RAM iniomem_resourcelist.Signed-off-by Zong Li <[email protected]>--- arch/riscv/mm/init.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/riscv/mm/init.c +21
-0@@ -517,6 +517,27 @@ void mark_rodata_ro(void) }#endif +void __init resource_init (void ) +{ +struct memblock_region *region; + +for_each_memblock (memory, region) { +struct resource *res; + + res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES ); +if (!res) +panic ("%s: Failed to allocate %zu bytes\n" , __func__, +sizeof (struct resource )); + + res->name ="System RAM" ; + res->start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); + res->end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; + res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ; + +request_resource (&iomem_resource, res); + } +} +void __init paging_init (void ) {arch/riscv/mm/init.c +0
-0setup_vm_final ();
arch/riscv/mm/init.c void __init paging_init(void) · line 551
Quoted 7 lines
arch/riscv/mm/init.c +1
-0@@ -524,6 +545,7 @@ void __init paging_init(void)sparse_init ();setup_zero_page ();zone_sizes_init (); +resource_init (); }#ifdef CONFIG_SPARSEMEM_VMEMMAP
I already have a patch for registering System RAM as an iomem resource on my kexec/kdump series. Since I don't care about System RAM regions being accurately exposed to userspace (I parse the current device tree instead) I just use memblock_start_of_DRAM/end_of_DRAM. This approach from arm64 codebase is better since it also handles the case of sparse memory regions but in order to be useful for kdump we need to add the various segments of the kernel image as child nodes to their respective region for kexec-tools. I'll re-spin my patchset anyway so I'll extend it to better handle System RAM regions.
Re: [PATCH 2/2] riscv: Support CONFIG_STRICT_DEVMEM
In reply to Zong LiΣτις 2020-06-16 10:45, Zong Li έγραψε:
Quoted 74 lines
Implement the '
devmem_is_allowed()' interface for RISC-V, like some of other architectures have done. It will be called fromrange_is_allowed()when userpsace attempts to access/dev/mem.Access to exclusive IOMEM and kernel RAM is denied unless
CONFIG_STRICT_DEVMEMis set to 'n'.Test it by devmem, the result as follows:
-
CONFIG_STRICT_DEVMEM=y$ devmem 0x10010000 0x00000000 $ devmem 0x80200000 0x0000106F-
CONFIG_STRICT_DEVMEMis not set$ devmem 0x10010000 devmem: mmap: Operation not permitted $ devmem 0x80200000 devmem: mmap: Operation not permittedSigned-off-by Zong Li <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+)arch/riscv/Kconfig +1
-0@@ -16,6 +16,7 @@ config RISCV select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_WX + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_MMIOWBarch/riscv/include/asm/io.h +2
-0@@ -147,4 +147,6 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +extern int devmem_is_allowed (unsigned long pfn); +#endif /*
_ASM_RISCV_IO_H*/arch/riscv/mm/init.c +4
-0@@ -517,6 +517,25 @@ void mark_rodata_ro(void) }#endif +#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.
+ *
+ * Disallow access to system RAM as well as device-exclusive MMIO regions.
+ * This effectively disable read()/write() on/dev/mem.
+ */arch/riscv/mm/init.c +3
-0+int devmem_is_allowed (unsigned long pfn) +{ +if (iomem_is_exclusive (pfn <<PAGE_SHIFT ))
arch/riscv/mm/init.c void mark_rodata_ro(void) · line 541
Quoted 10 lines
arch/riscv/mm/init.c +7
-0+return 0 ; +if (!page_is_ram (pfn)) +return 1 ; + return 0; +} +#endif +void __init resource_init (void ) {struct memblock_region *region;
This shouldn't be part of /mm/init.c, it has nothing to do with memory initialization, I suggest we move it to another file like mmap.c on arm/arm64. Also before using iomem_is_exclusive we should probably also mark any reserved regions with the no-map attribute as busy|exclusive, reserved-memory regions are not necessarily part of the main memory so the page_is_ram check may pass and iomem_is_exclusive won't do any good.
Re: [PATCH 1/2] riscv: Register System RAM as iomem resources
In reply to Nick KossifidisQuoted 52 lines · Nick Kossifidis
Στις 2020-06-16 10:45, Zong Li έγραψε:
Quoted 50 lines
Add System RAM to
/proc/iomem, various tools expect it such as kdump. It is also needed forpage_is_ramAPI which checks the specified address
whether registered as System RAM iniomem_resourcelist.Signed-off-by Zong Li <[email protected]>--- arch/riscv/mm/init.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/riscv/mm/init.c +21
-0@@ -517,6 +517,27 @@ void mark_rodata_ro(void) }#endif +void __init resource_init (void ) +{ +struct memblock_region *region; + +for_each_memblock (memory, region) { +struct resource *res; + + res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES ); +if (!res) +panic ("%s: Failed to allocate %zu bytes\n" , __func__, +sizeof (struct resource )); + + res->name ="System RAM" ; + res->start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); + res->end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; + res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ; + +request_resource (&iomem_resource, res); + } +} +void __init paging_init (void ) {setup_vm_final();arch/riscv/mm/init.c +1
-0@@ -524,6 +545,7 @@ void __init paging_init(void)sparse_init ();setup_zero_page ();zone_sizes_init (); +resource_init (); }
Quoted 12 lines
arch/riscv/mm/init.c void __init paging_init(void) · line 551
Quoted 1 line
arch/riscv/mm/init.c +0
-0#ifdef CONFIG_SPARSEMEM_VMEMMAP I already have a patch for registering System RAM as an iomem resource on my kexec/kdump series. Since I don't care about System RAM regions being accurately exposed to userspace (I parse the current device tree instead) I just use memblock_start_of_DRAM/end_of_DRAM. This approach from arm64 codebase is better since it also handles the case of sparse memory regions but in order to be useful for kdump we need to add the various segments of the kernel image as child nodes to their respective region for kexec-tools. I'll re-spin my patchset anyway so I'll extend it to better handle System RAM regions.
OK, great, I would remove this patch here and only reserve the second patch in the next version.
Re: [PATCH 2/2] riscv: Support CONFIG_STRICT_DEVMEM
In reply to Nick KossifidisQuoted 82 lines · Nick Kossifidis
Στις 2020-06-16 10:45, Zong Li έγραψε:
Quoted 80 lines
Implement the '
devmem_is_allowed()' interface for RISC-V, like some of other architectures have done. It will be called fromrange_is_allowed()
when userpsace attempts to access/dev/mem.Access to exclusive IOMEM and kernel RAM is denied unless
CONFIG_STRICT_DEVMEMis set to 'n'.Test it by devmem, the result as follows:
-
CONFIG_STRICT_DEVMEM=y$ devmem 0x10010000 0x00000000 $ devmem 0x80200000 0x0000106F-
CONFIG_STRICT_DEVMEMis not set$ devmem 0x10010000 devmem: mmap: Operation not permitted $ devmem 0x80200000 devmem: mmap: Operation not permittedSigned-off-by Zong Li <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+)arch/riscv/Kconfig +1
-0@@ -16,6 +16,7 @@ config RISCV select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_WX + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_MMIOWBarch/riscv/include/asm/io.h +2
-0@@ -147,4 +147,6 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +extern int devmem_is_allowed (unsigned long pfn); +#endif /*
_ASM_RISCV_IO_H*/arch/riscv/mm/init.c +4
-0@@ -517,6 +517,25 @@ void mark_rodata_ro(void) }#endif +#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.
+ *
+ * Disallow access to system RAM as well as device-exclusive MMIO regions.
+ * This effectively disable read()/write() on/dev/mem.
+ */arch/riscv/mm/init.c +8
-0+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 ; +}
Quoted 8 lines
arch/riscv/mm/init.c void mark_rodata_ro(void) · line 541
Quoted 5 lines
arch/riscv/mm/init.c +2
-0+#endif +void __init resource_init (void ) {struct memblock_region *region;This shouldn't be part of /mm/init.c, it has nothing to do with memory initialization, I suggest we move it to another file like
mmap.con
Let me move it, thanks.
Quoted 4 lines
arm/arm64. Also before using
iomem_is_exclusivewe should probably also mark any reserved regions with the no-map attribute as busy|exclusive, reserved-memory regions are not necessarily part of the main memory so thepage_is_ramcheck may pass andiomem_is_exclusivewon't do any good.
What do you think if we mark the reserved region in kdump_resource_init, and change the kdump_resource_init to a more generic name for initializing resources?
Re: [PATCH 2/2] riscv: Support CONFIG_STRICT_DEVMEM
Στις 2020-06-17 04:56, Zong Li έγραψε:
Quoted 94 lines · Nick Kossifidis
Quoted 82 lines
Στις 2020-06-16 10:45, Zong Li έγραψε:
Quoted 80 lines
Implement the '
devmem_is_allowed()' interface for RISC-V, like some of other architectures have done. It will be called fromrange_is_allowed()
when userpsace attempts to access/dev/mem.Access to exclusive IOMEM and kernel RAM is denied unless
CONFIG_STRICT_DEVMEMis set to 'n'.Test it by devmem, the result as follows:
-
CONFIG_STRICT_DEVMEM=y$ devmem 0x10010000 0x00000000 $ devmem 0x80200000 0x0000106F-
CONFIG_STRICT_DEVMEMis not set$ devmem 0x10010000 devmem: mmap: Operation not permitted $ devmem 0x80200000 devmem: mmap: Operation not permittedSigned-off-by Zong Li <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+)arch/riscv/Kconfig +1
-0@@ -16,6 +16,7 @@ config RISCV select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_WX + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_MMIOWBarch/riscv/include/asm/io.h +2
-0@@ -147,4 +147,6 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +extern int devmem_is_allowed (unsigned long pfn); +#endif /*
_ASM_RISCV_IO_H*/arch/riscv/mm/init.c +4
-0@@ -517,6 +517,25 @@ void mark_rodata_ro(void) }#endif +#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.
+ *
+ * Disallow access to system RAM as well as device-exclusive MMIO regions.
+ * This effectively disable read()/write() on/dev/mem.
+ */arch/riscv/mm/init.c +8
-0+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 ; +}Quoted 8 lines
arch/riscv/mm/init.c void mark_rodata_ro(void) · line 541
Quoted 5 lines
arch/riscv/mm/init.c +2
-0+#endif +void __init resource_init (void ) {struct memblock_region *region;This shouldn't be part of /mm/init.c, it has nothing to do with memory initialization, I suggest we move it to another file like
mmap.conLet me move it, thanks.
Quoted 8 lines
Quoted 4 lines
arm/arm64. Also before using
iomem_is_exclusivewe should probably also mark any reserved regions with the no-map attribute as busy|exclusive, reserved-memory regions are not necessarily part of the main memory so thepage_is_ramcheck may pass andiomem_is_exclusivewon't do any good.What do you think if we mark the reserved region in
kdump_resource_init, and change thekdump_resource_initto a more generic name for initializing resources?
Sounds good to me, I'll work on this within the week. Do you agree with marking the no-map reserved-memory regions as exclusive ?
Re: [PATCH 2/2] riscv: Support CONFIG_STRICT_DEVMEM
Quoted 104 lines · Nick Kossifidis
Στις 2020-06-17 04:56, Zong Li έγραψε:
Quoted 102 lines
Quoted 82 lines · Nick Kossifidis
Στις 2020-06-16 10:45, Zong Li έγραψε:
Quoted 80 lines
Implement the '
devmem_is_allowed()' interface for RISC-V, like some of other architectures have done. It will be called fromrange_is_allowed()
when userpsace attempts to access/dev/mem.Access to exclusive IOMEM and kernel RAM is denied unless
CONFIG_STRICT_DEVMEMis set to 'n'.Test it by devmem, the result as follows:
-
CONFIG_STRICT_DEVMEM=y$ devmem 0x10010000 0x00000000 $ devmem 0x80200000 0x0000106F-
CONFIG_STRICT_DEVMEMis not set$ devmem 0x10010000 devmem: mmap: Operation not permitted $ devmem 0x80200000 devmem: mmap: Operation not permittedSigned-off-by Zong Li <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+)arch/riscv/Kconfig +1
-0@@ -16,6 +16,7 @@ config RISCV select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_WX + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_MMIOWBarch/riscv/include/asm/io.h +2
-0@@ -147,4 +147,6 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +extern int devmem_is_allowed (unsigned long pfn); +#endif /*
_ASM_RISCV_IO_H*/arch/riscv/mm/init.c +4
-0@@ -517,6 +517,25 @@ void mark_rodata_ro(void) }#endif +#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.
+ *
+ * Disallow access to system RAM as well as device-exclusive MMIO regions.
+ * This effectively disable read()/write() on/dev/mem.
+ */arch/riscv/mm/init.c +8
-0+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 ; +}Quoted 8 lines
arch/riscv/mm/init.c void mark_rodata_ro(void) · line 541
Quoted 5 lines
arch/riscv/mm/init.c +2
-0+#endif +void __init resource_init (void ) {struct memblock_region *region;This shouldn't be part of /mm/init.c, it has nothing to do with memory initialization, I suggest we move it to another file like
mmap.conLet me move it, thanks.
Quoted 6 lines
arm/arm64. Also before using
iomem_is_exclusivewe should probably also
mark any reserved regions with the no-map attribute as busy|exclusive, reserved-memory regions are not necessarily part of the main memory so thepage_is_ramcheck may pass andiomem_is_exclusivewon't do any good.
Quoted 6 lines
Quoted 3 lines
What do you think if we mark the reserved region in
kdump_resource_init, and change thekdump_resource_initto a more generic name for initializing resources?Sounds good to me, I'll work on this within the week. Do you agree with marking the no-map reserved-memory regions as exclusive ?
It's OK to me, It seems to me that exclusive is more suitable than busy when initialization.
Palmer Dabbelt
maintainerRe: [PATCH 1/2] riscv: Register System RAM as iomem resources
In reply to Zong LiQuoted 23 lines · On Tue, 16 Jun 2020 00:45:46 PDT (-0700), [email protected] wrote:
Add System RAM to
/proc/iomem, various tools expect it such as kdump. It is also needed forpage_is_ramAPI which checks the specified address whether registered as System RAM iniomem_resourcelist.Signed-off-by Zong Li <[email protected]>--- arch/riscv/mm/init.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/riscv/mm/init.c +6
-0@@ -517,6 +517,27 @@ void mark_rodata_ro(void) }#endif +void __init resource_init (void ) +{ +struct memblock_region *region; + +for_each_memblock (memory, region) { +struct resource *res;
arch/riscv/mm/init.c void mark_rodata_ro(void) · line 535
Quoted 10 lines
arch/riscv/mm/init.c +10
-0+ + res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES ); +if (!res) +panic ("%s: Failed to allocate %zu bytes\n" , __func__, +sizeof (struct resource )); + + res->name ="System RAM" ; + res->start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); + res->end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; + res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;
Looks like everyone else is checking MEMBLOCK_NOMAP before registering memory regions. I've added that and put this on for-next. Thanks!
commit 11dc632bf515874c84887727614e8044452f1f28
gpg: Signature made Thu 09 Jul 2020 11:24:08 AM PDT gpg: using RSA key 2B3C3747446843B24A943A7A2E1319F35FBB1889 gpg: issuer "[email protected]" gpg: Good signature from "Palmer Dabbelt <[email protected]>" [ultimate] gpg: aka "Palmer Dabbelt <[email protected]>" [ultimate] Author: Zong Li <[email protected]> Date: Tue Jun 16 15:45:46 2020 +0800
riscv: Register System RAM as iomem resources
Add System RAM to /proc/iomem, various tools expect it such as kdump. It is also needed for page_is_ram API which checks the specified address whether registered as System RAM in iomem_resource list.
arch/riscv/mm/init.c +0 -0
@@ -517,6 +517,32 @@ void mark_rodata_ro(void)
}
#endif
+void __init resource_init(void)
+{
+ struct memblock_region *region;
+
+ for_each_memblock(memory, region) {
+ struct resource *res;
+
+ res = memblock_alloc(sizeof(struct resource), SMP_CACHE_BYTES);
+ if (!res)
+ panic("%s: Failed to allocate %zu bytes\n", __func__,
+ sizeof(struct resource));
+
+ if (memblock_is_nomap(region) {
+ res->name = "reserved";
+ res->flags = IORESOURCE_MEM;
+ } else {
+ res->name = "System RAM";
+ res->flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY;
+ }
+ res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region));
+ res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1;
+
+ request_resource(&iomem_resource, res);
+ }
+}
+
void __init paging_init(void)
{
setup_vm_final();
@@ -524,6 +550,7 @@ void __init paging_init(void)
sparse_init();
setup_zero_page();
zone_sizes_init();+ resource_init();
}
#ifdef CONFIG_SPARSEMEM_VMEMMAP
Quoted 16 lines
arch/riscv/mm/init.c +6
-0+ +request_resource (&iomem_resource, res); + } +} +void __init paging_init (void ) {setup_vm_final ();@@ -524,6 +545,7 @@ void __init paging_init(void)sparse_init ();setup_zero_page ();zone_sizes_init (); +resource_init (); }#ifdef CONFIG_SPARSEMEM_VMEMMAP
Palmer Dabbelt
maintainerRe: [PATCH 2/2] riscv: Support CONFIG_STRICT_DEVMEM
In reply to Zong LiQuoted 3 lines · On Tue, 16 Jun 2020 00:45:47 PDT (-0700), [email protected] wrote:
Implement the '
devmem_is_allowed()' interface for RISC-V, like some of other architectures have done. It will be called fromrange_is_allowed()when userpsace attempts to access/dev/mem.
In fact, it's exactly the same (down to a few words of the comment) to the others that I checked. I'm going to put a generic version in lib/ instead, I've sent out the patches.
Quoted 77 lines
Access to exclusive IOMEM and kernel RAM is denied unless
CONFIG_STRICT_DEVMEMis set to 'n'.Test it by devmem, the result as follows:
-
CONFIG_STRICT_DEVMEM=y$ devmem 0x10010000 0x00000000 $ devmem 0x80200000 0x0000106F-
CONFIG_STRICT_DEVMEMis not set$ devmem 0x10010000 devmem: mmap: Operation not permitted $ devmem 0x80200000 devmem: mmap: Operation not permittedSigned-off-by Zong Li <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+)arch/riscv/Kconfig +1
-0@@ -16,6 +16,7 @@ config RISCV select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_WX + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_MMIOWBarch/riscv/include/asm/io.h +2
-0@@ -147,4 +147,6 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +extern int devmem_is_allowed (unsigned long pfn); +#endif /* _ASM_RISCV_IO_H */ arch/riscv/mm/init.c +19
-0@@ -517,6 +517,25 @@ void mark_rodata_ro(void) }#endif +#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. +* +* Disallow 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 +void __init resource_init (void ) {struct memblock_region *region;
Re: [PATCH 1/2] riscv: Register System RAM as iomem resources
In reply to Palmer DabbeltΣτις 2020-07-09 21:27, Palmer Dabbelt έγραψε:
Quoted 122 lines · On Tue, 16 Jun 2020 00:45:46 PDT (-0700), [email protected] wrote:
Quoted 25 lines
Add System RAM to
/proc/iomem, various tools expect it such as kdump. It is also needed forpage_is_ramAPI which checks the specified address whether registered as System RAM iniomem_resourcelist.Signed-off-by Zong Li <[email protected]>--- arch/riscv/mm/init.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)arch/riscv/mm/init.c +8
-0@@ -517,6 +517,27 @@ void mark_rodata_ro(void) }#endif +void __init resource_init (void ) +{ +struct memblock_region *region; + +for_each_memblock (memory, region) { +struct resource *res; + + res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES );arch/riscv/mm/init.c void mark_rodata_ro(void) · line 537
Quoted 10 lines
arch/riscv/mm/init.c +8
-0+if (!res) +panic ("%s: Failed to allocate %zu bytes\n" , __func__, +sizeof (struct resource )); + + res->name ="System RAM" ; + res->start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); + res->end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; + res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ;Looks like everyone else is checking
MEMBLOCK_NOMAPbefore registering memory regions. I've added that and put this on for-next. Thanks!commit
11dc632bf515874c84887727614e8044452f1f28gpg: Signature made Thu 09 Jul 2020 11:24:08 AM PDT gpg: using RSA key 2B3C3747446843B24A943A7A2E1319F35FBB1889 gpg: issuer "[email protected]" gpg: Good signature from "Palmer Dabbelt <[email protected]>" [ultimate] gpg: aka "Palmer Dabbelt <[email protected]>" [ultimate] Author: Zong Li <[email protected]> Date: Tue Jun 16 15:45:46 2020 +0800riscv: Register System RAM as iomem resources
Add System RAM to/proc/iomem, various tools expect it such as
kdump.
It is also needed forpage_is_ramAPI which checks the specified
address
whether registered as System RAM iniomem_resourcelist.Signed-off-by Zong Li <[email protected]>[Palmer: check MEMBLOCK_NOMAP]Signed-off-by Palmer Dabbelt <[email protected]>arch/riscv/mm/init.c +26
-0@@ -517,6 +517,32 @@ void mark_rodata_ro(void) }#endif +void __init resource_init (void ) +{ +struct memblock_region *region; + +for_each_memblock (memory, region) { +struct resource *res; + + res =memblock_alloc (sizeof (struct resource ),SMP_CACHE_BYTES ); +if (!res) +panic ("%s: Failed to allocate %zu bytes\n" , __func__, +sizeof (struct resource )); + + if (memblock_is_nomap(region) { + res->name ="reserved" ; + res->flags =IORESOURCE_MEM ; + }else { + res->name ="System RAM" ; + res->flags =IORESOURCE_SYSTEM_RAM |IORESOURCE_BUSY ; + } + res->start =__pfn_to_phys (memblock_region_memory_base_pfn (region)); + res->end =__pfn_to_phys (memblock_region_memory_end_pfn (region)) -1 ; + +request_resource (&iomem_resource, res); + } +} +void __init paging_init (void ) {setup_vm_final();arch/riscv/mm/init.c +1
-0@@ -524,6 +550,7 @@ void __init paging_init(void)sparse_init ();setup_zero_page ();zone_sizes_init (); +resource_init (); }#ifdef CONFIG_SPARSEMEM_VMEMMAP Quoted 17 lines
arch/riscv/mm/init.c +5
-0+ +request_resource (&iomem_resource, res); + } +} +void __init paging_init (void ){
arch/riscv/mm/init.c +1
-0setup_vm_final ();@@ -524,6 +545,7 @@ void __init paging_init(void)sparse_init ();setup_zero_page ();zone_sizes_init (); +resource_init (); }
Quoted 6 lines
arch/riscv/mm/init.c void __init paging_init(void) · line 551
Quoted 1 line
arch/riscv/mm/init.c +0
-0#ifdef CONFIG_SPARSEMEM_VMEMMAP _______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Zong Li sent a newer version of this series without this patch, since I'm handling this on the kexec/kdump series as well where other sections needed for kdump are also registered.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH 2/2] riscv: Support CONFIG_STRICT_DEVMEM
In reply to Palmer DabbeltQuoted 10 lines · Palmer Dabbelt
Quoted 3 lines · On Tue, 16 Jun 2020 00:45:47 PDT (-0700), [email protected] wrote:
Implement the '
devmem_is_allowed()' interface for RISC-V, like some of other architectures have done. It will be called fromrange_is_allowed()when userpsace attempts to access/dev/mem.In fact, it's exactly the same (down to a few words of the comment) to the others that I checked. I'm going to put a generic version in
lib/instead, I've sent out the patches.
OK, no problem, thanks for improving it.
Quoted 77 lines
Quoted 77 lines
Access to exclusive IOMEM and kernel RAM is denied unless
CONFIG_STRICT_DEVMEMis set to 'n'.Test it by devmem, the result as follows:
-
CONFIG_STRICT_DEVMEM=y$ devmem 0x10010000 0x00000000 $ devmem 0x80200000 0x0000106F-
CONFIG_STRICT_DEVMEMis not set$ devmem 0x10010000 devmem: mmap: Operation not permitted $ devmem 0x80200000 devmem: mmap: Operation not permittedSigned-off-by Zong Li <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/io.h | 2 ++ arch/riscv/mm/init.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+)arch/riscv/Kconfig +1
-0@@ -16,6 +16,7 @@ config RISCV select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_DEBUG_VIRTUAL if MMU select ARCH_HAS_DEBUG_WX + select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_MMIOWBarch/riscv/include/asm/io.h +2
-0@@ -147,4 +147,6 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +extern int devmem_is_allowed (unsigned long pfn); +#endif /* _ASM_RISCV_IO_H */ arch/riscv/mm/init.c +19
-0@@ -517,6 +517,25 @@ void mark_rodata_ro(void) }#endif +#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. +* +* Disallow 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 +void __init resource_init (void ) {struct memblock_region *region;