Commit d8e04206 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Konrad Rzeszutek Wilk
Browse files

xen: define BIOVEC_PHYS_MERGEABLE() 



Impact: allow Xen control of bio merging

When running in Xen domain with device access, we need to make sure
the block subsystem doesn't merge requests across pages which aren't
machine physically contiguous.  To do this, we define our own
BIOVEC_PHYS_MERGEABLE.  When CONFIG_XEN isn't enabled, or we're not
running in a Xen domain, this has identical behaviour to the normal
implementation.  When running under Xen, we also make sure the
underlying machine pages are the same or adjacent.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 23ace955

arch/x86/include/asm/io.h

+13 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#include <asm-generic/int-ll64.h>

#include <asm/page.h>



#include <xen/xen.h>



#define build_mmio_read(name, size, type, reg, barrier) \

static inline type name(const volatile void __iomem *addr) \

{ type ret; asm volatile("mov" size " %1,%0":reg (ret) \
@@ -349,6 +351,17 @@ extern void __iomem *early_memremap(resource_size_t phys_addr, 
extern void early_iounmap(void __iomem *addr, unsigned long size);

extern void fixup_early_ioremap(void);



#ifdef CONFIG_XEN

struct bio_vec;



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	/* CONFIG_XEN */



#define IO_SPACE_LIMIT 0xffff



#endif /* _ASM_X86_IO_H */

drivers/xen/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y	+= grant-table.o features.o events.o manage.o

obj-y	+= grant-table.o features.o events.o manage.o biomerge.o

obj-y	+= xenbus/



nostackp := $(call cc-option, -fno-stack-protector)

drivers/xen/biomerge.c

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#include <linux/bio.h>

#include <linux/io.h>

#include <xen/page.h>



bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,

			       const struct bio_vec *vec2)

{

	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) &&

		((mfn1 == mfn2) || ((mfn1+1) == mfn2));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE