Skip to contentSkip to conversation

FAILED: patch "[PATCH] CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM" failed to apply to 4.19-stable tree

PATCH [email protected] 2 participants 3 messages Nov 12, 2018 – Nov 20, 2018

Subsystems (2)
Stable branch Xen hypervisor interface
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From f9005571701920551bcf54a500973fb61f2e1eda Mon Sep 17 00:00:00 2001

From: Stefano Stabellini <[email protected]>
Date: Wed, 31 Oct 2018 16:11:49 -0700
Subject: [PATCH] CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM

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

Cc <[email protected]> # 4.12
Fixes 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds")
Signed-off-by Stefano Stabellini <[email protected]>
Reviewed-by Juergen Gross <[email protected]>
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
Signed-off-by Juergen Gross <[email protected]>
include/xen/xen-ops.h +7 -5
index 18803ff76e27..4969817124a8 100644
@@ -42,16 +42,12 @@ 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);
 
 void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order);
-
-int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
-		  xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot,
-		  unsigned int domid, bool no_translate, struct page **pages);
 #else
 static inline int xen_create_contiguous_region(phys_addr_t pstart,
 					       unsigned int order,

@@ -63,7 +59,13 @@ static inline int xen_create_contiguous_region(phys_addr_t pstart,
 
 static inline void xen_destroy_contiguous_region(phys_addr_t pstart,
 						 unsigned int order) { }
+#endif
 
+#if defined(CONFIG_XEN_PV)
+int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
+		  xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot,
+		  unsigned int domid, bool no_translate, struct page **pages);
+#else
 static inline int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
 				xen_pfn_t *pfn, int nr, int *err_ptr,
 				pgprot_t prot,  unsigned int domid,
Reviewed-by Juergen Gross
#1 lore raw
Quoted 4 lines · On Sun, 11 Nov 2018, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Hi Greg,

The following patch applies to 4.19, 4.18 and 4.14. I just had to remove the change to xen_remap_pfn.

I can resend separately if you prefer.

Cheers,

Stefano

---

Quoted 1 line
Quoted 1 line

From f9005571701920551bcf54a500973fb61f2e1eda Mon Sep 17 00:00:00 2001

From: Stefano Stabellini <[email protected]>
Date: Mon, 12 Nov 2018 09:49:11 -0800
Subject: [PATCH] CONFIG_XEN_PV breaks xen_create_contiguous_region on ARM

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 <[email protected]> # 4.12
Fixes 16624390816c ("xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds")
Signed-off-by Stefano Stabellini <[email protected]>
Reviewed-by Juergen Gross <[email protected]>
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
CC [email protected]
Signed-off-by Juergen Gross <[email protected]>
---
 include/xen/xen-ops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/xen/xen-ops.h +1 -1
index fd18c97..f6e798d 100644
@@ -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);
Signature · 1 line
2.7.4
author maintainer
#2 lore raw
Quoted 6 lines · Stefano Stabellini
Quoted 4 lines · On Sun, 11 Nov 2018, [email protected] wrote:

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 6 lines

Hi Greg,

The following patch applies to 4.19, 4.18 and 4.14. I just had to remove the change to xen_remap_pfn.

I can resend separately if you prefer.

Now applied, thanks.

greg k-h