25ba77c141
NUMA node ids are passed as either int or unsigned int almost exclusivly page_to_nid and zone_to_nid both return unsigned long. This is a throw back to when page_to_nid was a #define and was thus exposing the real type of the page flags field. In addition to fixing up the definitions of page_to_nid and zone_to_nid I audited the users of these functions identifying the following incorrect uses: 1) mm/page_alloc.c show_node() -- printk dumping the node id, 2) include/asm-ia64/pgalloc.h pgtable_quicklist_free() -- comparison against numa_node_id() which returns an int from cpu_to_node(), and 3) mm/mpolicy.c check_pte_range -- used as an index in node_isset which uses bit_set which in generic code takes an int. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Cc: Christoph Lameter <clameter@engr.sgi.com> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
164 lines
3.5 KiB
C
164 lines
3.5 KiB
C
#ifndef _ASM_IA64_PGALLOC_H
|
|
#define _ASM_IA64_PGALLOC_H
|
|
|
|
/*
|
|
* This file contains the functions and defines necessary to allocate
|
|
* page tables.
|
|
*
|
|
* This hopefully works with any (fixed) ia-64 page-size, as defined
|
|
* in <asm/page.h> (currently 8192).
|
|
*
|
|
* Copyright (C) 1998-2001 Hewlett-Packard Co
|
|
* David Mosberger-Tang <davidm@hpl.hp.com>
|
|
* Copyright (C) 2000, Goutham Rao <goutham.rao@intel.com>
|
|
*/
|
|
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/page-flags.h>
|
|
#include <linux/threads.h>
|
|
|
|
#include <asm/mmu_context.h>
|
|
|
|
DECLARE_PER_CPU(unsigned long *, __pgtable_quicklist);
|
|
#define pgtable_quicklist __ia64_per_cpu_var(__pgtable_quicklist)
|
|
DECLARE_PER_CPU(long, __pgtable_quicklist_size);
|
|
#define pgtable_quicklist_size __ia64_per_cpu_var(__pgtable_quicklist_size)
|
|
|
|
static inline long pgtable_quicklist_total_size(void)
|
|
{
|
|
long ql_size = 0;
|
|
int cpuid;
|
|
|
|
for_each_online_cpu(cpuid) {
|
|
ql_size += per_cpu(__pgtable_quicklist_size, cpuid);
|
|
}
|
|
return ql_size;
|
|
}
|
|
|
|
static inline void *pgtable_quicklist_alloc(void)
|
|
{
|
|
unsigned long *ret = NULL;
|
|
|
|
preempt_disable();
|
|
|
|
ret = pgtable_quicklist;
|
|
if (likely(ret != NULL)) {
|
|
pgtable_quicklist = (unsigned long *)(*ret);
|
|
ret[0] = 0;
|
|
--pgtable_quicklist_size;
|
|
preempt_enable();
|
|
} else {
|
|
preempt_enable();
|
|
ret = (unsigned long *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static inline void pgtable_quicklist_free(void *pgtable_entry)
|
|
{
|
|
#ifdef CONFIG_NUMA
|
|
int nid = page_to_nid(virt_to_page(pgtable_entry));
|
|
|
|
if (unlikely(nid != numa_node_id())) {
|
|
free_page((unsigned long)pgtable_entry);
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
preempt_disable();
|
|
*(unsigned long *)pgtable_entry = (unsigned long)pgtable_quicklist;
|
|
pgtable_quicklist = (unsigned long *)pgtable_entry;
|
|
++pgtable_quicklist_size;
|
|
preempt_enable();
|
|
}
|
|
|
|
static inline pgd_t *pgd_alloc(struct mm_struct *mm)
|
|
{
|
|
return pgtable_quicklist_alloc();
|
|
}
|
|
|
|
static inline void pgd_free(pgd_t * pgd)
|
|
{
|
|
pgtable_quicklist_free(pgd);
|
|
}
|
|
|
|
#ifdef CONFIG_PGTABLE_4
|
|
static inline void
|
|
pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
|
|
{
|
|
pgd_val(*pgd_entry) = __pa(pud);
|
|
}
|
|
|
|
static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
|
|
{
|
|
return pgtable_quicklist_alloc();
|
|
}
|
|
|
|
static inline void pud_free(pud_t * pud)
|
|
{
|
|
pgtable_quicklist_free(pud);
|
|
}
|
|
#define __pud_free_tlb(tlb, pud) pud_free(pud)
|
|
#endif /* CONFIG_PGTABLE_4 */
|
|
|
|
static inline void
|
|
pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
|
|
{
|
|
pud_val(*pud_entry) = __pa(pmd);
|
|
}
|
|
|
|
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
|
|
{
|
|
return pgtable_quicklist_alloc();
|
|
}
|
|
|
|
static inline void pmd_free(pmd_t * pmd)
|
|
{
|
|
pgtable_quicklist_free(pmd);
|
|
}
|
|
|
|
#define __pmd_free_tlb(tlb, pmd) pmd_free(pmd)
|
|
|
|
static inline void
|
|
pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte)
|
|
{
|
|
pmd_val(*pmd_entry) = page_to_phys(pte);
|
|
}
|
|
|
|
static inline void
|
|
pmd_populate_kernel(struct mm_struct *mm, pmd_t * pmd_entry, pte_t * pte)
|
|
{
|
|
pmd_val(*pmd_entry) = __pa(pte);
|
|
}
|
|
|
|
static inline struct page *pte_alloc_one(struct mm_struct *mm,
|
|
unsigned long addr)
|
|
{
|
|
return virt_to_page(pgtable_quicklist_alloc());
|
|
}
|
|
|
|
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
|
|
unsigned long addr)
|
|
{
|
|
return pgtable_quicklist_alloc();
|
|
}
|
|
|
|
static inline void pte_free(struct page *pte)
|
|
{
|
|
pgtable_quicklist_free(page_address(pte));
|
|
}
|
|
|
|
static inline void pte_free_kernel(pte_t * pte)
|
|
{
|
|
pgtable_quicklist_free(pte);
|
|
}
|
|
|
|
#define __pte_free_tlb(tlb, pte) pte_free(pte)
|
|
|
|
extern void check_pgt_cache(void);
|
|
|
|
#endif /* _ASM_IA64_PGALLOC_H */
|