Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755906AbaJXJaP (ORCPT ); Fri, 24 Oct 2014 05:30:15 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:54620 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750888AbaJXJaN (ORCPT ); Fri, 24 Oct 2014 05:30:13 -0400 X-IronPort-AV: E=Sophos;i="5.04,779,1406592000"; d="scan'208";a="185832687" Message-ID: <1414143007.15687.27.camel@citrix.com> Subject: Re: [PATCH v5 5/6] xen/arm/arm64: introduce xen_arch_need_swiotlb From: Ian Campbell To: Stefano Stabellini CC: , , , , , Date: Fri, 24 Oct 2014 10:30:07 +0100 In-Reply-To: <1414085246-16160-5-git-send-email-stefano.stabellini@eu.citrix.com> References: <1414085246-16160-5-git-send-email-stefano.stabellini@eu.citrix.com> Organization: Citrix Systems, Inc. Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.7-1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2014-10-23 at 18:27 +0100, Stefano Stabellini wrote: > Introduce an arch specific function to find out whether a particular dma > mapping operation needs to bounce on the swiotlb buffer. > > On ARM and ARM64, if the page involved is a foreign page and the device > is not coherent, we need to bounce because at unmap time we cannot > execute any required cache maintenance operations (we don't know how to > find the pfn from the mfn). > > No change of behaviour for x86. > > Signed-off-by: Stefano Stabellini Your tab stops are messed up on almost every new line you added. Looks like you have ts=4 or something. The actual changes look ok though, so with the coding style fixed you can add: Acked-by: Ian Campbell > > --- > > Changes in v5: > - fix indentation. > --- > arch/arm/include/asm/xen/page.h | 4 ++++ > arch/arm/xen/mm.c | 7 +++++++ > arch/x86/include/asm/xen/page.h | 7 +++++++ > drivers/xen/swiotlb-xen.c | 5 ++++- > 4 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h > index 135c24a..fb7839d 100644 > --- a/arch/arm/include/asm/xen/page.h > +++ b/arch/arm/include/asm/xen/page.h > @@ -107,4 +107,8 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) > #define xen_remap(cookie, size) ioremap_cache((cookie), (size)) > #define xen_unmap(cookie) iounmap((cookie)) > > +bool xen_arch_need_swiotlb(struct device *dev, > + unsigned long pfn, > + unsigned long mfn); > + > #endif /* _ASM_ARM_XEN_PAGE_H */ > diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c > index 659e1c3..728c245 100644 > --- a/arch/arm/xen/mm.c > +++ b/arch/arm/xen/mm.c > @@ -140,6 +140,13 @@ void xen_dma_sync_single_for_device(struct device *hwdev, > __xen_dma_page_cpu_to_dev(hwdev, handle, size, dir); > } > > +bool xen_arch_need_swiotlb(struct device *dev, > + unsigned long pfn, > + unsigned long mfn) > +{ > + return ((pfn != mfn) && !xen_is_dma_coherent(dev)); > +} > + > int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, > unsigned int address_bits, > dma_addr_t *dma_handle) > diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h > index c949923..800b6a9 100644 > --- a/arch/x86/include/asm/xen/page.h > +++ b/arch/x86/include/asm/xen/page.h > @@ -236,4 +236,11 @@ void make_lowmem_page_readwrite(void *vaddr); > #define xen_remap(cookie, size) ioremap((cookie), (size)); > #define xen_unmap(cookie) iounmap((cookie)) > > +static inline bool xen_arch_need_swiotlb(struct device *dev, > + unsigned long pfn, > + unsigned long mfn) > +{ > + return false; > +} > + > #endif /* _ASM_X86_XEN_PAGE_H */ > diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c > index ebd8f21..ac0bd60 100644 > --- a/drivers/xen/swiotlb-xen.c > +++ b/drivers/xen/swiotlb-xen.c > @@ -399,7 +399,9 @@ dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, > * buffering it. > */ > if (dma_capable(dev, dev_addr, size) && > - !range_straddles_page_boundary(phys, size) && !swiotlb_force) { > + !range_straddles_page_boundary(phys, size) && > + !xen_arch_need_swiotlb(dev, PFN_DOWN(phys), PFN_DOWN(dev_addr)) && > + !swiotlb_force) { > /* we are not interested in the dma_addr returned by > * xen_dma_map_page, only in the potential cache flushes executed > * by the function. */ > @@ -557,6 +559,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, > dma_addr_t dev_addr = xen_phys_to_bus(paddr); > > if (swiotlb_force || > + xen_arch_need_swiotlb(hwdev, PFN_DOWN(paddr), PFN_DOWN(dev_addr)) || > !dma_capable(hwdev, dev_addr, sg->length) || > range_straddles_page_boundary(paddr, sg->length)) { > phys_addr_t map = swiotlb_tbl_map_single(hwdev, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/