On Thu, Apr 22, 2010 at 04:16:36PM +0100, Stefano Stabellini wrote:
> Hi all,
> this patch adds the xen pci platform device driver that is responsible
> for initializing the grant table and xenbus in PV on HVM mode.
> Few changes to xenbus and grant table are necessary to allow the delayed
> initialization in HVM mode.
> Finally grant table needs few additional modifications to work in HVM
> mode.
>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Signed-off-by: Sheng Yang <sheng@xxxxxxxxxxxxxxx>
>
>
> ---
> drivers/xen/Kconfig | 10 ++
> drivers/xen/Makefile | 1 +
> drivers/xen/events.c | 2 +-
> drivers/xen/grant-table.c | 66 +++++++++-
> drivers/xen/platform-pci.c | 227
> ++++++++++++++++++++++++++++++++++
> drivers/xen/xenbus/xenbus_probe.c | 20 ++-
> include/xen/grant_table.h | 1 +
> include/xen/interface/grant_table.h | 1 +
> include/xen/interface/platform_pci.h | 45 +++++++
> include/xen/platform_pci.h | 40 ++++++
> include/xen/xenbus.h | 1 +
> 11 files changed, 400 insertions(+), 14 deletions(-)
> create mode 100644 drivers/xen/platform-pci.c
> create mode 100644 include/xen/interface/platform_pci.h
> create mode 100644 include/xen/platform_pci.h
>
> diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
> index d6d6f3e..5f9f7da 100644
> --- a/drivers/xen/Kconfig
> +++ b/drivers/xen/Kconfig
> @@ -184,3 +184,13 @@ config ACPI_PROCESSOR_XEN
> tristate
> depends on XEN_DOM0 && ACPI_PROCESSOR && CPU_FREQ
> default y
> +
> +config XEN_PLATFORM_PCI
> + tristate "xen platform pci device driver"
> + depends on XEN
> + select XEN_XENBUS_FRONTEND
> + help
> + Driver for the Xen Pci Platform device: it is responsible for
Pci -> PCI
.. snip ..
> + initializing xenbus and grant_table when running in a Xen HVM
> + domain. As a consequence this driver is required to run any Xen PV
> + frontend on Xen HVM.
> @@ -448,6 +452,26 @@ static int gnttab_map(unsigned int start_idx, unsigned
> int end_idx)
> unsigned int nr_gframes = end_idx + 1;
> int rc;
>
> + if (xen_hvm_domain()) {
> + struct xen_add_to_physmap xatp;
> + unsigned int i = end_idx;
> + rc = 0;
> + /*
> + * Loop backwards, so that the first hypercall has the largest
> + * index, ensuring that the table will grow only once.
> + */
> + do {
> + xatp.domid = DOMID_SELF;
> + xatp.idx = i;
> + xatp.space = XENMAPSPACE_grant_table;
> + xatp.gpfn = (hvm_pv_resume_frames >> PAGE_SHIFT) + i;
> + if ((rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap,
> &xatp)) != 0)
> + break;
> + } while (i-- > start_idx);
> +
So if the hypercall fails, should we print out a message ? Or is it OK
to return the rc?
> + return rc;
> + }
> +
> frames = kmalloc(nr_gframes * sizeof(unsigned long), GFP_ATOMIC);
> if (!frames)
> return -ENOMEM;
... snip ..
> +++ b/drivers/xen/platform-pci.c
> @@ -0,0 +1,227 @@
> +/******************************************************************************
> + * platform-pci.c
> + *
> + * Xen platform PCI device driver
> + * Copyright (c) 2005, Intel Corporation.
> + * Copyright (c) 2007, XenSource Inc.
No 'Copyright (c) 2010, Citrix'?
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> with
> + * this program; if not, write to the Free Software Foundation, Inc., 59
> Temple
> + * Place - Suite 330, Boston, MA 02111-1307 USA.
> + *
> + */
> +
> +#include <linux/module.h>
> +#include <linux/pci.h>
> +#include <linux/interrupt.h>
> +
> +#include <asm/io.h>
I think scripts/checkpatch.pl complains about this. You did
run script/checkpath.pl, right?
You might want also to put all of those includes in
an alphabetical order.
> +
> +#include <xen/grant_table.h>
> +#include <xen/platform_pci.h>
> +#include <xen/interface/platform_pci.h>
> +#include <xen/xenbus.h>
> +#include <xen/events.h>
> +#include <xen/hvm.h>
> +
> +#define DRV_NAME "xen-platform-pci"
> +
> +MODULE_AUTHOR("ssmith@xxxxxxxxxxxxx and stefano.stabellini@xxxxxxxxxxxxx");
> +MODULE_DESCRIPTION("Xen platform PCI device");
> +MODULE_LICENSE("GPL");
> +
> +static unsigned long platform_mmio;
> +static unsigned long platform_mmio_alloc;
> +static unsigned long platform_mmiolen;
> +
> +unsigned long alloc_xen_mmio(unsigned long len)
> +{
> + unsigned long addr;
> +
> + addr = platform_mmio + platform_mmio_alloc;
> + platform_mmio_alloc += len;
> + BUG_ON(platform_mmio_alloc > platform_mmiolen);
> +
> + return addr;
> +}
> +
> +static uint64_t get_callback_via(struct pci_dev *pdev)
> +{
> + u8 pin;
> + int irq;
> +
> +#ifdef __ia64__
> + for (irq = 0; irq < 16; irq++) {
> + if (isa_irq_to_vector(irq) == pdev->irq)
> + return irq; /* ISA IRQ */
> + }
Um, is this still neccessary? Have you tested this driver on IA64 with
this kernel?
> +#else /* !__ia64__ */
> + irq = pdev->irq;
> + if (irq < 16)
> + return irq; /* ISA IRQ */
> +#endif
> + pin = pdev->pin;
> +
> + /* We don't know the GSI. Specify the PCI INTx line instead. */
> + return (((uint64_t)0x01 << 56) | /* PCI INTx identifier */
> + ((uint64_t)pci_domain_nr(pdev->bus) << 32) |
> + ((uint64_t)pdev->bus->number << 16) |
> + ((uint64_t)(pdev->devfn & 0xff) << 8) |
> + ((uint64_t)(pin - 1) & 3));
> +}
> +
> +static irqreturn_t do_hvm_evtchn_intr(int irq, void *dev_id)
> +{
> + xen_hvm_evtchn_do_upcall(get_irq_regs());
> + return IRQ_HANDLED;
> +}
> +
> +int xen_irq_init(struct pci_dev *pdev)
The name sounds awkward. How about 'get_irq' or 'allocate_irq'?
> +{
> + __set_irq_handler(pdev->irq, handle_edge_irq, 0, NULL);
Is that kosher? I am not that familiar with how QEMU sets up the ACPI
DSDT to figure out what the device pin (which looking at the qemu source
is set to '1') corresponds to what IRQ.
Is it possible that with AMD-Vi or Intel VT-d you pass in a PCI device
that would have an interrupt line that would coincide with this device?
Or is the hvmloader + QEMU smart enought to take that under account
and stick this device on an edge interrupt line?
Perhaps doing something like:
int flags = IRQF_SAMPLE_RANDOM | IRQF_NOBALANCING;
if (pdev->irq > 16)
flags |= IRQF_SHARED;
else {
flags |= IRQF_TRIGGER_RISING | IRQF_DISABLED;
/* Whack! */
__set_irq_handler(pdev->irq, handle_edge_irq, 0, NULL);
}
return request_irq(pdev->irq, do_.., flags,"xen-pla..", pdev);
> + return request_irq(pdev->irq, do_hvm_evtchn_intr,
> + IRQF_SAMPLE_RANDOM | IRQF_DISABLED | IRQF_NOBALANCING |
> + IRQF_TRIGGER_RISING, "xen-platform-pci", pdev);
> +}
> +
> +static int __devinit platform_pci_init(struct pci_dev *pdev,
> + const struct pci_device_id *ent)
> +{
> + int i, ret;
> + long ioaddr, iolen;
> + long mmio_addr, mmio_len;
> + uint64_t callback_via;
> +
> + i = pci_enable_device(pdev);
> + if (i)
> + return i;
> +
> + ioaddr = pci_resource_start(pdev, 0);
> + iolen = pci_resource_len(pdev, 0);
> +
> + mmio_addr = pci_resource_start(pdev, 1);
> + mmio_len = pci_resource_len(pdev, 1);
> +
> + if (mmio_addr == 0 || ioaddr == 0) {
> + printk(KERN_WARNING DRV_NAME ":no resources found\n");
Uhh, you can also use 'dev_warn' - much nicer than thse printks.
Shouldn't you do pci_disable_device(..) ?
> + return -ENOENT;
> + }
> +
> + if (request_mem_region(mmio_addr, mmio_len, DRV_NAME) == NULL) {
> + printk(KERN_ERR ":MEM I/O resource 0x%lx @ 0x%lx busy\n",
> + mmio_addr, mmio_len);
Ditto
> + return -EBUSY;
> + }
> +
> + if (request_region(ioaddr, iolen, DRV_NAME) == NULL) {
> + printk(KERN_ERR DRV_NAME ":I/O resource 0x%lx @ 0x%lx busy\n",
> + iolen, ioaddr);
> + release_mem_region(mmio_addr, mmio_len);
> + return -EBUSY;
Ditto.
> + }
> +
> + platform_mmio = mmio_addr;
> + platform_mmiolen = mmio_len;
> +
> + if (!xen_have_vector_callback) {
> + xen_irq_init(pdev);
Not checking the return value? What if it is -1?
> + callback_via = get_callback_via(pdev);
> + if ((ret = xen_set_callback_via(callback_via)))
What happens with the xen_have_vector_callback and
x86_platform_ipi_callback which were set in the previous patch?
Will you receive a poke on do_hvm_pv_evtchn_intr and do_hvm_evtchn_intr?
> + goto out;
> + }
> + if ((ret = gnttab_init()))
> + goto out;
> +
> + if ((ret = xenbus_probe_init()))
> + goto out;
> +
> + out:
> + if (ret) {
> + release_mem_region(mmio_addr, mmio_len);
> + release_region(ioaddr, iolen);
No pci_disable_device() ?
> + }
> +
> + return ret;
> +}
> +
> +#define XEN_PLATFORM_VENDOR_ID 0x5853
> +#define XEN_PLATFORM_DEVICE_ID 0x0001
> +static struct pci_device_id platform_pci_tbl[] __devinitdata = {
> + {XEN_PLATFORM_VENDOR_ID, XEN_PLATFORM_DEVICE_ID,
> + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> + {0,}
> +};
> +
> +MODULE_DEVICE_TABLE(pci, platform_pci_tbl);
> +
> +static struct pci_driver platform_driver = {
> + name: DRV_NAME,
> + probe: platform_pci_init,
> + id_table: platform_pci_tbl,
> +};
> +
> +static int check_platform_magic(void)
> +{
> + short magic;
> + char protocol, *err;
> +
> + magic = inw(XEN_IOPORT_MAGIC);
> +
> + if (magic != XEN_IOPORT_MAGIC_VAL) {
> + err = "unrecognised magic value";
> + goto no_dev;
> + }
> +
> + protocol = inb(XEN_IOPORT_PROTOVER);
> +
> + printk(KERN_DEBUG DRV_NAME "I/O protocol version %d\n", protocol);
dev_dbg
> +
> + switch (protocol) {
> + case 1:
> + outw(XEN_IOPORT_LINUX_PRODNUM, XEN_IOPORT_PRODNUM);
> + outl(XEN_IOPORT_LINUX_DRVVER, XEN_IOPORT_DRVVER);
> + if (inw(XEN_IOPORT_MAGIC) != XEN_IOPORT_MAGIC_VAL) {
> + printk(KERN_ERR DRV_NAME "blacklisted by host\n");
dev_err
> + return -ENODEV;
> + }
> + break;
> + default:
> + err = "unknown I/O protocol version";
> + goto no_dev;
> + }
> +
> + return 0;
> +
> + no_dev:
> + printk(KERN_WARNING DRV_NAME "failed backend handshake: %s\n", err);
dev_warn. Shouldn't the rc be -ENODEV?
> + return 0;
> +}
> +
> +static int __init platform_pci_module_init(void)
> +{
> + int rc;
> +
> + rc = check_platform_magic();
> + if (rc < 0)
> + return rc;
> +
> + rc = pci_register_driver(&platform_driver);
> + if (rc) {
> + printk(KERN_INFO DRV_NAME
> + ": No platform pci device model found\n");
> + return rc;
> + }
> +
> + return 0;
> +}
> +
> +module_init(platform_pci_module_init);
> diff --git a/drivers/xen/xenbus/xenbus_probe.c
> b/drivers/xen/xenbus/xenbus_probe.c
> index 7d11957..f0e6574 100644
> --- a/drivers/xen/xenbus/xenbus_probe.c
> +++ b/drivers/xen/xenbus/xenbus_probe.c
> @@ -668,17 +668,25 @@ void xenbus_probe(struct work_struct *unused)
> blocking_notifier_call_chain(&xenstore_chain, 0, NULL);
> }
>
> -static int __init xenbus_probe_init(void)
> +static int __init __xenbus_probe_init(void)
> +{
> + /* Delay initialization in the PV on HVM case */
> + if (xen_hvm_domain())
> + return 0;
> +
> + if (!xen_pv_domain())
> + return -ENODEV;
> +
> + return xenbus_probe_init();
> +}
> +
> +int xenbus_probe_init(void)
> {
> int err = 0;
> unsigned long page = 0;
>
> DPRINTK("");
>
> - err = -ENODEV;
> - if (!xen_domain())
> - return err;
> -
> /*
> * Domain0 doesn't have a store_evtchn or store_mfn yet.
> */
> @@ -752,6 +760,6 @@ static int __init xenbus_probe_init(void)
> return err;
> }
>
> -postcore_initcall(xenbus_probe_init);
> +postcore_initcall(__xenbus_probe_init);
>
> MODULE_LICENSE("GPL");
> diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
> index 9e54167..7f48be7 100644
> --- a/include/xen/grant_table.h
> +++ b/include/xen/grant_table.h
> @@ -59,6 +59,7 @@ struct gnttab_free_callback {
>
> void gnttab_reset_grant_page(struct page *page);
>
> +int gnttab_init(void);
> int gnttab_suspend(void);
> int gnttab_resume(void);
>
> diff --git a/include/xen/interface/grant_table.h
> b/include/xen/interface/grant_table.h
> index 8211af8..c704fe5 100644
> --- a/include/xen/interface/grant_table.h
> +++ b/include/xen/interface/grant_table.h
> @@ -28,6 +28,7 @@
> #ifndef __XEN_PUBLIC_GRANT_TABLE_H__
> #define __XEN_PUBLIC_GRANT_TABLE_H__
>
> +#include <xen/interface/xen.h>
>
> /***********************************
> * GRANT TABLE REPRESENTATION
> diff --git a/include/xen/interface/platform_pci.h
> b/include/xen/interface/platform_pci.h
> new file mode 100644
> index 0000000..bc230cd
> --- /dev/null
> +++ b/include/xen/interface/platform_pci.h
> @@ -0,0 +1,45 @@
> +/******************************************************************************
> + * platform_pci.h
> + *
> + * Interface for granting foreign access to page frames, and receiving
> + * page-ownership transfers.
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> copy
> + * of this software and associated documentation files (the "Software"), to
> + * deal in the Software without restriction, including without limitation the
> + * rights to use, copy, modify, merge, publish, distribute, sublicense,
> and/or
> + * sell copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> THE
> + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> + * DEALINGS IN THE SOFTWARE.
> + */
> +
> +#ifndef __XEN_PUBLIC_PLATFORM_PCI_H__
> +#define __XEN_PUBLIC_PLATFORM_PCI_H__
> +
> +#define XEN_IOPORT_BASE 0x10
> +
> +#define XEN_IOPORT_PLATFLAGS (XEN_IOPORT_BASE + 0) /* 1 byte access (R/W) */
> +#define XEN_IOPORT_MAGIC (XEN_IOPORT_BASE + 0) /* 2 byte access (R) */
> +#define XEN_IOPORT_UNPLUG (XEN_IOPORT_BASE + 0) /* 2 byte access (W) */
> +#define XEN_IOPORT_DRVVER (XEN_IOPORT_BASE + 0) /* 4 byte access (W) */
> +
> +#define XEN_IOPORT_SYSLOG (XEN_IOPORT_BASE + 2) /* 1 byte access (W) */
> +#define XEN_IOPORT_PROTOVER (XEN_IOPORT_BASE + 2) /* 1 byte access (R) */
> +#define XEN_IOPORT_PRODNUM (XEN_IOPORT_BASE + 2) /* 2 byte access (W) */
> +
> +#define UNPLUG_ALL_IDE_DISKS 1
> +#define UNPLUG_ALL_NICS 2
> +#define UNPLUG_AUX_IDE_DISKS 4
> +#define UNPLUG_ALL 7
> +
> +#endif /* __XEN_PUBLIC_PLATFORM_PCI_H__ */
> diff --git a/include/xen/platform_pci.h b/include/xen/platform_pci.h
> new file mode 100644
> index 0000000..870e7a4
> --- /dev/null
> +++ b/include/xen/platform_pci.h
> @@ -0,0 +1,40 @@
> +/******************************************************************************
> + * platform-pci.h
> + *
> + * Xen platform PCI device driver
> + * Copyright (c) 2004, Intel Corporation. <xiaofeng.ling@xxxxxxxxx>
> + * Copyright (c) 2007, XenSource Inc.
Copyring 2010 Citrix?
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home