MIPS: Fixed __debug_virt_addr_valid()
PATCH 1/1 MIPS: Fixed __debug_virt_addr_valid()
It is permissible for kernel code to call virt_to_phys() against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.
--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/mips/mm/physaddr.c +2 -1
@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h>
@@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ; }phys_addr_t __virt_to_phys (volatile const void *x)
Signature · 1 line
2.25.1
Quoted 24 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +1
-0@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h>
arch/mips/mm/physaddr.c static inline bool __debug_virt_addr_valid(unsigned long x) · line 35
Quoted 6 lines
arch/mips/mm/physaddr.c +1
-1@@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ;
With this do we really need the high_memory-based conditionals in this method?
If the line above is the only way to take the uncached segment into account then can we reduce the whole method to:
static inline bool __debug_virt_addr_valid {
return x >= PAGE_OFFSET && KSEGX(x) < KSEG2;
}?
Though this still may be invalid for EVA systems, like malta (see arch/mips/include/asm/mach-malta/spaces.h).
Note AFAICS if EVA is enabled, highmem is implied to be disabled (see the CPU_MIPS32_3_5_EVA config utilization and HIGHMEM config dependencies). Thus all the memory is supposed to be linearly mapped in that case.
-Sergey
Quoted 6 lines
arch/mips/mm/physaddr.c +0
-0}
phys_addr_t__virt_to_phys(volatile const void *x)Signature · 1 line
2.25.1
Quoted 42 lines · Serge Semin
Quoted 24 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +1
-0@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> arch/mips/mm/physaddr.c static inline bool __debug_virt_addr_valid(unsigned long x) · line 35
Quoted 6 lines
arch/mips/mm/physaddr.c +1
-1@@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ;With this do we really need the high_memory-based conditionals in this method?
If the line above is the only way to take the uncached segment into account then can we reduce the whole method to:
static inline bool __debug_virt_addr_valid { return x >= PAGE_OFFSET && KSEGX(x) < KSEG2; }?
Quoted 7 lines
Though this still may be invalid for EVA systems, like malta (see
arch/mips/include/asm/mach-malta/spaces.h).Note AFAICS if EVA is enabled, highmem is implied to be disabled (see the
CPU_MIPS32_3_5_EVAconfig utilization and HIGHMEM config dependencies). Thus all the memory is supposed to be linearly mapped in that case.
OK, so if all of the memory is linearly mapped, then I am not too sure what we will be able to check, which is in essence pretty similar to what happens on MIPS64, right?
Maybe DEBUG_VIRTUAL should depend on !EVA as well?
Signature · 1 line
Florian
Quoted 50 lines · Florian Fainelli
Quoted 40 lines · Serge Semin
Quoted 23 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +1
-0@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> arch/mips/mm/physaddr.c static inline bool __debug_virt_addr_valid(unsigned long x) · line 34
Quoted 5 lines
arch/mips/mm/physaddr.c +1
-1@@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ;With this do we really need the high_memory-based conditionals in this method?
If the line above is the only way to take the uncached segment into account then can we reduce the whole method to:
static inline bool __debug_virt_addr_valid { return x >= PAGE_OFFSET && KSEGX(x) < KSEG2; }?
Quoted 7 lines
Though this still may be invalid for EVA systems, like malta (see
arch/mips/include/asm/mach-malta/spaces.h).Note AFAICS if EVA is enabled, highmem is implied to be disabled (see the
CPU_MIPS32_3_5_EVAconfig utilization and HIGHMEM config dependencies). Thus all the memory is supposed to be linearly mapped in that case.
Quoted 3 lines
OK, so if all of the memory is linearly mapped, then I am not too sure what we will be able to check, which is in essence pretty similar to what happens on MIPS64, right?
Essence is right, but in general situation is more complicated. Basically EVA (seems like a Bible reference...) provides a way to change the traditional MIPS memory address space to pretty much any within 4GB virtual-to-physical address mapping. Most importantly it can be used to eliminate the limitation of having just 512MB of the directly mapped memory in kernel.
Anyway neither MIPS HIGHMEM kernel config nor the Malta's EVA mode don't imply having high-memory enabled in case of EVAs. Most likely the constraint has been set due to the MIPS arch code too much relying on the traditional address space mapping. So the high-memory part just wasn't fixed to be properly working in that case, while the CPU MMU-type segments can still be defined for EVA. As the comment in the Malta spaces.h header file says HIGHMEM_START is preserved just for the correct high-mem macros arithmetics.
Just to note. Lack of high-memory in case of EVA is a big drawback because some physical memory gets to be unavailable. At the very least 512MB segment must be preserved for the uncached kernel region for MMIOs. Not to say that XPA won't work without high-memory. So it's either XPA (greater than 4GB physical memory) or EVA (up to 3.5GB directly mapped kernel memory). So annoying.
Quoted 2 lines
Maybe
DEBUG_VIRTUALshould depend on !EVA as well?
In that case the debug-version of __phys_addr_symbol() will be unavailable too. I would rather suggest to fix the __debug_virt_addr_valid() method implementation to at least returning always true in case of EVA or !HIGHMEM.
-Sergey
Quoted 2 lines
Signature · 1 line
Florian
Quoted 34 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +2
-1@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> @@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ; }phys_addr_t __virt_to_phys (volatile const void *x)Signature · 1 line
2.25.1
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 ]
Quoted 32 lines · Thomas Bogendoerfer
Quoted 31 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +2
-1@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> @@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ; }
Quoted 6 lines
Quoted 3 lines
arch/mips/mm/physaddr.c +0
-0phys_addr_t __virt_to_phys (volatile const void *x)Signature · 1 line
2.25.1applied to mips-next.
Are you sure it was ready to be applied?
-Sergey
Quoted 6 lines
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Thomas Bogendoerfer
maintainerQuoted 38 lines · Serge Semin
Quoted 36 lines · Thomas Bogendoerfer
Quoted 34 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +2
-1@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> @@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ; }phys_addr_t __virt_to_phys (volatile const void *x)Signature · 1 line
2.25.1
Quoted 4 lines
Quoted 1 line
applied to mips-next.
Are you sure it was ready to be applied?
your comment sounded like optimizing, which can be done later on, so I assumed it ready.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 39 lines · Thomas Bogendoerfer
Quoted 38 lines · Serge Semin
Quoted 36 lines · Thomas Bogendoerfer
Quoted 34 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +2
-1@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> @@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ; }phys_addr_t __virt_to_phys (volatile const void *x)Signature · 1 line
2.25.1
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
applied to mips-next.
Are you sure it was ready to be applied?
your comment sounded like optimizing, which can be done later on, so I assumed it ready.
What about Malta and EVA?
-Sergey
Quoted 6 lines
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
Quoted 42 lines · Serge Semin
Quoted 41 lines · Thomas Bogendoerfer
Quoted 40 lines · Serge Semin
Quoted 38 lines · Thomas Bogendoerfer
Quoted 34 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +2
-1@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> @@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false; +return KSEGX (x) <KSEG2 ; }phys_addr_t __virt_to_phys (volatile const void *x)Signature · 1 line
2.25.1applied to mips-next.
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Are you sure it was ready to be applied?
your comment sounded like optimizing, which can be done later on, so I assumed it ready.
What about Malta and EVA?
Sergey's comment definitively need to be addressed, and I would not see the point in making an incremental change to a wrong fix. Can you drop that patch for now? Thanks!
Signature · 1 line
Florian
Thomas Bogendoerfer
maintainerQuoted 44 lines · Florian Fainelli
Quoted 43 lines · Serge Semin
Quoted 41 lines · Thomas Bogendoerfer
Quoted 39 lines · Serge Semin
Quoted 27 lines · Thomas Bogendoerfer
Quoted 26 lines · Florian Fainelli
It is permissible for kernel code to call
virt_to_phys()against virtual addresses that are in KSEG0 or KSEG1 and we need to be dealing with both types. Add a final condition that ensures that the virtual address is below KSEG2.Fixes dfad83cb7193 ("MIPS: Add support for CONFIG_DEBUG_VIRTUAL")Signed-off-by Florian Fainelli <[email protected]>--- arch/mips/mm/physaddr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/mips/mm/physaddr.c +1
-1@@ -5,6 +5,7 @@#include <linux/mmdebug.h> #include <linux/mm.h> +#include <asm/addrspace.h> #include <asm/sections.h> #include <asm/io.h> #include <asm/page.h> @@ -30,7 +31,7 @@ static inline bool __debug_virt_addr_valid(unsigned long x)if (x ==MAX_DMA_ADDRESS )return true; -return false;Quoted 8 lines
Quoted 5 lines
arch/mips/mm/physaddr.c +1
-0+return KSEGX (x) <KSEG2 ; }phys_addr_t __virt_to_phys (volatile const void *x)Signature · 1 line
2.25.1applied to mips-next.
Are you sure it was ready to be applied?
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
your comment sounded like optimizing, which can be done later on, so I assumed it ready.
What about Malta and EVA?
Sergey's comment definitively need to be addressed, and I would not see the point in making an incremental change to a wrong fix. Can you drop that patch for now? Thanks!
dropped.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]