Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754452AbbHRV6L (ORCPT ); Tue, 18 Aug 2015 17:58:11 -0400 Received: from mail-ig0-f173.google.com ([209.85.213.173]:36265 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753085AbbHRV6H (ORCPT ); Tue, 18 Aug 2015 17:58:07 -0400 MIME-Version: 1.0 In-Reply-To: <20150817235416.GS26431@google.com> References: <1438039809-24957-1-git-send-email-yinghai@kernel.org> <1438039809-24957-14-git-send-email-yinghai@kernel.org> <20150817235416.GS26431@google.com> Date: Tue, 18 Aug 2015 14:58:06 -0700 X-Google-Sender-Auth: QTs_5og4ZKLbPbsfZhPn6ijM_-s Message-ID: Subject: Re: [PATCH v3 13/51] PCI: Separate realloc list checking after allocation From: Yinghai Lu 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 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2567 Lines: 63 On Mon, Aug 17, 2015 at 4:54 PM, Bjorn Helgaas 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 >> Cc: "Rafael J. Wysocki" >> Cc: Len Brown >> 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/