From: stefano.stabellini@eu.citrix.com (Stefano Stabellini)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 16/17] arm, arm64: do not always merge biovec if we are running on Xen
Date: Wed, 9 Oct 2013 21:48:29 +0100 [thread overview]
Message-ID: <1381351710-1876-16-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1310092109190.26077@kaball.uk.xensource.com>
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 <stefano.stabellini@eu.citrix.com>
Changes in v7:
- remove the extra autotranslate check in biomerge.c.
---
arch/arm/include/asm/io.h | 8 ++++++++
arch/arm64/include/asm/io.h | 9 +++++++++
2 files changed, 17 insertions(+), 0 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 <linux/types.h>
+#include <linux/blk_types.h>
#include <asm/byteorder.h>
#include <asm/memory.h>
#include <asm-generic/pci_iomap.h>
+#include <xen/xen.h>
/*
* 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 <linux/types.h>
+#include <linux/blk_types.h>
#include <asm/byteorder.h>
#include <asm/barrier.h>
#include <asm/pgtable.h>
+#include <xen/xen.h>
+
/*
* 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 */
--
1.7.2.5
next prev parent reply other threads:[~2013-10-09 20:48 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 20:47 [PATCH v7 0/17] enable swiotlb-xen on arm and arm64 Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 01/17] arm: make SWIOTLB available Stefano Stabellini
2013-10-10 9:43 ` Will Deacon
2013-10-15 15:45 ` Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 02/17] arm64: define DMA_ERROR_CODE Stefano Stabellini
2013-10-10 9:44 ` Will Deacon
2013-10-15 15:46 ` Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 03/17] arm/xen,arm64/xen: introduce p2m Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 04/17] xen/x86: allow __set_phys_to_machine for autotranslate guests Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 05/17] xen: make xen_create_contiguous_region return the dma address Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 06/17] xen/arm,arm64: enable SWIOTLB_XEN Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 07/17] swiotlb-xen: introduce xen_swiotlb_set_dma_mask Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 08/17] arm/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 09/17] arm64/xen: " Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 10/17] xen: introduce xen_alloc/free_coherent_pages Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 11/17] swiotlb-xen: use xen_alloc/free_coherent_pages Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 12/17] xen: introduce xen_dma_map/unmap_page and xen_dma_sync_single_for_cpu/device Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 13/17] swiotlb-xen: use xen_dma_map/unmap_page, xen_dma_sync_single_for_cpu/device Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 14/17] ASoC: Samsung: Rename dma_ops by samsung_dma_ops Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 15/17] swiotlb: print a warning when the swiotlb is full Stefano Stabellini
2013-10-09 20:48 ` Stefano Stabellini [this message]
2013-10-09 20:48 ` [PATCH v8 17/17] grant-table: call set_phys_to_machine after mapping grant refs Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381351710-1876-16-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).