xen/grant-table: do some cleanup
Subsystems (21)
Juergen Gross
maintainercover xen/grant-table: do some cleanup
Cleanup grant table code by removing unused functionality.
Juergen Gross (2):
xen/grant-table: remove gnttab_*transfer*() functions xen/grant-table: remove readonly parameter from functions
drivers/block/xen-blkfront.c | 8 +- drivers/char/tpm/xen-tpmfront.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 2 +- drivers/input/misc/xen-kbdfront.c | 4 +- drivers/net/xen-netfront.c | 13 +- drivers/pci/xen-pcifront.c | 2 +- drivers/scsi/xen-scsifront.c | 4 +- drivers/usb/host/xen-hcd.c | 4 +- drivers/xen/gntalloc.c | 2 +- drivers/xen/gntdev-dmabuf.c | 2 +- drivers/xen/grant-table.c | 151 +++----------------- drivers/xen/pvcalls-front.c | 6 +- drivers/xen/xen-front-pgdir-shbuf.c | 3 +- include/xen/grant_table.h | 13 +- net/9p/trans_xen.c | 8 +- sound/xen/xen_snd_front_evtchnl.c | 2 +- 16 files changed, 50 insertions(+), 176 deletions(-)
Signature · 1 line
2.34.1
Juergen Gross
maintainerPATCH 1/2 xen/grant-table: remove gnttab_*transfer*() functions
All grant table operations related to the "transfer" functionality are unused currently. There have been users in the old days of the "Xen-o-Linux" kernel, but those didn't make it upstream.
So remove the "transfer" related functions.
--- drivers/xen/grant-table.c | 113 +------------------------------------- include/xen/grant_table.h | 8 --- 2 files changed, 2 insertions(+), 119 deletions(-)
drivers/xen/grant-table.c +2 -111
@@ -109,7 +109,7 @@ struct gnttab_ops {void (*unmap_frames)(void );/* * Introducing a valid entry into the grant table, granting the frame of -* this grant entry to domain for accessing or transfering. Ref +* this grant entry to domain for accessing. Ref * parameter is reference of this introduced grant entry, domid is id of * granted domain, frame is the page frame to be granted, and flags is * status of the grant entry to be updated.
@@ -125,14 +125,6 @@ struct gnttab_ops {* access for this entry and return success(==1). */ int (*end_foreign_access_ref)(grant_ref_t ref,int readonly); -/* -* Stop granting a grant entry to domain for transfer. Ref parameter is -* reference of a grant entry whose grant transfer will be stopped. If -* tranfer has not started, just reclaim the grant entry and return -* failure(==0). Otherwise, wait for the transfer to complete and then -* return the frame. -*/ -unsigned long (*end_foreign_transfer_ref)(grant_ref_t ref);/* * Read the frame number related to a given grant reference. */
@@ -230,10 +222,7 @@ static void put_free_entry(grant_ref_t ref)* Following applies to gnttab_update_entry_v1 and gnttab_update_entry_v2. * Introducing a valid entry into the grant table: * 1. Write ent->domid. -* 2. Write ent->frame: -* GTF_permit_access: Frame to which access is permitted. -* GTF_accept_transfer: Pseudo-phys frame slot being filled by new -* frame, or zero if none. +* 2. Write ent->frame: Frame to which access is permitted. * 3. Write memory barrier (WMB). * 4. Write ent->flags, inc. valid type. */
@@ -455,102 +444,6 @@ void gnttab_end_foreign_access(grant_ref_t ref, int readonly, }EXPORT_SYMBOL_GPL (gnttab_end_foreign_access); -int gnttab_grant_foreign_transfer (domid_t domid,unsigned long pfn) -{ -int ref; - - ref =get_free_entries (1 ); -if (unlikely (ref <0 )) -return -ENOSPC ; -gnttab_grant_foreign_transfer_ref (ref, domid, pfn); - -return ref; -} -EXPORT_SYMBOL_GPL (gnttab_grant_foreign_transfer); - -void gnttab_grant_foreign_transfer_ref (grant_ref_t ref,domid_t domid, -unsigned long pfn) -{ - gnttab_interface->update_entry (ref, domid, pfn, GTF_accept_transfer); -} -EXPORT_SYMBOL_GPL (gnttab_grant_foreign_transfer_ref); - -static unsigned long gnttab_end_foreign_transfer_ref_v1 (grant_ref_t ref) -{ -unsigned long frame; -u16 flags; -u16 *pflags; - - pflags = &gnttab_shared.v1[ref].flags; - -/* -* If a transfer is not even yet started, try to reclaim the grant -* reference and return failure (== 0). -*/ -while (!((flags = *pflags) & GTF_transfer_committed)) { -if (sync_cmpxchg (pflags, flags,0 ) == flags) -return 0 ; -cpu_relax (); - } - -/* If a transfer is in progress then wait until it is completed. */ -while (!(flags & GTF_transfer_completed)) { - flags = *pflags; -cpu_relax (); - } - -rmb ();/* Read the frame number /after/ reading completion status. */ - frame = gnttab_shared.v1[ref].frame; -BUG_ON (frame ==0 ); - -return frame; -} - -static unsigned long gnttab_end_foreign_transfer_ref_v2 (grant_ref_t ref) -{ -unsigned long frame; -u16 flags; -u16 *pflags; - - pflags = &gnttab_shared.v2[ref].hdr.flags; - -/* -* If a transfer is not even yet started, try to reclaim the grant -* reference and return failure (== 0). -*/ -while (!((flags = *pflags) & GTF_transfer_committed)) { -if (sync_cmpxchg (pflags, flags,0 ) == flags) -return 0 ; -cpu_relax (); - } - -/* If a transfer is in progress then wait until it is completed. */ -while (!(flags & GTF_transfer_completed)) { - flags = *pflags; -cpu_relax (); - } - -rmb ();/* Read the frame number /after/ reading completion status. */ - frame = gnttab_shared.v2[ref].full_page.frame; -BUG_ON (frame ==0 ); - -return frame; -} - -unsigned long gnttab_end_foreign_transfer_ref (grant_ref_t ref) -{ -return gnttab_interface->end_foreign_transfer_ref (ref); -} -EXPORT_SYMBOL_GPL (gnttab_end_foreign_transfer_ref); - -unsigned long gnttab_end_foreign_transfer (grant_ref_t ref) -{ -unsigned long frame =gnttab_end_foreign_transfer_ref (ref); -put_free_entry (ref); -return frame; -} -EXPORT_SYMBOL_GPL (gnttab_end_foreign_transfer); -void gnttab_free_grant_reference (grant_ref_t ref) {put_free_entry (ref);
@@ -1423,7 +1316,6 @@ static const struct gnttab_ops gnttab_v1_ops = { .unmap_frames = gnttab_unmap_frames_v1, .update_entry = gnttab_update_entry_v1, .end_foreign_access_ref = gnttab_end_foreign_access_ref_v1, - .end_foreign_transfer_ref = gnttab_end_foreign_transfer_ref_v1, .read_frame = gnttab_read_frame_v1, };
@@ -1435,7 +1327,6 @@ static const struct gnttab_ops gnttab_v2_ops = { .unmap_frames = gnttab_unmap_frames_v2, .update_entry = gnttab_update_entry_v2, .end_foreign_access_ref = gnttab_end_foreign_access_ref_v2, - .end_foreign_transfer_ref = gnttab_end_foreign_transfer_ref_v2, .read_frame = gnttab_read_frame_v2, };
include/xen/grant_table.h +0 -8
@@ -125,11 +125,6 @@ void gnttab_end_foreign_access(grant_ref_t ref, int readonly,*/ int gnttab_try_end_foreign_access (grant_ref_t ref); -int gnttab_grant_foreign_transfer (domid_t domid,unsigned long pfn); - -unsigned long gnttab_end_foreign_transfer_ref (grant_ref_t ref); -unsigned long gnttab_end_foreign_transfer (grant_ref_t ref); -/* * operations on reserved batches of grant references */
@@ -162,9 +157,6 @@ static inline void gnttab_page_grant_foreign_access_ref_one( readonly); } -void gnttab_grant_foreign_transfer_ref (grant_ref_t ,domid_t domid, -unsigned long pfn); -static inline void gnttab_set_map_op (struct gnttab_map_grant_ref *map,phys_addr_t addr,uint32_t flags,grant_ref_t ref,domid_t domid)
Signature · 1 line
2.34.1
Re: [PATCH 1/2] xen/grant-table: remove gnttab_*transfer*() functions
Quoted 5 lines · Juergen Gross
All grant table operations related to the "transfer" functionality are unused currently. There have been users in the old days of the "Xen-o-Linux" kernel, but those didn't make it upstream.
So remove the "transfer" related functions.
Do we need to assert somewhere that transfer flags are not set?
-boris
Juergen Gross
maintainerRe: [PATCH 1/2] xen/grant-table: remove gnttab_*transfer*() functions
Quoted 10 lines · Boris Ostrovsky
Quoted 5 lines · Juergen Gross
All grant table operations related to the "transfer" functionality are unused currently. There have been users in the old days of the "Xen-o-Linux" kernel, but those didn't make it upstream.
So remove the "transfer" related functions.
Do we need to assert somewhere that transfer flags are not set?
This would be an orthogonal change, right? My patch is just removing never called functions.
In any case I believe checking those flags is the job of the hypervisor. If an operation is illegal due to a transfer flag being set, it needs to be rejected at hypervisor level.
Juergen
Boris Ostrovsky
Reviewed-byRe: [PATCH 1/2] xen/grant-table: remove gnttab_*transfer*() functions
Quoted 7 lines · Juergen Gross
Quoted 6 lines · Boris Ostrovsky
Quoted 4 lines · Juergen Gross
All grant table operations related to the "transfer" functionality are unused currently. There have been users in the old days of the "Xen-o-Linux" kernel, but those didn't make it upstream.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
So remove the "transfer" related functions.
Do we need to assert somewhere that transfer flags are not set?
This would be an orthogonal change, right? My patch is just removing never called functions.
I was thinking of having this done as part of code removal (maybe as a separate patch).
Quoted 3 lines
In any case I believe checking those flags is the job of the hypervisor. If an operation is illegal due to a transfer flag being set, it needs to be rejected at hypervisor level.
True.
Boris Ostrovsky
AppliedRe: [PATCH 1/2] xen/grant-table: remove gnttab_*transfer*() functions
In reply to Juergen GrossQuoted 7 lines · Juergen Gross
All grant table operations related to the "transfer" functionality are unused currently. There have been users in the old days of the "Xen-o-Linux" kernel, but those didn't make it upstream.
So remove the "transfer" related functions.
Signed-off-by Juergen Gross <[email protected]>
Applied to for-linus-5.18 (both patches)
Juergen Gross
maintainerPATCH 2/2 xen/grant-table: remove readonly parameter from functions
In reply to Juergen GrossThe gnttab_end_foreign_access() family of functions is taking a "readonly" parameter, which isn't used. Remove it from the function parameters.
--- drivers/block/xen-blkfront.c | 8 ++--- drivers/char/tpm/xen-tpmfront.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 2 +- drivers/input/misc/xen-kbdfront.c | 4 +-- drivers/net/xen-netfront.c | 13 ++++--- drivers/pci/xen-pcifront.c | 2 +- drivers/scsi/xen-scsifront.c | 4 +-- drivers/usb/host/xen-hcd.c | 4 +-- drivers/xen/gntalloc.c | 2 +- drivers/xen/gntdev-dmabuf.c | 2 +- drivers/xen/grant-table.c | 38 +++++++++------------ drivers/xen/pvcalls-front.c | 6 ++-- drivers/xen/xen-front-pgdir-shbuf.c | 3 +- include/xen/grant_table.h | 5 ++- net/9p/trans_xen.c | 8 ++--- sound/xen/xen_snd_front_evtchnl.c | 2 +- 16 files changed, 48 insertions(+), 57 deletions(-)
drivers/block/xen-blkfront.c +4 -4
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {
drivers/pci/xen-pcifront.c +1 -1
@@ -755,7 +755,7 @@ static void free_pdev(struct pcifront_device *pdev)xenbus_free_evtchn (pdev->xdev, pdev->evtchn);if (pdev->gnt_ref !=INVALID_GRANT_REF ) -gnttab_end_foreign_access (pdev->gnt_ref,0 /* r/w page */ , +gnttab_end_foreign_access (pdev->gnt_ref, (unsigned long )pdev->sh_info);else free_page ((unsigned long )pdev->sh_info);
drivers/scsi/xen-scsifront.c +2 -2
@@ -757,7 +757,7 @@ static int scsifront_alloc_ring(struct vscsifrnt_info *info) free_irq:unbind_from_irqhandler (info->irq, info); free_gnttab: -gnttab_end_foreign_access (info->ring_ref,0 , +gnttab_end_foreign_access (info->ring_ref, (unsigned long )info->ring.sring);return err;
@@ -766,7 +766,7 @@ static int scsifront_alloc_ring(struct vscsifrnt_info *info)static void scsifront_free_ring (struct vscsifrnt_info *info) {unbind_from_irqhandler (info->irq, info); -gnttab_end_foreign_access (info->ring_ref,0 , +gnttab_end_foreign_access (info->ring_ref, (unsigned long )info->ring.sring); }
drivers/usb/host/xen-hcd.c +2 -2
@@ -1075,14 +1075,14 @@ static void xenhcd_destroy_rings(struct xenhcd_info *info) info->irq =0 ;if (info->urb_ring_ref !=GRANT_INVALID_REF ) { -gnttab_end_foreign_access (info->urb_ring_ref,0 , +gnttab_end_foreign_access (info->urb_ring_ref, (unsigned long )info->urb_ring.sring); info->urb_ring_ref =GRANT_INVALID_REF ; } info->urb_ring.sring =NULL ;if (info->conn_ring_ref !=GRANT_INVALID_REF ) { -gnttab_end_foreign_access (info->conn_ring_ref,0 , +gnttab_end_foreign_access (info->conn_ring_ref, (unsigned long )info->conn_ring.sring); info->conn_ring_ref =GRANT_INVALID_REF ; }
drivers/xen/gntalloc.c +1 -1
@@ -192,7 +192,7 @@ static void __del_gref(struct gntalloc_gref *gref)if (gref->gref_id) {if (gref->page) { addr = (unsigned long )page_to_virt (gref->page); -gnttab_end_foreign_access (gref->gref_id,0 , addr); +gnttab_end_foreign_access (gref->gref_id, addr); }else gnttab_free_grant_reference (gref->gref_id); }
drivers/xen/gntdev-dmabuf.c +1 -1
@@ -533,7 +533,7 @@ static void dmabuf_imp_end_foreign_access(u32 *refs, int count)for (i =0 ; i < count; i++)if (refs[i] !=GRANT_INVALID_REF ) -gnttab_end_foreign_access (refs[i],0 ,0UL ); +gnttab_end_foreign_access (refs[i],0UL ); }static void dmabuf_imp_free_storage (struct gntdev_dmabuf *gntdev_dmabuf)
drivers/xen/grant-table.c +16 -22
@@ -118,13 +118,12 @@ struct gnttab_ops { unsigned long frame, unsigned flags);/* * Stop granting a grant entry to domain for accessing. Ref parameter is -* reference of a grant entry whose grant access will be stopped, -* readonly is not in use in this function. If the grant entry is -* currently mapped for reading or writing, just return failure(==0) -* directly and don't tear down the grant access. Otherwise, stop grant -* access for this entry and return success(==1). +* reference of a grant entry whose grant access will be stopped. +* If the grant entry is currently mapped for reading or writing, just +* return failure(==0) directly and don't tear down the grant access. +* Otherwise, stop grant access for this entry and return success(==1). */ -int (*end_foreign_access_ref)(grant_ref_t ref,int readonly); +int (*end_foreign_access_ref)(grant_ref_t ref);/* * Read the frame number related to a given grant reference. */
@@ -270,7 +269,7 @@ int gnttab_grant_foreign_access(domid_t domid, unsigned long frame, }EXPORT_SYMBOL_GPL (gnttab_grant_foreign_access); -static int gnttab_end_foreign_access_ref_v1 (grant_ref_t ref,int readonly) +static int gnttab_end_foreign_access_ref_v1 (grant_ref_t ref) {u16 flags, nflags;u16 *pflags;
@@ -286,7 +285,7 @@ static int gnttab_end_foreign_access_ref_v1(grant_ref_t ref, int readonly)return 1 ; } -static int gnttab_end_foreign_access_ref_v2 (grant_ref_t ref,int readonly) +static int gnttab_end_foreign_access_ref_v2 (grant_ref_t ref) { gnttab_shared.v2[ref].hdr.flags =0 ;mb ();/* Concurrent access by hypervisor. */
@@ -309,14 +308,14 @@ static int gnttab_end_foreign_access_ref_v2(grant_ref_t ref, int readonly)return 1 ; } -static inline int _gnttab_end_foreign_access_ref (grant_ref_t ref,int readonly) +static inline int _gnttab_end_foreign_access_ref (grant_ref_t ref) { -return gnttab_interface->end_foreign_access_ref (ref, readonly); +return gnttab_interface->end_foreign_access_ref (ref); } -int gnttab_end_foreign_access_ref (grant_ref_t ref,int readonly) +int gnttab_end_foreign_access_ref (grant_ref_t ref) { -if (_gnttab_end_foreign_access_ref (ref, readonly)) +if (_gnttab_end_foreign_access_ref (ref))return 1 ;pr_warn ("WARNING: g.e. %#x still in use!\n" , ref);return 0 ;
@@ -336,7 +335,6 @@ static unsigned long gnttab_read_frame_v2(grant_ref_t ref)struct deferred_entry {struct list_head list;grant_ref_t ref; -bool ro;uint16_t warn_delay;struct page *page; };
@@ -360,7 +358,7 @@ static void gnttab_handle_deferred(struct timer_list *unused)break ;list_del (&entry->list);spin_unlock_irqrestore (&gnttab_list_lock, flags); -if (_gnttab_end_foreign_access_ref (entry->ref, entry->ro)) { +if (_gnttab_end_foreign_access_ref (entry->ref)) {put_free_entry (entry->ref);pr_debug ("freeing g.e. %#x (pfn %#lx)\n" , entry->ref,page_to_pfn (entry->page));
@@ -386,8 +384,7 @@ static void gnttab_handle_deferred(struct timer_list *unused)spin_unlock_irqrestore (&gnttab_list_lock, flags); } -static void gnttab_add_deferred (grant_ref_t ref,bool readonly, -struct page *page) +static void gnttab_add_deferred (grant_ref_t ref,struct page *page) {struct deferred_entry *entry;gfp_t gfp = (in_atomic () ||irqs_disabled ()) ?GFP_ATOMIC :GFP_KERNEL ;
@@ -405,7 +402,6 @@ static void gnttab_add_deferred(grant_ref_t ref, bool readonly,unsigned long flags; entry->ref = ref; - entry->ro = readonly; entry->page = page; entry->warn_delay =60 ;spin_lock_irqsave (&gnttab_list_lock, flags);
@@ -423,7 +419,7 @@ static void gnttab_add_deferred(grant_ref_t ref, bool readonly,int gnttab_try_end_foreign_access (grant_ref_t ref) { -int ret =_gnttab_end_foreign_access_ref (ref,0 ); +int ret =_gnttab_end_foreign_access_ref (ref);if (ret)put_free_entry (ref);
@@ -432,15 +428,13 @@ int gnttab_try_end_foreign_access(grant_ref_t ref) }EXPORT_SYMBOL_GPL (gnttab_try_end_foreign_access); -void gnttab_end_foreign_access (grant_ref_t ref,int readonly, -unsigned long page) +void gnttab_end_foreign_access (grant_ref_t ref,unsigned long page) {if (gnttab_try_end_foreign_access (ref)) {if (page !=0 )put_page (virt_to_page (page)); }else -gnttab_add_deferred (ref, readonly, - page ?virt_to_page (page) :NULL ); +gnttab_add_deferred (ref, page ?virt_to_page (page) :NULL ); }EXPORT_SYMBOL_GPL (gnttab_end_foreign_access);
drivers/xen/pvcalls-front.c +3 -3
@@ -238,8 +238,8 @@ static void pvcalls_front_free_map(struct pvcalls_bedata *bedata,spin_unlock (&bedata->socket_lock);for (i =0 ; i < (1 <<PVCALLS_RING_ORDER ); i++) -gnttab_end_foreign_access (map->active.ring->ref[i],0 ,0 ); -gnttab_end_foreign_access (map->active.ref,0 ,0 ); +gnttab_end_foreign_access (map->active.ring->ref[i],0 ); +gnttab_end_foreign_access (map->active.ref,0 );free_page ((unsigned long )map->active.ring);kfree (map);
@@ -1117,7 +1117,7 @@ static int pvcalls_front_remove(struct xenbus_device *dev) } }if (bedata->ref !=-1 ) -gnttab_end_foreign_access (bedata->ref,0 ,0 ); +gnttab_end_foreign_access (bedata->ref,0 );kfree (bedata->ring.sring);kfree (bedata);xenbus_switch_state (dev, XenbusStateClosed);
drivers/xen/xen-front-pgdir-shbuf.c +1 -2
@@ -143,8 +143,7 @@ void xen_front_pgdir_shbuf_free(struct xen_front_pgdir_shbuf *buf)for (i =0 ; i < buf->num_grefs; i++)if (buf->grefs[i] !=GRANT_INVALID_REF ) -gnttab_end_foreign_access (buf->grefs[i], -0 ,0UL ); +gnttab_end_foreign_access (buf->grefs[i],0UL ); }kfree (buf->grefs);kfree (buf->directory);
include/xen/grant_table.h +2 -3
@@ -97,7 +97,7 @@ int gnttab_grant_foreign_access(domid_t domid, unsigned long frame,* longer in use. Return 1 if the grant entry was freed, 0 if it is still in * use. */ -int gnttab_end_foreign_access_ref (grant_ref_t ref,int readonly); +int gnttab_end_foreign_access_ref (grant_ref_t ref);/* * Eventually end access through the given grant reference, and once that
@@ -114,8 +114,7 @@ int gnttab_end_foreign_access_ref(grant_ref_t ref, int readonly);* gnttab_end_foreign_access() are done via alloc_pages_exact() (and freeing * via free_pages_exact()) in order to avoid high order pages. */ -void gnttab_end_foreign_access (grant_ref_t ref,int readonly, -unsigned long page); +void gnttab_end_foreign_access (grant_ref_t ref,unsigned long page);/* * End access through the given grant reference, iff the grant entry is
net/9p/trans_xen.c +4 -4
@@ -279,13 +279,13 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)grant_ref_t ref; ref = priv->rings[i].intf->ref[j]; -gnttab_end_foreign_access (ref,0 ,0 ); +gnttab_end_foreign_access (ref,0 ); }free_pages_exact (priv->rings[i].data.in,1UL << (priv->rings[i].intf->ring_order +XEN_PAGE_SHIFT )); } -gnttab_end_foreign_access (priv->rings[i].ref,0 ,0 ); +gnttab_end_foreign_access (priv->rings[i].ref,0 );free_page ((unsigned long )priv->rings[i].intf); }kfree (priv->rings);
@@ -353,10 +353,10 @@ static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev, out:if (bytes) {for (i--; i >=0 ; i--) -gnttab_end_foreign_access (ring->intf->ref[i],0 ,0 ); +gnttab_end_foreign_access (ring->intf->ref[i],0 );free_pages_exact (bytes,1UL << (order +XEN_PAGE_SHIFT )); } -gnttab_end_foreign_access (ring->ref,0 ,0 ); +gnttab_end_foreign_access (ring->ref,0 );free_page ((unsigned long )ring->intf);return ret; }
sound/xen/xen_snd_front_evtchnl.c +1 -1
@@ -168,7 +168,7 @@ static void evtchnl_free(struct xen_snd_front_info *front_info,/* End access and free the page. */ if (channel->gref !=GRANT_INVALID_REF ) -gnttab_end_foreign_access (channel->gref,0 , page); +gnttab_end_foreign_access (channel->gref, page);else free_page (page);
Signature · 1 line
2.34.1
Re: [PATCH 2/2] xen/grant-table: remove readonly parameter from functions
Quoted 5 lines · Juergen Gross
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 Juergen Gross <[email protected]>
Re: [PATCH 2/2] xen/grant-table: remove readonly parameter from functions
In reply to Juergen GrossQuoted 6 lines · On Freitag, 11. März 2022 11:34:29 CET Juergen Gross wrote:
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 Juergen Gross <[email protected]>---
Quoted 17 lines
drivers/block/xen-blkfront.c | 8 ++--- drivers/char/tpm/xen-tpmfront.c | 2 +- drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 2 +- drivers/input/misc/xen-kbdfront.c | 4 +-- drivers/net/xen-netfront.c | 13 ++++--- drivers/pci/xen-pcifront.c | 2 +- drivers/scsi/xen-scsifront.c | 4 +-- drivers/usb/host/xen-hcd.c | 4 +-- drivers/xen/gntalloc.c | 2 +- drivers/xen/gntdev-dmabuf.c | 2 +- drivers/xen/grant-table.c | 38 +++++++++------------ drivers/xen/pvcalls-front.c | 6 ++-- drivers/xen/xen-front-pgdir-shbuf.c | 3 +- include/xen/grant_table.h | 5 ++- net/9p/trans_xen.c | 8 ++--- sound/xen/xen_snd_front_evtchnl.c | 2 +- 16 files changed, 48 insertions(+), 57 deletions(-)