Commit c94b731d authored by Juergen Gross's avatar Juergen Gross Committed by Boris Ostrovsky
Browse files

xen/grant-table: remove readonly parameter from functions 



The gnttab_end_foreign_access() family of functions is taking a
"readonly" parameter, which isn't used. Remove it from the function
parameters.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20220311103429.12845-3-jgross@suse.com


Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
Acked-by: default avatarChristian Schoenebeck <qemu_oss@crudebyte.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent b0f21263

drivers/block/xen-blkfront.c

+4 −4
Original line number Diff line number Diff line
@@ -1223,7 +1223,7 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo) 
			list_del(&persistent_gnt->node);

			if (persistent_gnt->gref != GRANT_INVALID_REF) {

				gnttab_end_foreign_access(persistent_gnt->gref,

							  0, 0UL);

							  0UL);

				rinfo->persistent_gnts_c--;

			}

			if (info->feature_persistent)
@@ -1246,7 +1246,7 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo) 
		       rinfo->shadow[i].req.u.rw.nr_segments;

		for (j = 0; j < segs; j++) {

			persistent_gnt = rinfo->shadow[i].grants_used[j];

			gnttab_end_foreign_access(persistent_gnt->gref, 0, 0UL);

			gnttab_end_foreign_access(persistent_gnt->gref, 0UL);

			if (info->feature_persistent)

				__free_page(persistent_gnt->page);

			kfree(persistent_gnt);
@@ -1261,7 +1261,7 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo) 


		for (j = 0; j < INDIRECT_GREFS(segs); j++) {

			persistent_gnt = rinfo->shadow[i].indirect_grants[j];

			gnttab_end_foreign_access(persistent_gnt->gref, 0, 0UL);

			gnttab_end_foreign_access(persistent_gnt->gref, 0UL);

			__free_page(persistent_gnt->page);

			kfree(persistent_gnt);

		}
@@ -1284,7 +1284,7 @@ static void blkif_free_ring(struct blkfront_ring_info *rinfo) 
	/* Free resources associated with old device channel. */

	for (i = 0; i < info->nr_ring_pages; i++) {

		if (rinfo->ring_ref[i] != GRANT_INVALID_REF) {

			gnttab_end_foreign_access(rinfo->ring_ref[i], 0, 0);

			gnttab_end_foreign_access(rinfo->ring_ref[i], 0);

			rinfo->ring_ref[i] = GRANT_INVALID_REF;

		}

	}

drivers/char/tpm/xen-tpmfront.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static void ring_free(struct tpm_private *priv) 
		return;



	if (priv->ring_ref)

		gnttab_end_foreign_access(priv->ring_ref, 0,

		gnttab_end_foreign_access(priv->ring_ref,

				(unsigned long)priv->shr);

	else

		free_page((unsigned long)priv->shr);

drivers/gpu/drm/xen/xen_drm_front_evtchnl.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void evtchnl_free(struct xen_drm_front_info *front_info, 


	/* end access and free the page */

	if (evtchnl->gref != GRANT_INVALID_REF)

		gnttab_end_foreign_access(evtchnl->gref, 0, page);

		gnttab_end_foreign_access(evtchnl->gref, page);



	memset(evtchnl, 0, sizeof(*evtchnl));

}

drivers/input/misc/xen-kbdfront.c

+2 −2
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int xenkbd_connect_backend(struct xenbus_device *dev, 
 error_evtchan:

	xenbus_free_evtchn(dev, evtchn);

 error_grant:

	gnttab_end_foreign_access(info->gref, 0, 0UL);

	gnttab_end_foreign_access(info->gref, 0UL);

	info->gref = -1;

	return ret;

}
@@ -492,7 +492,7 @@ static void xenkbd_disconnect_backend(struct xenkbd_info *info) 
		unbind_from_irqhandler(info->irq, info);

	info->irq = -1;

	if (info->gref >= 0)

		gnttab_end_foreign_access(info->gref, 0, 0UL);

		gnttab_end_foreign_access(info->gref, 0UL);

	info->gref = -1;

}

drivers/net/xen-netfront.c

+6 −7
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static bool xennet_tx_buf_gc(struct netfront_queue *queue) 
			skb = queue->tx_skbs[id];

			queue->tx_skbs[id] = NULL;

			if (unlikely(!gnttab_end_foreign_access_ref(

				queue->grant_tx_ref[id], GNTMAP_readonly))) {

				queue->grant_tx_ref[id]))) {

				dev_alert(dev,

					  "Grant still in use by backend domain\n");

				goto err;
@@ -1029,7 +1029,7 @@ static int xennet_get_responses(struct netfront_queue *queue, 
			goto next;

		}



		if (!gnttab_end_foreign_access_ref(ref, 0)) {

		if (!gnttab_end_foreign_access_ref(ref)) {

			dev_alert(dev,

				  "Grant still in use by backend domain\n");

			queue->info->broken = true;
@@ -1388,7 +1388,6 @@ static void xennet_release_tx_bufs(struct netfront_queue *queue) 
		queue->tx_skbs[i] = NULL;

		get_page(queue->grant_tx_page[i]);

		gnttab_end_foreign_access(queue->grant_tx_ref[i],

					  GNTMAP_readonly,

					  (unsigned long)page_address(queue->grant_tx_page[i]));

		queue->grant_tx_page[i] = NULL;

		queue->grant_tx_ref[i] = GRANT_INVALID_REF;
@@ -1421,7 +1420,7 @@ static void xennet_release_rx_bufs(struct netfront_queue *queue) 
		 * foreign access is ended (which may be deferred).

		 */

		get_page(page);

		gnttab_end_foreign_access(ref, 0,

		gnttab_end_foreign_access(ref,

					  (unsigned long)page_address(page));

		queue->grant_rx_ref[id] = GRANT_INVALID_REF;
@@ -1763,7 +1762,7 @@ static void xennet_end_access(int ref, void *page) 
{

	/* This frees the page as a side-effect */

	if (ref != GRANT_INVALID_REF)

		gnttab_end_foreign_access(ref, 0, (unsigned long)page);

		gnttab_end_foreign_access(ref, (unsigned long)page);

}



static void xennet_disconnect_backend(struct netfront_info *info)
@@ -1980,14 +1979,14 @@ static int setup_netfront(struct xenbus_device *dev, 
	 */

 fail:

	if (queue->rx_ring_ref != GRANT_INVALID_REF) {

		gnttab_end_foreign_access(queue->rx_ring_ref, 0,

		gnttab_end_foreign_access(queue->rx_ring_ref,

					  (unsigned long)rxs);

		queue->rx_ring_ref = GRANT_INVALID_REF;

	} else {

		free_page((unsigned long)rxs);

	}

	if (queue->tx_ring_ref != GRANT_INVALID_REF) {

		gnttab_end_foreign_access(queue->tx_ring_ref, 0,

		gnttab_end_foreign_access(queue->tx_ring_ref,

					  (unsigned long)txs);

		queue->tx_ring_ref = GRANT_INVALID_REF;

	} else {