Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756133Ab3I3QH1 (ORCPT ); Mon, 30 Sep 2013 12:07:27 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:34113 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755215Ab3I3QHX (ORCPT ); Mon, 30 Sep 2013 12:07:23 -0400 Date: Mon, 30 Sep 2013 12:06:46 -0400 From: Konrad Rzeszutek Wilk To: Stefano Stabellini Cc: xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Ian.Campbell@citrix.com Subject: Re: [PATCH v6 16/19] arm,arm64: do not always merge biovec if we are running on Xen Message-ID: <20130930160646.GV3106@phenom.dumpdata.com> References: <1380298207-29151-16-git-send-email-stefano.stabellini@eu.citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1380298207-29151-16-git-send-email-stefano.stabellini@eu.citrix.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3943 Lines: 110 On Fri, Sep 27, 2013 at 05:10:04PM +0100, Stefano Stabellini wrote: > This is similar to what it is done on X86: biovecs are prevented from merging > otherwise every dma requests would be forced to bounce on the swiotlb buffer. > > Signed-off-by: Stefano Stabellini This also alters the generic (well, was x86, now it is generic) code. Perhaps that change should be made in a seperate patch and explain what the autotranslate extra check will do for PV, PVH and HVM guests? Wait, does that mean we had not been merging requests on HVM guests? Is that good or bad? > --- > arch/arm/include/asm/io.h | 8 ++++++++ > arch/arm64/include/asm/io.h | 9 +++++++++ > drivers/xen/biomerge.c | 4 +++- > 3 files changed, 20 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h > index d070741..c45effc 100644 > --- a/arch/arm/include/asm/io.h > +++ b/arch/arm/include/asm/io.h > @@ -24,9 +24,11 @@ > #ifdef __KERNEL__ > > #include > +#include > #include > #include > #include > +#include > > /* > * ISA I/O bus memory addresses are 1:1 with the physical address. > @@ -372,6 +374,12 @@ extern void pci_iounmap(struct pci_dev *dev, void __iomem *addr); > #define BIOVEC_MERGEABLE(vec1, vec2) \ > ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2))) > > +extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, > + const struct bio_vec *vec2); > +#define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ > + (__BIOVEC_PHYS_MERGEABLE(vec1, vec2) && \ > + (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2))) > + > #ifdef CONFIG_MMU > #define ARCH_HAS_VALID_PHYS_ADDR_RANGE > extern int valid_phys_addr_range(phys_addr_t addr, size_t size); > diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h > index 1d12f89..c163287b 100644 > --- a/arch/arm64/include/asm/io.h > +++ b/arch/arm64/include/asm/io.h > @@ -22,11 +22,14 @@ > #ifdef __KERNEL__ > > #include > +#include > > #include > #include > #include > > +#include > + > /* > * Generic IO read/write. These perform native-endian accesses. > */ > @@ -263,5 +266,11 @@ extern int devmem_is_allowed(unsigned long pfn); > */ > #define xlate_dev_kmem_ptr(p) p > > +extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, > + const struct bio_vec *vec2); > +#define BIOVEC_PHYS_MERGEABLE(vec1, vec2) \ > + (__BIOVEC_PHYS_MERGEABLE(vec1, vec2) && \ > + (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2))) > + > #endif /* __KERNEL__ */ > #endif /* __ASM_IO_H */ > diff --git a/drivers/xen/biomerge.c b/drivers/xen/biomerge.c > index 0edb91c..f323a2d 100644 > --- a/drivers/xen/biomerge.c > +++ b/drivers/xen/biomerge.c > @@ -2,6 +2,7 @@ > #include > #include > #include > +#include > > bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, > const struct bio_vec *vec2) > @@ -9,7 +10,8 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, > unsigned long mfn1 = pfn_to_mfn(page_to_pfn(vec1->bv_page)); > unsigned long mfn2 = pfn_to_mfn(page_to_pfn(vec2->bv_page)); > > - return __BIOVEC_PHYS_MERGEABLE(vec1, vec2) && > + return !xen_feature(XENFEAT_auto_translated_physmap) && > + __BIOVEC_PHYS_MERGEABLE(vec1, vec2) && > ((mfn1 == mfn2) || ((mfn1+1) == mfn2)); > } > EXPORT_SYMBOL(xen_biovec_phys_mergeable); > -- > 1.7.2.5 > -- 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/