From: Taku Izumi <izumi.taku@jp.fujitsu.com>
To: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: linux-pci@vger.kernel.org, bhelgaas@google.com,
linux-acpi@vger.kernel.org, kaneshige.kenji@jp.fujitsu.com,
yinghai@kernel.org, jiang.liu@huawei.com
Subject: [PATCH 1/7][RESEND] x86, PCI: Fix non acpi path pci_sysdata leaking with release_fn
Date: Fri, 10 Aug 2012 15:11:50 +0900 [thread overview]
Message-ID: <20120810151150.a3942c58.izumi.taku@jp.fujitsu.com> (raw)
In-Reply-To: <20120810150955.e4ab3c7f.izumi.taku@jp.fujitsu.com>
From: Yinghai Lu <yinghai@kernel.org>
x86, PCI: Fix non acpi path pci_sysdata leaking with release_fn
Non acpi path, or root is not probed from acpi, during root bus removal
will get warning about leaking from pci_scan_bus_on_node.
Fix it with setting pci_host_bridge release function.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
---
arch/x86/pci/common.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
Index: Bjorn-next-0808/arch/x86/pci/common.c
===================================================================
--- Bjorn-next-0808.orig/arch/x86/pci/common.c
+++ Bjorn-next-0808/arch/x86/pci/common.c
@@ -634,17 +634,19 @@ int pci_ext_cfg_avail(struct pci_dev *de
return 0;
}
+static void release_pci_sysdata(struct pci_host_bridge *bridge)
+{
+ struct pci_sysdata *sd = bridge->release_data;
+
+ kfree(sd);
+}
+
struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node)
{
LIST_HEAD(resources);
struct pci_bus *bus = NULL;
struct pci_sysdata *sd;
- /*
- * Allocate per-root-bus (not per bus) arch-specific data.
- * TODO: leak; this memory is never freed.
- * It's arguable whether it's worth the trouble to care.
- */
sd = kzalloc(sizeof(*sd), GFP_KERNEL);
if (!sd) {
printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busno);
@@ -654,7 +656,10 @@ struct pci_bus * __devinit pci_scan_bus_
x86_pci_root_bus_resources(busno, &resources);
printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busno);
bus = pci_scan_root_bus(NULL, busno, ops, sd, &resources);
- if (!bus) {
+ if (bus)
+ pci_set_host_bridge_release(to_pci_host_bridge(bus->bridge),
+ release_pci_sysdata, sd);
+ else {
pci_free_resource_list(&resources);
kfree(sd);
}
next prev parent reply other threads:[~2012-08-10 6:11 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 6:09 [PATCH 0/7][RESEND] acpi, pci: hostbridge hotplug support Taku Izumi
2012-08-10 6:11 ` Taku Izumi [this message]
2012-08-16 16:42 ` [PATCH 1/7][RESEND] x86, PCI: Fix non acpi path pci_sysdata leaking with release_fn Bjorn Helgaas
2012-08-10 6:12 ` [PATCH 2/7][RESEND] PCI: Correctly clean up pci root buses in function pci_remove_bus() Taku Izumi
2012-08-16 17:11 ` Bjorn Helgaas
2012-08-30 15:43 ` Jiang Liu
2012-08-10 6:12 ` [PATCH 3/7][RESEND] ACPI, PCI: Use normal list for struct acpi_pci_driver Taku Izumi
2012-08-10 6:13 ` [PATCH 4/7][RESEND] ACPI, PCI: Notify acpi_pci_drivers when hot-plugging PCI root bridges Taku Izumi
2012-08-10 6:14 ` [PATCH 5/7][RESEND] ACPI, PCI: Protect global lists in drivers/acpi/pci_root.c Taku Izumi
2012-08-16 17:25 ` Bjorn Helgaas
2012-08-10 6:14 ` [PATCH 6/7][RESEND] ACPI, PCI: add hostbridge removal function Taku Izumi
2012-08-10 6:15 ` [PATCH 7/7][RESEND] ACPI, PCI: add resoruce-assign code for devices under hot-added hostbridge Taku Izumi
2012-08-10 16:41 ` [PATCH 0/7][RESEND] acpi, pci: hostbridge hotplug support Yinghai Lu
2012-08-20 5:02 ` Taku Izumi
2012-08-30 6:23 ` Bjorn Helgaas
2012-08-30 6:33 ` Jiang Liu
2012-08-30 15:48 ` Yinghai Lu
2012-08-30 16:38 ` Jiang Liu
2012-08-30 17:29 ` Yinghai Lu
2012-08-31 0:43 ` Bjorn Helgaas
2012-08-31 1:03 ` Jiang Liu
2012-08-31 5:04 ` Bjorn Helgaas
2012-08-31 5:19 ` Jiang Liu
2012-08-31 5:42 ` Bjorn Helgaas
2012-08-31 16:44 ` Yinghai Lu
2012-09-01 3:56 ` Jiang Liu
2012-09-03 2:28 ` Taku Izumi
2012-09-03 4:04 ` Jiang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120810151150.a3942c58.izumi.taku@jp.fujitsu.com \
--to=izumi.taku@jp.fujitsu.com \
--cc=bhelgaas@google.com \
--cc=jiang.liu@huawei.com \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).