x86: convert to the new dynamic percpu allocator
Impact: use new dynamic allocator, unified access to static/dynamic percpu memory Convert to the new dynamic percpu allocator. * implement populate_extra_pte() for both 32 and 64 * update setup_per_cpu_areas() to use pcpu_setup_static() * define __addr_to_pcpu_ptr() and __pcpu_ptr_to_addr() * define config HAVE_DYNAMIC_PER_CPU_AREA Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
@@ -135,6 +135,9 @@ config ARCH_HAS_CACHE_LINE_SIZE
|
|||||||
config HAVE_SETUP_PER_CPU_AREA
|
config HAVE_SETUP_PER_CPU_AREA
|
||||||
def_bool y
|
def_bool y
|
||||||
|
|
||||||
|
config HAVE_DYNAMIC_PER_CPU_AREA
|
||||||
|
def_bool y
|
||||||
|
|
||||||
config HAVE_CPUMASK_OF_CPU_MAP
|
config HAVE_CPUMASK_OF_CPU_MAP
|
||||||
def_bool X86_64_SMP
|
def_bool X86_64_SMP
|
||||||
|
|
||||||
|
@@ -43,6 +43,14 @@
|
|||||||
#else /* ...!ASSEMBLY */
|
#else /* ...!ASSEMBLY */
|
||||||
|
|
||||||
#include <linux/stringify.h>
|
#include <linux/stringify.h>
|
||||||
|
#include <asm/sections.h>
|
||||||
|
|
||||||
|
#define __addr_to_pcpu_ptr(addr) \
|
||||||
|
(void *)((unsigned long)(addr) - (unsigned long)pcpu_base_addr \
|
||||||
|
+ (unsigned long)__per_cpu_start)
|
||||||
|
#define __pcpu_ptr_to_addr(ptr) \
|
||||||
|
(void *)((unsigned long)(ptr) + (unsigned long)pcpu_base_addr \
|
||||||
|
- (unsigned long)__per_cpu_start)
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
#define __percpu_arg(x) "%%"__stringify(__percpu_seg)":%P" #x
|
#define __percpu_arg(x) "%%"__stringify(__percpu_seg)":%P" #x
|
||||||
|
@@ -402,6 +402,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
|
|||||||
|
|
||||||
/* Install a pte for a particular vaddr in kernel space. */
|
/* Install a pte for a particular vaddr in kernel space. */
|
||||||
void set_pte_vaddr(unsigned long vaddr, pte_t pte);
|
void set_pte_vaddr(unsigned long vaddr, pte_t pte);
|
||||||
|
void populate_extra_pte(unsigned long vaddr);
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
extern void native_pagetable_setup_start(pgd_t *base);
|
extern void native_pagetable_setup_start(pgd_t *base);
|
||||||
|
@@ -61,38 +61,56 @@ static inline void setup_percpu_segment(int cpu)
|
|||||||
*/
|
*/
|
||||||
void __init setup_per_cpu_areas(void)
|
void __init setup_per_cpu_areas(void)
|
||||||
{
|
{
|
||||||
ssize_t size;
|
ssize_t size = __per_cpu_end - __per_cpu_start;
|
||||||
char *ptr;
|
unsigned int nr_cpu_pages = DIV_ROUND_UP(size, PAGE_SIZE);
|
||||||
int cpu;
|
static struct page **pages;
|
||||||
|
size_t pages_size;
|
||||||
/* Copy section for each CPU (we discard the original) */
|
unsigned int cpu, i, j;
|
||||||
size = roundup(PERCPU_ENOUGH_ROOM, PAGE_SIZE);
|
unsigned long delta;
|
||||||
|
size_t pcpu_unit_size;
|
||||||
|
|
||||||
pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n",
|
pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n",
|
||||||
NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);
|
NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids);
|
||||||
|
pr_info("PERCPU: Allocating %zd bytes for static per cpu data\n", size);
|
||||||
|
|
||||||
pr_info("PERCPU: Allocating %zd bytes of per cpu data\n", size);
|
pages_size = nr_cpu_pages * num_possible_cpus() * sizeof(pages[0]);
|
||||||
|
pages = alloc_bootmem(pages_size);
|
||||||
|
|
||||||
|
j = 0;
|
||||||
for_each_possible_cpu(cpu) {
|
for_each_possible_cpu(cpu) {
|
||||||
|
void *ptr;
|
||||||
|
|
||||||
|
for (i = 0; i < nr_cpu_pages; i++) {
|
||||||
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
||||||
ptr = alloc_bootmem_pages(size);
|
ptr = alloc_bootmem_pages(PAGE_SIZE);
|
||||||
#else
|
#else
|
||||||
int node = early_cpu_to_node(cpu);
|
int node = early_cpu_to_node(cpu);
|
||||||
|
|
||||||
if (!node_online(node) || !NODE_DATA(node)) {
|
if (!node_online(node) || !NODE_DATA(node)) {
|
||||||
ptr = alloc_bootmem_pages(size);
|
ptr = alloc_bootmem_pages(PAGE_SIZE);
|
||||||
pr_info("cpu %d has no node %d or node-local memory\n",
|
pr_info("cpu %d has no node %d or node-local "
|
||||||
cpu, node);
|
"memory\n", cpu, node);
|
||||||
pr_debug("per cpu data for cpu%d at %016lx\n",
|
pr_debug("per cpu data for cpu%d at %016lx\n",
|
||||||
cpu, __pa(ptr));
|
cpu, __pa(ptr));
|
||||||
} else {
|
} else {
|
||||||
ptr = alloc_bootmem_pages_node(NODE_DATA(node), size);
|
ptr = alloc_bootmem_pages_node(NODE_DATA(node),
|
||||||
pr_debug("per cpu data for cpu%d on node%d at %016lx\n",
|
PAGE_SIZE);
|
||||||
cpu, node, __pa(ptr));
|
pr_debug("per cpu data for cpu%d on node%d "
|
||||||
|
"at %016lx\n", cpu, node, __pa(ptr));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
memcpy(ptr, __per_cpu_load + i * PAGE_SIZE, PAGE_SIZE);
|
||||||
|
pages[j++] = virt_to_page(ptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
memcpy(ptr, __per_cpu_load, __per_cpu_end - __per_cpu_start);
|
pcpu_unit_size = pcpu_setup_static(populate_extra_pte, pages, size);
|
||||||
per_cpu_offset(cpu) = ptr - __per_cpu_start;
|
|
||||||
|
free_bootmem(__pa(pages), pages_size);
|
||||||
|
|
||||||
|
delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
|
||||||
|
for_each_possible_cpu(cpu) {
|
||||||
|
per_cpu_offset(cpu) = delta + cpu * pcpu_unit_size;
|
||||||
per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
|
per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
|
||||||
per_cpu(cpu_number, cpu) = cpu;
|
per_cpu(cpu_number, cpu) = cpu;
|
||||||
setup_percpu_segment(cpu);
|
setup_percpu_segment(cpu);
|
||||||
|
@@ -137,6 +137,16 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
|
|||||||
return pte_offset_kernel(pmd, 0);
|
return pte_offset_kernel(pmd, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void __init populate_extra_pte(unsigned long vaddr)
|
||||||
|
{
|
||||||
|
int pgd_idx = pgd_index(vaddr);
|
||||||
|
int pmd_idx = pmd_index(vaddr);
|
||||||
|
pmd_t *pmd;
|
||||||
|
|
||||||
|
pmd = one_md_table_init(swapper_pg_dir + pgd_idx);
|
||||||
|
one_page_table_init(pmd + pmd_idx);
|
||||||
|
}
|
||||||
|
|
||||||
static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd,
|
static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd,
|
||||||
unsigned long vaddr, pte_t *lastpte)
|
unsigned long vaddr, pte_t *lastpte)
|
||||||
{
|
{
|
||||||
|
@@ -223,6 +223,25 @@ set_pte_vaddr(unsigned long vaddr, pte_t pteval)
|
|||||||
set_pte_vaddr_pud(pud_page, vaddr, pteval);
|
set_pte_vaddr_pud(pud_page, vaddr, pteval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void __init populate_extra_pte(unsigned long vaddr)
|
||||||
|
{
|
||||||
|
pgd_t *pgd;
|
||||||
|
pud_t *pud;
|
||||||
|
|
||||||
|
pgd = pgd_offset_k(vaddr);
|
||||||
|
if (pgd_none(*pgd)) {
|
||||||
|
pud = (pud_t *)spp_getpage();
|
||||||
|
pgd_populate(&init_mm, pgd, pud);
|
||||||
|
if (pud != pud_offset(pgd, 0)) {
|
||||||
|
printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
|
||||||
|
pud, pud_offset(pgd, 0));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
set_pte_vaddr_pud((pud_t *)pgd_page_vaddr(*pgd), vaddr, __pte(0));
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Create large page table mappings for a range of physical addresses.
|
* Create large page table mappings for a range of physical addresses.
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user