diff options
| author | Bob Liu <bob.liu@oracle.com> | 2015-07-22 14:40:09 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-08-31 14:14:06 +0100 |
| commit | af4209563da5df8cb676e6d483768deb8df16cdd (patch) | |
| tree | e4524b7d08803adf1328e4d0adc92076b5addf46 /drivers/block | |
| parent | 6c3505ca3663a5ff114d0db6778f979560ae65f9 (diff) | |
| download | linux-stable-af4209563da5df8cb676e6d483768deb8df16cdd.tar.gz linux-stable-af4209563da5df8cb676e6d483768deb8df16cdd.tar.bz2 linux-stable-af4209563da5df8cb676e6d483768deb8df16cdd.zip | |
xen-blkfront: don't add indirect pages to list when !feature_persistent
commit 7b0767502b5db11cb1f0daef2d01f6d71b1192dc upstream.
We should consider info->feature_persistent when adding indirect page to list
info->indirect_pages, else the BUG_ON() in blkif_free() would be triggered.
When we are using persistent grants the indirect_pages list
should always be empty because blkfront has pre-allocated enough
persistent pages to fill all requests on the ring.
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Bob Liu <bob.liu@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/xen-blkfront.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 5deb235bd18f..2a29cf69cd73 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1093,8 +1093,10 @@ static void blkif_completion(struct blk_shadow *s, struct blkfront_info *info, * Add the used indirect page back to the list of * available pages for indirect grefs. */ - indirect_page = pfn_to_page(s->indirect_grants[i]->pfn); - list_add(&indirect_page->lru, &info->indirect_pages); + if (!info->feature_persistent) { + indirect_page = pfn_to_page(s->indirect_grants[i]->pfn); + list_add(&indirect_page->lru, &info->indirect_pages); + } s->indirect_grants[i]->gref = GRANT_INVALID_REF; list_add_tail(&s->indirect_grants[i]->node, &info->grants); } |