Re: [Xen-devel] [PATCH 0/2] Handle xen_platform_pci=0 case

[Anthony PERARD <anthony.perard@xxxxxxxxxx>]

On Tue, Nov 26, 2013 at 03:09:56PM -0500, Konrad Rzeszutek Wilk wrote:
> > Something like this? (Untested, not even compiled)
> > 
> 
> Please try this one:
> 
> From f7d3581aa19a35ea3ff10b965b2b08843e923635 Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> Date: Tue, 26 Nov 2013 15:05:40 -0500
> Subject: [PATCH] xen/pvhvm: If xen_platform_pci=0 is set don't blow up.
> 
> *TODO*
> 
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>

Looks like Linux is more happy with this patch.

I have apply it on top of Linux 3.12.1 and no more "kernel BUG at
drivers/xen/grant-table.c:1189!" in linux debug. Also, with the patch, my
guest will shutdown (without, something prevent from shuting down
complitly).

So, this patch is working for me. Thanks.
> ---
>  drivers/block/xen-blkfront.c               |  2 +-
>  drivers/input/misc/xen-kbdfront.c          |  4 ++++
>  drivers/net/xen-netfront.c                 |  2 +-
>  drivers/xen/xenbus/xenbus_probe_frontend.c |  2 +-
>  include/xen/platform_pci.h                 | 13 +++++++++++++
>  5 files changed, 20 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> index 432db1b..bcbaf0b 100644
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@ -2074,7 +2074,7 @@ static int __init xlblk_init(void)
>       if (!xen_domain())
>               return -ENODEV;
>  
> -     if (xen_hvm_domain() && !xen_platform_pci_unplug)
> +     if (xen_err_out())
>               return -ENODEV;
>  
>       if (register_blkdev(XENVBD_MAJOR, DEV_NAME)) {
> diff --git a/drivers/input/misc/xen-kbdfront.c 
> b/drivers/input/misc/xen-kbdfront.c
> index e21c181..9d250cf 100644
> --- a/drivers/input/misc/xen-kbdfront.c
> +++ b/drivers/input/misc/xen-kbdfront.c
> @@ -29,6 +29,7 @@
>  #include <xen/interface/io/fbif.h>
>  #include <xen/interface/io/kbdif.h>
>  #include <xen/xenbus.h>
> +#include <xen/platform_pci.h>
>  
>  struct xenkbd_info {
>       struct input_dev *kbd;
> @@ -380,6 +381,9 @@ static int __init xenkbd_init(void)
>       if (xen_initial_domain())
>               return -ENODEV;
>  
> +     if (xen_err_out())
> +             return -ENODEV;
> +
>       return xenbus_register_frontend(&xenkbd_driver);
>  }
>  
> diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
> index e59acb1..be2744b 100644
> --- a/drivers/net/xen-netfront.c
> +++ b/drivers/net/xen-netfront.c
> @@ -2115,7 +2115,7 @@ static int __init netif_init(void)
>       if (!xen_domain())
>               return -ENODEV;
>  
> -     if (xen_hvm_domain() && !xen_platform_pci_unplug)
> +     if (xen_err_out())
>               return -ENODEV;
>  
>       pr_info("Initialising Xen virtual ethernet driver\n");
> diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c 
> b/drivers/xen/xenbus/xenbus_probe_frontend.c
> index 129bf84..b1c0f2a 100644
> --- a/drivers/xen/xenbus/xenbus_probe_frontend.c
> +++ b/drivers/xen/xenbus/xenbus_probe_frontend.c
> @@ -496,7 +496,7 @@ subsys_initcall(xenbus_probe_frontend_init);
>  #ifndef MODULE
>  static int __init boot_wait_for_devices(void)
>  {
> -     if (xen_hvm_domain() && !xen_platform_pci_unplug)
> +     if (xen_err_out())
>               return -ENODEV;
>  
>       ready_to_wait_for_devices = 1;
> diff --git a/include/xen/platform_pci.h b/include/xen/platform_pci.h
> index 438c256..a5bbd0b 100644
> --- a/include/xen/platform_pci.h
> +++ b/include/xen/platform_pci.h
> @@ -47,5 +47,18 @@ static inline int xen_must_unplug_disks(void) {
>  }
>  
>  extern int xen_platform_pci_unplug;
> +static  bool xen_err_out(void)
> +{
>  
> +     if (!xen_domain())
> +             return true;
> +
> +     if (xen_hvm_domain()) {
> +             if (xen_platform_pci_unplug & (XEN_UNPLUG_UNNECESSARY | 
> XEN_UNPLUG_NEVER))
> +                     return true;
> +             if (xen_platform_pci_unplug == 0)
> +                     return true;
> +     }
> +     return false;
> +}
>  #endif /* _XEN_PLATFORM_PCI_H */
> -- 
> 1.8.3.1
> 

-- 
Anthony PERARD

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel