* [PATCH v3 13/51] PCI: Separate realloc list checking after allocation
[not found] <1438039809-24957-1-git-send-email-yinghai@kernel.org>
@ 2015-07-27 23:29 ` Yinghai Lu
2015-08-17 23:54 ` Bjorn Helgaas
0 siblings, 1 reply; 3+ messages in thread
From: Yinghai Lu @ 2015-07-27 23:29 UTC (permalink / raw)
To: Bjorn Helgaas, David Miller, Benjamin Herrenschmidt, Wei Yang, TJ,
Yijing Wang
Cc: Andrew Morton, linux-pci, linux-kernel, Yinghai Lu,
Rafael J. Wysocki, Len Brown, linux-acpi
We check the realloc list, as list must be empty after allocation.
Separate the realloc list checking to another function.
Add checking that is missed in acpiphp driver.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
---
drivers/pci/hotplug/acpiphp_glue.c | 1 +
drivers/pci/pci.h | 1 +
drivers/pci/setup-bus.c | 11 ++++++++---
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index ff53856..134caee 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -507,6 +507,7 @@ static void enable_slot(struct acpiphp_slot *slot)
}
}
__pci_bus_assign_resources(bus, &add_list, NULL);
+ __pci_bus_check_realloc(&add_list);
acpiphp_sanitize_bus(bus);
pcie_bus_configure_settings(bus);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 4ff0ff1..2b83977 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -235,6 +235,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus,
void __pci_bus_assign_resources(const struct pci_bus *bus,
struct list_head *realloc_head,
struct list_head *fail_head);
+void __pci_bus_check_realloc(struct list_head *realloc_head);
bool pci_bus_clip_resource(struct pci_dev *dev, int idx);
void pci_reassigndev_resource_alignment(struct pci_dev *dev);
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 06664db..f30225c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -350,6 +350,11 @@ out:
}
}
+void __pci_bus_check_realloc(struct list_head *realloc_head)
+{
+ BUG_ON(!list_empty(realloc_head));
+}
+
/**
* assign_requested_resources_sorted() - satisfy resource requests
*
@@ -1861,7 +1866,7 @@ again:
/* Depth last, allocate resources and update the hardware. */
__pci_bus_assign_resources(bus, add_list, &fail_head);
if (add_list)
- BUG_ON(!list_empty(add_list));
+ __pci_bus_check_realloc(add_list);
tried_times++;
/* any device complain? */
@@ -1936,7 +1941,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
again:
__pci_bus_size_bridges(parent, &add_list);
__pci_bridge_assign_resources(bridge, &add_list, &fail_head);
- BUG_ON(!list_empty(&add_list));
+ __pci_bus_check_realloc(&add_list);
tried_times++;
if (list_empty(&fail_head))
@@ -1995,6 +2000,6 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
&add_list);
up_read(&pci_bus_sem);
__pci_bus_assign_resources(bus, &add_list, NULL);
- BUG_ON(!list_empty(&add_list));
+ __pci_bus_check_realloc(&add_list);
}
EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
--
1.8.4.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 13/51] PCI: Separate realloc list checking after allocation
2015-07-27 23:29 ` [PATCH v3 13/51] PCI: Separate realloc list checking after allocation Yinghai Lu
@ 2015-08-17 23:54 ` Bjorn Helgaas
2015-08-18 21:58 ` Yinghai Lu
0 siblings, 1 reply; 3+ messages in thread
From: Bjorn Helgaas @ 2015-08-17 23:54 UTC (permalink / raw)
To: Yinghai Lu
Cc: David Miller, Benjamin Herrenschmidt, Wei Yang, TJ, Yijing Wang,
Andrew Morton, linux-pci, linux-kernel, Rafael J. Wysocki,
Len Brown, linux-acpi
On Mon, Jul 27, 2015 at 04:29:31PM -0700, Yinghai Lu wrote:
> We check the realloc list, as list must be empty after allocation.
>
> Separate the realloc list checking to another function.
>
> Add checking that is missed in acpiphp driver.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
> Cc: Len Brown <lenb@kernel.org>
> Cc: linux-acpi@vger.kernel.org
> ---
> drivers/pci/hotplug/acpiphp_glue.c | 1 +
> drivers/pci/pci.h | 1 +
> drivers/pci/setup-bus.c | 11 ++++++++---
> 3 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
> index ff53856..134caee 100644
> --- a/drivers/pci/hotplug/acpiphp_glue.c
> +++ b/drivers/pci/hotplug/acpiphp_glue.c
> @@ -507,6 +507,7 @@ static void enable_slot(struct acpiphp_slot *slot)
> }
> }
> __pci_bus_assign_resources(bus, &add_list, NULL);
> + __pci_bus_check_realloc(&add_list);
>
> acpiphp_sanitize_bus(bus);
> pcie_bus_configure_settings(bus);
> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
> index 4ff0ff1..2b83977 100644
> --- a/drivers/pci/pci.h
> +++ b/drivers/pci/pci.h
> @@ -235,6 +235,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus,
> void __pci_bus_assign_resources(const struct pci_bus *bus,
> struct list_head *realloc_head,
> struct list_head *fail_head);
> +void __pci_bus_check_realloc(struct list_head *realloc_head);
> bool pci_bus_clip_resource(struct pci_dev *dev, int idx);
>
> void pci_reassigndev_resource_alignment(struct pci_dev *dev);
> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> index 06664db..f30225c 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -350,6 +350,11 @@ out:
> }
> }
>
> +void __pci_bus_check_realloc(struct list_head *realloc_head)
> +{
> + BUG_ON(!list_empty(realloc_head));
I don't think this really improves readability. At least before, we could
see what we were looking for and we knew it might BUG().
> +}
> +
> /**
> * assign_requested_resources_sorted() - satisfy resource requests
> *
> @@ -1861,7 +1866,7 @@ again:
> /* Depth last, allocate resources and update the hardware. */
> __pci_bus_assign_resources(bus, add_list, &fail_head);
> if (add_list)
> - BUG_ON(!list_empty(add_list));
> + __pci_bus_check_realloc(add_list);
> tried_times++;
>
> /* any device complain? */
> @@ -1936,7 +1941,7 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge)
> again:
> __pci_bus_size_bridges(parent, &add_list);
> __pci_bridge_assign_resources(bridge, &add_list, &fail_head);
> - BUG_ON(!list_empty(&add_list));
> + __pci_bus_check_realloc(&add_list);
> tried_times++;
>
> if (list_empty(&fail_head))
> @@ -1995,6 +2000,6 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus)
> &add_list);
> up_read(&pci_bus_sem);
> __pci_bus_assign_resources(bus, &add_list, NULL);
> - BUG_ON(!list_empty(&add_list));
> + __pci_bus_check_realloc(&add_list);
> }
> EXPORT_SYMBOL_GPL(pci_assign_unassigned_bus_resources);
> --
> 1.8.4.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3 13/51] PCI: Separate realloc list checking after allocation
2015-08-17 23:54 ` Bjorn Helgaas
@ 2015-08-18 21:58 ` Yinghai Lu
0 siblings, 0 replies; 3+ messages in thread
From: Yinghai Lu @ 2015-08-18 21:58 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: David Miller, Benjamin Herrenschmidt, Wei Yang, TJ, Yijing Wang,
Andrew Morton, linux-pci@vger.kernel.org,
Linux Kernel Mailing List, Rafael J. Wysocki, Len Brown,
ACPI Devel Maling List
On Mon, Aug 17, 2015 at 4:54 PM, Bjorn Helgaas <bhelgaas@google.com> wrote:
> On Mon, Jul 27, 2015 at 04:29:31PM -0700, Yinghai Lu wrote:
>> We check the realloc list, as list must be empty after allocation.
>>
>> Separate the realloc list checking to another function.
>>
>> Add checking that is missed in acpiphp driver.
>>
>> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
>> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
>> Cc: Len Brown <lenb@kernel.org>
>> Cc: linux-acpi@vger.kernel.org
>> ---
>> drivers/pci/hotplug/acpiphp_glue.c | 1 +
>> drivers/pci/pci.h | 1 +
>> drivers/pci/setup-bus.c | 11 ++++++++---
>> 3 files changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
>> index ff53856..134caee 100644
>> --- a/drivers/pci/hotplug/acpiphp_glue.c
>> +++ b/drivers/pci/hotplug/acpiphp_glue.c
>> @@ -507,6 +507,7 @@ static void enable_slot(struct acpiphp_slot *slot)
>> }
>> }
>> __pci_bus_assign_resources(bus, &add_list, NULL);
>> + __pci_bus_check_realloc(&add_list);
>>
>> acpiphp_sanitize_bus(bus);
>> pcie_bus_configure_settings(bus);
>> diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
>> index 4ff0ff1..2b83977 100644
>> --- a/drivers/pci/pci.h
>> +++ b/drivers/pci/pci.h
>> @@ -235,6 +235,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus,
>> void __pci_bus_assign_resources(const struct pci_bus *bus,
>> struct list_head *realloc_head,
>> struct list_head *fail_head);
>> +void __pci_bus_check_realloc(struct list_head *realloc_head);
>> bool pci_bus_clip_resource(struct pci_dev *dev, int idx);
>>
>> void pci_reassigndev_resource_alignment(struct pci_dev *dev);
>> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
>> index 06664db..f30225c 100644
>> --- a/drivers/pci/setup-bus.c
>> +++ b/drivers/pci/setup-bus.c
>> @@ -350,6 +350,11 @@ out:
>> }
>> }
>>
>> +void __pci_bus_check_realloc(struct list_head *realloc_head)
>> +{
>> + BUG_ON(!list_empty(realloc_head));
>
> I don't think this really improves readability. At least before, we could
> see what we were looking for and we knew it might BUG().
ok, will only missing BUG_ON into acpiphp_glue.c.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-18 21:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1438039809-24957-1-git-send-email-yinghai@kernel.org>
2015-07-27 23:29 ` [PATCH v3 13/51] PCI: Separate realloc list checking after allocation Yinghai Lu
2015-08-17 23:54 ` Bjorn Helgaas
2015-08-18 21:58 ` Yinghai Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox