Re: [PATCH 1/3] iommu: set correct IOMMU entries when iommu_hap_pt_share == 0

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

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é <roger.pau@citrix.com>
> Cc: Tim Deegan <tim@xen.org>
> Cc: Jan Beulich <jbeulich@suse.com>
> ---
>  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_present);
>          else
>          {
> -            if ( p2mt == p2m_ram_rw )
> +            unsigned int flags;
> +
> +            switch( p2mt )
> +            {
> +            case p2m_ram_rw:
> +            case p2m_grant_map_rw:
> +            case p2m_map_foreign:
> +                flags =  IOMMUF_readable | IOMMUF_writable;
> +                break;
> +            case p2m_ram_ro:
> +            case p2m_grant_map_ro:
> +                flags = IOMMUF_readable;
> +                break;
> +            default:
> +                flags = 0;
> +                break;
> +            }
> +
> +            if ( flags != 0 )
>              {
>                  if ( order > 0 )
>                  {
>                      for ( i = 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 == p2m_ram_rw )
> +            unsigned int flags;
> +
> +            switch( p2mt )
> +            {
> +            case p2m_ram_rw:
> +            case p2m_grant_map_rw:
> +            case p2m_map_foreign:
> +                flags =  IOMMUF_readable | IOMMUF_writable;
> +                break;
> +            case p2m_ram_ro:
> +            case p2m_grant_map_ro:
> +                flags = IOMMUF_readable;
> +                break;
> +            default:
> +                flags = 0;
> +                break;
> +            }
> +
> +            if ( flags != 0 )
>                  for ( i = 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, flags);
>              else
>                  for ( int i = 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