mirror of
https://github.com/torvalds/linux.git
synced 2024-09-28 19:03:08 +00:00
7d74275d39
I submitted an earlier patch that make __phys_addr an inline. This obviously results in an increase in the code size. One step I can take to reduce that is to make it so that the __pa_symbol call does a direct translation for kernel addresses instead of covering all of virtual memory. On my system this reduced the size for __pa_symbol from 5 instructions totalling 30 bytes to 3 instructions totalling 16 bytes. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Link: http://lkml.kernel.org/r/20121116215356.8521.92472.stgit@ahduyck-cp1.jf.intel.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
92 lines
2.0 KiB
C
92 lines
2.0 KiB
C
#include <linux/mmdebug.h>
|
|
#include <linux/module.h>
|
|
#include <linux/mm.h>
|
|
|
|
#include <asm/page.h>
|
|
|
|
#include "physaddr.h"
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
#ifdef CONFIG_DEBUG_VIRTUAL
|
|
unsigned long __phys_addr(unsigned long x)
|
|
{
|
|
unsigned long y = x - __START_KERNEL_map;
|
|
|
|
/* use the carry flag to determine if x was < __START_KERNEL_map */
|
|
if (unlikely(x > y)) {
|
|
x = y + phys_base;
|
|
|
|
VIRTUAL_BUG_ON(y >= KERNEL_IMAGE_SIZE);
|
|
} else {
|
|
x = y + (__START_KERNEL_map - PAGE_OFFSET);
|
|
|
|
/* carry flag will be set if starting x was >= PAGE_OFFSET */
|
|
VIRTUAL_BUG_ON((x > y) || !phys_addr_valid(x));
|
|
}
|
|
|
|
return x;
|
|
}
|
|
EXPORT_SYMBOL(__phys_addr);
|
|
|
|
unsigned long __phys_addr_symbol(unsigned long x)
|
|
{
|
|
unsigned long y = x - __START_KERNEL_map;
|
|
|
|
/* only check upper bounds since lower bounds will trigger carry */
|
|
VIRTUAL_BUG_ON(y >= KERNEL_IMAGE_SIZE);
|
|
|
|
return y + phys_base;
|
|
}
|
|
EXPORT_SYMBOL(__phys_addr_symbol);
|
|
#endif
|
|
|
|
bool __virt_addr_valid(unsigned long x)
|
|
{
|
|
unsigned long y = x - __START_KERNEL_map;
|
|
|
|
/* use the carry flag to determine if x was < __START_KERNEL_map */
|
|
if (unlikely(x > y)) {
|
|
x = y + phys_base;
|
|
|
|
if (y >= KERNEL_IMAGE_SIZE)
|
|
return false;
|
|
} else {
|
|
x = y + (__START_KERNEL_map - PAGE_OFFSET);
|
|
|
|
/* carry flag will be set if starting x was >= PAGE_OFFSET */
|
|
if ((x > y) || !phys_addr_valid(x))
|
|
return false;
|
|
}
|
|
|
|
return pfn_valid(x >> PAGE_SHIFT);
|
|
}
|
|
EXPORT_SYMBOL(__virt_addr_valid);
|
|
|
|
#else
|
|
|
|
#ifdef CONFIG_DEBUG_VIRTUAL
|
|
unsigned long __phys_addr(unsigned long x)
|
|
{
|
|
/* VMALLOC_* aren't constants */
|
|
VIRTUAL_BUG_ON(x < PAGE_OFFSET);
|
|
VIRTUAL_BUG_ON(__vmalloc_start_set && is_vmalloc_addr((void *) x));
|
|
return x - PAGE_OFFSET;
|
|
}
|
|
EXPORT_SYMBOL(__phys_addr);
|
|
#endif
|
|
|
|
bool __virt_addr_valid(unsigned long x)
|
|
{
|
|
if (x < PAGE_OFFSET)
|
|
return false;
|
|
if (__vmalloc_start_set && is_vmalloc_addr((void *) x))
|
|
return false;
|
|
if (x >= FIXADDR_START)
|
|
return false;
|
|
return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);
|
|
}
|
|
EXPORT_SYMBOL(__virt_addr_valid);
|
|
|
|
#endif /* CONFIG_X86_64 */
|