Attachment 302107 Details for Bug 441543 – batch-update-va-mapping-and-pin.patch

[patch] batch-update-va-mapping-and-pin.patch

batch-update-va-mapping-and-pin.patch (text/plain), 1.74 KB, created by Mark McLoughlin on 2008-04-11 12:14:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark McLoughlin

Created: 2008-04-11 12:14:08 UTC

Size: 1.74 KB

patch

obsolete

>diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
>index 0a2ace7..e124cc6 100644
>--- a/arch/x86/xen/enlighten.c
>+++ b/arch/x86/xen/enlighten.c
>@@ -807,6 +807,24 @@ static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
> 		BUG();
> }
> 
>+static void make_ptpage_readonly(void *vaddr, unsigned readonly)
>+{
>+	pte_t *pte, ptev;
>+	unsigned long address = (unsigned long)vaddr;
>+	unsigned int level;
>+	struct multicall_space mcs = __xen_mc_entry(0);
>+
>+	pte = lookup_address(address, &level);
>+	BUG_ON(pte == NULL);
>+
>+	if (readonly)
>+		ptev = pte_wrprotect(*pte);
>+	else
>+		ptev = pte_mkwrite(*pte);
>+
>+	MULTI_update_va_mapping(mcs.mc, address, ptev, 0);
>+}
>+
> /* This needs to make sure the new pte page is pinned iff its being
>    attached to a pinned pagetable. */
> static void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn,
>@@ -818,9 +836,11 @@ static void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn,
> 		SetPagePinned(page);
> 
> 		if (!PageHighMem(page)) {
>-			make_lowmem_page_readonly(__va(PFN_PHYS(pfn)));
>+			xen_mc_batch();
>+			make_ptpage_readonly(__va(PFN_PHYS(pfn)), 1);
> 			if (level == PT_PTE)
>-				pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn);
>+				xen_do_pin(MMUEXT_PIN_L1_TABLE, pfn);
>+			xen_mc_issue(0);
> 		} else
> 			/* make sure there are no stray mappings of
> 			   this page */
>@@ -845,9 +865,11 @@ static void xen_release_ptpage(unsigned long pfn, unsigned level)
> 
> 	if (PagePinned(page)) {
> 		if (!PageHighMem(page)) {
>+			xen_mc_batch();
> 			if (level == PT_PTE)
>-				pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn);
>-			make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
>+				xen_do_pin(MMUEXT_UNPIN_TABLE, pfn);
>+			make_ptpage_readonly(__va(PFN_PHYS(pfn)), 0);
>+			xen_mc_issue(0);
> 		}
> 		ClearPagePinned(page);
> 	}

Actions: View | Diff

Attachments on bug 441543: 301790 | 301840 | 302107 | 302525