From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH v3 2/4] iommu: set correct IOMMU entries when iommu_hap_pt_share == 0 Date: Fri, 23 May 2014 13:23:17 -0400 Message-ID: <20140523172317.GC8343@phenom.dumpdata.com> References: <1400862788-22037-1-git-send-email-roger.pau@citrix.com> <1400862788-22037-3-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WntBm-0007lB-I0 for xen-devel@lists.xenproject.org; Fri, 23 May 2014 17:23:26 +0000 Content-Disposition: inline In-Reply-To: <1400862788-22037-3-git-send-email-roger.pau@citrix.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: Roger Pau Monne Cc: xen-devel@lists.xenproject.org, Tim Deegan , Jan Beulich List-Id: xen-devel@lists.xenproject.org On Fri, May 23, 2014 at 06:33:06PM +0200, Roger Pau Monne wrote: > If the memory map is not shared between HAP and IOMMU we fail to set > correct IOMMU mappings for memory types other than p2m_ram_rw. > = > This patchs adds IOMMU support for the following memory types: > p2m_grant_map_rw, p2m_map_foreign, p2m_ram_ro, p2m_grant_map_ro and > p2m_ram_logdirty. > = > Signed-off-by: Roger Pau Monn=E9 > Reviewed-by: Jan Beulich > Reviewed-by: Tim Deegan Seems that this has slipped: Tested-by: David Zhuang > Cc: Tim Deegan > Cc: Jan Beulich > --- > Changes since v1: > - Move the p2m type switch to IOMMU flags to an inline function that > is shared between p2m-ept and p2m-pt. > - Make p2m_set_entry also use p2m_get_iommu_flags. > --- > xen/arch/x86/mm/p2m-ept.c | 7 ++++--- > xen/arch/x86/mm/p2m-pt.c | 11 +++++------ > xen/include/asm-x86/p2m.h | 27 +++++++++++++++++++++++++++ > 3 files changed, 36 insertions(+), 9 deletions(-) > = > diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c > index 12547a3..28ed184 100644 > --- a/xen/arch/x86/mm/p2m-ept.c > +++ b/xen/arch/x86/mm/p2m-ept.c > @@ -777,10 +777,11 @@ out: > iommu_pte_flush(d, gfn, &ept_entry->epte, order, vtd_pte_pre= sent); > else > { > - if ( p2mt =3D=3D p2m_ram_rw ) > + unsigned int flags =3D p2m_get_iommu_flags(p2mt); > + > + if ( flags !=3D 0 ) > for ( i =3D 0; i < (1 << order); i++ ) > - iommu_map_page(d, gfn + i, mfn_x(mfn) + i, > - IOMMUF_readable | IOMMUF_writable); > + iommu_map_page(d, gfn + i, mfn_x(mfn) + i, flags); > else > for ( i =3D 0; i < (1 << order); i++ ) > iommu_unmap_page(d, gfn + i); > diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c > index a1794d0..085ab6f 100644 > --- a/xen/arch/x86/mm/p2m-pt.c > +++ b/xen/arch/x86/mm/p2m-pt.c > @@ -491,9 +491,7 @@ p2m_pt_set_entry(struct p2m_domain *p2m, unsigned lon= g gfn, mfn_t mfn, > l2_pgentry_t l2e_content; > l3_pgentry_t l3e_content; > int rc; > - unsigned int iommu_pte_flags =3D (p2mt =3D=3D p2m_ram_rw) ? > - IOMMUF_readable|IOMMUF_writable: > - 0; = > + unsigned int iommu_pte_flags =3D p2m_get_iommu_flags(p2mt); > unsigned long old_mfn =3D 0; > = > if ( tb_init_done ) > @@ -662,10 +660,11 @@ p2m_pt_set_entry(struct p2m_domain *p2m, unsigned l= ong gfn, mfn_t mfn, > } > else > { > - if ( p2mt =3D=3D p2m_ram_rw ) > + unsigned int flags =3D p2m_get_iommu_flags(p2mt); > + > + if ( flags !=3D 0 ) > for ( i =3D 0; i < (1UL << page_order); i++ ) > - iommu_map_page(p2m->domain, gfn+i, mfn_x(mfn)+i, > - IOMMUF_readable|IOMMUF_writable); > + iommu_map_page(p2m->domain, gfn+i, mfn_x(mfn)+i, fla= gs); > else > for ( int i =3D 0; i < (1UL << page_order); i++ ) > iommu_unmap_page(p2m->domain, gfn+i); > diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h > index d0cfdac..0ddbadb 100644 > --- a/xen/include/asm-x86/p2m.h > +++ b/xen/include/asm-x86/p2m.h > @@ -691,6 +691,33 @@ void p2m_flush_nestedp2m(struct domain *d); > void nestedp2m_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, > l1_pgentry_t *p, l1_pgentry_t new, unsigned int level); > = > +/* > + * p2m type to IOMMU flags > + */ > +static inline unsigned int p2m_get_iommu_flags(p2m_type_t p2mt) > +{ > + unsigned int flags; > + > + switch( p2mt ) > + { > + case p2m_ram_rw: > + case p2m_grant_map_rw: > + case p2m_ram_logdirty: > + case p2m_map_foreign: > + flags =3D IOMMUF_readable | IOMMUF_writable; > + break; > + case p2m_ram_ro: > + case p2m_grant_map_ro: > + flags =3D IOMMUF_readable; > + break; > + default: > + flags =3D 0; > + break; > + } > + > + return flags; > +} > + > #endif /* _XEN_P2M_H */ > = > /* > -- = > 1.7.7.5 (Apple Git-26) > = > = > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel