This is a note to let you know that I've just added the patch titled CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM to the 4.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: config_xen_pv-breaks-xen_create_contiguous_region-on-arm.patch and it can be found in the queue-4.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From f9005571701920551bcf54a500973fb61f2e1eda Mon Sep 17 00:00:00 2001 From: Stefano Stabellini <stefanos@xxxxxxxxxx> Date: Wed, 31 Oct 2018 16:11:49 -0700 Subject: CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM From: Stefano Stabellini <stefanos@xxxxxxxxxx> commit f9005571701920551bcf54a500973fb61f2e1eda upstream. xen_create_contiguous_region has now only an implementation if CONFIG_XEN_PV is defined. However, on ARM we never set CONFIG_XEN_PV but we do have an implementation of xen_create_contiguous_region which is required for swiotlb-xen to work correctly (although it just sets *dma_handle). [backport: remove change to xen_remap_pfn] Cc: <stable@xxxxxxxxxxxxxxx> # 4.12 Fixes: 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds") Signed-off-by: Stefano Stabellini <stefanos@xxxxxxxxxx> Reviewed-by: Juergen Gross <jgross@xxxxxxxx> CC: Jeff.Kubascik@xxxxxxxxxxxxxxx CC: Jarvis.Roach@xxxxxxxxxxxxxxx CC: Nathan.Studer@xxxxxxxxxxxxxxx CC: vkuznets@xxxxxxxxxx CC: boris.ostrovsky@xxxxxxxxxx CC: jgross@xxxxxxxx CC: julien.grall@xxxxxxx Signed-off-by: Juergen Gross <jgross@xxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/xen/xen-ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -41,7 +41,7 @@ int xen_setup_shutdown_event(void); extern unsigned long *xen_contiguous_bitmap; -#ifdef CONFIG_XEN_PV +#if defined(CONFIG_XEN_PV) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, unsigned int address_bits, dma_addr_t *dma_handle); Patches currently in stable-queue which might be from stefanos@xxxxxxxxxx are queue-4.18/config_xen_pv-breaks-xen_create_contiguous_region-on-arm.patch