Skip to contentSkip to conversation

PCI: Reset failed bridge resources in PCI realloc

PATCH In review Guo Chao 3 participants 4 messages Jul 30, 2014 – Sep 4, 2014 PCI

lore
Share & tools
lore

Guo Chao

author
#0 lore raw

PATCH 1/1 PCI: Reset failed bridge resources in PCI realloc

We observed a problem on at least two POWER machines with PCIe devices with very large SR-IOV BARs. The total size is larger than host bridge MMIO window. We expect normal BARs of this device get address successfuly, and SR-IOV BARs deserted. However, this only happens if PCI realloc is disabled (pci=realloc=off or not config at all). Otherwise we fail to assign both BARs.

Here is what happened when realloc is enabled:
* SR-IOV resources will NOT be considered as optional until the last round of realloc. Both normal BARs and SR-IOV BARs of this device will be sized and recorded in upstream bridge as initial size.
* Realloc never works because this bridge is too big, at end of each round, the bridge is restored to the value before assigning, i.e. it keeps its size.
* At last round, we finally consider SR-IOV resources optional and size them seperately. We should get a small bridge this time.
* However, in pbus_size_mem() we call calculate_memsize() to calculate the final size. calculate_memsize() never shrinks window, i.e. if old size is larger than newly sized result, old size will be honored. Unfortunately, the old size at this time is the sum of both normal BARs and SR-IOV BARs when doing realloc.
* The bridge window failed to get address just like previous rounds.

Without PCI realloc, SR-IOV resources are considered as optional from the beginning and sized seperately. The old size would be 0. We get a small bridge window and assinged successfully. Everything work as expected.

I actually don't quite understand what realloc does. Apparently this is not the right fix ...

---
 drivers/pci/setup-bus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/setup-bus.c +1 -1
index a5a63ec..39837d7 100644
@@ -1623,7 +1623,7 @@ again:
 		res->end = fail_res->end;
 		res->flags = fail_res->flags;
 		if (fail_res->dev->subordinate)
-			res->flags = 0;
+			res->flags = res->start = res->end = 0;
 	}
 	free_list(&fail_head);
 
Signature · 1 line
1.9.1
#1 lore raw
Quoted 7 lines · Guo Chao

* However, in pbus_size_mem() we call calculate_memsize() to calculate the final size. calculate_memsize() never shrinks window, i.e. if old size is larger than newly sized result, old size will be honored. Unfortunately, the old size at this time is the sum of both normal BARs and SR-IOV BARs when doing realloc.

that checking about old_size is added by:

| commit d65245c3297ac63abc51a976d92f45f2195d2854
| Author: Yinghai Lu <[email protected]>
| Date:   Fri Jan 22 01:02:23 2010 -0800
|
|    PCI: don't shrink bridge resources
|
|    When clearing leaf bridge resources, trying to get a big enough one, we
|    could shrink the bridge if there is no resource under it.  Confirm
|    against the old resource side to make sure we're increasing the
|    allocation.

so to make both cases ok, may need to check if there is any children devices on the dev->subordinate. Please check attached.

Thanks

Yinghai

---
 drivers/pci/setup-bus.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pci/setup-bus.c +8 -2
Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
@@ -1622,8 +1622,11 @@ again:
         res->start = fail_res->start;
         res->end = fail_res->end;
         res->flags = fail_res->flags;
-        if (fail_res->dev->subordinate)
+        if (fail_res->dev->subordinate) {
             res->flags = 0;
+            if (!list_empty(&fail_res->dev->subordinate->devices))
+                res->start = res->end = 0;
+        }
     }
     free_list(&fail_head);
 
@@ -1688,8 +1691,11 @@ again:
         res->start = fail_res->start;
         res->end = fail_res->end;
         res->flags = fail_res->flags;
-        if (fail_res->dev->subordinate)
+        if (fail_res->dev->subordinate) {
             res->flags = 0;
+            if (!list_empty(&fail_res->dev->subordinate->devices))
+                res->start = res->end = 0;
+        }
     }
     free_list(&fail_head);
---
 drivers/pci/setup-bus.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pci/setup-bus.c +8 -2
Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
@@ -1622,8 +1622,11 @@ again:
 		res->start = fail_res->start;
 		res->end = fail_res->end;
 		res->flags = fail_res->flags;
-		if (fail_res->dev->subordinate)
+		if (fail_res->dev->subordinate) {
 			res->flags = 0;
+			if (!list_empty(&fail_res->dev->subordinate->devices))
+				res->start = res->end = 0;
+		}
 	}
 	free_list(&fail_head);
 
@@ -1688,8 +1691,11 @@ again:
 		res->start = fail_res->start;
 		res->end = fail_res->end;
 		res->flags = fail_res->flags;
-		if (fail_res->dev->subordinate)
+		if (fail_res->dev->subordinate) {
 			res->flags = 0;
+			if (!list_empty(&fail_res->dev->subordinate->devices))
+				res->start = res->end = 0;
+		}
 	}
 	free_list(&fail_head);
 
author
#2 lore raw
Quoted 22 lines · Yinghai Lu
Quoted 7 lines · Guo Chao

* However, in pbus_size_mem() we call calculate_memsize() to calculate the final size. calculate_memsize() never shrinks window, i.e. if old size is larger than newly sized result, old size will be honored. Unfortunately, the old size at this time is the sum of both normal BARs and SR-IOV BARs when doing realloc.

that checking about old_size is added by:

| commit d65245c3297ac63abc51a976d92f45f2195d2854
| Author: Yinghai Lu <[email protected]>
| Date:   Fri Jan 22 01:02:23 2010 -0800
|
|    PCI: don't shrink bridge resources
|
|    When clearing leaf bridge resources, trying to get a big enough one, we
|    could shrink the bridge if there is no resource under it.  Confirm
|    against the old resource side to make sure we're increasing the
|    allocation.
Quoted 3 lines

so to make both cases ok, may need to check if there is any children devices on the dev->subordinate. Please check attached.

Works well on one of the machines. Thanks.

Guo Chao

Quoted 73 lines

Thanks

Yinghai

---
 drivers/pci/setup-bus.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================

drivers/pci/setup-bus.c +8 -3
@@ -1622,8 +1622,11 @@ again:
         res->start = fail_res->start;
         res->end = fail_res->end;
         res->flags = fail_res->flags;
-        if (fail_res->dev->subordinate)
+        if (fail_res->dev->subordinate) {
             res->flags = 0;
+            if (!list_empty(&fail_res->dev->subordinate->devices))
+                res->start = res->end = 0;
+        }
     }
     free_list(&fail_head);
 
@@ -1688,8 +1691,11 @@ again:
         res->start = fail_res->start;
         res->end = fail_res->end;
         res->flags = fail_res->flags;
-        if (fail_res->dev->subordinate)
+        if (fail_res->dev->subordinate) {
             res->flags = 0;
+            if (!list_empty(&fail_res->dev->subordinate->devices))
+                res->start = res->end = 0;
+        }
     }
     free_list(&fail_head);
 
---
 drivers/pci/setup-bus.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================

drivers/pci/setup-bus.c +8 -2
@@ -1622,8 +1622,11 @@ again:
 		res->start = fail_res->start;
 		res->end = fail_res->end;
 		res->flags = fail_res->flags;
-		if (fail_res->dev->subordinate)
+		if (fail_res->dev->subordinate) {
 			res->flags = 0;
+			if (!list_empty(&fail_res->dev->subordinate->devices))
+				res->start = res->end = 0;
+		}
 	}
 	free_list(&fail_head);
 
@@ -1688,8 +1691,11 @@ again:
 		res->start = fail_res->start;
 		res->end = fail_res->end;
 		res->flags = fail_res->flags;
-		if (fail_res->dev->subordinate)
+		if (fail_res->dev->subordinate) {
 			res->flags = 0;
+			if (!list_empty(&fail_res->dev->subordinate->devices))
+				res->start = res->end = 0;
+		}
 	}
 	free_list(&fail_head);
 
maintainer
#3 lore raw
In reply to Yinghai Lu
Quoted 22 lines · Yinghai Lu
Quoted 7 lines · Guo Chao

* However, in pbus_size_mem() we call calculate_memsize() to calculate the final size. calculate_memsize() never shrinks window, i.e. if old size is larger than newly sized result, old size will be honored. Unfortunately, the old size at this time is the sum of both normal BARs and SR-IOV BARs when doing realloc.

that checking about old_size is added by:

| commit d65245c3297ac63abc51a976d92f45f2195d2854
| Author: Yinghai Lu <[email protected]>
| Date:   Fri Jan 22 01:02:23 2010 -0800
|
|    PCI: don't shrink bridge resources
|
|    When clearing leaf bridge resources, trying to get a big enough one, we
|    could shrink the bridge if there is no resource under it.  Confirm
|    against the old resource side to make sure we're increasing the
|    allocation.
Quoted 2 lines

so to make both cases ok, may need to check if there is any children devices on the dev->subordinate. Please check attached.

I think we should postpone this until we figure out how we're going to manage resource start/end/flags, i.e., the IORESOURCE_UNSET and IORESOURCE_DISABLED question.

Quoted 73 lines

Thanks

Yinghai

---
 drivers/pci/setup-bus.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================

drivers/pci/setup-bus.c +8 -3
@@ -1622,8 +1622,11 @@ again:
         res->start = fail_res->start;
         res->end = fail_res->end;
         res->flags = fail_res->flags;
-        if (fail_res->dev->subordinate)
+        if (fail_res->dev->subordinate) {
             res->flags = 0;
+            if (!list_empty(&fail_res->dev->subordinate->devices))
+                res->start = res->end = 0;
+        }
     }
     free_list(&fail_head);
 
@@ -1688,8 +1691,11 @@ again:
         res->start = fail_res->start;
         res->end = fail_res->end;
         res->flags = fail_res->flags;
-        if (fail_res->dev->subordinate)
+        if (fail_res->dev->subordinate) {
             res->flags = 0;
+            if (!list_empty(&fail_res->dev->subordinate->devices))
+                res->start = res->end = 0;
+        }
     }
     free_list(&fail_head);
 
---
 drivers/pci/setup-bus.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================

drivers/pci/setup-bus.c +8 -2
@@ -1622,8 +1622,11 @@ again:
 		res->start = fail_res->start;
 		res->end = fail_res->end;
 		res->flags = fail_res->flags;
-		if (fail_res->dev->subordinate)
+		if (fail_res->dev->subordinate) {
 			res->flags = 0;
+			if (!list_empty(&fail_res->dev->subordinate->devices))
+				res->start = res->end = 0;
+		}
 	}
 	free_list(&fail_head);
 
@@ -1688,8 +1691,11 @@ again:
 		res->start = fail_res->start;
 		res->end = fail_res->end;
 		res->flags = fail_res->flags;
-		if (fail_res->dev->subordinate)
+		if (fail_res->dev->subordinate) {
 			res->flags = 0;
+			if (!list_empty(&fail_res->dev->subordinate->devices))
+				res->start = res->end = 0;
+		}
 	}
 	free_list(&fail_head);