| Message ID | 1391609794-505-1-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, 5 Feb 2014, Julien Grall wrote: > The function domain_page_map_to_mfn can be used to translate a virtual > address mapped by both map_domain_page and map_domain_page_global. > The former is using vmap to map the mfn, therefore domain_page_map_to_mfn > will always fail because the address is not in DOMHEAP range. > > Check if the address is in vmap range and use __pa to translate it. > > This patch fix guest shutdown when the event fifo is used. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > Cc: George Dunlap <george.dunlap@citrix.com> It looks good to me. Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > --- > This is a bug fix for Xen 4.4. Without this patch, it's impossible to > use Linux 3.14 (and higher) as guest with the event fifo driver. > --- > xen/arch/arm/mm.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 127cce0..bdca68a 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -325,11 +325,15 @@ void unmap_domain_page(const void *va) > local_irq_restore(flags); > } > > -unsigned long domain_page_map_to_mfn(const void *va) > +unsigned long domain_page_map_to_mfn(const void *ptr) > { > + unsigned long va = (unsigned long)ptr; > lpae_t *map = this_cpu(xen_dommap); > - int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; > - unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; > + int slot = (va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; > + unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; > + > + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) > + return virt_to_mfn(va); > > ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); > ASSERT(map[slot].pt.avail != 0); > -- > 1.7.10.4 >
On Wed, 2014-02-05 at 14:51 +0000, George Dunlap wrote: > On 02/05/2014 02:16 PM, Julien Grall wrote: > > The function domain_page_map_to_mfn can be used to translate a virtual > > address mapped by both map_domain_page and map_domain_page_global. > > The former is using vmap to map the mfn, therefore domain_page_map_to_mfn > > will always fail because the address is not in DOMHEAP range. > > > > Check if the address is in vmap range and use __pa to translate it. > > > > This patch fix guest shutdown when the event fifo is used. > > > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > > I assume this brings the arm paths into line with the x86 functionality? Yes, functionality which is now expected by common code as well (FIFO evthcn stuff). > > -George > > > > > > --- > > This is a bug fix for Xen 4.4. Without this patch, it's impossible to > > use Linux 3.14 (and higher) as guest with the event fifo driver. > > --- > > xen/arch/arm/mm.c | 10 +++++++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > > index 127cce0..bdca68a 100644 > > --- a/xen/arch/arm/mm.c > > +++ b/xen/arch/arm/mm.c > > @@ -325,11 +325,15 @@ void unmap_domain_page(const void *va) > > local_irq_restore(flags); > > } > > > > -unsigned long domain_page_map_to_mfn(const void *va) > > +unsigned long domain_page_map_to_mfn(const void *ptr) > > { > > + unsigned long va = (unsigned long)ptr; > > lpae_t *map = this_cpu(xen_dommap); > > - int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; > > - unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; > > + int slot = (va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; > > + unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; > > + > > + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) > > + return virt_to_mfn(va); > > > > ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); > > ASSERT(map[slot].pt.avail != 0); >
On Wed, 2014-02-05 at 14:16 +0000, Julien Grall wrote: > The function domain_page_map_to_mfn can be used to translate a virtual > address mapped by both map_domain_page and map_domain_page_global. > The former is using vmap to map the mfn, therefore domain_page_map_to_mfn > will always fail because the address is not in DOMHEAP range. > > Check if the address is in vmap range and use __pa to translate it. > > This patch fix guest shutdown when the event fifo is used. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > Cc: George Dunlap <george.dunlap@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> > > --- > This is a bug fix for Xen 4.4. Without this patch, it's impossible to > use Linux 3.14 (and higher) as guest with the event fifo driver. > --- > xen/arch/arm/mm.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 127cce0..bdca68a 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -325,11 +325,15 @@ void unmap_domain_page(const void *va) > local_irq_restore(flags); > } > > -unsigned long domain_page_map_to_mfn(const void *va) > +unsigned long domain_page_map_to_mfn(const void *ptr) > { > + unsigned long va = (unsigned long)ptr; > lpae_t *map = this_cpu(xen_dommap); > - int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; > - unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; > + int slot = (va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; > + unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; > + > + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) > + return virt_to_mfn(va); > > ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); > ASSERT(map[slot].pt.avail != 0);
On Thu, 2014-02-06 at 12:03 +0000, George Dunlap wrote: > On 02/06/2014 12:02 PM, Ian Campbell wrote: > > On Wed, 2014-02-05 at 14:51 +0000, George Dunlap wrote: > >> On 02/05/2014 02:16 PM, Julien Grall wrote: > >>> The function domain_page_map_to_mfn can be used to translate a virtual > >>> address mapped by both map_domain_page and map_domain_page_global. > >>> The former is using vmap to map the mfn, therefore domain_page_map_to_mfn > >>> will always fail because the address is not in DOMHEAP range. > >>> > >>> Check if the address is in vmap range and use __pa to translate it. > >>> > >>> This patch fix guest shutdown when the event fifo is used. > >>> > >>> Signed-off-by: Julien Grall <julien.grall@linaro.org> > >> I assume this brings the arm paths into line with the x86 functionality? > > Yes, functionality which is now expected by common code as well (FIFO > > evthcn stuff). > > In that case: > > Release-acked-by: George Dunlap <george.dunlap@eu.citrix.com> Thanks, applied.
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 127cce0..bdca68a 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -325,11 +325,15 @@ void unmap_domain_page(const void *va) local_irq_restore(flags); } -unsigned long domain_page_map_to_mfn(const void *va) +unsigned long domain_page_map_to_mfn(const void *ptr) { + unsigned long va = (unsigned long)ptr; lpae_t *map = this_cpu(xen_dommap); - int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; - unsigned long offset = ((unsigned long)va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + int slot = (va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; + unsigned long offset = (va>>THIRD_SHIFT) & LPAE_ENTRY_MASK; + + if ( va >= VMAP_VIRT_START && va < VMAP_VIRT_END ) + return virt_to_mfn(va); ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); ASSERT(map[slot].pt.avail != 0);
The function domain_page_map_to_mfn can be used to translate a virtual address mapped by both map_domain_page and map_domain_page_global. The former is using vmap to map the mfn, therefore domain_page_map_to_mfn will always fail because the address is not in DOMHEAP range. Check if the address is in vmap range and use __pa to translate it. This patch fix guest shutdown when the event fifo is used. Signed-off-by: Julien Grall <julien.grall@linaro.org> Cc: George Dunlap <george.dunlap@citrix.com> --- This is a bug fix for Xen 4.4. Without this patch, it's impossible to use Linux 3.14 (and higher) as guest with the event fifo driver. --- xen/arch/arm/mm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)