QubesOS/qubes-linux-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update patches

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-03-15 22:28:57 +01:00
parent 0643a07e26
commit 1bedd1129e
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
15 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-kbuild-AFTER_LINK.patch
View File

@ -1,4 +1,4 @@
From 234f2726089c1b655b0efe975a988ac6fc857b2a Mon Sep 17 00:00:00 2001 From 59ee809914574cb2f858e94755fa17be86f34844 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com> From: Roland McGrath <roland@redhat.com>
Date: Mon, 6 Oct 2008 23:03:03 -0700 Date: Mon, 6 Oct 2008 23:03:03 -0700
Subject: [PATCH] kbuild: AFTER_LINK Subject: [PATCH] kbuild: AFTER_LINK
@ -31,7 +31,7 @@ index b215c712d897..e18cd2a3ea53 100644
cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $< cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $<
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index c3d7ccd25381..7c03993ea881 100644 index 5bfe2243a08f..b6ec22f85266 100644
--- a/arch/x86/entry/vdso/Makefile --- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile
@@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \ @@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \

8
0002-xen-netfront-detach-crash.patch
View File

@ -1,4 +1,4 @@
From 702adf2c9c1536d5cb10b4be1340ba52654a05b5 Mon Sep 17 00:00:00 2001 From 12e8f728cbc2bc04bb92b6507369462119aae167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Thu, 6 Sep 2018 15:09:44 +0200 Date: Thu, 6 Sep 2018 15:09:44 +0200
@ -16,10 +16,10 @@ http://xen.markmail.org/thread/pw5edbtqienjx4q5
1 file changed, 4 insertions(+), 3 deletions(-) 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index f17f602e6171..61298526aee3 100644 index c914c24f880b..f1688897b256 100644
--- a/drivers/net/xen-netfront.c --- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c
@@ -1140,9 +1140,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue) @@ -1138,9 +1138,10 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue)
skb = queue->tx_skbs[i].skb; skb = queue->tx_skbs[i].skb;
get_page(queue->grant_tx_page[i]); get_page(queue->grant_tx_page[i]);
@ -34,5 +34,5 @@ index f17f602e6171..61298526aee3 100644
queue->grant_tx_ref[i] = GRANT_INVALID_REF; queue->grant_tx_ref[i] = GRANT_INVALID_REF;
add_id_to_freelist(&queue->tx_skb_freelist, queue->tx_skbs, i); add_id_to_freelist(&queue->tx_skb_freelist, queue->tx_skbs, i);
-- --
2.17.1 2.20.1

20
0003-mce-hide-EBUSY-initialization-error-on-Xen.patch
View File

@ -1,4 +1,4 @@
From 2d71f4d315dfcaaa9e4c1e3693e391f9d2b0a8b4 Mon Sep 17 00:00:00 2001 From d067698d74ef4d62d6afffc5433cf8d2a6aa69e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Tue, 5 Jan 2016 02:44:04 +0100 Date: Tue, 5 Jan 2016 02:44:04 +0100
@ -35,14 +35,14 @@ from threshold_init_device explaining the situation:
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
--- ---
arch/x86/kernel/cpu/mcheck/mce.c | 9 +++++++++ arch/x86/kernel/cpu/mce/core.c | 9 +++++++++
1 file changed, 9 insertions(+) 1 file changed, 9 insertions(+)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 953b3ce92dcc..e0bb9b52d8d1 100644 index 6ce290c506d9..8db95e580a85 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c --- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mce/core.c
@@ -52,6 +52,10 @@ @@ -50,6 +50,10 @@
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/reboot.h> #include <asm/reboot.h>
@ -50,10 +50,10 @@ index 953b3ce92dcc..e0bb9b52d8d1 100644
+#include <xen/xen.h> +#include <xen/xen.h>
+#endif +#endif
+ +
#include "mce-internal.h" #include "internal.h"
static DEFINE_MUTEX(mce_log_mutex); static DEFINE_MUTEX(mce_log_mutex);
@@ -2395,6 +2399,11 @@ static __init int mcheck_init_device(void) @@ -2406,6 +2410,11 @@ static __init int mcheck_init_device(void)
free_cpumask_var(mce_device_initialized); free_cpumask_var(mce_device_initialized);
err_out: err_out:
@ -66,5 +66,5 @@ index 953b3ce92dcc..e0bb9b52d8d1 100644
return err; return err;
-- --
2.17.1 2.20.1

6
0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
View File

@ -1,4 +1,4 @@
From 84160fa4557bf07017e35180d53abe4ea6ef7b14 Mon Sep 17 00:00:00 2001 From 6cc28f4d36c81f198dc8cdade583039642942dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Sat, 30 Jan 2016 01:53:26 +0100 Date: Sat, 30 Jan 2016 01:53:26 +0100
@ -10,7 +10,7 @@ Ease debugging of PCI passthrough problems.
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
index e6c1934734b7..0458fcefa4b9 100644 index 117e76b2f939..34f380be2b34 100644
--- a/drivers/xen/events/events_base.c --- a/drivers/xen/events/events_base.c
+++ b/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) @@ -521,7 +521,7 @@ static unsigned int __startup_pirq(unsigned int irq)
@ -23,5 +23,5 @@ index e6c1934734b7..0458fcefa4b9 100644
} }
evtchn = bind_pirq.port; evtchn = bind_pirq.port;
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From 6bec01bac2a0b1b8d7639de2c7fd646363f57d2d Mon Sep 17 00:00:00 2001 From ad4aeb98f9ebc13ebf9a81de5392ad8cd30c7525 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com> From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 11 Jun 2012 22:49:31 +0200 Date: Mon, 11 Jun 2012 22:49:31 +0200
Subject: [PATCH] pvops: respect 'removable' xenstore flag for block devices Subject: [PATCH] pvops: respect 'removable' xenstore flag for block devices
@ -10,10 +10,10 @@ by normal user.
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 429d20131c7e..2541d8c38336 100644 index 0ed4b200fa58..2054a3e9e435 100644
--- a/drivers/block/xen-blkfront.c --- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c
@@ -2338,6 +2338,7 @@ static void blkfront_connect(struct blkfront_info *info) @@ -2339,6 +2339,7 @@ static void blkfront_connect(struct blkfront_info *info)
unsigned int binfo; unsigned int binfo;
char *envp[] = { "RESIZE=1", NULL }; char *envp[] = { "RESIZE=1", NULL };
int err, i; int err, i;
@ -21,7 +21,7 @@ index 429d20131c7e..2541d8c38336 100644
switch (info->connected) { switch (info->connected) {
case BLKIF_STATE_CONNECTED: case BLKIF_STATE_CONNECTED:
@@ -2405,6 +2406,12 @@ static void blkfront_connect(struct blkfront_info *info) @@ -2406,6 +2407,12 @@ static void blkfront_connect(struct blkfront_info *info)
} }
} }
@ -35,5 +35,5 @@ index 429d20131c7e..2541d8c38336 100644
physical_sector_size); physical_sector_size);
if (err) { if (err) {
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From 6b4db8c77bd178701b3f501135ab3be08cdc43ac Mon Sep 17 00:00:00 2001 From fea008c8237d8d1aa6ecf6e8bc16fbcf12da2b09 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com> From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sun, 15 Jul 2012 19:57:47 +0200 Date: Sun, 15 Jul 2012 19:57:47 +0200
Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630) Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
@ -8,7 +8,7 @@ Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2541d8c38336..3f6df7d98265 100644 index 2054a3e9e435..132723c0b337 100644
--- a/drivers/block/xen-blkfront.c --- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
@ -30,5 +30,5 @@ index 2541d8c38336..3f6df7d98265 100644
default: default:
/*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n", /*printk(KERN_ALERT "ioctl %08x not supported by Xen blkdev\n",
-- --
2.17.1 2.20.1

10
0007-block-add-no_part_scan-module-parameter.patch
View File

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

4
0008-xen-Add-RING_COPY_RESPONSE.patch
View File

@ -1,4 +1,4 @@
From bb7d9fa8c1c8d2e90ea7cac04fb1fafe4965ad69 Mon Sep 17 00:00:00 2001 From d3ad2f3739a7c6eca8f7177a89449cbd16557c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Tue, 15 Dec 2015 21:35:14 +0100 Date: Tue, 15 Dec 2015 21:35:14 +0100
@ -54,5 +54,5 @@ index 3f40501fc60b..03702f6874df 100644
#define RING_REQUEST_CONS_OVERFLOW(_r, _cons) \ #define RING_REQUEST_CONS_OVERFLOW(_r, _cons) \
(((_cons) - (_r)->rsp_prod_pvt) >= RING_SIZE(_r)) (((_cons) - (_r)->rsp_prod_pvt) >= RING_SIZE(_r))
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From 2d7190695574d4a39597a65d3ba3858098f22da4 Mon Sep 17 00:00:00 2001 From 48468975242efd6098b66685a00e6f906fa740e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:09:55 +0100 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(-) 1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 61298526aee3..08ea5004e86b 100644 index f1688897b256..4d8d53862d1b 100644
--- a/drivers/net/xen-netfront.c --- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c
@@ -387,13 +387,13 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue) @@ -385,13 +385,13 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
rmb(); /* Ensure we see responses up to 'rp'. */ rmb(); /* Ensure we see responses up to 'rp'. */
for (cons = queue->tx.rsp_cons; cons != prod; cons++) { for (cons = queue->tx.rsp_cons; cons != prod; cons++) {
@ -39,7 +39,7 @@ index 61298526aee3..08ea5004e86b 100644
skb = queue->tx_skbs[id].skb; skb = queue->tx_skbs[id].skb;
if (unlikely(gnttab_query_foreign_access( if (unlikely(gnttab_query_foreign_access(
queue->grant_tx_ref[id]) != 0)) { queue->grant_tx_ref[id]) != 0)) {
@@ -742,7 +742,7 @@ static int xennet_get_extras(struct netfront_queue *queue, @@ -740,7 +740,7 @@ static int xennet_get_extras(struct netfront_queue *queue,
RING_IDX rp) RING_IDX rp)
{ {
@ -48,7 +48,7 @@ index 61298526aee3..08ea5004e86b 100644
struct device *dev = &queue->info->netdev->dev; struct device *dev = &queue->info->netdev->dev;
RING_IDX cons = queue->rx.rsp_cons; RING_IDX cons = queue->rx.rsp_cons;
int err = 0; int err = 0;
@@ -758,24 +758,23 @@ static int xennet_get_extras(struct netfront_queue *queue, @@ -756,24 +756,23 @@ static int xennet_get_extras(struct netfront_queue *queue,
break; break;
} }
@ -80,7 +80,7 @@ index 61298526aee3..08ea5004e86b 100644
queue->rx.rsp_cons = cons; queue->rx.rsp_cons = cons;
return err; return err;
@@ -785,28 +784,28 @@ static int xennet_get_responses(struct netfront_queue *queue, @@ -783,28 +782,28 @@ static int xennet_get_responses(struct netfront_queue *queue,
struct netfront_rx_info *rinfo, RING_IDX rp, struct netfront_rx_info *rinfo, RING_IDX rp,
struct sk_buff_head *list) struct sk_buff_head *list)
{ {
@ -115,7 +115,7 @@ index 61298526aee3..08ea5004e86b 100644
xennet_move_rx_slot(queue, skb, ref); xennet_move_rx_slot(queue, skb, ref);
err = -EINVAL; err = -EINVAL;
goto next; goto next;
@@ -820,7 +819,7 @@ static int xennet_get_responses(struct netfront_queue *queue, @@ -818,7 +817,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
if (ref == GRANT_INVALID_REF) { if (ref == GRANT_INVALID_REF) {
if (net_ratelimit()) if (net_ratelimit())
dev_warn(dev, "Bad rx response id %d.\n", dev_warn(dev, "Bad rx response id %d.\n",
@ -124,7 +124,7 @@ index 61298526aee3..08ea5004e86b 100644
err = -EINVAL; err = -EINVAL;
goto next; goto next;
} }
@@ -833,7 +832,7 @@ static int xennet_get_responses(struct netfront_queue *queue, @@ -831,7 +830,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
__skb_queue_tail(list, skb); __skb_queue_tail(list, skb);
next: next:
@ -133,7 +133,7 @@ index 61298526aee3..08ea5004e86b 100644
break; break;
if (cons + slots == rp) { if (cons + slots == rp) {
@@ -843,7 +842,7 @@ static int xennet_get_responses(struct netfront_queue *queue, @@ -841,7 +840,7 @@ static int xennet_get_responses(struct netfront_queue *queue,
break; break;
} }
@ -142,7 +142,7 @@ index 61298526aee3..08ea5004e86b 100644
skb = xennet_get_rx_skb(queue, cons + slots); skb = xennet_get_rx_skb(queue, cons + slots);
ref = xennet_get_rx_ref(queue, cons + slots); ref = xennet_get_rx_ref(queue, cons + slots);
slots++; slots++;
@@ -898,9 +897,9 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue, @@ -896,9 +895,9 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
struct sk_buff *nskb; struct sk_buff *nskb;
while ((nskb = __skb_dequeue(list))) { while ((nskb = __skb_dequeue(list))) {
@ -154,7 +154,7 @@ index 61298526aee3..08ea5004e86b 100644
if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) { if (skb_shinfo(skb)->nr_frags == MAX_SKB_FRAGS) {
unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to; unsigned int pull_to = NETFRONT_SKB_CB(skb)->pull_to;
@@ -916,7 +915,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue, @@ -914,7 +913,7 @@ static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
skb_frag_page(nfrag), skb_frag_page(nfrag),
@ -163,7 +163,7 @@ index 61298526aee3..08ea5004e86b 100644
skb_shinfo(nskb)->nr_frags = 0; skb_shinfo(nskb)->nr_frags = 0;
kfree_skb(nskb); kfree_skb(nskb);
@@ -1012,7 +1011,7 @@ static int xennet_poll(struct napi_struct *napi, int budget) @@ -1010,7 +1009,7 @@ static int xennet_poll(struct napi_struct *napi, int budget)
i = queue->rx.rsp_cons; i = queue->rx.rsp_cons;
work_done = 0; work_done = 0;
while ((i != rp) && (work_done < budget)) { while ((i != rp) && (work_done < budget)) {
@ -173,5 +173,5 @@ index 61298526aee3..08ea5004e86b 100644
err = xennet_get_responses(queue, &rinfo, rp, &tmpq); err = xennet_get_responses(queue, &rinfo, rp, &tmpq);
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From a72bc89ab6d6c7e171bd04357ea6954a9c62b43d Mon Sep 17 00:00:00 2001 From 8ea03fbc0533da4a06b5b13a2ebff11c5e7e5db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:19:37 +0100 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(-) 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 08ea5004e86b..88578e5aeaaf 100644 index 4d8d53862d1b..834a7950bea1 100644
--- a/drivers/net/xen-netfront.c --- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c
@@ -458,7 +458,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset, @@ -456,7 +456,7 @@ static void xennet_tx_setup_grant(unsigned long gfn, unsigned int offset,
tx->flags = 0; tx->flags = 0;
info->tx = tx; info->tx = tx;
@ -32,7 +32,7 @@ index 08ea5004e86b..88578e5aeaaf 100644
} }
static struct xen_netif_tx_request *xennet_make_first_txreq( static struct xen_netif_tx_request *xennet_make_first_txreq(
@@ -575,7 +575,7 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev @@ -573,7 +573,7 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
int slots; int slots;
struct page *page; struct page *page;
unsigned int offset; unsigned int offset;
@ -41,7 +41,7 @@ index 08ea5004e86b..88578e5aeaaf 100644
unsigned long flags; unsigned long flags;
struct netfront_queue *queue = NULL; struct netfront_queue *queue = NULL;
unsigned int num_queues = dev->real_num_tx_queues; unsigned int num_queues = dev->real_num_tx_queues;
@@ -635,14 +635,15 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev @@ -633,14 +633,15 @@ static netdev_tx_t xennet_start_xmit(struct sk_buff *skb, struct net_device *dev
} }
/* First request for the linear area. */ /* First request for the linear area. */
@ -60,5 +60,5 @@ index 08ea5004e86b..88578e5aeaaf 100644
if (skb->ip_summed == CHECKSUM_PARTIAL) if (skb->ip_summed == CHECKSUM_PARTIAL)
/* local packet? */ /* local packet? */
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From 91bac2da855a018b8ffd1bed9694e9c962340f08 Mon Sep 17 00:00:00 2001 From becb6fe42dc732b626000752a79e9374b6502417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:22:24 +0100 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(+) 1 file changed, 1 insertion(+)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 88578e5aeaaf..69e1c3aebe71 100644 index 834a7950bea1..a429ab24114b 100644
--- a/drivers/net/xen-netfront.c --- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c
@@ -394,6 +394,7 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue) @@ -392,6 +392,7 @@ static void xennet_tx_buf_gc(struct netfront_queue *queue)
continue; continue;
id = txrsp.id; id = txrsp.id;
@ -31,5 +31,5 @@ index 88578e5aeaaf..69e1c3aebe71 100644
if (unlikely(gnttab_query_foreign_access( if (unlikely(gnttab_query_foreign_access(
queue->grant_tx_ref[id]) != 0)) { queue->grant_tx_ref[id]) != 0)) {
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From bfad51710e1523650c2cfbf9aff561bb8364d9a7 Mon Sep 17 00:00:00 2001 From 137c43d513048974b8f2cf662b05f6b5b9b5711d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:51:10 +0100 Date: Wed, 16 Dec 2015 05:51:10 +0100
@ -20,7 +20,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 17 insertions(+), 17 deletions(-) 1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 3f6df7d98265..e520bc6f6007 100644 index 132723c0b337..a11d39df586b 100644
--- a/drivers/block/xen-blkfront.c --- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c
@@ -1551,7 +1551,7 @@ static bool blkif_completion(unsigned long *id, @@ -1551,7 +1551,7 @@ static bool blkif_completion(unsigned long *id,
@ -124,5 +124,5 @@ index 3f6df7d98265..e520bc6f6007 100644
break; break;
default: default:
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From 98231d38e75826534ef10b0ea06ecde796b89c3c Mon Sep 17 00:00:00 2001 From d611c137661200e874ce07633fd1f18232ad8ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com> <marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 06:07:14 +0100 Date: Wed, 16 Dec 2015 06:07:14 +0100
@ -22,7 +22,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 44 insertions(+), 32 deletions(-) 1 file changed, 44 insertions(+), 32 deletions(-)
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index e520bc6f6007..8132836e225b 100644 index a11d39df586b..d55e18aa1cff 100644
--- a/drivers/block/xen-blkfront.c --- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c
@@ -527,19 +527,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,
@ -187,5 +187,5 @@ index e520bc6f6007..8132836e225b 100644
if (new_persistent_gnts) if (new_persistent_gnts)
gnttab_free_grant_references(setup.gref_head); gnttab_free_grant_references(setup.gref_head);
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From ca6107528e5b5c986b64297ae62f706b5b391b0c Mon Sep 17 00:00:00 2001 From 5d1abeb05f35d53d7344eead0f8fcce4eea783fb Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 1 Apr 2015 17:01:26 -0400 Date: Wed, 1 Apr 2015 17:01:26 -0400
Subject: [PATCH] xen/pcifront/pciback: Update pciif.h with ->err and ->result Subject: [PATCH] xen/pcifront/pciback: Update pciif.h with ->err and ->result
@ -71,5 +71,5 @@ index d9922ae36eb5..c8b674fd2455 100644
/* IN: Contains extra infor for this operation */ /* IN: Contains extra infor for this operation */
uint32_t info; uint32_t info;
-- --
2.17.1 2.20.1

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

@ -1,4 +1,4 @@
From 7cea4f1e3e43d8fc20e2605495d6ed24bfeeeb9b Mon Sep 17 00:00:00 2001 From 38e59128707d1efda6ccba7e5ad548f5c2118926 Mon Sep 17 00:00:00 2001
From: HW42 <hw42@ipsumj.de> From: HW42 <hw42@ipsumj.de>
Date: Tue, 12 Sep 2017 00:49:02 +0200 Date: Tue, 12 Sep 2017 00:49:02 +0200
Subject: [PATCH] xen-pciback: add attribute to allow MSI enable flag writes Subject: [PATCH] xen-pciback: add attribute to allow MSI enable flag writes
@ -82,10 +82,10 @@ index 73427d8e0116..a277ddc7f7b4 100644
return 0; return 0;
} }
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index 59661db144e5..51a116f37b95 100644 index 097410a7cdb7..fb6a4a43c11d 100644
--- a/drivers/xen/xen-pciback/pci_stub.c --- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/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 *dev) @@ -304,6 +304,8 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
xen_pcibk_config_reset_dev(dev); xen_pcibk_config_reset_dev(dev);
xen_pcibk_config_free_dyn_fields(dev); xen_pcibk_config_free_dyn_fields(dev);
@ -94,7 +94,7 @@ index 59661db144e5..51a116f37b95 100644
xen_unregister_device_domain_owner(dev); xen_unregister_device_domain_owner(dev);
spin_lock_irqsave(&found_psdev->lock, flags); spin_lock_irqsave(&found_psdev->lock, flags);
@@ -1430,6 +1432,63 @@ static ssize_t permissive_show(struct device_driver *drv, char *buf) @@ -1431,6 +1433,63 @@ static ssize_t permissive_show(struct device_driver *drv, char *buf)
} }
static DRIVER_ATTR_RW(permissive); static DRIVER_ATTR_RW(permissive);
@ -158,7 +158,7 @@ index 59661db144e5..51a116f37b95 100644
static void pcistub_exit(void) static void pcistub_exit(void)
{ {
driver_remove_file(&xen_pcibk_pci_driver.driver, &driver_attr_new_slot); driver_remove_file(&xen_pcibk_pci_driver.driver, &driver_attr_new_slot);
@@ -1439,6 +1498,8 @@ static void pcistub_exit(void) @@ -1440,6 +1499,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_quirks);
driver_remove_file(&xen_pcibk_pci_driver.driver, driver_remove_file(&xen_pcibk_pci_driver.driver,
&driver_attr_permissive); &driver_attr_permissive);
@ -167,7 +167,7 @@ index 59661db144e5..51a116f37b95 100644
driver_remove_file(&xen_pcibk_pci_driver.driver, driver_remove_file(&xen_pcibk_pci_driver.driver,
&driver_attr_irq_handlers); &driver_attr_irq_handlers);
driver_remove_file(&xen_pcibk_pci_driver.driver, driver_remove_file(&xen_pcibk_pci_driver.driver,
@@ -1529,6 +1590,9 @@ static int __init pcistub_init(void) @@ -1530,6 +1591,9 @@ static int __init pcistub_init(void)
if (!err) if (!err)
err = driver_create_file(&xen_pcibk_pci_driver.driver, err = driver_create_file(&xen_pcibk_pci_driver.driver,
&driver_attr_permissive); &driver_attr_permissive);
@ -190,5 +190,5 @@ index 263c059bff90..796f949c92be 100644
unsigned int enable_intx:1; unsigned int enable_intx:1;
unsigned int isr_on:1; /* Whether the IRQ handler is installed. */ unsigned int isr_on:1; /* Whether the IRQ handler is installed. */
-- --
2.17.1 2.20.1