Skip to content

Commit

Permalink
xen/p2m: Use SetPagePrivate and its friends for M2P overrides.
Browse files Browse the repository at this point in the history
We use the page->private field and hence should use the proper
macros and set proper bits. Also WARN_ON in case somebody
tries to overwrite our data.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Konrad Rzeszutek Wilk committed Sep 24, 2011
1 parent a867db1 commit 0f4b49e
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions arch/x86/xen/p2m.c
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,9 @@ int m2p_add_override(unsigned long mfn, struct page *page, bool clear_pte)
"m2p_add_override: pfn %lx not mapped", pfn))
return -EINVAL;
}

page->private = mfn;
WARN_ON(PagePrivate(page));
SetPagePrivate(page);
set_page_private(page, mfn);
page->index = pfn_to_mfn(pfn);

if (unlikely(!set_phys_to_machine(pfn, FOREIGN_FRAME(mfn))))
Expand Down Expand Up @@ -736,7 +737,8 @@ int m2p_remove_override(struct page *page, bool clear_pte)
list_del(&page->lru);
spin_unlock_irqrestore(&m2p_override_lock, flags);
set_phys_to_machine(pfn, page->index);

WARN_ON(!PagePrivate(page));
ClearPagePrivate(page);
if (clear_pte && !PageHighMem(page))
set_pte_at(&init_mm, address, ptep,
pfn_pte(pfn, PAGE_KERNEL));
Expand All @@ -758,7 +760,7 @@ struct page *m2p_find_override(unsigned long mfn)
spin_lock_irqsave(&m2p_override_lock, flags);

list_for_each_entry(p, bucket, lru) {
if (p->private == mfn) {
if (page_private(p) == mfn) {
ret = p;
break;
}
Expand Down

0 comments on commit 0f4b49e

Please sign in to comment.