Commit f74fd13f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.5b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull more xen updates from Juergen Gross:

 - a patch to fix a build warning

 - a cleanup of no longer needed code in the Xen event handling

 - a small series for the Xen grant driver avoiding high order
   allocations and replacing an insane global limit by a per-call one

 - a small series fixing Xen frontend/backend module referencing

* tag 'for-linus-5.5b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-blkback: allow module to be cleanly unloaded
  xen/xenbus: reference count registered modules
  xen/gntdev: switch from kcalloc() to kvcalloc()
  xen/gntdev: replace global limit of mapped pages by limit per call
  xen/gntdev: remove redundant non-zero check on ret
  xen/events: remove event handling recursion detection
parents 6dc517a3 14855954

drivers/block/xen-blkback/blkback.c

+8 −0
Original line number Diff line number Diff line
@@ -1506,5 +1506,13 @@ static int __init xen_blkif_init(void) 


module_init(xen_blkif_init);



static void __exit xen_blkif_fini(void)

{

	xen_blkif_xenbus_fini();

	xen_blkif_interface_fini();

}



module_exit(xen_blkif_fini);



MODULE_LICENSE("Dual BSD/GPL");

MODULE_ALIAS("xen-backend:vbd");

drivers/block/xen-blkback/common.h

+3 −0
Original line number Diff line number Diff line
@@ -375,9 +375,12 @@ struct phys_req { 
	struct block_device	*bdev;

	blkif_sector_t		sector_number;

};



int xen_blkif_interface_init(void);

void xen_blkif_interface_fini(void);



int xen_blkif_xenbus_init(void);

void xen_blkif_xenbus_fini(void);



irqreturn_t xen_blkif_be_int(int irq, void *dev_id);

int xen_blkif_schedule(void *arg);

drivers/block/xen-blkback/xenbus.c

+11 −0
Original line number Diff line number Diff line
@@ -333,6 +333,12 @@ int __init xen_blkif_interface_init(void) 
	return 0;

}



void xen_blkif_interface_fini(void)

{

	kmem_cache_destroy(xen_blkif_cachep);

	xen_blkif_cachep = NULL;

}



/*

 *  sysfs interface for VBD I/O requests

 */
@@ -1122,3 +1128,8 @@ int xen_blkif_xenbus_init(void) 
{

	return xenbus_register_backend(&xen_blkbk_driver);

}



void xen_blkif_xenbus_fini(void)

{

	xenbus_unregister_driver(&xen_blkbk_driver);

}

drivers/xen/events/events_base.c

+3 −13
Original line number Diff line number Diff line
@@ -1213,31 +1213,21 @@ void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector) 
	notify_remote_via_irq(irq);

}



static DEFINE_PER_CPU(unsigned, xed_nesting_count);



static void __xen_evtchn_do_upcall(void)

{

	struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);

	int cpu = get_cpu();

	unsigned count;

	int cpu = smp_processor_id();



	do {

		vcpu_info->evtchn_upcall_pending = 0;



		if (__this_cpu_inc_return(xed_nesting_count) - 1)

			goto out;



		xen_evtchn_handle_events(cpu);



		BUG_ON(!irqs_disabled());



		count = __this_cpu_read(xed_nesting_count);

		__this_cpu_write(xed_nesting_count, 0);

	} while (count != 1 || vcpu_info->evtchn_upcall_pending);



out:

		virt_rmb(); /* Hypervisor can set upcall pending. */



	put_cpu();

	} while (vcpu_info->evtchn_upcall_pending);

}



void xen_evtchn_do_upcall(struct pt_regs *regs)

drivers/xen/gntdev-common.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ void gntdev_add_map(struct gntdev_priv *priv, struct gntdev_grant_map *add); 


void gntdev_put_map(struct gntdev_priv *priv, struct gntdev_grant_map *map);



bool gntdev_account_mapped_pages(int count);

bool gntdev_test_page_count(unsigned int count);



int gntdev_map_grant_pages(struct gntdev_grant_map *map);

CRA Git | Maintained and supported by SUSTech CRA and CCSE