Skip to content

Commit

Permalink
Merge tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history 
…ux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:

 - two cleanup patches

 - a fix of a memory leak in the Xen pvfront driver

 - a fix of a locking issue in the Xen hypervisor console driver

* tag 'for-linus-6.2-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pvcalls: free active map buffer on pvcalls_front_free_map
  hvc/xen: lock console list traversal
  x86/xen: Remove the unused function p2m_index()
  xen: make remove callback of xen driver void returned
  • Loading branch information
@torvalds
torvalds committed Jan 12, 2023
2 parents 772d0e9 + f57034c commit bad8c4a
Show file tree
Hide file tree
Showing 20 changed files with 54 additions and 70 deletions.
5 changes: 0 additions & 5 deletions arch/x86/xen/p2m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@ static inline unsigned p2m_mid_index(unsigned long pfn)
return (pfn / P2M_PER_PAGE) % P2M_MID_PER_PAGE;
}

static inline unsigned p2m_index(unsigned long pfn)
{
return pfn % P2M_PER_PAGE;
}

static void p2m_top_mfn_init(unsigned long *top)
{
unsigned i;
Expand Down
4 changes: 1 addition & 3 deletions drivers/block/xen-blkback/xenbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
return 0;
}

static int xen_blkbk_remove(struct xenbus_device *dev)
static void xen_blkbk_remove(struct xenbus_device *dev)
{
struct backend_info *be = dev_get_drvdata(&dev->dev);

Expand All @@ -547,8 +547,6 @@ static int xen_blkbk_remove(struct xenbus_device *dev)
/* Put the reference we set in xen_blkif_alloc(). */
xen_blkif_put(be->blkif);
}

return 0;
}

int xen_blkbk_flush_diskcache(struct xenbus_transaction xbt,
Expand Down
3 changes: 1 addition & 2 deletions drivers/block/xen-blkfront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2467,7 +2467,7 @@ static void blkback_changed(struct xenbus_device *dev,
}
}

static int blkfront_remove(struct xenbus_device *xbdev)
static void blkfront_remove(struct xenbus_device *xbdev)
{
struct blkfront_info *info = dev_get_drvdata(&xbdev->dev);

Expand All @@ -2488,7 +2488,6 @@ static int blkfront_remove(struct xenbus_device *xbdev)
}

kfree(info);
return 0;
}

static int blkfront_is_ready(struct xenbus_device *dev)
Expand Down
3 changes: 1 addition & 2 deletions drivers/char/tpm/xen-tpmfront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,14 +360,13 @@ static int tpmfront_probe(struct xenbus_device *dev,
return tpm_chip_register(priv->chip);
}

static int tpmfront_remove(struct xenbus_device *dev)
static void tpmfront_remove(struct xenbus_device *dev)
{
struct tpm_chip *chip = dev_get_drvdata(&dev->dev);
struct tpm_private *priv = dev_get_drvdata(&chip->dev);
tpm_chip_unregister(chip);
ring_free(priv);
dev_set_drvdata(&chip->dev, NULL);
return 0;
}

static int tpmfront_resume(struct xenbus_device *dev)
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/xen/xen_drm_front.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ static int xen_drv_probe(struct xenbus_device *xb_dev,
return xenbus_switch_state(xb_dev, XenbusStateInitialising);
}

static int xen_drv_remove(struct xenbus_device *dev)
static void xen_drv_remove(struct xenbus_device *dev)
{
struct xen_drm_front_info *front_info = dev_get_drvdata(&dev->dev);
int to = 100;
Expand Down Expand Up @@ -751,7 +751,6 @@ static int xen_drv_remove(struct xenbus_device *dev)

xen_drm_drv_fini(front_info);
xenbus_frontend_closed(dev);
return 0;
}

static const struct xenbus_device_id xen_driver_ids[] = {
Expand Down
5 changes: 2 additions & 3 deletions drivers/input/misc/xen-kbdfront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module_param_array(ptr_size, int, NULL, 0444);
MODULE_PARM_DESC(ptr_size,
"Pointing device width, height in pixels (default 800,600)");

static int xenkbd_remove(struct xenbus_device *);
static void xenkbd_remove(struct xenbus_device *);
static int xenkbd_connect_backend(struct xenbus_device *, struct xenkbd_info *);
static void xenkbd_disconnect_backend(struct xenkbd_info *);

Expand Down Expand Up @@ -404,7 +404,7 @@ static int xenkbd_resume(struct xenbus_device *dev)
return xenkbd_connect_backend(dev, info);
}

static int xenkbd_remove(struct xenbus_device *dev)
static void xenkbd_remove(struct xenbus_device *dev)
{
struct xenkbd_info *info = dev_get_drvdata(&dev->dev);

Expand All @@ -417,7 +417,6 @@ static int xenkbd_remove(struct xenbus_device *dev)
input_unregister_device(info->mtouch);
free_page((unsigned long)info->page);
kfree(info);
return 0;
}

static int xenkbd_connect_backend(struct xenbus_device *dev,
Expand Down
3 changes: 1 addition & 2 deletions drivers/net/xen-netback/xenbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ static int read_xenbus_vif_flags(struct backend_info *be)
return 0;
}

static int netback_remove(struct xenbus_device *dev)
static void netback_remove(struct xenbus_device *dev)
{
struct backend_info *be = dev_get_drvdata(&dev->dev);

Expand All @@ -992,7 +992,6 @@ static int netback_remove(struct xenbus_device *dev)
kfree(be->hotplug_script);
kfree(be);
dev_set_drvdata(&dev->dev, NULL);
return 0;
}

/*
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/xen-netfront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2646,7 +2646,7 @@ static void xennet_bus_close(struct xenbus_device *dev)
} while (!ret);
}

static int xennet_remove(struct xenbus_device *dev)
static void xennet_remove(struct xenbus_device *dev)
{
struct netfront_info *info = dev_get_drvdata(&dev->dev);

Expand All @@ -2662,8 +2662,6 @@ static int xennet_remove(struct xenbus_device *dev)
rtnl_unlock();
}
xennet_free_netdev(info->netdev);

return 0;
}

static const struct xenbus_device_id netfront_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/pci/xen-pcifront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1055,14 +1055,12 @@ static int pcifront_xenbus_probe(struct xenbus_device *xdev,
return err;
}

static int pcifront_xenbus_remove(struct xenbus_device *xdev)
static void pcifront_xenbus_remove(struct xenbus_device *xdev)
{
struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev);

if (pdev)
free_pdev(pdev);

return 0;
}

static const struct xenbus_device_id xenpci_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/scsi/xen-scsifront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ static int scsifront_suspend(struct xenbus_device *dev)
return err;
}

static int scsifront_remove(struct xenbus_device *dev)
static void scsifront_remove(struct xenbus_device *dev)
{
struct vscsifrnt_info *info = dev_get_drvdata(&dev->dev);

Expand All @@ -1011,8 +1011,6 @@ static int scsifront_remove(struct xenbus_device *dev)

scsifront_free_ring(info);
scsi_host_put(info->host);

return 0;
}

static void scsifront_disconnect(struct vscsifrnt_info *info)
Expand Down
50 changes: 31 additions & 19 deletions drivers/tty/hvc/hvc_xen.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,22 @@ static DEFINE_SPINLOCK(xencons_lock);

static struct xencons_info *vtermno_to_xencons(int vtermno)
{
struct xencons_info *entry, *n, *ret = NULL;
struct xencons_info *entry, *ret = NULL;
unsigned long flags;

if (list_empty(&xenconsoles))
return NULL;
spin_lock_irqsave(&xencons_lock, flags);
if (list_empty(&xenconsoles)) {
spin_unlock_irqrestore(&xencons_lock, flags);
return NULL;
}

list_for_each_entry_safe(entry, n, &xenconsoles, list) {
list_for_each_entry(entry, &xenconsoles, list) {
if (entry->vtermno == vtermno) {
ret = entry;
break;
}
}
spin_unlock_irqrestore(&xencons_lock, flags);

return ret;
}
Expand Down Expand Up @@ -223,7 +228,7 @@ static int xen_hvm_console_init(void)
{
int r;
uint64_t v = 0;
unsigned long gfn;
unsigned long gfn, flags;
struct xencons_info *info;

if (!xen_hvm_domain())
Expand Down Expand Up @@ -258,9 +263,9 @@ static int xen_hvm_console_init(void)
goto err;
info->vtermno = HVC_COOKIE;

spin_lock(&xencons_lock);
spin_lock_irqsave(&xencons_lock, flags);
list_add_tail(&info->list, &xenconsoles);
spin_unlock(&xencons_lock);
spin_unlock_irqrestore(&xencons_lock, flags);

return 0;
err:
Expand All @@ -283,6 +288,7 @@ static int xencons_info_pv_init(struct xencons_info *info, int vtermno)
static int xen_pv_console_init(void)
{
struct xencons_info *info;
unsigned long flags;

if (!xen_pv_domain())
return -ENODEV;
Expand All @@ -299,16 +305,17 @@ static int xen_pv_console_init(void)
/* already configured */
return 0;
}
spin_lock(&xencons_lock);
spin_lock_irqsave(&xencons_lock, flags);
xencons_info_pv_init(info, HVC_COOKIE);
spin_unlock(&xencons_lock);
spin_unlock_irqrestore(&xencons_lock, flags);

return 0;
}

static int xen_initial_domain_console_init(void)
{
struct xencons_info *info;
unsigned long flags;

if (!xen_initial_domain())
return -ENODEV;
Expand All @@ -323,9 +330,9 @@ static int xen_initial_domain_console_init(void)
info->irq = bind_virq_to_irq(VIRQ_CONSOLE, 0, false);
info->vtermno = HVC_COOKIE;

spin_lock(&xencons_lock);
spin_lock_irqsave(&xencons_lock, flags);
list_add_tail(&info->list, &xenconsoles);
spin_unlock(&xencons_lock);
spin_unlock_irqrestore(&xencons_lock, flags);

return 0;
}
Expand Down Expand Up @@ -380,10 +387,12 @@ static void xencons_free(struct xencons_info *info)

static int xen_console_remove(struct xencons_info *info)
{
unsigned long flags;

xencons_disconnect_backend(info);
spin_lock(&xencons_lock);
spin_lock_irqsave(&xencons_lock, flags);
list_del(&info->list);
spin_unlock(&xencons_lock);
spin_unlock_irqrestore(&xencons_lock, flags);
if (info->xbdev != NULL)
xencons_free(info);
else {
Expand All @@ -394,9 +403,9 @@ static int xen_console_remove(struct xencons_info *info)
return 0;
}

static int xencons_remove(struct xenbus_device *dev)
static void xencons_remove(struct xenbus_device *dev)
{
return xen_console_remove(dev_get_drvdata(&dev->dev));
xen_console_remove(dev_get_drvdata(&dev->dev));
}

static int xencons_connect_backend(struct xenbus_device *dev,
Expand Down Expand Up @@ -464,6 +473,7 @@ static int xencons_probe(struct xenbus_device *dev,
{
int ret, devid;
struct xencons_info *info;
unsigned long flags;

devid = dev->nodename[strlen(dev->nodename) - 1] - '0';
if (devid == 0)
Expand All @@ -482,9 +492,9 @@ static int xencons_probe(struct xenbus_device *dev,
ret = xencons_connect_backend(dev, info);
if (ret < 0)
goto error;
spin_lock(&xencons_lock);
spin_lock_irqsave(&xencons_lock, flags);
list_add_tail(&info->list, &xenconsoles);
spin_unlock(&xencons_lock);
spin_unlock_irqrestore(&xencons_lock, flags);

return 0;

Expand Down Expand Up @@ -584,10 +594,12 @@ static int __init xen_hvc_init(void)

info->hvc = hvc_alloc(HVC_COOKIE, info->irq, ops, 256);
if (IS_ERR(info->hvc)) {
unsigned long flags;

r = PTR_ERR(info->hvc);
spin_lock(&xencons_lock);
spin_lock_irqsave(&xencons_lock, flags);
list_del(&info->list);
spin_unlock(&xencons_lock);
spin_unlock_irqrestore(&xencons_lock, flags);
if (info->irq)
unbind_from_irqhandler(info->irq, NULL);
kfree(info);
Expand Down
4 changes: 1 addition & 3 deletions drivers/usb/host/xen-hcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1530,15 +1530,13 @@ static void xenhcd_backend_changed(struct xenbus_device *dev,
}
}

static int xenhcd_remove(struct xenbus_device *dev)
static void xenhcd_remove(struct xenbus_device *dev)
{
struct xenhcd_info *info = dev_get_drvdata(&dev->dev);
struct usb_hcd *hcd = xenhcd_info_to_hcd(info);

xenhcd_destroy_rings(info);
usb_put_hcd(hcd);

return 0;
}

static int xenhcd_probe(struct xenbus_device *dev,
Expand Down
6 changes: 2 additions & 4 deletions drivers/video/fbdev/xen-fbfront.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ MODULE_PARM_DESC(video,
"Video memory size in MB, width, height in pixels (default 2,800,600)");

static void xenfb_make_preferred_console(void);
static int xenfb_remove(struct xenbus_device *);
static void xenfb_remove(struct xenbus_device *);
static void xenfb_init_shared_page(struct xenfb_info *, struct fb_info *);
static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *);
static void xenfb_disconnect_backend(struct xenfb_info *);
Expand Down Expand Up @@ -523,7 +523,7 @@ static int xenfb_resume(struct xenbus_device *dev)
return xenfb_connect_backend(dev, info);
}

static int xenfb_remove(struct xenbus_device *dev)
static void xenfb_remove(struct xenbus_device *dev)
{
struct xenfb_info *info = dev_get_drvdata(&dev->dev);

Expand All @@ -538,8 +538,6 @@ static int xenfb_remove(struct xenbus_device *dev)
vfree(info->gfns);
vfree(info->fb);
kfree(info);

return 0;
}

static unsigned long vmalloc_to_gfn(void *address)
Expand Down
3 changes: 1 addition & 2 deletions drivers/xen/pvcalls-back.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1181,9 +1181,8 @@ static void pvcalls_back_changed(struct xenbus_device *dev,
}
}

static int pvcalls_back_remove(struct xenbus_device *dev)
static void pvcalls_back_remove(struct xenbus_device *dev)
{
return 0;
}

static int pvcalls_back_uevent(struct xenbus_device *xdev,
Expand Down
Loading

0 comments on commit bad8c4a

Please sign in to comment.