From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH v2 1/2] x86: add p2m_mmio_write_dm Date: Fri, 22 Aug 2014 11:13:23 +0100 Message-ID: <53F717C3.2090304@citrix.com> References: <1408735115-6023-1-git-send-email-wei.ye@intel.com> <1408735115-6023-2-git-send-email-wei.ye@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1408735115-6023-2-git-send-email-wei.ye@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Ye , xen-devel@lists.xen.org Cc: kevin.tian@intel.com, keir@xen.org, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, tim@xen.org, ian.jackson@eu.citrix.com, donald.d.dugger@intel.com, Paul.Durrant@citrix.com, zhiyuan.lv@intel.com, JBeulich@suse.com, yang.z.zhang@intel.com List-Id: xen-devel@lists.xenproject.org On 22/08/14 20:18, Wei Ye wrote: > Add an new p2m type p2m_mmio_write_dm. Page of this type is read > only, and write will go to the device model for emulation just like > a mmio. > > Signed-off-by: Wei Ye > --- > xen/arch/x86/hvm/hvm.c | 3 ++- > xen/arch/x86/mm/p2m-ept.c | 1 + > xen/arch/x86/mm/p2m-pt.c | 1 + > xen/include/asm-x86/p2m.h | 1 + > 4 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c > index 17ff011..4984149 100644 > --- a/xen/arch/x86/hvm/hvm.c > +++ b/xen/arch/x86/hvm/hvm.c > @@ -2739,7 +2739,8 @@ int hvm_hap_nested_page_fault(paddr_t gpa, > * to the mmio handler. > */ > if ( (p2mt == p2m_mmio_dm) || > - (access_w && (p2mt == p2m_ram_ro)) ) > + (access_w && (p2mt == p2m_ram_ro)) || > + (access_w && (p2mt == p2m_mmio_write_dm)) ) Please adjust the position of the logical or. ~Andrew > { > put_gfn(p2m->domain, gfn); > > diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c > index 15c6e83..f4c72d7 100644 > --- a/xen/arch/x86/mm/p2m-ept.c > +++ b/xen/arch/x86/mm/p2m-ept.c > @@ -127,6 +127,7 @@ static void ept_p2m_type_to_flags(ept_entry_t *entry, p2m_type_t type, p2m_acces > case p2m_ram_logdirty: > case p2m_ram_ro: > case p2m_ram_shared: > + case p2m_mmio_write_dm: > entry->r = entry->x = 1; > entry->w = 0; > break; > diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c > index 085ab6f..99b8b76 100644 > --- a/xen/arch/x86/mm/p2m-pt.c > +++ b/xen/arch/x86/mm/p2m-pt.c > @@ -98,6 +98,7 @@ static unsigned long p2m_type_to_flags(p2m_type_t t, mfn_t mfn) > case p2m_ram_ro: > case p2m_ram_logdirty: > case p2m_ram_shared: > + case p2m_mmio_write_dm: > return flags | P2M_BASE_FLAGS; > case p2m_ram_rw: > return flags | P2M_BASE_FLAGS | _PAGE_RW; > diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h > index 0ddbadb..523c7a9 100644 > --- a/xen/include/asm-x86/p2m.h > +++ b/xen/include/asm-x86/p2m.h > @@ -71,6 +71,7 @@ typedef enum { > p2m_ram_shared = 12, /* Shared or sharable memory */ > p2m_ram_broken = 13, /* Broken page, access cause domain crash */ > p2m_map_foreign = 14, /* ram pages from foreign domain */ > + p2m_mmio_write_dm = 15, /* Read-only; write go to the device model */ > } p2m_type_t; > > /*