* [PATCH][XEN] x86: cleanup mm.c
@ 2007-11-30 15:44 Christoph Egger
0 siblings, 0 replies; only message in thread
From: Christoph Egger @ 2007-11-30 15:44 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 713 bytes --]
Hi!
Attached patch caches current vcpu and current->domain where appropriate.
Make mod_l4_entry() definition matching with mod_l?_entry(). Since
current->domain was always passed to it, this has no functional change.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
--
AMD Saxony, Dresden, Germany
Operating System Research Center
Legal Information:
AMD Saxony Limited Liability Company & Co. KG
Sitz (Geschäftsanschrift):
Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland
Registergericht Dresden: HRA 4896
vertretungsberechtigter Komplementär:
AMD Saxony LLC (Sitz Wilmington, Delaware, USA)
Geschäftsführer der AMD Saxony LLC:
Dr. Hans-R. Deppe, Thomas McCoy
[-- Attachment #2: xen_mm.diff --]
[-- Type: text/plain, Size: 11840 bytes --]
diff -r 3057f813da14 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Thu Nov 29 19:30:33 2007 +0000
+++ b/xen/arch/x86/mm.c Fri Nov 30 18:43:22 2007 +0100
@@ -620,6 +620,7 @@ get_page_from_l1e(
unsigned long mfn = l1e_get_pfn(l1e);
struct page_info *page = mfn_to_page(mfn);
uint32_t l1f = l1e_get_flags(l1e);
+ struct vcpu *v = current;
int okay;
if ( !(l1f & _PAGE_PRESENT) )
@@ -635,7 +636,7 @@ get_page_from_l1e(
{
/* DOMID_IO reverts to caller for privilege checks. */
if ( d == dom_io )
- d = current->domain;
+ d = v->domain;
if ( !iomem_access_permitted(d, mfn, mfn) )
{
@@ -653,7 +654,7 @@ get_page_from_l1e(
* qemu-dm helper process in dom0 to map the domain's memory without
* messing up the count of "real" writable mappings.) */
okay = (((l1f & _PAGE_RW) &&
- !(unlikely(paging_mode_external(d) && (d != current->domain))))
+ !(unlikely(paging_mode_external(d) && (d != v->domain))))
? get_page_and_type(page, d, PGT_writable_page)
: get_page(page, d));
if ( !okay )
@@ -673,7 +674,7 @@ get_page_from_l1e(
{
if ( (l1f & _PAGE_RW) &&
!(unlikely(paging_mode_external(d) &&
- (d != current->domain))) )
+ (d != v->domain))) )
put_page_type(page);
put_page(page);
MEM_LOG("Attempt to change cache attributes of Xen heap page");
@@ -1384,14 +1385,15 @@ static int mod_l1_entry(l1_pgentry_t *pl
unsigned long gl1mfn)
{
l1_pgentry_t ol1e;
- struct domain *d = current->domain;
+ struct vcpu *v = current;
+ struct domain *d = v->domain;
unsigned long mfn;
if ( unlikely(__copy_from_user(&ol1e, pl1e, sizeof(ol1e)) != 0) )
return 0;
if ( unlikely(paging_mode_refcounts(d)) )
- return UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current);
+ return UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, v);
if ( l1e_get_flags(nl1e) & _PAGE_PRESENT )
{
@@ -1413,12 +1415,12 @@ static int mod_l1_entry(l1_pgentry_t *pl
/* Fast path for identical mapping, r/w and presence. */
if ( !l1e_has_changed(ol1e, nl1e, _PAGE_RW | _PAGE_PRESENT) )
- return UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current);
+ return UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, v);
if ( unlikely(!get_page_from_l1e(nl1e, FOREIGNDOM)) )
return 0;
- if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current)) )
+ if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, v)) )
{
put_page_from_l1e(nl1e, d);
return 0;
@@ -1426,7 +1428,7 @@ static int mod_l1_entry(l1_pgentry_t *pl
}
else
{
- if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, current)) )
+ if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, nl1e, gl1mfn, v)) )
return 0;
}
@@ -1442,7 +1444,8 @@ static int mod_l2_entry(l2_pgentry_t *pl
unsigned long type)
{
l2_pgentry_t ol2e;
- struct domain *d = current->domain;
+ struct vcpu *v = current;
+ struct domain *d = v->domain;
if ( unlikely(!is_guest_l2_slot(d, type, pgentry_ptr_to_slot(pl2e))) )
{
@@ -1466,18 +1469,18 @@ static int mod_l2_entry(l2_pgentry_t *pl
/* Fast path for identical mapping and presence. */
if ( !l2e_has_changed(ol2e, nl2e, _PAGE_PRESENT))
- return UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, current);
+ return UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, v);
if ( unlikely(!get_page_from_l2e(nl2e, pfn, d)) )
return 0;
- if ( unlikely(!UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, current)) )
+ if ( unlikely(!UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, v)) )
{
put_page_from_l2e(nl2e, pfn);
return 0;
}
}
- else if ( unlikely(!UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, current)) )
+ else if ( unlikely(!UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, v)) )
{
return 0;
}
@@ -1494,7 +1497,8 @@ static int mod_l3_entry(l3_pgentry_t *pl
unsigned long pfn)
{
l3_pgentry_t ol3e;
- struct domain *d = current->domain;
+ struct vcpu *v = current;
+ struct domain *d = v->domain;
int okay;
if ( unlikely(!is_guest_l3_slot(pgentry_ptr_to_slot(pl3e))) )
@@ -1528,18 +1532,18 @@ static int mod_l3_entry(l3_pgentry_t *pl
/* Fast path for identical mapping and presence. */
if (!l3e_has_changed(ol3e, nl3e, _PAGE_PRESENT))
- return UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current);
+ return UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, v);
if ( unlikely(!get_page_from_l3e(nl3e, pfn, d)) )
return 0;
- if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current)) )
+ if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, v)) )
{
put_page_from_l3e(nl3e, pfn);
return 0;
}
}
- else if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current)) )
+ else if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, v)) )
{
return 0;
}
@@ -1558,11 +1562,12 @@ static int mod_l3_entry(l3_pgentry_t *pl
#if CONFIG_PAGING_LEVELS >= 4
/* Update the L4 entry at pl4e to new value nl4e. pl4e is within frame pfn. */
-static int mod_l4_entry(struct domain *d,
- l4_pgentry_t *pl4e,
+static int mod_l4_entry(l4_pgentry_t *pl4e,
l4_pgentry_t nl4e,
unsigned long pfn)
{
+ struct vcpu *v = current;
+ struct domain *d = v->domain;
l4_pgentry_t ol4e;
if ( unlikely(!is_guest_l4_slot(d, pgentry_ptr_to_slot(pl4e))) )
@@ -1583,22 +1588,22 @@ static int mod_l4_entry(struct domain *d
return 0;
}
- adjust_guest_l4e(nl4e, current->domain);
+ adjust_guest_l4e(nl4e, d);
/* Fast path for identical mapping and presence. */
if (!l4e_has_changed(ol4e, nl4e, _PAGE_PRESENT))
- return UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, current);
-
- if ( unlikely(!get_page_from_l4e(nl4e, pfn, current->domain)) )
+ return UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, v);
+
+ if ( unlikely(!get_page_from_l4e(nl4e, pfn, d)) )
return 0;
- if ( unlikely(!UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, current)) )
+ if ( unlikely(!UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, v)) )
{
put_page_from_l4e(nl4e, pfn);
return 0;
}
}
- else if ( unlikely(!UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, current)) )
+ else if ( unlikely(!UPDATE_ENTRY(l4, pl4e, ol4e, nl4e, pfn, v)) )
{
return 0;
}
@@ -1885,7 +1890,6 @@ int new_guest_cr3(unsigned long mfn)
okay = paging_mode_refcounts(d)
? 0 /* Old code was broken, but what should it be? */
: mod_l4_entry(
- d,
__va(pagetable_get_paddr(v->arch.guest_table)),
l4e_from_pfn(
mfn,
@@ -2117,7 +2121,7 @@ int do_mmuext_op(
type = PGT_l4_page_table;
pin_page:
- rc = xsm_memory_pin_page(current->domain, page);
+ rc = xsm_memory_pin_page(d, page);
if ( rc )
break;
@@ -2407,14 +2411,14 @@ int do_mmu_update(
*/
case MMU_NORMAL_PT_UPDATE:
- rc = xsm_mmu_normal_update(current->domain, req.val);
+ rc = xsm_mmu_normal_update(d, req.val);
if ( rc )
break;
gmfn = req.ptr >> PAGE_SHIFT;
mfn = gmfn_to_mfn(d, gmfn);
- if ( unlikely(!get_page_from_pagenr(mfn, current->domain)) )
+ if ( unlikely(!get_page_from_pagenr(mfn, d)) )
{
MEM_LOG("Could not get page for normal update");
break;
@@ -2468,7 +2472,7 @@ int do_mmu_update(
case PGT_l4_page_table:
{
l4_pgentry_t l4e = l4e_from_intpte(req.val);
- okay = mod_l4_entry(d, va, l4e, mfn);
+ okay = mod_l4_entry(va, l4e, mfn);
}
break;
#endif
@@ -2501,7 +2505,7 @@ int do_mmu_update(
mfn = req.ptr >> PAGE_SHIFT;
gpfn = req.val;
- rc = xsm_mmu_machphys_update(current->domain, mfn);
+ rc = xsm_mmu_machphys_update(d, mfn);
if ( rc )
break;
@@ -2782,21 +2786,22 @@ int replace_grant_host_mapping(
{
l1_pgentry_t *pl1e, ol1e;
unsigned long gl1mfn;
+ struct vcpu *v = current;
int rc;
if ( flags & GNTMAP_contains_pte )
{
if ( !new_addr )
- return destroy_grant_pte_mapping(addr, frame, current->domain);
+ return destroy_grant_pte_mapping(addr, frame, v->domain);
MEM_LOG("Unsupported grant table operation");
return GNTST_general_error;
}
if ( !new_addr )
- return destroy_grant_va_mapping(addr, frame, current);
-
- pl1e = guest_map_l1e(current, new_addr, &gl1mfn);
+ return destroy_grant_va_mapping(addr, frame, v);
+
+ pl1e = guest_map_l1e(v, new_addr, &gl1mfn);
if ( !pl1e )
{
MEM_LOG("Could not find L1 PTE for address %lx",
@@ -2806,18 +2811,18 @@ int replace_grant_host_mapping(
ol1e = *pl1e;
if ( unlikely(!UPDATE_ENTRY(l1, pl1e, ol1e, l1e_empty(),
- gl1mfn, current)) )
+ gl1mfn, v)) )
{
MEM_LOG("Cannot delete PTE entry at %p", (unsigned long *)pl1e);
- guest_unmap_l1e(current, pl1e);
+ guest_unmap_l1e(v, pl1e);
return GNTST_general_error;
}
- guest_unmap_l1e(current, pl1e);
-
- rc = replace_grant_va_mapping(addr, frame, ol1e, current);
- if ( rc && !paging_mode_refcounts(current->domain) )
- put_page_from_l1e(ol1e, current->domain);
+ guest_unmap_l1e(v, pl1e);
+
+ rc = replace_grant_va_mapping(addr, frame, ol1e, v);
+ if ( rc && !paging_mode_refcounts(v->domain) )
+ put_page_from_l1e(ol1e, v->domain);
return rc;
}
@@ -2885,7 +2890,7 @@ int do_update_va_mapping(unsigned long v
if ( unlikely(!__addr_ok(va) && !paging_mode_external(d)) )
return -EINVAL;
- rc = xsm_update_va_mapping(current->domain, val);
+ rc = xsm_update_va_mapping(d, val);
if ( rc )
return rc;
@@ -2931,7 +2936,7 @@ int do_update_va_mapping(unsigned long v
{
case UVMF_LOCAL:
if ( !paging_mode_enabled(d)
- || (paging_invlpg(current, va) != 0) )
+ || (paging_invlpg(v, va) != 0) )
flush_tlb_one_local(va);
break;
case UVMF_ALL:
@@ -3040,6 +3045,7 @@ long do_set_gdt(XEN_GUEST_HANDLE(ulong)
{
int nr_pages = (entries + 511) / 512;
unsigned long frames[16];
+ struct vcpu *v = current;
long ret;
/* Rechecked in set_gdt, but ensures a sane limit for copy_from_user(). */
@@ -3049,12 +3055,12 @@ long do_set_gdt(XEN_GUEST_HANDLE(ulong)
if ( copy_from_guest(frames, frame_list, nr_pages) )
return -EFAULT;
- LOCK_BIGLOCK(current->domain);
-
- if ( (ret = set_gdt(current, frames, entries)) == 0 )
+ LOCK_BIGLOCK(v->domain);
+
+ if ( (ret = set_gdt(v, frames, entries)) == 0 )
flush_tlb_local();
- UNLOCK_BIGLOCK(current->domain);
+ UNLOCK_BIGLOCK(v->domain);
return ret;
}
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-30 15:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-30 15:44 [PATCH][XEN] x86: cleanup mm.c Christoph Egger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.