diff options
author | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-02-02 12:22:34 +0000 |
---|---|---|
committer | Andres Lagar-Cavilla <andres@lagarcavilla.org> | 2012-02-02 12:22:34 +0000 |
commit | af518d3ea10ea088182525f24243d8ad29ecf2ba (patch) | |
tree | 4d7da356b2d404780965dbde53266293a0e57683 | |
parent | 00f3b625052cc8933feab4e3010e169ad66fd538 (diff) | |
download | xen-af518d3ea10ea088182525f24243d8ad29ecf2ba.tar.gz xen-af518d3ea10ea088182525f24243d8ad29ecf2ba.tar.bz2 xen-af518d3ea10ea088182525f24243d8ad29ecf2ba.zip |
x86/mm: Remove p2m_ram_paging_in
This state in the paging state machine became unnecessary after the last
few updates.
Once eliminated, rename p2m_ram_paging_in_start to p2m_ram_paging_in.
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Acked-by: Tim Deegan <tim@xen.org>
Committed-by: Tim Deegan <tim@xen.org>
-rw-r--r-- | xen/arch/x86/mm.c | 8 | ||||
-rw-r--r-- | xen/arch/x86/mm/p2m-ept.c | 3 | ||||
-rw-r--r-- | xen/arch/x86/mm/p2m.c | 7 | ||||
-rw-r--r-- | xen/include/asm-x86/p2m.h | 7 |
4 files changed, 10 insertions, 15 deletions
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index fc954bb8e3..c8829c30d7 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3573,7 +3573,7 @@ int do_mmu_update( rc = -ENOENT; break; } - else if ( p2m_ram_paging_in_start == l1e_p2mt && + else if ( p2m_ram_paging_in == l1e_p2mt && !mfn_valid(l1emfn) ) { put_gfn(pg_owner, l1egfn); @@ -3622,7 +3622,7 @@ int do_mmu_update( rc = -ENOENT; break; } - else if ( p2m_ram_paging_in_start == l2e_p2mt && + else if ( p2m_ram_paging_in == l2e_p2mt && !mfn_valid(l2emfn) ) { put_gfn(pg_owner, l2egfn); @@ -3657,7 +3657,7 @@ int do_mmu_update( rc = -ENOENT; break; } - else if ( p2m_ram_paging_in_start == l3e_p2mt && + else if ( p2m_ram_paging_in == l3e_p2mt && !mfn_valid(l3emfn) ) { put_gfn(pg_owner, l3egfn); @@ -3692,7 +3692,7 @@ int do_mmu_update( rc = -ENOENT; break; } - else if ( p2m_ram_paging_in_start == l4e_p2mt && + else if ( p2m_ram_paging_in == l4e_p2mt && !mfn_valid(l4emfn) ) { put_gfn(pg_owner, l4egfn); diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 38903a6205..dd9e56becd 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -82,7 +82,6 @@ static void ept_p2m_type_to_flags(ept_entry_t *entry, p2m_type_t type, p2m_acces case p2m_ram_paging_out: case p2m_ram_paged: case p2m_ram_paging_in: - case p2m_ram_paging_in_start: default: entry->r = entry->w = entry->x = 0; break; @@ -381,7 +380,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, old_entry = *ept_entry; if ( mfn_valid(mfn_x(mfn)) || direct_mmio || p2m_is_paged(p2mt) || - (p2mt == p2m_ram_paging_in_start) ) + (p2mt == p2m_ram_paging_in) ) { /* Construct the new entry, and then write it once */ new_entry.emt = epte_get_entry_emt(p2m->domain, gfn, mfn, &ipat, diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index a7441e16ea..31a10d8a25 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -932,7 +932,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn) if ( p2mt == p2m_ram_paging_out ) req.flags |= MEM_EVENT_FLAG_EVICT_FAIL; - set_p2m_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_in_start, a); + set_p2m_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_in, a); } p2m_unlock(p2m); @@ -991,7 +991,7 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, uint64_t buffer) ret = -ENOENT; /* Allow missing pages */ - if ( (p2mt != p2m_ram_paging_in_start) && (p2mt != p2m_ram_paged) ) + if ( (p2mt != p2m_ram_paging_in) && (p2mt != p2m_ram_paged) ) goto out; /* Allocate a page if the gfn does not have one yet */ @@ -1083,8 +1083,7 @@ void p2m_mem_paging_resume(struct domain *d) mfn = p2m->get_entry(p2m, rsp.gfn, &p2mt, &a, p2m_query, NULL); /* Allow only pages which were prepared properly, or pages which * were nominated but not evicted */ - if ( mfn_valid(mfn) && - (p2mt == p2m_ram_paging_in || p2mt == p2m_ram_paging_in_start) ) + if ( mfn_valid(mfn) && (p2mt == p2m_ram_paging_in) ) { set_p2m_entry(p2m, rsp.gfn, mfn, PAGE_ORDER_4K, paging_mode_log_dirty(d) ? p2m_ram_logdirty : diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 8269144424..daa3d15ba1 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -82,9 +82,8 @@ typedef enum { p2m_ram_paging_out = 9, /* Memory that is being paged out */ p2m_ram_paged = 10, /* Memory that has been paged out */ p2m_ram_paging_in = 11, /* Memory that is being paged in */ - p2m_ram_paging_in_start = 12, /* Memory that is being paged in */ - p2m_ram_shared = 13, /* Shared or sharable memory */ - p2m_ram_broken = 14, /* Broken page, access cause domain crash */ + p2m_ram_shared = 12, /* Shared or sharable memory */ + p2m_ram_broken = 13, /* Broken page, access cause domain crash */ } p2m_type_t; /* @@ -131,7 +130,6 @@ typedef enum { | p2m_to_mask(p2m_ram_ro) \ | p2m_to_mask(p2m_ram_paging_out) \ | p2m_to_mask(p2m_ram_paged) \ - | p2m_to_mask(p2m_ram_paging_in_start) \ | p2m_to_mask(p2m_ram_paging_in) \ | p2m_to_mask(p2m_ram_shared)) @@ -158,7 +156,6 @@ typedef enum { #define P2M_PAGING_TYPES (p2m_to_mask(p2m_ram_paging_out) \ | p2m_to_mask(p2m_ram_paged) \ - | p2m_to_mask(p2m_ram_paging_in_start) \ | p2m_to_mask(p2m_ram_paging_in)) #define P2M_PAGED_TYPES (p2m_to_mask(p2m_ram_paged)) |