Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1226557 > unrolled thread
| Started by | Yinghai Lu <yinghai@kernel.org> |
|---|---|
| First post | 2015-09-17 01:00 +0200 |
| Last post | 2015-09-17 17:40 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH v5 00/53] PCI: Resource allocation cleanup for v4.4 Yinghai Lu <yinghai@kernel.org> - 2015-09-17 01:00 +0200
[PATCH v5 17/53] PCI: Separate out save_resources()/restore_resources() Yinghai Lu <yinghai@kernel.org> - 2015-09-17 01:10 +0200
Re: [PATCH v5 00/53] PCI: Resource allocation cleanup for v4.4 Bjorn Helgaas <bhelgaas@google.com> - 2015-09-17 17:00 +0200
Re: [PATCH v5 00/53] PCI: Resource allocation cleanup for v4.4 Yinghai Lu <yinghai@kernel.org> - 2015-09-17 17:40 +0200
| From | Yinghai Lu <yinghai@kernel.org> |
|---|---|
| Date | 2015-09-17 01:00 +0200 |
| Subject | [PATCH v5 00/53] PCI: Resource allocation cleanup for v4.4 |
| Message-ID | <q9sU9-9R-3@gated-at.bofh.it> |
Hi,
After 5b28541552ef (PCI: Restrict 64-bit prefetchable bridge windows
to 64-bit resources), we have several reports on resource allocation
failure, and we try to fix the problem with resource clip, and get
more problems.
One is realloc fail with two graphics cards above 4G.
One is from sparc that have problem with clip as we don't parse
mem64 for it.
Other report is about pci remove/rescan does not work on some setup
when BIOS tend to allocate small bus size.
This patchset enhance resource allocation to address those problems.
1. optimize bus mmio alignment calculation.
2. optimize bus mmio optional alignment calculation.
3. add support for alt size to prefer small bus size to small bus alignment.
when we have small resource window on parent bridges.
4. treat ROM bar as optional resource.
5. during allocation, will pick up best fit resource, and allocate near end.
6. parse MEM64 for sparc and other system with OF.
7. treat non-pref mmio64 if parent bridges are all pcie.
8. restore old pref allocation logic if hostbridge does not support mmio64 really.
9. don't realloc resource if device firmware does not support bar change.
10. add pci=assign_pref_bars to clear and assign pref bars.
11. don't clear resource when allocation fails.
I put latest copy at:
git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git for-pci-v4.4-next
That is based on v4.3-rc1 plus reverting of pci_read_bridge_bases() change.
Yijing and Wei Yang both test the branch, and the patchset fixs rescan problem,
and is working well on powerpc setup.
Thanks
Yinghai
v2:
- fix resource_disabled allocation from powerpc
- other warnings that were found by Fengguang's build robot.
- io port alignment clean up.
- rebased to v4.2-rc2
- better for two alt_size support.
v3:
- fix reset bridge resource on last try: only with bridge resources
- remove/rescan path checking with old_size.
v4:
- Update changelog according to Bjorn.
- split calculate_size patch to two.
- use required instead of must.
v5:
- update changelog
- add one debug patch
- add one patch that get resource allocation near end of avialable window
Yinghai Lu (53):
PCI: Cleanup res_to_dev_res() printout
PCI: Reuse res_to_dev_res() in reassign_resources_sorted()
PCI: Use correct align for optional only resources during sorting
PCI: Optimize bus min_align/size calculation during sizing
PCI: Optimize bus align/size calculation for optional during sizing
PCI: Don't add too much optional size for hotplug bridge MMIO
PCI: Reorder resources list for required/optional resources
PCI: Remove duplicated code for resource sorting
PCI: Rename pdev_sort_resources() to pdev_assign_resources_prepare()
PCI: Treat ROM resource as optional during realloc
PCI: Add debug printout during releasing partial assigned resources
PCI: Simplify res reference using in __assign_resources_sorted()
PCI: Separate realloc list checking after allocation
PCI: Add __add_to_list()
PCI: Cache window alignment value during bus sizing
PCI: Check if resource is allocated before trying to assign one
PCI: Separate out save_resources()/restore_resources()
PCI: Move comment to pci_need_to_release()
PCI: Separate required+optional assigning to another function
PCI: Skip required+optional if there is no optional
PCI: Move saved required resource list out of required+optional assigning
PCI: Add alt_size ressource allocation support
PCI: Add support for more than two alt_size entries under same bridge
PCI: Fix size calculation with old_size on rescan path
PCI: Don't add too much optional size for hotplug bridge io
PCI: Move ISA io port align out of calculate_iosize()
PCI: Don't add too much io port for hotplug bridge with old size
PCI: Unify calculate_size() for io port and MMIO
PCI: Allow bridge optional only io port resource required size to be 0
PCI: Unify skip_ioresource_align()
PCI: Kill macro checking for bus io port sizing
resources: Split out __allocate_resource()
resources: Make allocate_resource() return best fit resource
PCI, x86: Allocate from high in available window for MMIO
PCI: Add debug print out for min_align and alt_size
PCI: Check pref compatible bit for mem64 resource of PCIe device
PCI: Only treat non-pref mmio64 as pref if all bridges have MEM_64
PCI: Add has_mem64 for struct host_bridge
PCI: Only treat non-pref mmio64 as pref if host bridge has mmio64
PCI: Restore pref MMIO allocation logic for host bridge without mmio64
sparc/PCI: Add mem64 resource parsing for root bus
sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing
OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource
PCI: Treat optional as required in first try for bridge rescan
PCI: Get new realloc size for bridge for last try
PCI: Don't release sibling bridge resources during hotplug
PCI: Don't release fixed resource for realloc
PCI: Claim fixed resource during remove/rescan path
PCI: Set resource to FIXED for LSI devices
PCI, x86: Add pci=assign_pref_bars to reallocate pref BARs
PCI: Introduce resource_disabled()
PCI: Don't set flags to 0 when assign resource fail
arch/alpha/kernel/pci.c | 2 +-
arch/ia64/pci/pci.c | 4 +-
arch/microblaze/pci/pci-common.c | 23 +-
arch/mn10300/unit-asb2305/pci-asb2305.c | 4 +-
arch/mn10300/unit-asb2305/pci.c | 4 +-
arch/powerpc/kernel/pci-common.c | 27 +-
arch/powerpc/kernel/pci_of_scan.c | 4 +-
arch/powerpc/platforms/powernv/pci-ioda.c | 12 +-
arch/s390/pci/pci.c | 2 +-
arch/sparc/kernel/of_device_32.c | 5 +-
arch/sparc/kernel/of_device_64.c | 5 +-
arch/sparc/kernel/pci.c | 9 +-
arch/sparc/kernel/pci_common.c | 15 +-
arch/sparc/kernel/pci_impl.h | 1 +
arch/x86/include/asm/pci_x86.h | 2 +-
arch/x86/pci/common.c | 7 +-
arch/x86/pci/i386.c | 86 +-
arch/xtensa/kernel/pci.c | 4 +-
drivers/iommu/intel-iommu.c | 3 +-
drivers/of/address.c | 4 +-
drivers/pci/bus.c | 6 +-
drivers/pci/host/pcie-rcar.c | 2 +-
drivers/pci/hotplug/acpiphp_glue.c | 1 +
drivers/pci/iov.c | 2 +-
drivers/pci/pci.c | 3 +-
drivers/pci/pci.h | 4 +
drivers/pci/probe.c | 44 +-
drivers/pci/quirks.c | 37 +
drivers/pci/rom.c | 2 +-
drivers/pci/setup-bus.c | 1292 +++++++++++++++++++++--------
drivers/pci/setup-res.c | 18 +-
include/asm-generic/pci-bridge.h | 2 +
include/linux/ioport.h | 6 +-
include/linux/pci.h | 5 +
kernel/resource.c | 175 +++-
35 files changed, 1351 insertions(+), 471 deletions(-)
--
1.8.4.5
--
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/
[toc] | [next] | [standalone]
| From | Yinghai Lu <yinghai@kernel.org> |
|---|---|
| Date | 2015-09-17 01:10 +0200 |
| Subject | [PATCH v5 17/53] PCI: Separate out save_resources()/restore_resources() |
| Message-ID | <q9tZT-1VO-3@gated-at.bofh.it> |
| In reply to | #1226557 |
We need to save/restore resources several times for alt_size support,
separate the save_resources()/resources() to save some lines later.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/setup-bus.c | 49 ++++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 71e20f8..c067ae0 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -436,6 +436,29 @@ static bool pci_need_to_release(unsigned long mask, struct resource *res)
return false; /* should not get here */
}
+static bool save_resources(struct list_head *head,
+ struct list_head *save_head)
+{
+ struct pci_dev_resource *dev_res;
+
+ /* Save original start, end, flags etc at first */
+ list_for_each_entry(dev_res, head, list)
+ if (add_to_list(save_head, dev_res->dev, dev_res->res)) {
+ free_list(save_head);
+ return false;
+ }
+
+ return true;
+}
+
+static void restore_resource(struct pci_dev_resource *save_res,
+ struct resource *res)
+{
+ res->start = save_res->start;
+ res->end = save_res->end;
+ res->flags = save_res->flags;
+}
+
static void __assign_resources_sorted(struct list_head *head,
struct list_head *realloc_head,
struct list_head *fail_head)
@@ -473,13 +496,8 @@ static void __assign_resources_sorted(struct list_head *head,
if (!realloc_head || list_empty(realloc_head))
goto requested_and_reassign;
- /* Save original start, end, flags etc at first */
- list_for_each_entry(dev_res, head, list) {
- if (add_to_list(&save_head, dev_res->dev, dev_res->res)) {
- free_list(&save_head);
- goto requested_and_reassign;
- }
- }
+ if (!save_resources(head, &save_head))
+ goto requested_and_reassign;
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
@@ -548,12 +566,9 @@ static void __assign_resources_sorted(struct list_head *head,
}
}
/* Restore start/end/flags from saved list */
- list_for_each_entry(save_res, &save_head, list) {
- res = save_res->res;
- res->start = save_res->start;
- res->end = save_res->end;
- res->flags = save_res->flags;
- }
+ list_for_each_entry(save_res, &save_head, list)
+ restore_resource(save_res, save_res->res);
+
free_list(&save_head);
requested_and_reassign:
@@ -1917,9 +1932,7 @@ again:
list_for_each_entry(fail_res, &fail_head, list) {
struct resource *res = fail_res->res;
- res->start = fail_res->start;
- res->end = fail_res->end;
- res->flags = fail_res->flags;
+ restore_resource(fail_res, res);
if (fail_res->dev->subordinate)
res->flags = 0;
}
@@ -1983,9 +1996,7 @@ again:
list_for_each_entry(fail_res, &fail_head, list) {
struct resource *res = fail_res->res;
- res->start = fail_res->start;
- res->end = fail_res->end;
- res->flags = fail_res->flags;
+ restore_resource(fail_res, res);
if (fail_res->dev->subordinate)
res->flags = 0;
}
--
1.8.4.5
--
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/
[toc] | [prev] | [next] | [standalone]
| From | Bjorn Helgaas <bhelgaas@google.com> |
|---|---|
| Date | 2015-09-17 17:00 +0200 |
| Message-ID | <q9IPg-6Ov-15@gated-at.bofh.it> |
| In reply to | #1226557 |
On Wed, Sep 16, 2015 at 4:56 PM, Yinghai Lu <yinghai@kernel.org> wrote: > Hi, > > After 5b28541552ef (PCI: Restrict 64-bit prefetchable bridge windows > to 64-bit resources), we have several reports on resource allocation > failure, and we try to fix the problem with resource clip, and get > more problems. > > One is realloc fail with two graphics cards above 4G. > One is from sparc that have problem with clip as we don't parse > mem64 for it. I assume the following patches are related to the sparc64/mem64 thing. Could they be split out and posted separately? We should be able to fix that issue even without all the other patches. > sparc/PCI: Add mem64 resource parsing for root bus > sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing > powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing > OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource -- 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/
[toc] | [prev] | [next] | [standalone]
| From | Yinghai Lu <yinghai@kernel.org> |
|---|---|
| Date | 2015-09-17 17:40 +0200 |
| Message-ID | <q9JrZ-7OO-47@gated-at.bofh.it> |
| In reply to | #1227088 |
On Thu, Sep 17, 2015 at 7:55 AM, Bjorn Helgaas <bhelgaas@google.com> wrote: > > I assume the following patches are related to the sparc64/mem64 thing. > Could they be split out and posted separately? We should be able to > fix that issue even without all the other patches. > >> sparc/PCI: Add mem64 resource parsing for root bus >> sparc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing >> powerpc/PCI: Add IORESOURCE_MEM_64 for 64-bit resource in OF parsing >> OF/PCI: Add IORESOURCE_MEM_64 for 64-bit resource Yes, you are right. -- 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/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web