Skip to contentSkip to conversation

common: fdt_support: Remove fdt_add_mem_rsv in fdt_shrink_to_minimum

RFC PATCH New Keerthy 3 participants 5 messages Jan 30, 2019 – Apr 16, 2019

lore
Share & tools
lore

Keerthy

author
#0 lore raw

RFC PATCH 1/1 common: fdt_support: Remove fdt_add_mem_rsv in fdt_shrink_to_minimum

With introduction of commit:

a156c47e39ad: tftp: prevent overwriting reserved memory

tftp with loadaddr is failing for Images of the size bigger than SPL. The issue is that SPL image is located at bootaddr
and dtb is allocated at bootaddr + spl_size.

The region where dtb is present is marked reserved.

So when the tftp tries to load the Image it tries to find a location from loadaddr to the first reserved memory region which is the dtb base address. The max_size obtained is pretty less and hence tftp fails with the below error:

TFTP error: trying to overwrite reserved memory...

---

I am sure there are better solutions so just wanted to know if there is one.

 common/fdt_support.c | 5 -----
 1 file changed, 5 deletions(-)
common/fdt_support.c +0 -5
index 42583e3ed8..2bb101e56e 100644
@@ -633,11 +633,6 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize)
 	/* Change the fdt header to reflect the correct size */
 	fdt_set_totalsize(blob, actualsize);
 
-	/* Add the new reservation */
-	ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize);
-	if (ret < 0)
-		return ret;
-
 	return actualsize;
 }
 
Signature · 1 line
2.17.1
#1 lore raw

RFC PATCH 1/1 common: fdt_support: Remove fdt_add_mem_rsv in fdt_shrink_to_minimum

Hi Keerthy,

Quoted 9 lines · Keerthy

With introduction of commit:

a156c47e39ad: tftp: prevent overwriting reserved memory

tftp with loadaddr is failing for Images of the size bigger than SPL. The issue is that SPL image is located at bootaddr
and dtb is allocated at bootaddr + spl_size.

Quoted 8 lines

The region where dtb is present is marked reserved.

So when the tftp tries to load the Image it tries to find a location from loadaddr to the first reserved memory region which is the dtb base address. The max_size obtained is pretty less and hence tftp fails with the below error:

TFTP error: trying to overwrite reserved memory...

I don't quite get this. Are you saying that we load U-Boot to loadaddr, overwriting the SPL DT?

Simon Goldschmidt, any thoughts?

Regards,
Simon

Quoted 29 lines

---

I am sure there are better solutions so just wanted to know if there is one.

 common/fdt_support.c | 5 -----
 1 file changed, 5 deletions(-)
common/fdt_support.c +0 -6
index 42583e3ed8..2bb101e56e 100644
@@ -633,11 +633,6 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize)
        /* Change the fdt header to reflect the correct size */
        fdt_set_totalsize(blob, actualsize);
 
-       /* Add the new reservation */
-       ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize);
-       if (ret < 0)
-               return ret;
-
        return actualsize;
 }
 
--

2.17.1

author
#2 lore raw

RFC PATCH 1/1 common: fdt_support: Remove fdt_add_mem_rsv in fdt_shrink_to_minimum

Quoted 19 lines · Simon Glass

Hi Keerthy,

Quoted 16 lines · Keerthy

With introduction of commit:

a156c47e39ad: tftp: prevent overwriting reserved memory

tftp with loadaddr is failing for Images of the size bigger than SPL. The issue is that SPL image is located at bootaddr
and dtb is allocated at bootaddr + spl_size.

The region where dtb is present is marked reserved.

So when the tftp tries to load the Image it tries to find a location from loadaddr to the first reserved memory region which is the dtb base address. The max_size obtained is pretty less and hence tftp fails with the below error:

Quoted 4 lines
Quoted 1 line

TFTP error: trying to overwrite reserved memory...

I don't quite get this. Are you saying that we load U-Boot to loadaddr, overwriting the SPL DT?

Simon,

No. Basically when we try to load kernel to bootaddr using tftp there is dtb present at bootaddr+spl_size and its marked as reserved. So TFTP fails. IMHO post relocation it should not be marked as reserved. Basically we will never be able to find enough space between bootaddr and dtb address for us to fit kernel Image and tftp will always fail for bootaddr.

Hope i am clear now.

Regards,
Keerthy

Quoted 36 lines

Simon Goldschmidt, any thoughts?

Regards,
Simon

Quoted 29 lines

---

I am sure there are better solutions so just wanted to know if there is one.

  common/fdt_support.c | 5 -----
  1 file changed, 5 deletions(-)
common/fdt_support.c +0 -6
index 42583e3ed8..2bb101e56e 100644
@@ -633,11 +633,6 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize)
         /* Change the fdt header to reflect the correct size */
         fdt_set_totalsize(blob, actualsize);
 
-       /* Add the new reservation */
-       ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize);
-       if (ret < 0)
-               return ret;
-
         return actualsize;
  }
 
--

2.17.1

#3 lore raw

RFC PATCH 1/1 common: fdt_support: Remove fdt_add_mem_rsv in fdt_shrink_to_minimum

Hi Keerthy, Kumar,

Quoted 30 lines · keerthy
Quoted 19 lines · Simon Glass

Hi Keerthy,

Quoted 16 lines · Keerthy

With introduction of commit:

a156c47e39ad: tftp: prevent overwriting reserved memory

tftp with loadaddr is failing for Images of the size bigger than SPL. The issue is that SPL image is located at bootaddr
and dtb is allocated at bootaddr + spl_size.

The region where dtb is present is marked reserved.

So when the tftp tries to load the Image it tries to find a location from loadaddr to the first reserved memory region which is the dtb base address. The max_size obtained is pretty less and hence tftp fails with the below error:

Quoted 4 lines
Quoted 1 line

TFTP error: trying to overwrite reserved memory...

I don't quite get this. Are you saying that we load U-Boot to loadaddr, overwriting the SPL DT?

Simon,

Quoted 9 lines

No. Basically when we try to load kernel to bootaddr using tftp there is dtb present at bootaddr+spl_size and its marked as reserved. So TFTP fails. IMHO post relocation it should not be marked as reserved. Basically we will never be able to find enough space between bootaddr and dtb address for us to fit kernel Image and tftp will always fail for bootaddr.

Hope i am clear now.

It looks like this code was added from PowerPC by Kumar Gala <[email protected]>, now copied.

3082d2348c fdt: refactor fdt resize code

I don't really understand why the tftp command is looking at reserved memory in the DT. Is this due to the recent improvements to enforce reserved memory that Simon Goldschmidt did?

I'm sorry but I cannot really help with reviewing this. Perhaps Tom knows more.

Regards,
Simon

Quoted 38 lines

Regards,
Keerthy

Quoted 36 lines

Simon Goldschmidt, any thoughts?

Regards,
Simon

Quoted 29 lines

---

I am sure there are better solutions so just wanted to know if there is one.

  common/fdt_support.c | 5 -----
  1 file changed, 5 deletions(-)
common/fdt_support.c +0 -6
index 42583e3ed8..2bb101e56e 100644
@@ -633,11 +633,6 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize)
         /* Change the fdt header to reflect the correct size */
         fdt_set_totalsize(blob, actualsize);
 
-       /* Add the new reservation */
-       ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize);
-       if (ret < 0)
-               return ret;
-
         return actualsize;
  }
 
--

2.17.1

#4 lore raw

RFC PATCH 1/1 common: fdt_support: Remove fdt_add_mem_rsv in fdt_shrink_to_minimum

Quoted 44 lines · Simon Glass

Hi Keerthy, Kumar,

Quoted 30 lines · keerthy
Quoted 19 lines · Simon Glass

Hi Keerthy,

Quoted 16 lines · Keerthy

With introduction of commit:

a156c47e39ad: tftp: prevent overwriting reserved memory

tftp with loadaddr is failing for Images of the size bigger than SPL. The issue is that SPL image is located at bootaddr
and dtb is allocated at bootaddr + spl_size.

The region where dtb is present is marked reserved.

So when the tftp tries to load the Image it tries to find a location from loadaddr to the first reserved memory region which is the dtb base address. The max_size obtained is pretty less and hence tftp fails with the below error:

Quoted 4 lines
Quoted 1 line

TFTP error: trying to overwrite reserved memory...

I don't quite get this. Are you saying that we load U-Boot to loadaddr, overwriting the SPL DT?

Simon,

Quoted 9 lines

No. Basically when we try to load kernel to bootaddr using tftp there is dtb present at bootaddr+spl_size and its marked as reserved. So TFTP fails. IMHO post relocation it should not be marked as reserved. Basically we will never be able to find enough space between bootaddr and dtb address for us to fit kernel Image and tftp will always fail for bootaddr.

Hope i am clear now.

Quoted 8 lines

It looks like this code was added from PowerPC by Kumar Gala <[email protected]>, now copied.

3082d2348c fdt: refactor fdt resize code

I don't really understand why the tftp command is looking at reserved memory in the DT. Is this due to the recent improvements to enforce reserved memory that Simon Goldschmidt did?

The tftp command looks at reserved memory in the DT because in many situations, we have to prevent writing to that memory to prevent security issues where reserved memory gets overwritten before we have checked the signature of a loaded binary.

That being said, I don't really understand the boot flow and what's going wrong, could someone please explain this to me further?

Why is the region of the SPL dtb marked as reserved?

Regards,
Simon

Quoted 44 lines

I'm sorry but I cannot really help with reviewing this. Perhaps Tom knows more.

Regards,
Simon

Quoted 38 lines

Regards,
Keerthy

Quoted 36 lines

Simon Goldschmidt, any thoughts?

Regards,
Simon

Quoted 29 lines

---

I am sure there are better solutions so just wanted to know if there is one.

  common/fdt_support.c | 5 -----
  1 file changed, 5 deletions(-)
common/fdt_support.c +0 -6
index 42583e3ed8..2bb101e56e 100644
@@ -633,11 +633,6 @@ int fdt_shrink_to_minimum(void *blob, uint extrasize)
         /* Change the fdt header to reflect the correct size */
         fdt_set_totalsize(blob, actualsize);
 
-       /* Add the new reservation */
-       ret = fdt_add_mem_rsv(blob, map_to_sysmem(blob), actualsize);
-       if (ret < 0)
-               return ret;
-
         return actualsize;
  }
 
--

2.17.1