MIPS: Add support for CONFIG_DEBUG_VIRTUAL
PATCH v4 1/1 MIPS: Add support for CONFIG_DEBUG_VIRTUAL
Provide hooks to intercept bad usages of virt_to_phys() and __pa_symbol() throughout the kernel. To make this possible, we need to rename the current implement of virt_to_phys() into __virt_to_phys_nodebug() and wrap it around depending on CONFIG_DEBUG_VIRTUAL.
A similar thing is needed for __pa_symbol() which is now aliased to __phys_addr_symbol() whose implementation is either the direct return of RELOC_HIDE or goes through the debug version.
---
Changes in v4:
- properly address sparse warning in arch/mips/kernel/vdso.c and eliminate it entirely
Changes in v3:
- added missing SDPX license tag in physaddr.c
Changes in v2:
- fixed sparse warning in arch/mips/kernel/vdso.c
arch/mips/Kconfig | 1 + arch/mips/include/asm/io.h | 14 ++++++++- arch/mips/include/asm/page.h | 9 +++++- arch/mips/kernel/vdso.c | 5 ++-- arch/mips/mm/Makefile | 2 ++ arch/mips/mm/physaddr.c | 56 ++++++++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 arch/mips/mm/physaddr.c
arch/mips/Kconfig +1 -0
@@ -4,6 +4,7 @@ config MIPS default y select ARCH_32BIT_OFF_T if !64BIT select ARCH_BINFMT_ELF_STATE if MIPS_FP_SUPPORT + select ARCH_HAS_DEBUG_VIRTUAL if !64BIT select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_KCOV select ARCH_HAS_PTE_SPECIAL if !(32BIT && CPU_HAS_RIXI)
arch/mips/include/asm/io.h +13 -1
@@ -100,11 +100,23 @@ static inline void set_io_port_base(unsigned long base)* almost all conceivable cases a device driver should not be using * this function */ -static inline unsigned long virt_to_phys (volatile const void *address) +static inline unsigned long __virt_to_phys_nodebug (volatile const void *address) {return __pa (address); } +#ifdef CONFIG_DEBUG_VIRTUAL +extern phys_addr_t __virt_to_phys (volatile const void *x); +#else +#define __virt_to_phys (x) __virt_to_phys_nodebug(x) +#endif + +#define virt_to_phys virt_to_phys +static inline phys_addr_t virt_to_phys (const volatile void *x) +{ +return __virt_to_phys (x); +} +/* * phys_to_virt - map physical address to virtual * @address: address to remap
arch/mips/include/asm/page.h +8 -1
@@ -210,9 +210,16 @@ static inline unsigned long ___pa(unsigned long x)* also affect MIPS so we keep this one until GCC 3.x has been retired * before we can apply https://patchwork.linux-mips.org/patch/1541/ */ +#define __pa_symbol_nodebug (x) __pa(RELOC_HIDE((unsigned long)(x), 0)) + +#ifdef CONFIG_DEBUG_VIRTUAL +extern phys_addr_t __phys_addr_symbol (unsigned long x); +#else +#define __phys_addr_symbol (x) __pa_symbol_nodebug(x) +#endif #ifndef __pa_symbol -#define __pa_symbol (x) __pa(RELOC_HIDE((unsigned long)(x), 0)) +#define __pa_symbol (x) __phys_addr_symbol((unsigned long)(x))#endif #define pfn_to_kaddr (pfn) __va((pfn) << PAGE_SHIFT)
arch/mips/kernel/vdso.c +3 -2
@@ -90,7 +90,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) {struct mips_vdso_image *image = current->thread.abi->vdso;struct mm_struct *mm = current->mm; -unsigned long gic_size, vvar_size, size, base, data_addr, vdso_addr, gic_pfn; +unsigned long gic_size, vvar_size, size, base, data_addr, vdso_addr, gic_pfn, gic_base;struct vm_area_struct *vma;int ret;
@@ -158,7 +158,8 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)/* Map GIC user page. */ if (gic_size) { - gic_pfn =virt_to_phys (mips_gic_base +MIPS_GIC_USER_OFS ) >>PAGE_SHIFT ; + gic_base = (unsigned long )mips_gic_base +MIPS_GIC_USER_OFS ; + gic_pfn =virt_to_phys ((void *)gic_base) >>PAGE_SHIFT ; ret =io_remap_pfn_range (vma, base, gic_pfn, gic_size,pgprot_noncached (vma->vm_page_prot));
arch/mips/mm/Makefile +2 -0
@@ -40,3 +40,5 @@ obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o obj-$(CONFIG_SCACHE_DEBUGFS) += sc-debugfs.o + +obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o
arch/mips/mm/physaddr.c new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.25.1
Quoted 24 lines · Florian Fainelli
Provide hooks to intercept bad usages of
virt_to_phys()and__pa_symbol()throughout the kernel. To make this possible, we need to rename the current implement ofvirt_to_phys()into__virt_to_phys_nodebug()and wrap it around depending onCONFIG_DEBUG_VIRTUAL.A similar thing is needed for
__pa_symbol()which is now aliased to__phys_addr_symbol()whose implementation is either the direct return ofRELOC_HIDEor goes through the debug version.Signed-off-by Florian Fainelli <[email protected]>---
Changes in v4:- properly address sparse warning in
arch/mips/kernel/vdso.cand eliminate it entirelyChanges in v3:
- added missing SDPX license tag in
physaddr.cChanges in v2:
- fixed sparse warning inarch/mips/kernel/vdso.c
Quoted 8 lines
arch/mips/Kconfig | 1 + arch/mips/include/asm/io.h | 14 ++++++++- arch/mips/include/asm/page.h | 9 +++++- arch/mips/kernel/vdso.c | 5 ++-- arch/mips/mm/Makefile | 2 ++ arch/mips/mm/physaddr.c | 56 ++++++++++++++++++++++++++++++++++++ 6 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 arch/mips/mm/physaddr.c
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]