| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1371747665-12768-3-git-send-email-liuj97@gmail.com>
Date: Fri, 21 Jun 2013 01:01:04 +0800
From: Jiang Liu <liuj97@...il.com>
To: Bjorn Helgaas <bhelgaas@...gle.com>,
Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
Jeremy Fitzhardinge <jeremy@...p.org>
Cc: liuj97@...il.com, Jiang Liu <jiang.liu@...wei.com>,
Yijing Wang <wangyijing@...wei.com>,
xen-devel@...ts.xensource.com,
virtualization@...ts.linux-foundation.org,
linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 2/3] PCI, xen-pcifront: use new PCI interfaces to simplify implementation
From: Jiang Liu <jiang.liu@...wei.com>
Use new PCI interfaces to simplify xen-pcifront implementation:
1) Use pci_create_root_bus() instead of pci_scan_bus_parented()
because pci_scan_bus_parented() will be marked as __deprecated.
This also gets rid of a duplicated call to pci_bus_start_devices().
2) Use pci_stop_and_remove_root_bus() instead of open-coded private
implementation.
3) Use pci_set_host_bridge_release() to release data structures
associated with PCI root buses.
Signed-off-by: Jiang Liu <jiang.liu@...wei.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Cc: Jeremy Fitzhardinge <jeremy@...p.org>
Cc: xen-devel@...ts.xensource.com
Cc: virtualization@...ts.linux-foundation.org
Cc: linux-pci@...r.kernel.org
Cc: linux-kernel@...r.kernel.org
---
drivers/pci/xen-pcifront.c | 70 ++++++++++++++++++++--------------------------
1 file changed, 30 insertions(+), 40 deletions(-)
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 966abc6..1b01960 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -25,11 +25,6 @@
#define INVALID_GRANT_REF (0)
#define INVALID_EVTCHN (-1)
-struct pci_bus_entry {
- struct list_head list;
- struct pci_bus *bus;
-};
-
#define _PDEVB_op_active (0)
#define PDEVB_op_active (1 << (_PDEVB_op_active))
@@ -47,12 +42,12 @@ struct pcifront_device {
struct xen_pci_sharedinfo *sh_info;
struct work_struct op_work;
unsigned long flags;
-
};
struct pcifront_sd {
int domain;
struct pcifront_device *pdev;
+ struct resource busn_res;
};
static inline struct pcifront_device *
@@ -67,6 +62,12 @@ static inline void pcifront_init_sd(struct pcifront_sd *sd,
{
sd->domain = domain;
sd->pdev = pdev;
+
+ /* Xen pci-backend doesn't export P2P bridges */
+ sd->busn_res.start = bus;
+ sd->busn_res.end = bus;
+ sd->busn_res.flags = IORESOURCE_BUS;
+ sd->busn_res.name = "PCI busn";
}
static DEFINE_SPINLOCK(pcifront_dev_lock);
@@ -441,12 +442,19 @@ static int pcifront_scan_bus(struct pcifront_device *pdev,
return 0;
}
+static void pcifront_release_sd(struct pci_host_bridge *bridge)
+{
+ struct pcifront_sd *sd = bridge->release_data;
+
+ kfree(sd);
+}
+
static int pcifront_scan_root(struct pcifront_device *pdev,
unsigned int domain, unsigned int bus)
{
struct pci_bus *b;
struct pcifront_sd *sd = NULL;
- struct pci_bus_entry *bus_entry = NULL;
+ LIST_HEAD(resources);
int err = 0;
#ifndef CONFIG_PCI_DOMAINS
@@ -463,16 +471,18 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
dev_info(&pdev->xdev->dev, "Creating PCI Frontend Bus %04x:%02x\n",
domain, bus);
- bus_entry = kmalloc(sizeof(*bus_entry), GFP_KERNEL);
- sd = kmalloc(sizeof(*sd), GFP_KERNEL);
- if (!bus_entry || !sd) {
+ sd = kzalloc(sizeof(*sd), GFP_KERNEL);
+ if (!sd) {
err = -ENOMEM;
goto err_out;
}
pcifront_init_sd(sd, domain, bus, pdev);
- b = pci_scan_bus_parented(&pdev->xdev->dev, bus,
- &pcifront_bus_ops, sd);
+ pci_add_resource(&resources, &ioport_resource);
+ pci_add_resource(&resources, &iomem_resource);
+ pci_add_resource(&resources, &sd->busn_res);
+ b = pci_create_root_bus(&pdev->xdev->dev, bus, &pcifront_bus_ops,
+ sd, &resources);
if (!b) {
dev_err(&pdev->xdev->dev,
"Error creating PCI Frontend Bus!\n");
@@ -480,9 +490,8 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
goto err_out;
}
- bus_entry->bus = b;
-
- list_add(&bus_entry->list, &pdev->root_buses);
+ pci_set_host_bridge_release(to_pci_host_bridge(b->bridge),
+ pcifront_release_sd, sd);
/* pci_scan_bus_parented skips devices which do not have a have
* devfn==0. The pcifront_scan_bus enumerates all devfn. */
@@ -497,7 +506,6 @@ static int pcifront_scan_root(struct pcifront_device *pdev,
return err;
err_out:
- kfree(bus_entry);
kfree(sd);
return err;
@@ -538,35 +546,17 @@ static int pcifront_rescan_root(struct pcifront_device *pdev,
return err;
}
-static void free_root_bus_devs(struct pci_bus *bus)
-{
- struct pci_dev *dev;
-
- while (!list_empty(&bus->devices)) {
- dev = container_of(bus->devices.next, struct pci_dev,
- bus_list);
- dev_dbg(&dev->dev, "removing device\n");
- pci_stop_and_remove_bus_device(dev);
- }
-}
-
static void pcifront_free_roots(struct pcifront_device *pdev)
{
- struct pci_bus_entry *bus_entry, *t;
+ struct pcifront_sd *sd;
+ struct pci_bus *bus, *temp;
dev_dbg(&pdev->xdev->dev, "cleaning up root buses\n");
- list_for_each_entry_safe(bus_entry, t, &pdev->root_buses, list) {
- list_del(&bus_entry->list);
-
- free_root_bus_devs(bus_entry->bus);
-
- kfree(bus_entry->bus->sysdata);
-
- device_unregister(bus_entry->bus->bridge);
- pci_remove_bus(bus_entry->bus);
-
- kfree(bus_entry);
+ list_for_each_entry_safe(bus, temp, &pci_root_buses, node) {
+ sd = bus->sysdata;
+ if (sd->pdev == pdev)
+ pci_stop_and_remove_root_bus(bus);
}
}
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists