Skip to content

Commit

Permalink
[PATCH] x86-64: use lru instead of page->index and page->private for …
Browse files Browse the repository at this point in the history
…pgd lists management.

x86_64 currently simulates a list using the index and private fields of the
page struct.  Seems that the code was inherited from i386.  But x86_64 does
not use the slab to allocate pgds and pmds etc.  So the lru field is not
used by the slab and therefore available.

This patch uses standard list operations on page->lru to realize pgd
tracking.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Christoph Lameter authored and Andi Kleen committed May 2, 2007
1 parent 05f3692 commit 2bff738
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
5 changes: 2 additions & 3 deletions arch/x86_64/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
}

DEFINE_SPINLOCK(pgd_lock);
struct page *pgd_list;
LIST_HEAD(pgd_list);

void vmalloc_sync_all(void)
{
Expand All @@ -605,8 +605,7 @@ void vmalloc_sync_all(void)
if (pgd_none(*pgd_ref))
continue;
spin_lock(&pgd_lock);
for (page = pgd_list; page;
page = (struct page *)page->index) {
list_for_each_entry(page, &pgd_list, lru) {
pgd_t *pgd;
pgd = (pgd_t *)page_address(page) + pgd_index(address);
if (pgd_none(*pgd))
Expand Down
14 changes: 3 additions & 11 deletions include/asm-x86_64/pgalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,16 @@ static inline void pgd_list_add(pgd_t *pgd)
struct page *page = virt_to_page(pgd);

spin_lock(&pgd_lock);
page->index = (pgoff_t)pgd_list;
if (pgd_list)
pgd_list->private = (unsigned long)&page->index;
pgd_list = page;
page->private = (unsigned long)&pgd_list;
list_add(&page->lru, &pgd_list);
spin_unlock(&pgd_lock);
}

static inline void pgd_list_del(pgd_t *pgd)
{
struct page *next, **pprev, *page = virt_to_page(pgd);
struct page *page = virt_to_page(pgd);

spin_lock(&pgd_lock);
next = (struct page *)page->index;
pprev = (struct page **)page->private;
*pprev = next;
if (next)
next->private = (unsigned long)pprev;
list_del(&page->lru);
spin_unlock(&pgd_lock);
}

Expand Down
2 changes: 1 addition & 1 deletion include/asm-x86_64/pgtable.h
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })

extern spinlock_t pgd_lock;
extern struct page *pgd_list;
extern struct list_head pgd_list;
void vmalloc_sync_all(void);

extern int kern_addr_valid(unsigned long addr);
Expand Down

0 comments on commit 2bff738

Please sign in to comment.