#include <asm/e820.h>
#include <asm/tlb.h>
#include <asm/tlbflush.h>
-#include <asm/atomic_kmap.h>
void show_mem(void)
{
struct page *page;
pg_data_t *pgdat;
unsigned long i;
+ struct page_state ps;
+ unsigned long flags;
- printk("Mem-info:\n");
+ printk(KERN_INFO "Mem-info:\n");
show_free_areas();
- printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
- for_each_pgdat(pgdat) {
+ printk(KERN_INFO "Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
+ for_each_online_pgdat(pgdat) {
+ pgdat_resize_lock(pgdat, &flags);
for (i = 0; i < pgdat->node_spanned_pages; ++i) {
- page = pgdat->node_mem_map + i;
+ page = pgdat_page_nr(pgdat, i);
total++;
if (PageHighMem(page))
highmem++;
else if (page_count(page))
shared += page_count(page) - 1;
}
+ pgdat_resize_unlock(pgdat, &flags);
}
- printk("%d pages of RAM\n", total);
- printk("%d pages of HIGHMEM\n",highmem);
- printk("%d reserved pages\n",reserved);
- printk("%d pages shared\n",shared);
- printk("%d pages swap cached\n",cached);
+ printk(KERN_INFO "%d pages of RAM\n", total);
+ printk(KERN_INFO "%d pages of HIGHMEM\n", highmem);
+ printk(KERN_INFO "%d reserved pages\n", reserved);
+ printk(KERN_INFO "%d pages shared\n", shared);
+ printk(KERN_INFO "%d pages swap cached\n", cached);
+
+ get_page_state(&ps);
+ printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty);
+ printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);
+ printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped);
+ printk(KERN_INFO "%lu pages slab\n", ps.nr_slab);
+ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);
}
-EXPORT_SYMBOL_GPL(show_mem);
-
/*
* Associate a virtual page frame with a given physical page frame
* and protection flags for that frame.
static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
{
pgd_t *pgd;
+ pud_t *pud;
pmd_t *pmd;
pte_t *pte;
BUG();
return;
}
- pmd = pmd_offset(pgd, vaddr);
+ pud = pud_offset(pgd, vaddr);
+ if (pud_none(*pud)) {
+ BUG();
+ return;
+ }
+ pmd = pmd_offset(pud, vaddr);
if (pmd_none(*pmd)) {
BUG();
return;
void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
{
pgd_t *pgd;
+ pud_t *pud;
pmd_t *pmd;
if (vaddr & (PMD_SIZE-1)) { /* vaddr is misaligned */
- printk ("set_pmd_pfn: vaddr misaligned\n");
+ printk(KERN_WARNING "set_pmd_pfn: vaddr misaligned\n");
return; /* BUG(); */
}
if (pfn & (PTRS_PER_PTE-1)) { /* pfn is misaligned */
- printk ("set_pmd_pfn: pfn misaligned\n");
+ printk(KERN_WARNING "set_pmd_pfn: pfn misaligned\n");
return; /* BUG(); */
}
pgd = swapper_pg_dir + pgd_index(vaddr);
if (pgd_none(*pgd)) {
- printk ("set_pmd_pfn: pgd_none\n");
+ printk(KERN_WARNING "set_pmd_pfn: pgd_none\n");
return; /* BUG(); */
}
- pmd = pmd_offset(pgd, vaddr);
+ pud = pud_offset(pgd, vaddr);
+ pmd = pmd_offset(pud, vaddr);
set_pmd(pmd, pfn_pmd(pfn, flags));
/*
* It's enough to flush this one mapping.
__flush_tlb_one(vaddr);
}
+static int nr_fixmaps = 0;
+unsigned long __FIXADDR_TOP = 0xfffff000;
+EXPORT_SYMBOL(__FIXADDR_TOP);
+
void __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t flags)
{
unsigned long address = __fix_to_virt(idx);
return;
}
set_pte_pfn(address, phys >> PAGE_SHIFT, flags);
+ nr_fixmaps++;
+}
+
+void set_fixaddr_top(unsigned long top)
+{
+ BUG_ON(nr_fixmaps > 0);
+ __FIXADDR_TOP = top - PAGE_SIZE;
}
pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{
- pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
- if (pte)
- clear_page(pte);
- return pte;
+ return (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
}
struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
struct page *pte;
#ifdef CONFIG_HIGHPTE
- pte = alloc_pages(GFP_KERNEL|__GFP_HIGHMEM|__GFP_REPEAT, 0);
+ pte = alloc_pages(GFP_KERNEL|__GFP_HIGHMEM|__GFP_REPEAT|__GFP_ZERO, 0);
#else
- pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0);
+ pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0);
#endif
- if (pte)
- clear_highpage(pte);
return pte;
}
memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
}
-void kpmd_ctor(void *__pmd, kmem_cache_t *cache, unsigned long flags)
-{
- pmd_t *kpmd, *pmd;
- kpmd = pmd_offset(&swapper_pg_dir[PTRS_PER_PGD-1],
- (PTRS_PER_PMD - NR_SHARED_PMDS)*PMD_SIZE);
- pmd = (pmd_t *)__pmd + (PTRS_PER_PMD - NR_SHARED_PMDS);
-
- memset(__pmd, 0, (PTRS_PER_PMD - NR_SHARED_PMDS)*sizeof(pmd_t));
- memcpy(pmd, kpmd, NR_SHARED_PMDS*sizeof(pmd_t));
-}
-
/*
- * List of all pgd's needed so it can invalidate entries in both cached
- * and uncached pgd's. This is essentially codepath-based locking
+ * List of all pgd's needed for non-PAE so it can invalidate entries
+ * in both cached and uncached pgd's; not needed for PAE since the
+ * kernel pmd is shared. If PAE were not to share the pmd a similar
+ * tactic would be needed. This is essentially codepath-based locking
* against pageattr.c; it is the unique case in which a valid change
* of kernel pagetables can't be lazily synchronized by vmalloc faults.
* vmalloc faults work because attached pagetables are never freed.
- * If the locking proves to be non-performant, a ticketing scheme with
- * checks at dup_mmap(), exec(), and other mmlist addition points
- * could be used. The locking scheme was chosen on the basis of
- * manfred's recommendations and having no core impact whatsoever.
- *
- * Lexicon for #ifdefless conditions to config options:
- * (a) PTRS_PER_PMD == 1 means non-PAE.
- * (b) PTRS_PER_PMD > 1 means PAE.
- * (c) TASK_SIZE > PAGE_OFFSET means 4:4.
- * (d) TASK_SIZE <= PAGE_OFFSET means non-4:4.
+ * The locking scheme was chosen on the basis of manfred's
+ * recommendations and having no core impact whatsoever.
* -- wli
*/
-spinlock_t pgd_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(pgd_lock);
struct page *pgd_list;
static inline void pgd_list_add(pgd_t *pgd)
struct page *page = virt_to_page(pgd);
page->index = (unsigned long)pgd_list;
if (pgd_list)
- pgd_list->private = (unsigned long)&page->index;
+ set_page_private(pgd_list, (unsigned long)&page->index);
pgd_list = page;
- page->private = (unsigned long)&pgd_list;
+ set_page_private(page, (unsigned long)&pgd_list);
}
static inline void pgd_list_del(pgd_t *pgd)
{
struct page *next, **pprev, *page = virt_to_page(pgd);
next = (struct page *)page->index;
- pprev = (struct page **)page->private;
+ pprev = (struct page **)page_private(page);
*pprev = next;
if (next)
- next->private = (unsigned long)pprev;
+ set_page_private(next, (unsigned long)pprev);
}
-void pgd_ctor(void *__pgd, kmem_cache_t *cache, unsigned long unused)
+void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
{
- pgd_t *pgd = __pgd;
unsigned long flags;
if (PTRS_PER_PMD == 1) {
- if (TASK_SIZE <= PAGE_OFFSET)
- spin_lock_irqsave(&pgd_lock, flags);
- else
- memcpy(&pgd[PTRS_PER_PGD - NR_SHARED_PMDS],
- &swapper_pg_dir[PTRS_PER_PGD - NR_SHARED_PMDS],
- NR_SHARED_PMDS*sizeof(pgd_t));
+ memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
+ spin_lock_irqsave(&pgd_lock, flags);
}
- if (TASK_SIZE <= PAGE_OFFSET)
- memcpy(&pgd[USER_PTRS_PER_PGD],
- &swapper_pg_dir[USER_PTRS_PER_PGD],
- (PTRS_PER_PGD - USER_PTRS_PER_PGD)*sizeof(pgd_t));
-
+ clone_pgd_range((pgd_t *)pgd + USER_PTRS_PER_PGD,
+ swapper_pg_dir + USER_PTRS_PER_PGD,
+ KERNEL_PGD_PTRS);
if (PTRS_PER_PMD > 1)
return;
- if (TASK_SIZE > PAGE_OFFSET)
- memset(pgd, 0, (PTRS_PER_PGD - NR_SHARED_PMDS)*sizeof(pgd_t));
- else {
- pgd_list_add(pgd);
- spin_unlock_irqrestore(&pgd_lock, flags);
- memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
- }
+ pgd_list_add(pgd);
+ spin_unlock_irqrestore(&pgd_lock, flags);
}
-/* Never called when PTRS_PER_PMD > 1 || TASK_SIZE > PAGE_OFFSET */
+/* never called when PTRS_PER_PMD > 1 */
void pgd_dtor(void *pgd, kmem_cache_t *cache, unsigned long unused)
{
unsigned long flags; /* can be called from interrupt context */
if (PTRS_PER_PMD == 1 || !pgd)
return pgd;
- /*
- * In the 4G userspace case alias the top 16 MB virtual
- * memory range into the user mappings as well (these
- * include the trampoline and CPU data structures).
- */
for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
- pmd_t *pmd;
-
- if (TASK_SIZE > PAGE_OFFSET && i == USER_PTRS_PER_PGD - 1)
- pmd = kmem_cache_alloc(kpmd_cache, GFP_KERNEL);
- else
- pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
-
+ pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
if (!pmd)
goto out_oom;
- set_pgd(&pgd[i], __pgd(1 + __pa((u64)((u32)pmd))));
+ set_pgd(&pgd[i], __pgd(1 + __pa(pmd)));
}
-
return pgd;
+
out_oom:
- /*
- * we don't have to handle the kpmd_cache here, since it's the
- * last allocation, and has either nothing to free or when it
- * succeeds the whole operation succeeds.
- */
for (i--; i >= 0; i--)
kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
kmem_cache_free(pgd_cache, pgd);
{
int i;
- /* in the non-PAE case, clear_page_tables() clears user pgd entries */
- if (PTRS_PER_PMD == 1)
- goto out_free;
-
/* in the PAE case user pgd entries are overwritten before usage */
- for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
- pmd_t *pmd = __va(pgd_val(pgd[i]) - 1);
-
- /*
- * only userspace pmd's are cleared for us
- * by mm/memory.c; it's a slab cache invariant
- * that we must separate the kernel pmd slab
- * all times, else we'll have bad pmd's.
- */
- if (TASK_SIZE > PAGE_OFFSET && i == USER_PTRS_PER_PGD - 1)
- kmem_cache_free(kpmd_cache, pmd);
- else
- kmem_cache_free(pmd_cache, pmd);
- }
-out_free:
+ if (PTRS_PER_PMD > 1)
+ for (i = 0; i < USER_PTRS_PER_PGD; ++i)
+ kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
+ /* in the non-PAE case, free_pgtables() clears user pgd entries */
kmem_cache_free(pgd_cache, pgd);
}
-
git://git.onelab.eu / linux-2.6.git / blobdiff