From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH v10 02/12] arch/arm: unmap partially-mapped I/O-memory regions Date: Tue, 29 Jul 2014 13:00:20 +0100 Message-ID: <53D78CD4.3010903@linaro.org> References: <1406585529-32193-1-git-send-email-avanzini.arianna@gmail.com> <1406585529-32193-3-git-send-email-avanzini.arianna@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1406585529-32193-3-git-send-email-avanzini.arianna@gmail.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: Arianna Avanzini , xen-devel@lists.xen.org Cc: julien.grall@citrix.com, paolo.valente@unimore.it, keir@xen.org, stefano.stabellini@eu.citrix.com, tim@xen.org, dario.faggioli@citrix.com, Ian.Jackson@eu.citrix.com, Ian.Campbell@eu.citrix.com, etrudeau@broadcom.com, JBeulich@suse.com, andrew.cooper3@citrix.com, viktor.kleinik@globallogic.com List-Id: xen-devel@lists.xenproject.org Hi Arianna, On 07/28/2014 11:11 PM, Arianna Avanzini wrote: > diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c > index 8feb5c5..2745279 100644 > --- a/xen/arch/arm/p2m.c > +++ b/xen/arch/arm/p2m.c > @@ -713,7 +713,7 @@ static int apply_p2m_changes(struct domain *d, > int rc, ret; > struct p2m_domain *p2m = &d->arch.p2m; > lpae_t *first = NULL, *second = NULL, *third = NULL; > - paddr_t addr; > + paddr_t addr, orig_maddr = maddr; > unsigned long cur_first_page = ~0, > cur_first_offset = ~0, > cur_second_offset = ~0; > @@ -844,6 +844,10 @@ out: > if (third) unmap_domain_page(third); > if (second) unmap_domain_page(second); > if (first) unmap_domain_page(first); > + if ( rc < 0 && mattr == MATTR_DEV && ( op == INSERT || op == ALLOCATE ) ) > + apply_p2m_changes(d, REMOVE, start_gpaddr, > + end_gpaddr, orig_maddr, > + MATTR_DEV, p2m_invalid); I though we agreed to handle remove for any kind of mapping... Why did you change to only apply for I/O-memory regions? Hence, testing mattr to check if it's an MMIO regions looks wrong to me. Regards, -- Julien Grall