From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH 1/3] iommu: set correct IOMMU entries when iommu_hap_pt_share == 0 Date: Mon, 7 Apr 2014 12:49:20 -0400 Message-ID: <20140407164920.GA3239@phenom.dumpdata.com> References: <1396886524-16921-1-git-send-email-roger.pau@citrix.com> <1396886524-16921-2-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 1WXCji-0001Rq-Qr for xen-devel@lists.xenproject.org; Mon, 07 Apr 2014 16:49:31 +0000 Content-Disposition: inline In-Reply-To: <1396886524-16921-2-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 Mon, Apr 07, 2014 at 06:02:02PM +0200, Roger Pau Monne wrote: > If the memory map is not shared between HAP and IOMMU we fails to set we fail > correct IOMMU mappings for memory types different than p2m_ram_rw. s/different/other/ > = > This patchs adds IOMMU support for the following memory types: > p2m_grant_map_rw, p2m_map_foreign, p2m_ram_ro and p2m_grant_map_ro. > = > Signed-off-by: Roger Pau Monn=E9 > Cc: Tim Deegan > Cc: Jan Beulich > --- > xen/arch/x86/mm/p2m-ept.c | 24 +++++++++++++++++++++--- > xen/arch/x86/mm/p2m-pt.c | 23 ++++++++++++++++++++--- > 2 files changed, 41 insertions(+), 6 deletions(-) > = > diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c > index beb7288..cf11a34 100644 > --- a/xen/arch/x86/mm/p2m-ept.c > +++ b/xen/arch/x86/mm/p2m-ept.c > @@ -475,18 +475,36 @@ out: > iommu_pte_flush(d, gfn, (u64*)ept_entry, order, vtd_pte_pres= ent); > else > { > - if ( p2mt =3D=3D p2m_ram_rw ) > + unsigned int flags; > + > + switch( p2mt ) > + { > + case p2m_ram_rw: > + case p2m_grant_map_rw: > + 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; > + } > + > + if ( flags !=3D 0 ) > { > if ( order > 0 ) > { > for ( i =3D 0; i < (1 << order); i++ ) > iommu_map_page( > p2m->domain, gfn - offset + i, mfn_x(mfn) - = offset + i, > - IOMMUF_readable | IOMMUF_writable); > + flags); > } > else if ( !order ) > iommu_map_page( > - p2m->domain, gfn, mfn_x(mfn), IOMMUF_readable | = IOMMUF_writable); > + p2m->domain, gfn, mfn_x(mfn), flags); > } > else > { > diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c > index 766fd67..749f7eb 100644 > --- a/xen/arch/x86/mm/p2m-pt.c > +++ b/xen/arch/x86/mm/p2m-pt.c > @@ -450,10 +450,27 @@ p2m_set_entry(struct p2m_domain *p2m, unsigned long= gfn, mfn_t mfn, > } > else > { > - if ( p2mt =3D=3D p2m_ram_rw ) > + unsigned int flags; > + > + switch( p2mt ) > + { > + case p2m_ram_rw: > + case p2m_grant_map_rw: > + 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; > + } > + > + 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); > -- = > 1.7.7.5 (Apple Git-26) > = > = > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel