Commit 3afe9076 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:
 "Fix the arm64 linear map range detection for tagged addresses and
  replace the bitwise operations with subtract (virt_addr_valid(),
  __is_lm_address(), __lm_to_phys())"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Use simpler arithmetics for the linear map macros
  arm64: Do not pass tagged addresses to __is_lm_address()
parents dbc15d24 22cd5edb

arch/arm64/include/asm/memory.h

+3 −3
Original line number Diff line number Diff line
@@ -251,9 +251,9 @@ static inline const void *__tag_set(const void *addr, u8 tag) 
 * lives in the [PAGE_OFFSET, PAGE_END) interval at the bottom of the

 * kernel's TTBR1 address range.

 */

#define __is_lm_address(addr)	(((u64)(addr) ^ PAGE_OFFSET) < (PAGE_END - PAGE_OFFSET))

#define __is_lm_address(addr)	(((u64)(addr) - PAGE_OFFSET) < (PAGE_END - PAGE_OFFSET))



#define __lm_to_phys(addr)	(((addr) & ~PAGE_OFFSET) + PHYS_OFFSET)

#define __lm_to_phys(addr)	(((addr) - PAGE_OFFSET) + PHYS_OFFSET)

#define __kimg_to_phys(addr)	((addr) - kimage_voffset)



#define __virt_to_phys_nodebug(x) ({					\
@@ -332,7 +332,7 @@ static inline void *phys_to_virt(phys_addr_t x) 
#endif /* !CONFIG_SPARSEMEM_VMEMMAP || CONFIG_DEBUG_VIRTUAL */



#define virt_addr_valid(addr)	({					\

	__typeof__(addr) __addr = addr;					\

	__typeof__(addr) __addr = __tag_reset(addr);			\

	__is_lm_address(__addr) && pfn_valid(virt_to_pfn(__addr));	\

})

arch/arm64/mm/physaddr.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


phys_addr_t __virt_to_phys(unsigned long x)

{

	WARN(!__is_lm_address(x),

	WARN(!__is_lm_address(__tag_reset(x)),

	     "virt_to_phys used for non-linear address: %pK (%pS)\n",

	      (void *)x,

	      (void *)x);