Commit 4f14faaa authored by Daniel De Graaf's avatar Daniel De Graaf Committed by Jens Axboe
Browse files

xen/blkback: use grant-table.c hypercall wrappers 



Signed-off-by: default avatarDaniel De Graaf <dgdegra@tycho.nsa.gov>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent c16fa4f2

drivers/block/xen-blkback/blkback.c

+4 −25
Original line number Original line Diff line number Diff line
@@ -321,6 +321,7 @@ struct seg_buf { 
static void xen_blkbk_unmap(struct pending_req *req)

static void xen_blkbk_unmap(struct pending_req *req)

{

{

	struct gnttab_unmap_grant_ref unmap[BLKIF_MAX_SEGMENTS_PER_REQUEST];

	struct gnttab_unmap_grant_ref unmap[BLKIF_MAX_SEGMENTS_PER_REQUEST];

	struct page *pages[BLKIF_MAX_SEGMENTS_PER_REQUEST];

	unsigned int i, invcount = 0;

	unsigned int i, invcount = 0;

	grant_handle_t handle;

	grant_handle_t handle;

	int ret;

	int ret;
@@ -332,25 +333,12 @@ static void xen_blkbk_unmap(struct pending_req *req) 
		gnttab_set_unmap_op(&unmap[invcount], vaddr(req, i),

		gnttab_set_unmap_op(&unmap[invcount], vaddr(req, i),

				    GNTMAP_host_map, handle);

				    GNTMAP_host_map, handle);

		pending_handle(req, i) = BLKBACK_INVALID_HANDLE;

		pending_handle(req, i) = BLKBACK_INVALID_HANDLE;

		pages[invcount] = virt_to_page(vaddr(req, i));

		invcount++;

		invcount++;

	}

	}





	ret = HYPERVISOR_grant_table_op(

	ret = gnttab_unmap_refs(unmap, pages, invcount, false);

		GNTTABOP_unmap_grant_ref, unmap, invcount);

	BUG_ON(ret);

	BUG_ON(ret);

	/*

	 * Note, we use invcount, so nr->pages, so we can't index

	 * using vaddr(req, i).

	 */

	for (i = 0; i < invcount; i++) {

		ret = m2p_remove_override(

			virt_to_page(unmap[i].host_addr), false);

		if (ret) {

			pr_alert(DRV_PFX "Failed to remove M2P override for %lx\n",

				 (unsigned long)unmap[i].host_addr);

			continue;

		}

	}

}

}





static int xen_blkbk_map(struct blkif_request *req,

static int xen_blkbk_map(struct blkif_request *req,
@@ -378,7 +366,7 @@ static int xen_blkbk_map(struct blkif_request *req, 
				  pending_req->blkif->domid);

				  pending_req->blkif->domid);

	}

	}





	ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, map, nseg);

	ret = gnttab_map_refs(map, NULL, &blkbk->pending_page(pending_req, 0), nseg);

	BUG_ON(ret);

	BUG_ON(ret);





	/*

	/*
@@ -398,15 +386,6 @@ static int xen_blkbk_map(struct blkif_request *req, 
		if (ret)

		if (ret)

			continue;

			continue;





		ret = m2p_add_override(PFN_DOWN(map[i].dev_bus_addr),

			blkbk->pending_page(pending_req, i), NULL);

		if (ret) {

			pr_alert(DRV_PFX "Failed to install M2P override for %lx (ret: %d)\n",

				 (unsigned long)map[i].dev_bus_addr, ret);

			/* We could switch over to GNTTABOP_copy */

			continue;

		}



		seg[i].buf  = map[i].dev_bus_addr |

		seg[i].buf  = map[i].dev_bus_addr |

			(req->u.rw.seg[i].first_sect << 9);

			(req->u.rw.seg[i].first_sect << 9);

	}

	}