Update to kernel-4.19.1 and rework patches

0001-kbuild-AFTER_LINK.patch

@@ -1,4 +1,4 @@
-From 649d991ca7737dd227f2a1ca4f30247daf6a7b4b Mon Sep 17 00:00:00 2001
+From ca7615cf7944d9b233b7cfad8f0465b4dfc87fba Mon Sep 17 00:00:00 2001
 From: Roland McGrath <roland@redhat.com>
 Date: Mon, 6 Oct 2008 23:03:03 -0700
 Subject: [PATCH] kbuild: AFTER_LINK
@@ -11,20 +11,16 @@ Upstream-status: ??
 
 Signed-off-by: Roland McGrath <roland@redhat.com>
 ---
- arch/arm64/kernel/vdso/Makefile     | 3 ++-
+ arch/arm64/kernel/vdso/Makefile | 3 ++-
- arch/powerpc/kernel/vdso32/Makefile | 3 ++-
+ arch/x86/entry/vdso/Makefile    | 5 +++--
- arch/powerpc/kernel/vdso64/Makefile | 3 ++-
+ scripts/link-vmlinux.sh         | 4 ++++
- arch/s390/kernel/vdso32/Makefile    | 3 ++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
- arch/s390/kernel/vdso64/Makefile    | 3 ++-
- arch/x86/entry/vdso/Makefile        | 5 +++--
- scripts/link-vmlinux.sh             | 4 ++++
- 7 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
-index 62c84f7..f44236a 100644
+index b215c712d897..e18cd2a3ea53 100644
 --- a/arch/arm64/kernel/vdso/Makefile
 +++ b/arch/arm64/kernel/vdso/Makefile
-@@ -54,7 +54,8 @@ $(obj-vdso): %.o: %.S FORCE
+@@ -55,7 +55,8 @@ $(obj-vdso): %.o: %.S FORCE
  
  # Actual build commands
  quiet_cmd_vdsold = VDSOL   $@
@@ -35,26 +31,26 @@ index 62c84f7..f44236a 100644
        cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
  
 diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
-index d540966..eeb47b6 100644
+index 141d415a8c80..771cc7e399dc 100644
 --- a/arch/x86/entry/vdso/Makefile
 +++ b/arch/x86/entry/vdso/Makefile
 @@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \
  quiet_cmd_vdso = VDSO    $@
-       cmd_vdso = $(CC) -nostdlib -o $@ \
+       cmd_vdso = $(LD) -nostdlib -o $@ \
  		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
--		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
+-		       -T $(filter %.lds,$^) $(filter %.o,$^) && \
 -		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
-+		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) \
++		       -T $(filter %.lds,$^) $(filter %.o,$^) \
 +		$(if $(AFTER_LINK),; $(AFTER_LINK)) && \
 +		sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
- VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \
+ VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
- 	$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
+ 	$(call ld-option, --build-id) -Bsymbolic
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index f742c65..526eee4 100755
+index c8cf45362bd6..ee9c4d8e1ddf 100755
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -111,6 +111,10 @@ vmlinux_link()
+@@ -112,6 +112,10 @@ vmlinux_link()
  			-lutil -lrt -lpthread
  		rm -f linux
  	fi
@@ -66,5 +62,5 @@ index f742c65..526eee4 100755
  
  
 -- 
-2.7.4
+2.17.1
 

0002-xen-netfront-detach-crash.patch

@@ -1,3 +1,9 @@
+From 702adf2c9c1536d5cb10b4be1340ba52654a05b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <marmarek@invisiblethingslab.com>
+Date: Thu, 6 Sep 2018 15:09:44 +0200
+Subject: [PATCH] xen-netfront-detach-crash
+
 When it get to free_page(queue->grant_tx_page[i]), the use counter on this page
 is already 0, which cause a crash. Not sure if this is the proper fix
 (according to git log this may introduce some memory leak), but at least it
@@ -5,12 +11,15 @@ prevent the crash.
 
 Details in this thread:
 http://xen.markmail.org/thread/pw5edbtqienjx4q5
+---
+ drivers/net/xen-netfront.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index f821a97..a5efbb0 100644
+index f17f602e6171..61298526aee3 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -1065,9 +1069,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
+@@ -1140,9 +1140,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
  
  		skb = queue->tx_skbs[i].skb;
  		get_page(queue->grant_tx_page[i]);
@@ -24,3 +33,6 @@ index f821a97..a5efbb0 100644
  		queue->grant_tx_page[i] = NULL;
  		queue->grant_tx_ref[i] = GRANT_INVALID_REF;
  		add_id_to_freelist(&queue->tx_skb_freelist, queue->tx_skbs, i);
+-- 
+2.17.1
+

0003-mce-hide-EBUSY-initialization-error-on-Xen.patch

@@ -1,4 +1,4 @@
-From 26df8496fdb73e9ae2bdf9d1684484196260a8f3 Mon Sep 17 00:00:00 2001
+From 2d71f4d315dfcaaa9e4c1e3693e391f9d2b0a8b4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Tue, 5 Jan 2016 02:44:04 +0100
@@ -6,8 +6,6 @@ Subject: [PATCH] mce: hide EBUSY initialization error on Xen
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-Organization: Invisible Things Lab
-Cc: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
 
 In case of Xen, the device is already registered by xen mcelog (in
 xen_late_init_mcelog), so fail here is expected. Note that
@@ -41,12 +39,12 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index c5b0d56..69b0b4b 100644
+index 953b3ce92dcc..e0bb9b52d8d1 100644
 --- a/arch/x86/kernel/cpu/mcheck/mce.c
 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
-@@ -53,6 +53,10 @@
+@@ -52,6 +52,10 @@
+ #include <asm/msr.h>
  #include <asm/reboot.h>
- #include <asm/set_memory.h>
  
 +#ifdef CONFIG_XEN_MCE_LOG
 +#include <xen/xen.h>
@@ -55,7 +53,7 @@ index c5b0d56..69b0b4b 100644
  #include "mce-internal.h"
  
  static DEFINE_MUTEX(mce_log_mutex);
-@@ -2355,6 +2359,11 @@ static __init int mcheck_init_device(void)
+@@ -2395,6 +2399,11 @@ static __init int mcheck_init_device(void)
  	free_cpumask_var(mce_device_initialized);
  
  err_out:
@@ -68,5 +66,5 @@ index c5b0d56..69b0b4b 100644
  
  	return err;
 -- 
-2.1.0
+2.17.1
 

0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch

@@ -0,0 +1,27 @@
+From 84160fa4557bf07017e35180d53abe4ea6ef7b14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <marmarek@invisiblethingslab.com>
+Date: Sat, 30 Jan 2016 01:53:26 +0100
+Subject: [PATCH] Log error code of EVTCHNOP_bind_pirq failure
+
+Ease debugging of PCI passthrough problems.
+---
+ drivers/xen/events/events_base.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
+index e6c1934734b7..0458fcefa4b9 100644
+--- a/drivers/xen/events/events_base.c
++++ b/drivers/xen/events/events_base.c
+@@ -521,7 +521,7 @@ static unsigned int __startup_pirq(unsigned int irq)
+ 					BIND_PIRQ__WILL_SHARE : 0;
+ 	rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
+ 	if (rc != 0) {
+-		pr_warn("Failed to obtain physical IRQ %d\n", irq);
++		pr_warn("Failed to obtain physical IRQ %d (error %d)\n", irq, rc);
+ 		return 0;
+ 	}
+ 	evtchn = bind_pirq.port;
+-- 
+2.17.1
+

0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch

@@ -1,8 +1,19 @@
+From 6bec01bac2a0b1b8d7639de2c7fd646363f57d2d Mon Sep 17 00:00:00 2001
+From: Marek Marczykowski <marmarek@invisiblethingslab.com>
+Date: Mon, 11 Jun 2012 22:49:31 +0200
+Subject: [PATCH] pvops: respect 'removable' xenstore flag for block devices
+
+Especially this is needed by pmount to allow mount qvm-block attached devices
+by normal user.
+---
+ drivers/block/xen-blkfront.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index 4e86393..34493d7 100644
+index 429d20131c7e..2541d8c38336 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -2317,6 +2317,7 @@ static void blkfront_connect(struct blkfront_info *info)
+@@ -2338,6 +2338,7 @@ static void blkfront_connect(struct blkfront_info *info)
  	unsigned int binfo;
  	char *envp[] = { "RESIZE=1", NULL };
  	int err, i;
@@ -10,7 +21,7 @@ index 4e86393..34493d7 100644
  
  	switch (info->connected) {
  	case BLKIF_STATE_CONNECTED:
-@@ -2384,6 +2385,12 @@ static void blkfront_connect(struct blkfront_info *info)
+@@ -2405,6 +2406,12 @@ static void blkfront_connect(struct blkfront_info *info)
  		}
  	}
  
@@ -23,3 +34,6 @@ index 4e86393..34493d7 100644
  	err = xlvbd_alloc_gendisk(sectors, info, binfo, sector_size,
  				  physical_sector_size);
  	if (err) {
+-- 
+2.17.1
+

0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch

@@ -0,0 +1,34 @@
+From 6b4db8c77bd178701b3f501135ab3be08cdc43ac Mon Sep 17 00:00:00 2001
+From: Marek Marczykowski <marmarek@invisiblethingslab.com>
+Date: Sun, 15 Jul 2012 19:57:47 +0200
+Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
+
+---
+ drivers/block/xen-blkfront.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
+index 2541d8c38336..3f6df7d98265 100644
+--- a/drivers/block/xen-blkfront.c
++++ b/drivers/block/xen-blkfront.c
+@@ -47,6 +47,7 @@
+ #include <linux/bitmap.h>
+ #include <linux/list.h>
+ #include <linux/workqueue.h>
++#include <linux/fd.h>
+ 
+ #include <xen/xen.h>
+ #include <xen/xenbus.h>
+@@ -511,6 +512,9 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
+ 			return 0;
+ 		return -EINVAL;
+ 	}
++	case FDEJECT:
++		xenbus_switch_state(info->xbdev, XenbusStateClosing);
++		return 0;
+ 
+ 	default:
+ 		/*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
+-- 
+2.17.1
+

0007-block-add-no_part_scan-module-parameter.patch

@@ -1,4 +1,4 @@
-From 19cb7d4e4efe39ef6ec8b216a254d83a1257846c Mon Sep 17 00:00:00 2001
+From a3d0a8585e975d169a3994463745620c8d8becd0 Mon Sep 17 00:00:00 2001
 From: Rusty Bird <rustybird@openmailbox.org>
 Date: Mon, 11 Jul 2016 13:05:38 +0000
 Subject: [PATCH] block: add no_part_scan module parameter
@@ -15,10 +15,10 @@ the /sys/module/block/parameters/no_part_scan file.
  1 file changed, 12 insertions(+)
 
 diff --git a/block/genhd.c b/block/genhd.c
-index 9f42526..85b71f5 100644
+index be5bab20b2ab..f4561f06e273 100644
 --- a/block/genhd.c
 +++ b/block/genhd.c
-@@ -628,6 +628,15 @@
+@@ -643,6 +643,15 @@ static void register_disk(struct device *parent, struct gendisk *disk)
  	WARN_ON(err);
  }
  
@@ -34,7 +34,7 @@ index 9f42526..85b71f5 100644
  /**
   * __device_add_disk - add disk information to kernel list
   * @parent: parent device for the disk
-@@ -645,6 +654,9 @@
+@@ -660,6 +669,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
  	dev_t devt;
  	int retval;
  
@@ -45,5 +45,5 @@ index 9f42526..85b71f5 100644
  	 * be accompanied with EXT_DEVT flag.  Make sure all
  	 * parameters make sense.
 -- 
-2.5.5
+2.17.1
 

0008-xen-Add-RING_COPY_RESPONSE.patch

@@ -1,4 +1,4 @@
-From bf0b3f33476360b5d72f87d749409b0a2b1a57cb Mon Sep 17 00:00:00 2001
+From bb7d9fa8c1c8d2e90ea7cac04fb1fafe4965ad69 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Tue, 15 Dec 2015 21:35:14 +0100

0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch

@@ -1,4 +1,4 @@
-From c7c1661d1b265ea620939bb5da4958eb0fb1385b Mon Sep 17 00:00:00 2001
+From 2d7190695574d4a39597a65d3ba3858098f22da4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:09:55 +0100
@@ -18,10 +18,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 25 insertions(+), 26 deletions(-)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 9dd2ca62d84a..1b6c319d74f1 100644
+index 61298526aee3..08ea5004e86b 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -388,13 +388,13 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
+@@ -387,13 +387,13 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
  		rmb(); /* Ensure we see responses up to 'rp'. */
  
  		for (cons = queue->tx.rsp_cons; cons != prod; cons++) {
@@ -154,7 +154,7 @@ index 9dd2ca62d84a..1b6c319d74f1 100644
  
  		if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) {
  			unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to;
-@@ -912,7 +911,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
+@@ -916,7 +915,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
  
  		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
  				skb_frag_page(nfrag),
@@ -163,7 +163,7 @@ index 9dd2ca62d84a..1b6c319d74f1 100644
  
  		skb_shinfo(nskb)->nr_frags = 0;
  		kfree_skb(nskb);
-@@ -1008,7 +1007,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)
+@@ -1012,7 +1011,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)
  	i = queue->rx.rsp_cons;
  	work_done = 0;
  	while ((i != rp) && (work_done < budget)) {

0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch

@@ -1,4 +1,4 @@
-From 11b753cc107f41aca56ba0698a1bd6b806cd6795 Mon Sep 17 00:00:00 2001
+From a72bc89ab6d6c7e171bd04357ea6954a9c62b43d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:19:37 +0100
@@ -20,10 +20,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 1b6c319d74f1..026d39702217 100644
+index 08ea5004e86b..88578e5aeaaf 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -459,7 +459,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
+@@ -458,7 +458,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
  	tx->flags = 0;
  
  	info->tx = tx;

0011-xen-netfront-add-range-check-for-Tx-response-id.patch

@@ -1,4 +1,4 @@
-From f8bc4b3be49e47dcf005ce12ef25071fe16bd45b Mon Sep 17 00:00:00 2001
+From 91bac2da855a018b8ffd1bed9694e9c962340f08 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:22:24 +0100
@@ -19,10 +19,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 026d39702217..4150128ab893 100644
+index 88578e5aeaaf..69e1c3aebe71 100644
 --- a/drivers/net/xen-netfront.c
 +++ b/drivers/net/xen-netfront.c
-@@ -395,6 +395,7 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
+@@ -394,6 +394,7 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
  				continue;
  
  			id  = txrsp.id;

0012-xen-blkfront-make-local-copy-of-response-before-usin.patch

@@ -1,4 +1,4 @@
-From 26baa3367516dac7e376e2595d187dd9887bf0e0 Mon Sep 17 00:00:00 2001
+From bfad51710e1523650c2cfbf9aff561bb8364d9a7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 05:51:10 +0100
@@ -20,10 +20,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index b5cedccb5d7d..87781c076733 100644
+index 3f6df7d98265..e520bc6f6007 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -1548,7 +1548,7 @@ static bool blkif_completion(unsigned long *id,
+@@ -1551,7 +1551,7 @@ static bool blkif_completion(unsigned long *id,
  static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  {
  	struct request *req;
@@ -32,7 +32,7 @@ index b5cedccb5d7d..87781c076733 100644
  	RING_IDX i, rp;
  	unsigned long flags;
  	struct blkfront_ring_info *rinfo = (struct blkfront_ring_info *)dev_id;
-@@ -1565,8 +1565,8 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1568,8 +1568,8 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  	for (i = rinfo->ring.rsp_cons; i != rp; i++) {
  		unsigned long id;
  
@@ -43,7 +43,7 @@ index b5cedccb5d7d..87781c076733 100644
  		/*
  		 * The backend has messed up and given us an id that we would
  		 * never have given to it (we stamp it up to BLK_RING_SIZE -
-@@ -1574,39 +1574,39 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1577,39 +1577,39 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  		 */
  		if (id >= BLK_RING_SIZE(info)) {
  			WARN(1, "%s: response to %s has incorrect id (%ld)\n",
@@ -91,7 +91,7 @@ index b5cedccb5d7d..87781c076733 100644
  				blkif_req(req)->error = BLK_STS_NOTSUPP;
  				info->feature_discard = 0;
  				info->feature_secdiscard = 0;
-@@ -1616,15 +1616,15 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1619,15 +1619,15 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  			break;
  		case BLKIF_OP_FLUSH_DISKCACHE:
  		case BLKIF_OP_WRITE_BARRIER:
@@ -111,7 +111,7 @@ index b5cedccb5d7d..87781c076733 100644
  				blkif_req(req)->error = BLK_STS_NOTSUPP;
  			}
  			if (unlikely(blkif_req(req)->error)) {
-@@ -1637,9 +1637,9 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
+@@ -1640,9 +1640,9 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  			/* fall through */
  		case BLKIF_OP_READ:
  		case BLKIF_OP_WRITE:

0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch

@@ -1,4 +1,4 @@
-From 5c574ee1c388258969b2c66d46db20be16c3aeb3 Mon Sep 17 00:00:00 2001
+From 98231d38e75826534ef10b0ea06ecde796b89c3c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 16 Dec 2015 06:07:14 +0100
@@ -22,10 +22,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 44 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
-index 87781c076733..3da0f6be24c9 100644
+index e520bc6f6007..8132836e225b 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -524,19 +524,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -527,19 +527,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
  
  static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
  					    struct request *req,
@@ -47,7 +47,7 @@ index 87781c076733..3da0f6be24c9 100644
  
  	return id;
  }
-@@ -544,23 +541,28 @@ static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
+@@ -547,23 +544,28 @@ static unsigned long blkif_ring_get_request(struct blkfront_ring_info *rinfo,
  static int blkif_queue_discard_req(struct request *req, struct blkfront_ring_info *rinfo)
  {
  	struct blkfront_info *info = rinfo->dev_info;
@@ -84,7 +84,7 @@ index 87781c076733..3da0f6be24c9 100644
  
  	return 0;
  }
-@@ -692,7 +694,7 @@ static void blkif_setup_extra_req(struct blkif_request *first,
+@@ -695,7 +697,7 @@ static void blkif_setup_extra_req(struct blkif_request *first,
  static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *rinfo)
  {
  	struct blkfront_info *info = rinfo->dev_info;
@@ -93,7 +93,7 @@ index 87781c076733..3da0f6be24c9 100644
  	unsigned long id, extra_id = NO_ASSOCIATED_ID;
  	bool require_extra_req = false;
  	int i;
-@@ -757,16 +759,16 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -760,16 +762,16 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  		 * BLKIF_OP_WRITE
  		 */
  		BUG_ON(req_op(req) == REQ_OP_FLUSH || req->cmd_flags & REQ_FUA);
@@ -118,7 +118,7 @@ index 87781c076733..3da0f6be24c9 100644
  			BLKIF_OP_WRITE : BLKIF_OP_READ;
  		if (req_op(req) == REQ_OP_FLUSH || req->cmd_flags & REQ_FUA) {
  			/*
-@@ -777,15 +779,15 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -780,15 +782,15 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  			 * since it is guaranteed ordered WRT previous writes.)
  			 */
  			if (info->feature_flush && info->feature_fua)
@@ -138,7 +138,7 @@ index 87781c076733..3da0f6be24c9 100644
  		if (unlikely(require_extra_req)) {
  			extra_id = blkif_ring_get_request(rinfo, req,
  							  &extra_ring_req);
-@@ -795,7 +797,7 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -798,7 +800,7 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  			 */
  			rinfo->shadow[extra_id].num_sg = 0;
  
@@ -147,7 +147,7 @@ index 87781c076733..3da0f6be24c9 100644
  
  			/* Link the 2 requests together */
  			rinfo->shadow[extra_id].associated_id = id;
-@@ -803,12 +805,12 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -806,12 +808,12 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  		}
  	}
  
@@ -162,7 +162,7 @@ index 87781c076733..3da0f6be24c9 100644
  
  	for_each_sg(rinfo->shadow[id].sg, sg, num_sg, i) {
  		BUG_ON(sg->offset + sg->length > PAGE_SIZE);
-@@ -830,10 +832,20 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
+@@ -833,10 +835,20 @@ static int blkif_queue_rw_req(struct request *req, struct blkfront_ring_info *ri
  	if (setup.segments)
  		kunmap_atomic(setup.segments);
  

0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch

@@ -0,0 +1,75 @@
+From ca6107528e5b5c986b64297ae62f706b5b391b0c Mon Sep 17 00:00:00 2001
+From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Date: Wed, 1 Apr 2015 17:01:26 -0400
+Subject: [PATCH] xen/pcifront/pciback: Update pciif.h with ->err and ->result
+ values.
+
+The '->err' should contain only the XEN_PCI_ERR_* type values.
+The '->result' may contain -EXX values or any other value
+that the XEN_PCI_OP_* deems appropiate.
+
+As such update the header and also the implementations.
+
+Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+
+Details in this thread:
+https://patchwork.kernel.org/patch/8258431/
+---
+ drivers/pci/xen-pcifront.c            | 2 +-
+ drivers/xen/xen-pciback/pciback_ops.c | 2 +-
+ include/xen/interface/io/pciif.h      | 6 ++++--
+ 3 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
+index eba6e33147a2..cc6dcb13f1a8 100644
+--- a/drivers/pci/xen-pcifront.c
++++ b/drivers/pci/xen-pcifront.c
+@@ -298,7 +298,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
+ 	} else {
+ 		pci_err(dev, "enable msix get err %x\n", err);
+ 	}
+-	return err;
++	return err ? -EINVAL : 0;
+ }
+ 
+ static void pci_frontend_disable_msix(struct pci_dev *dev)
+diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
+index ea4a08b83fa0..2d63aa2946a3 100644
+--- a/drivers/xen/xen-pciback/pciback_ops.c
++++ b/drivers/xen/xen-pciback/pciback_ops.c
+@@ -268,7 +268,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
+ 	if (dev_data)
+ 		dev_data->ack_intr = 0;
+ 
+-	return result > 0 ? 0 : result;
++	return result >= 0 ? 0 : XEN_PCI_ERR_op_failed;
+ }
+ 
+ static
+diff --git a/include/xen/interface/io/pciif.h b/include/xen/interface/io/pciif.h
+index d9922ae36eb5..c8b674fd2455 100644
+--- a/include/xen/interface/io/pciif.h
++++ b/include/xen/interface/io/pciif.h
+@@ -70,7 +70,7 @@ struct xen_pci_op {
+ 	/* IN: what action to perform: XEN_PCI_OP_* */
+ 	uint32_t cmd;
+ 
+-	/* OUT: will contain an error number (if any) from errno.h */
++	/* OUT: will contain an XEN_PCI_ERR_* number. */
+ 	int32_t err;
+ 
+ 	/* IN: which device to touch */
+@@ -82,7 +82,9 @@ struct xen_pci_op {
+ 	int32_t offset;
+ 	int32_t size;
+ 
+-	/* IN/OUT: Contains the result after a READ or the value to WRITE */
++	/* IN/OUT: Contains the result after a READ or the value to WRITE.
++	 * If the err does not have XEN_PCI_ERR_success, depending on
++	 * XEN_PCI_OP_* might have the errno value. */
+ 	uint32_t value;
+ 	/* IN: Contains extra infor for this operation */
+ 	uint32_t info;
+-- 
+2.17.1
+

0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch

@@ -1,4 +1,4 @@
-From 292dcb5eb9ceedeb981eb926be566af8c99cbb26 Mon Sep 17 00:00:00 2001
+From 7cea4f1e3e43d8fc20e2605495d6ed24bfeeeb9b Mon Sep 17 00:00:00 2001
 From: HW42 <hw42@ipsumj.de>
 Date: Tue, 12 Sep 2017 00:49:02 +0200
 Subject: [PATCH] xen-pciback: add attribute to allow MSI enable flag writes
@@ -14,14 +14,16 @@ guest (or stubdom) can already generate MSIs through other ways, see
 
 [1]: https://invisiblethingslab.com/resources/2011/Software%20Attacks%20on%20Intel%20VT-d.pdf
 ---
- drivers/xen/xen-pciback/conf_space_capability.c | 39 +++++++++++++++
+ .../xen/xen-pciback/conf_space_capability.c   | 39 +++++++++++
- drivers/xen/xen-pciback/pci_stub.c              | 65 +++++++++++++++++++++++++
+ drivers/xen/xen-pciback/pci_stub.c            | 64 +++++++++++++++++++
- drivers/xen/xen-pciback/pciback.h               |  1 +
+ drivers/xen/xen-pciback/pciback.h             |  1 +
- 3 files changed, 105 insertions(+)
+ 3 files changed, 104 insertions(+)
 
+diff --git a/drivers/xen/xen-pciback/conf_space_capability.c b/drivers/xen/xen-pciback/conf_space_capability.c
+index 73427d8e0116..a277ddc7f7b4 100644
 --- a/drivers/xen/xen-pciback/conf_space_capability.c
 +++ b/drivers/xen/xen-pciback/conf_space_capability.c
-@@ -190,6 +190,40 @@ static const struct config_field caplist
+@@ -190,6 +190,40 @@ static const struct config_field caplist_pm[] = {
  	{}
  };
  
@@ -62,7 +64,7 @@ guest (or stubdom) can already generate MSIs through other ways, see
  static struct xen_pcibk_config_capability xen_pcibk_config_capability_pm = {
  	.capability = PCI_CAP_ID_PM,
  	.fields = caplist_pm,
-@@ -198,11 +232,16 @@ static struct xen_pcibk_config_capabilit
+@@ -198,11 +232,16 @@ static struct xen_pcibk_config_capability xen_pcibk_config_capability_vpd = {
  	.capability = PCI_CAP_ID_VPD,
  	.fields = caplist_vpd,
  };
@@ -79,9 +81,11 @@ guest (or stubdom) can already generate MSIs through other ways, see
  
  	return 0;
  }
+diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
+index 59661db144e5..51a116f37b95 100644
 --- a/drivers/xen/xen-pciback/pci_stub.c
 +++ b/drivers/xen/xen-pciback/pci_stub.c
-@@ -303,6 +303,8 @@ void pcistub_put_pci_dev(struct pci_dev
+@@ -303,6 +303,8 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
  	xen_pcibk_config_reset_dev(dev);
  	xen_pcibk_config_free_dyn_fields(dev);
  
@@ -90,7 +94,7 @@ guest (or stubdom) can already generate MSIs through other ways, see
  	xen_unregister_device_domain_owner(dev);
  
  	spin_lock_irqsave(&found_psdev->lock, flags);
-@@ -1430,6 +1432,63 @@ static ssize_t permissive_show(struct de
+@@ -1430,6 +1432,63 @@ static ssize_t permissive_show(struct device_driver *drv, char *buf)
  }
  static DRIVER_ATTR_RW(permissive);
  
@@ -154,15 +158,15 @@ guest (or stubdom) can already generate MSIs through other ways, see
  static void pcistub_exit(void)
  {
  	driver_remove_file(&xen_pcibk_pci_driver.driver, &driver_attr_new_slot);
-@@ -1440,6 +1499,8 @@ static void pcistub_exit(void)
+@@ -1439,6 +1498,8 @@ static void pcistub_exit(void)
+ 	driver_remove_file(&xen_pcibk_pci_driver.driver, &driver_attr_quirks);
  	driver_remove_file(&xen_pcibk_pci_driver.driver,
  			   &driver_attr_permissive);
- 	driver_remove_file(&xen_pcibk_pci_driver.driver,
-+			   &driver_attr_allow_msi_enable);
 +	driver_remove_file(&xen_pcibk_pci_driver.driver,
++			   &driver_attr_allow_msi_enable);
+ 	driver_remove_file(&xen_pcibk_pci_driver.driver,
  			   &driver_attr_irq_handlers);
  	driver_remove_file(&xen_pcibk_pci_driver.driver,
- 			   &driver_attr_irq_handler_state);
 @@ -1529,6 +1590,9 @@ static int __init pcistub_init(void)
  	if (!err)
  		err = driver_create_file(&xen_pcibk_pci_driver.driver,
@@ -173,6 +177,8 @@ guest (or stubdom) can already generate MSIs through other ways, see
  
  	if (!err)
  		err = driver_create_file(&xen_pcibk_pci_driver.driver,
+diff --git a/drivers/xen/xen-pciback/pciback.h b/drivers/xen/xen-pciback/pciback.h
+index 263c059bff90..796f949c92be 100644
 --- a/drivers/xen/xen-pciback/pciback.h
 +++ b/drivers/xen/xen-pciback/pciback.h
 @@ -45,6 +45,7 @@ struct xen_pcibk_dev_data {
@@ -183,3 +189,6 @@ guest (or stubdom) can already generate MSIs through other ways, see
  	unsigned int warned_on_write:1;
  	unsigned int enable_intx:1;
  	unsigned int isr_on:1; /* Whether the IRQ handler is installed. */
+-- 
+2.17.1
+

patches.xen/irq-bind-debug-log.patch

@@ -1,13 +0,0 @@
-diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
-index 524c221..acb29f4 100644
---- a/drivers/xen/events/events_base.c
-+++ b/drivers/xen/events/events_base.c
-@@ -519,7 +519,7 @@ static unsigned int __startup_pirq(unsigned int irq)
- 					BIND_PIRQ__WILL_SHARE : 0;
- 	rc = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
- 	if (rc != 0) {
--		pr_warn("Failed to obtain physical IRQ %d\n", irq);
-+		pr_warn("Failed to obtain physical IRQ %d (error %d)\n", irq, rc);
- 		return 0;
- 	}
- 	evtchn = bind_pirq.port;

patches.xen/pci_op-cleanup.patch

@@ -1,104 +0,0 @@
-From xen-devel-bounces@lists.xen.org Tue Feb  9 06:00:36 2016
-Date: Mon, 8 Feb 2016 23:59:27 -0500
-From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-To: Marek =?iso-8859-1?Q?Marczykowski-G=F3recki?=
-	<marmarek@invisiblethingslab.com>
-Message-ID: <20160209045927.GC3853@localhost.localdomain>
-References: <CANQMFx4YULqKctKZqeESesTQjLQun7rQ0ZjGzq96TXTtUw6VWA@mail.gmail.com>
-	<20160127183005.GB3134@char.us.oracle.com>
-	<CANQMFx5macG2AbNWtrKjs6o445_Jo7+twMaDg6ozE=0DSD_n7A@mail.gmail.com>
-	<1454323426.28781.73.camel@citrix.com>
-	<20160201145053.GA21826@char.us.oracle.com>
-	<20160203142230.GC24446@mail-itl>
-	<20160203152657.GE20732@char.us.oracle.com>
-	<20160208173917.GD24446@mail-itl>
-MIME-Version: 1.0
-Content-Disposition: inline
-In-Reply-To: <20160208173917.GD24446@mail-itl>
-User-Agent: Mutt/1.5.24 (2015-08-30)
-Cc: Tommi Airikka <tommi@airikka.net>, Ian Campbell <ian.campbell@citrix.com>,
-	810379@bugs.debian.org, xen-devel@lists.xen.org
-Subject: Re: [Xen-devel] [BUG] pci-passthrough generates "xen:events: Failed
- to obtain physical IRQ" for some devices
-
-I posted it at some point. It was that the MSI-X enable op stashes the
-error value in op->value. But 'op->value' is an unsigned int so the
-value ends up being 0xfffffe or such. And the other PV frontends only
-check for !0 - and manufacture their own value (-EINVAL).
-
-Hence I want to update the pciff.h .. Oh here is the patch:
-Oh man. A year?!
-
-Anyhow this can be posted as a cleanup patch seperately of the
-bug-fixes.
-
-commit 393be47782bca7a24d3e365448d4d3d1a303abfe
-Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Date:   Wed Apr 1 17:01:26 2015 -0400
-
-    xen/pcifront/pciback: Update pciif.h with ->err and ->result values.
-
-    The '->err' should contain only the XEN_PCI_ERR_* type values.
-    The '->result' may contain -EXX values or any other value
-    that the XEN_PCI_OP_* deems appropiate.
-
-    As such update the header and also the implementations.
-
-    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-
-    Conflicts:
-    	drivers/xen/xen-pciback/pciback_ops.c
-
-    Conflicts:
-    	drivers/xen/xen-pciback/pciback_ops.c
-
-diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
-index 8785014..d458e53 100644
---- a/drivers/pci/xen-pcifront.c
-+++ b/drivers/pci/xen-pcifront.c
-@@ -298,7 +298,7 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
- 	} else {
-		pci_err(dev, "enable msix get err %x\n", err);
- 	}
--	return err;
-+	return err ? -EINVAL : 0;
- }
-
- static void pci_frontend_disable_msix(struct pci_dev *dev)
-diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
-index ee2c891..573590b 100644
---- a/drivers/xen/xen-pciback/pciback_ops.c
-+++ b/drivers/xen/xen-pciback/pciback_ops.c
-@@ -268,7 +268,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
- 	if (dev_data)
- 		dev_data->ack_intr = 0;
-
--	return result > 0 ? 0 : result;
-+	return result >= 0 ? 0 : XEN_PCI_ERR_op_failed;
- }
-
- static
-diff --git a/include/xen/interface/io/pciif.h b/include/xen/interface/io/pciif.h
-index d9922ae..c8b674f 100644
---- a/include/xen/interface/io/pciif.h
-+++ b/include/xen/interface/io/pciif.h
-@@ -70,7 +70,7 @@ struct xen_pci_op {
- 	/* IN: what action to perform: XEN_PCI_OP_* */
- 	uint32_t cmd;
-
--	/* OUT: will contain an error number (if any) from errno.h */
-+	/* OUT: will contain an XEN_PCI_ERR_* number. */
- 	int32_t err;
-
- 	/* IN: which device to touch */
-@@ -82,7 +82,9 @@ struct xen_pci_op {
- 	int32_t offset;
- 	int32_t size;
-
--	/* IN/OUT: Contains the result after a READ or the value to WRITE */
-+	/* IN/OUT: Contains the result after a READ or the value to WRITE.
-+	 * If the err does not have XEN_PCI_ERR_success, depending on
-+	 * XEN_PCI_OP_* might have the errno value. */
- 	uint32_t value;
- 	/* IN: Contains extra infor for this operation */
- 	uint32_t info;

patches.xen/pvops-blkfront-eject-support.patch

@@ -1,20 +0,0 @@
---- linux-3.4.1.orig/drivers/block/xen-blkfront.c	2012-06-01 09:18:44.000000000 +0200
-+++ linux-3.4.1/drivers/block/xen-blkfront.c	2012-07-15 15:54:31.350255623 +0200
-@@ -44,6 +44,7 @@
- #include <linux/scatterlist.h>
- #include <linux/bitmap.h>
- #include <linux/list.h>
-+#include <linux/fd.h>
- 
- #include <xen/xen.h>
- #include <xen/xenbus.h>
-@@ -241,6 +264,9 @@
- 			return 0;
- 		return -EINVAL;
- 	}
-+	case FDEJECT:
-+		xenbus_switch_state(info->xbdev, XenbusStateClosing);
-+		return 0;
- 
- 	default:
- 		/*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",

patches.xen/xen-balloon-add-runtime-control-for-scrubbing-balloo.patch

@@ -1,167 +0,0 @@
-From 59e44d8c45afe91204e90229bef64a6d2c5ac103 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
-Date: Thu, 6 Sep 2018 15:09:44 +0200
-Subject: [PATCH] xen/balloon: add runtime control for scrubbing ballooned out
- pages
-
-Scrubbing pages on initial balloon down can take some time, especially
-in nested virtualization case (nested EPT is slow). When HVM/PVH guest is
-started with memory= significantly lower than maxmem=, all the extra
-pages will be scrubbed before returning to Xen. But since most of them
-weren't used at all at that point, Xen needs to populate them first
-(from populate-on-demand pool). In nested virt case (Xen inside KVM)
-this slows down the guest boot by 15-30s with just 1.5GB needed to be
-returned to Xen.
-
-Add runtime parameter to enable/disable it, to allow initially disabling
-scrubbing, then enable it back during boot (for example in initramfs).
-Such usage relies on assumption that a) most pages ballooned out during
-initial boot weren't used at all, and b) even if they were, very few
-secrets are in the guest at that time (before any serious userspace
-kicks in).
-Convert CONFIG_XEN_SCRUB_PAGES to CONFIG_XEN_SCRUB_PAGES_DEFAULT (also
-enabled by default), controlling default value for the new runtime
-switch.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
-
----
- .../ABI/stable/sysfs-devices-system-xen_memory         |  9 +++++++++
- Documentation/admin-guide/kernel-parameters.txt        |  6 ++++++
- drivers/xen/Kconfig                                    | 10 +++++++---
- drivers/xen/balloon.c                                  |  9 ++++++---
- drivers/xen/xen-balloon.c                              |  2 ++
- include/xen/balloon.h                                  |  1 +
- 6 files changed, 31 insertions(+), 6 deletions(-)
-
-diff --git a/Documentation/ABI/stable/sysfs-devices-system-xen_memory b/Documentation/ABI/stable/sysfs-devices-system-xen_memory
-index caa311d59ac1..6d83f95a8a8e 100644
---- a/Documentation/ABI/stable/sysfs-devices-system-xen_memory
-+++ b/Documentation/ABI/stable/sysfs-devices-system-xen_memory
-@@ -75,3 +75,12 @@ Contact:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
- Description:
- 		Amount (in KiB) of low (or normal) memory in the
- 		balloon.
-+
-+What:		/sys/devices/system/xen_memory/xen_memory0/scrub_pages
-+Date:		September 2018
-+KernelVersion:	4.20
-+Contact:	xen-devel@lists.xenproject.org
-+Description:
-+		Control scrubbing pages before returning them to Xen for others domains
-+		use. Can be set with xen_scrub_pages cmdline
-+		parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 1370b424a453..c62691ddd476 100644
---- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -4921,6 +4921,12 @@
- 			Disables the PV optimizations forcing the HVM guest to
- 			run as generic HVM guest with no PV drivers.
- 
-+	xen_scrub_pages=	[XEN]
-+			Boolean option to control scrubbing pages before giving them back
-+			to Xen, for use by other domains. Can be also changed at runtime
-+			with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.
-+			Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.
-+
- 	xirc2ps_cs=	[NET,PCMCIA]
- 			Format:
- 			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]
-diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
-index e5d0c28372ea..2f0353290ce5 100644
---- a/drivers/xen/Kconfig
-+++ b/drivers/xen/Kconfig
-@@ -79,15 +79,19 @@ config XEN_BALLOON_MEMORY_HOTPLUG_LIMIT
- 	  This value is used to allocate enough space in internal
- 	  tables needed for physical memory administration.
- 
--config XEN_SCRUB_PAGES
--	bool "Scrub pages before returning them to system"
-+config XEN_SCRUB_PAGES_DEFAULT
-+	bool "Scrub pages before returning them to system by default"
- 	depends on XEN_BALLOON
- 	default y
- 	help
- 	  Scrub pages before returning them to the system for reuse by
- 	  other domains.  This makes sure that any confidential data
- 	  is not accidentally visible to other domains.  Is it more
--	  secure, but slightly less efficient.
-+	  secure, but slightly less efficient. This can be controlled with
-+	  xen_scrub_pages=0 parameter and
-+	  /sys/devices/system/xen_memory/xen_memory0/scrub_pages.
-+	  This option only sets the default value.
-+
- 	  If in doubt, say yes.
- 
- config XEN_DEV_EVTCHN
-diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
-index 065f0b607373..a3e5dfa71796 100644
---- a/drivers/xen/balloon.c
-+++ b/drivers/xen/balloon.c
-@@ -56,6 +56,7 @@
- #include <linux/percpu-defs.h>
- #include <linux/slab.h>
- #include <linux/sysctl.h>
-+#include <linux/moduleparam.h>
- 
- #include <asm/page.h>
- #include <asm/pgalloc.h>
-@@ -74,6 +75,9 @@
- 
- static int xen_hotplug_unpopulated;
- 
-+bool __read_mostly xen_scrub_pages = IS_ENABLED(CONFIG_XEN_SCRUB_PAGES_DEFAULT);
-+core_param(xen_scrub_pages, xen_scrub_pages, bool, 0);
-+
- #ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG
- 
- static int zero;
-@@ -159,9 +163,8 @@ static DECLARE_DELAYED_WORK(balloon_worker, balloon_process);
- 
- static void scrub_page(struct page *page)
- {
--#ifdef CONFIG_XEN_SCRUB_PAGES
--	clear_highpage(page);
--#endif
-+	if (xen_scrub_pages)
-+		clear_highpage(page);
- }
- 
- /* balloon_append: add the given page to the balloon. */
-diff --git a/drivers/xen/xen-balloon.c b/drivers/xen/xen-balloon.c
-index b437fccd4e62..a3dd7c6ec371 100644
---- a/drivers/xen/xen-balloon.c
-+++ b/drivers/xen/xen-balloon.c
-@@ -137,6 +137,7 @@ static DEVICE_ULONG_ATTR(schedule_delay, 0444, balloon_stats.schedule_delay);
- static DEVICE_ULONG_ATTR(max_schedule_delay, 0644, balloon_stats.max_schedule_delay);
- static DEVICE_ULONG_ATTR(retry_count, 0444, balloon_stats.retry_count);
- static DEVICE_ULONG_ATTR(max_retry_count, 0644, balloon_stats.max_retry_count);
-+static DEVICE_BOOL_ATTR(scrub_pages, 0644, xen_scrub_pages);
- 
- static ssize_t show_target_kb(struct device *dev, struct device_attribute *attr,
- 			      char *buf)
-@@ -203,6 +204,7 @@ static struct attribute *balloon_attrs[] = {
- 	&dev_attr_max_schedule_delay.attr.attr,
- 	&dev_attr_retry_count.attr.attr,
- 	&dev_attr_max_retry_count.attr.attr,
-+	&dev_attr_scrub_pages.attr.attr,
- 	NULL
- };
- 
-diff --git a/include/xen/balloon.h b/include/xen/balloon.h
-index 61f410fd74e4..0ec832b9ff55 100644
---- a/include/xen/balloon.h
-+++ b/include/xen/balloon.h
-@@ -21,6 +21,7 @@ struct balloon_stats {
- };
- 
- extern struct balloon_stats balloon_stats;
-+extern bool xen_scrub_pages;
- 
- void balloon_set_new_target(unsigned long target);
- 
--- 
-2.17.1
-

patches.xen/xsa270.patch

@@ -1,49 +0,0 @@
-From: Jan Beulich <jbeulich@suse.com>
-Subject: xen-netback: fix input validation in xenvif_set_hash_mapping()
-
-Both len and off are frontend specified values, so we need to make
-sure there's no overflow when adding the two for the bounds check. We
-also want to avoid undefined behavior and hence use off to index into
-->hash.mapping[] only after bounds checking. This at the same time
-allows to take care of not applying off twice for the bounds checking
-against vif->num_queues.
-
-It is also insufficient to bounds check copy_op.len, as this is len
-truncated to 16 bits.
-
-This is XSA-270.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
-Tested-by: Paul Durrant <paul.durrant@citrix.com>
-
---- a/drivers/net/xen-netback/hash.c
-+++ b/drivers/net/xen-netback/hash.c
-@@ -332,20 +332,22 @@ u32 xenvif_set_hash_mapping_size(struct
- u32 xenvif_set_hash_mapping(struct xenvif *vif, u32 gref, u32 len,
- 			    u32 off)
- {
--	u32 *mapping = &vif->hash.mapping[off];
-+	u32 *mapping = vif->hash.mapping;
- 	struct gnttab_copy copy_op = {
- 		.source.u.ref = gref,
- 		.source.domid = vif->domid,
--		.dest.u.gmfn = virt_to_gfn(mapping),
- 		.dest.domid = DOMID_SELF,
--		.dest.offset = xen_offset_in_page(mapping),
--		.len = len * sizeof(u32),
-+		.len = len * sizeof(*mapping),
- 		.flags = GNTCOPY_source_gref
- 	};
- 
--	if ((off + len > vif->hash.size) || copy_op.len > XEN_PAGE_SIZE)
-+	if ((off + len < off) || (off + len > vif->hash.size) ||
-+	    len > XEN_PAGE_SIZE / sizeof(*mapping))
- 		return XEN_NETIF_CTRL_STATUS_INVALID_PARAMETER;
- 
-+	copy_op.dest.u.gmfn = virt_to_gfn(mapping + off);
-+	copy_op.dest.offset = xen_offset_in_page(mapping + off);
-+
- 	while (len-- != 0)
- 		if (mapping[off++] >= vif->num_queues)
- 			return XEN_NETIF_CTRL_STATUS_INVALID_PARAMETER;

series.conf

@@ -1,28 +1,23 @@
-patches.rpmify/makefile-after_link.patch
+0001-kbuild-AFTER_LINK.patch
-
+0002-xen-netfront-detach-crash.patch
-patches.xen/xen-netfront-detach-crash.patch
+0003-mce-hide-EBUSY-initialization-error-on-Xen.patch
-patches.xen/0001-mce-hide-EBUSY-initialization-error-on-Xen.patch
+0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
-patches.xen/irq-bind-debug-log.patch
-patches.xen/xen-balloon-add-runtime-control-for-scrubbing-balloo.patch
 
 # Additional features
-#patches.xen/pvops-0100-usb-xen-pvusb-driver.patch
+0005-pvops-respect-removable-xenstore-flag-for-block-devi.patch
-patches.xen/pvops-blkfront-removable-flag.patch
+0006-pvops-xen-blkfront-handle-FDEJECT-as-detach-request-.patch
-patches.xen/pvops-blkfront-eject-support.patch
+0007-block-add-no_part_scan-module-parameter.patch
-
-patches.qubes/0001-block-add-no_part_scan-module-parameter.patch
 
 # Security fixes
-patches.xen/xsa155-linux-0008-xen-Add-RING_COPY_RESPONSE.patch
+0008-xen-Add-RING_COPY_RESPONSE.patch
-patches.xen/xsa155-linux44-0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
+0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch
-patches.xen/xsa155-linux44-0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch
+0010-xen-netfront-do-not-use-data-already-exposed-to-back.patch
-patches.xen/xsa155-linux-0011-xen-netfront-add-range-check-for-Tx-response-id.patch
+0011-xen-netfront-add-range-check-for-Tx-response-id.patch
-patches.xen/xsa155-linux312-0012-xen-blkfront-make-local-copy-of-response-before-usin.patch
+0012-xen-blkfront-make-local-copy-of-response-before-usin.patch
-patches.xen/xsa155-linux44-0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch
+0013-xen-blkfront-prepare-request-locally-only-then-put-i.patch
-patches.xen/xsa270.patch
 
 # MSI-X enabled device passthrough fix (#1734)
-patches.xen/pci_op-cleanup.patch
+0014-xen-pcifront-pciback-Update-pciif.h-with-err-and-res.patch
 
 # Fix for MSI support with stubdoms
-patches.xen/xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch
+0015-xen-pciback-add-attribute-to-allow-MSI-enable-flag-w.patch

version

@@ -1 +1 @@
-4.18.13
+4.19.1