Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2018-10-10 13:27:49 +0200
committerTakashi Iwai <tiwai@suse.de>2018-10-19 09:43:21 +0200
commit31f2eb8b428e655fc056d243e394348b7c327548 (patch)
treeeb578919f367a8edecc7765e40ba712e0961f58c
parent955627f4c02dae8b2336fb06226f43552c0736c9 (diff)
xen/blkfront: correct purging of persistent grantsrpm-4.4.156-94.64
-rw-r--r--patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch36
-rw-r--r--series.conf2
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch b/patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch
new file mode 100644
index 0000000000..f216113de0
--- /dev/null
+++ b/patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch
@@ -0,0 +1,36 @@
+From: Juergen Gross <jgross@suse.com>
+Date: Fri, 28 Sep 2018 09:28:27 +0200
+Patch-mainline: 4.19-rc6
+Git-commit: 6c7678674014b4552caf0e5aa0ca34078a377482
+References: bnc#1065600
+Subject: xen/blkfront: correct purging of persistent grants
+
+Commit a46b53672b2c2e3770b38a4abf90d16364d2584b ("xen/blkfront: cleanup
+stale persistent grants") introduced a regression as purged persistent
+grants were not pu into the list of free grants again. Correct that.
+
+Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ drivers/block/xen-blkfront.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
+index a71d817e900d..429d20131c7e 100644
+--- a/drivers/block/xen-blkfront.c
++++ b/drivers/block/xen-blkfront.c
+@@ -2351,8 +2351,8 @@ static void purge_persistent_grants(struct blkfront_info *info)
+ list_del(&gnt_list_entry->node);
+ gnttab_end_foreign_access(gnt_list_entry->gref, 0, 0UL);
+ info->persistent_gnts_c--;
+- __free_page(gnt_list_entry->page);
+- kfree(gnt_list_entry);
++ gnt_list_entry->gref = GRANT_INVALID_REF;
++ list_add_tail(&gnt_list_entry->node, &info->grants);
+ }
+ spin_unlock_irq(&info->io_lock);
+ }
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/series.conf b/series.conf
index ae3a8f1dd9..4112914ace 100644
--- a/series.conf
+++ b/series.conf
@@ -25176,6 +25176,8 @@
patches.fixes/0003-xen-blkfront-cleanup-stale-persistent-grants.patch
patches.fixes/0004-xen-blkfront-reorder-tests-in-xlblk_init.patch
+ patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch
+
########################################################
# You'd better have a good reason for adding a patch
# below here.