Skip to contentSkip to conversation

powerpc/prom: bump up maximum size of properties

PATCH In review Nishanth Aravamudan 3 participants 3 messages Feb 25, 2012 – Feb 27, 2012 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/prom: bump up maximum size of properties

On a 16TB system (using AMS/CMO), I get:

WARNING: ignoring large property [/ibm,dynamic-reconfiguration-memory] ibm,dynamic-memory length 0x000000000017ffec

and significantly less memory is thus shown to the partition. As far as I can tell, the constant used is arbitrary, but bump it up to 2MB, which covers the above property (approximately 1.5MB).

With this patch, the kernel does see all of the system memory on the 16TB system.

Cc Anton Blanchard <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Robert Jennings <[email protected]>
---
 arch/powerpc/kernel/prom_init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/kernel/prom_init.c +1 -1
index eca626e..0bf0ccc 100644
@@ -53,7 +53,7 @@
  * ensure that we don't lose things like the interrupt-map property
  * on a PCI-PCI bridge.
  */
-#define MAX_PROPERTY_LENGTH	(1UL * 1024 * 1024)
+#define MAX_PROPERTY_LENGTH	(2UL * 1024 * 1024)
 
 /*
  * Eventually bump that one up
Signature · 1 line
1.7.5.4
#1 lore raw
Quoted 10 lines · Nishanth Aravamudan

On a 16TB system (using AMS/CMO), I get:

WARNING: ignoring large property [/ibm,dynamic-reconfiguration-memory] ibm,dynamic-memory length 0x000000000017ffec

and significantly less memory is thus shown to the partition. As far as I can tell, the constant used is arbitrary, but bump it up to 2MB, which covers the above property (approximately 1.5MB).

With this patch, the kernel does see all of the system memory on the 16TB system.

Why not go all the way to either removing the limit, or setting it to something much bigger ? That's just asking to break again when we get an even bigger system.

The limit was originally set because of Apple machines carrying ROM images in the device-tree, at a time where we were much more memory constrained than we are now.

But even then, it never represented such a large gain and in the end, was probably not -that- useful.

I'd say bump it to something really large like 16M or remove the limit alltogether.

Cheers,
Ben.

Quoted 22 lines
Cc Anton Blanchard <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Robert Jennings <[email protected]>
---
 arch/powerpc/kernel/prom_init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/kernel/prom_init.c +1 -1
index eca626e..0bf0ccc 100644
@@ -53,7 +53,7 @@
  * ensure that we don't lose things like the interrupt-map property
  * on a PCI-PCI bridge.
  */
-#define MAX_PROPERTY_LENGTH	(1UL * 1024 * 1024)
+#define MAX_PROPERTY_LENGTH	(2UL * 1024 * 1024)
 
 /*
  * Eventually bump that one up
#2 lore raw

PATCH 1/1 powerpc/prom: remove limit on maximum size of properties

Hi Ben,

Quoted 9 lines · Benjamin Herrenschmidt
Quoted 8 lines · Nishanth Aravamudan

On a 16TB system (using AMS/CMO), I get:

WARNING: ignoring large property [/ibm,dynamic-reconfiguration-memory] ibm,dynamic-memory length 0x000000000017ffec

and significantly less memory is thus shown to the partition. As far as I can tell, the constant used is arbitrary, but bump it up to 2MB, which covers the above property (approximately 1.5MB).

Quoted 6 lines
Quoted 2 lines

With this patch, the kernel does see all of the system memory on the 16TB system.

Why not go all the way to either removing the limit, or setting it to something much bigger ? That's just asking to break again when we get an even bigger system.

Fair point -- sorry, was just trying to get something out the door that I had tested, since I have limited access to the hardware in question.

Quoted 9 lines

The limit was originally set because of Apple machines carrying ROM images in the device-tree, at a time where we were much more memory constrained than we are now.

But even then, it never represented such a large gain and in the end, was probably not -that- useful.

I'd say bump it to something really large like 16M or remove the limit alltogether.

So, in terms of removing the limit altogether, is that a literal statement? I don't know this code particularly well, but only see references to the constant, at least in prom_init.c:

powerpc/prom: remove limit on maximum size of properties

On a 16TB system (using AMS/CMO), I get:

WARNING: ignoring large property [/ibm,dynamic-reconfiguration-memory] ibm,dynamic-memory length 0x000000000017ffec

and significantly less memory is thus shown to the partition. As far as I can tell, the constant used is arbitrary. Ben Herrenschmidt provided additional background that

Quoted 3 lines

The limit was originally set because of Apple machines carrying ROM images in the device-tree, at a time where we were much more memory constrained than we are now.

and that it is likely not very useful any longer.

---
With this patch, the kernel should see all of the system memory on the 16TB system, but I'm unable to test due to lack of hardware access. I'm working on getting access again, but not confident that will happen soon.

arch/powerpc/kernel/prom_init.c +0 -15
index eca626e..e2d5990 100644
@@ -48,14 +48,6 @@
 #include <linux/linux_logo.h>
 
 /*
- * Properties whose value is longer than this get excluded from our
- * copy of the device tree. This value does need to be big enough to
- * ensure that we don't lose things like the interrupt-map property
- * on a PCI-PCI bridge.
- */
-#define MAX_PROPERTY_LENGTH	(1UL * 1024 * 1024)
-
-/*
  * Eventually bump that one up
  */
 #define DEVTREE_CHUNK_SIZE	0x100000
@@ -2273,13 +2265,6 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
 		/* sanity checks */
 		if (l == PROM_ERROR)
 			continue;
-		if (l > MAX_PROPERTY_LENGTH) {
-			prom_printf("WARNING: ignoring large property ");
-			/* It seems OF doesn't null-terminate the path :-( */
-			prom_printf("[%s] ", path);
-			prom_printf("%s length 0x%x\n", RELOC(pname), l);
-			continue;
-		}
 
 		/* push property head */
 		dt_push_token(OF_DT_PROP, mem_start, mem_end);
Signature · 2 lines
Nishanth Aravamudan <[email protected]>
IBM Linux Technology Center