lmb: handle more than one DRAM BANK
Subsystems (3)
PATCH v2 1/2 lmb: handle more than one DRAM BANK
This fixes the automatic lmb initialization and reservation for boards with more than one DRAM bank.
This fixes the CVE-2018-18439 and -18440 fixes that only allowed to load files into the firs DRAM bank from fs and via tftp.
---
Changes in v2: None
common/bootm.c | 4 ++-- fs/fs.c | 3 +-- include/lmb.h | 7 +++++-- lib/lmb.c | 37 ++++++++++++++++++++++++++++++++----- net/tftp.c | 3 +-- 5 files changed, 41 insertions(+), 13 deletions(-)
common/bootm.c +2 -2
@@ -59,8 +59,8 @@ static void boot_start_lmb(bootm_headers_t *images) mem_start =env_get_bootm_low (); mem_size =env_get_bootm_size (); -lmb_init_and_reserve (&images->lmb, (phys_addr_t )mem_start, mem_size, - NULL); +lmb_init_and_reserve_range (&images->lmb, (phys_addr_t )mem_start, + mem_size, NULL); }#else #define lmb_reserve (lmb, base, size)
fs/fs.c +1 -2
@@ -453,8 +453,7 @@ static int fs_read_lmb_check(const char *filename, ulong addr, loff_t offset,if (len && len < read_len) read_len = len; -lmb_init_and_reserve (&lmb, gd->bd->bi_dram[0 ].start, - gd->bd->bi_dram[0 ].size, (void *)gd->fdt_blob); +lmb_init_and_reserve (&lmb, gd->bd, (void *)gd->fdt_blob);lmb_dump_all (&lmb);if (lmb_alloc_addr (&lmb, addr, read_len) == addr)
include/lmb.h +5 -2
@@ -4,6 +4,8 @@#ifdef __KERNEL__#include <asm/types.h> +#include <asm/u-boot.h> +/* * Logical memory blocks. *
@@ -29,8 +31,9 @@ struct lmb { };extern void lmb_init (struct lmb *lmb); -extern void lmb_init_and_reserve (struct lmb *lmb,phys_addr_t base, -phys_size_t size,void *fdt_blob); +extern void lmb_init_and_reserve (struct lmb *lmb,bd_t *bd,void *fdt_blob); +extern void lmb_init_and_reserve_range (struct lmb *lmb,phys_addr_t base, +phys_size_t size,void *fdt_blob);extern long lmb_add (struct lmb *lmb,phys_addr_t base,phys_size_t size);extern long lmb_reserve (struct lmb *lmb,phys_addr_t base,phys_size_t size);extern phys_addr_t lmb_alloc (struct lmb *lmb,phys_size_t size,ulong align);
lib/lmb.c +32 -5
@@ -98,12 +98,8 @@ void lmb_init(struct lmb *lmb) lmb->reserved.size =0 ; } -/* Initialize the struct, add memory and call arch/board reserve functions */ -void lmb_init_and_reserve (struct lmb *lmb,phys_addr_t base,phys_size_t size, -void *fdt_blob) +static void lmb_reserve_common (struct lmb *lmb,void *fdt_blob) { -lmb_init (lmb); -lmb_add (lmb, base, size);arch_lmb_reserve (lmb);board_lmb_reserve (lmb);
@@ -111,6 +107,37 @@ void lmb_init_and_reserve(struct lmb *lmb, phys_addr_t base, phys_size_t size,boot_fdt_add_mem_rsv_regions (lmb, fdt_blob); } +/* Initialize the struct, add memory and call arch/board reserve functions */ +void lmb_init_and_reserve (struct lmb *lmb,bd_t *bd,void *fdt_blob) +{ +#ifdef CONFIG_NR_DRAM_BANKS +int i; +#endif + +lmb_init (lmb); +#ifdef CONFIG_NR_DRAM_BANKS +for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { +if (bd->bi_dram[i].size) { +lmb_add (lmb, bd->bi_dram[i].start, + bd->bi_dram[i].size); + } + } +#else +if (bd->bi_memsize) +lmb_add (lmb, bd->bi_memstart, bd->bi_memsize); +#endif +lmb_reserve_common (lmb, fdt_blob); +} + +/* Initialize the struct, add memory and call arch/board reserve functions */ +void lmb_init_and_reserve_range (struct lmb *lmb,phys_addr_t base, +phys_size_t size,void *fdt_blob) +{ +lmb_init (lmb); +lmb_add (lmb, base, size); +lmb_reserve_common (lmb, fdt_blob); +} +/* This routine called with relocation disabled. */ static long lmb_add_region (struct lmb_region *rgn,phys_addr_t base,phys_size_t size) {
net/tftp.c +1 -2
@@ -606,8 +606,7 @@ static int tftp_init_load_addr(void)struct lmb lmb;phys_size_t max_size; -lmb_init_and_reserve (&lmb, gd->bd->bi_dram[0 ].start, - gd->bd->bi_dram[0 ].size, (void *)gd->fdt_blob); +lmb_init_and_reserve (&lmb, gd->bd, (void *)gd->fdt_blob); max_size =lmb_get_free_size (&lmb, load_addr);if (!max_size)
Signature · 1 line
2.17.1
PATCH v2 2/2 test: lib: lmb: add lmb test for multiple RAM banks
This adds one test case that checks that allocation with multiple DRAM banks works correctly.
---
Changes in v2:
- added test
test/lib/lmb.c | 94 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 19 deletions(-)
test/lib/lmb.c +75 -19
@@ -15,9 +15,11 @@ static int check_lmb(struct unit_test_state *uts, struct lmb *lmb, phys_addr_t base2, phys_size_t size2, phys_addr_t base3, phys_size_t size3) { - ut_asserteq(lmb->memory.cnt, 1); -ut_asserteq (lmb->memory.region[0 ].base, ram_base); -ut_asserteq (lmb->memory.region[0 ].size, ram_size); + if (ram_size) { + ut_asserteq(lmb->memory.cnt, 1); +ut_asserteq (lmb->memory.region[0 ].base, ram_base); +ut_asserteq (lmb->memory.region[0 ].size, ram_size); + }ut_asserteq (lmb->reserved.cnt, num_reserved);if (num_reserved >0 ) {
@@ -45,8 +47,9 @@ static int check_lmb(struct unit_test_state *uts, struct lmb *lmb,* Test helper function that reserves 64 KiB somewhere in the simulated RAM and * then does some alloc + free tests. */ -static int test_multi_alloc (struct unit_test_state *uts, -const phys_addr_t ram,const phys_size_t ram_size, +static int test_multi_alloc (struct unit_test_state *uts,const phys_addr_t ram, +const phys_size_t ram_size,const phys_addr_t ram0, +const phys_size_t ram0_size,const phys_addr_t alloc_64k_addr) {const phys_addr_t ram_end = ram + ram_size;
@@ -65,82 +68,119 @@ static int test_multi_alloc(struct unit_test_state *uts,lmb_init (&lmb); +if (ram0_size) { + ret =lmb_add (&lmb, ram0, ram0_size); +ut_asserteq (ret,0 ); + } + ret =lmb_add (&lmb, ram, ram_size);ut_asserteq (ret,0 ); +if (ram0_size) { +ut_asserteq (lmb.memory.cnt,2 ); +ut_asserteq (lmb.memory.region[0 ].base, ram0); +ut_asserteq (lmb.memory.region[0 ].size, ram0_size); +ut_asserteq (lmb.memory.region[1 ].base, ram); +ut_asserteq (lmb.memory.region[1 ].size, ram_size); + }else { +ut_asserteq (lmb.memory.cnt,1 ); +ut_asserteq (lmb.memory.region[0 ].base, ram); +ut_asserteq (lmb.memory.region[0 ].size, ram_size); + } +/* reserve 64KiB somewhere */ ret =lmb_reserve (&lmb, alloc_64k_addr,0x10000 );ut_asserteq (ret,0 ); -ASSERT_LMB (&lmb, ram, ram_size,1 , alloc_64k_addr,0x10000 , +ASSERT_LMB (&lmb,0 ,0 ,1 , alloc_64k_addr,0x10000 ,0 ,0 ,0 ,0 );/* allocate somewhere, should be at the end of RAM */ a =lmb_alloc (&lmb,4 ,1 );ut_asserteq (a, ram_end -4 ); -ASSERT_LMB (&lmb, ram, ram_size,2 , alloc_64k_addr,0x10000 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr,0x10000 , ram_end -4 ,4 ,0 ,0 );/* alloc below end of reserved region -> below reserved region */ b =lmb_alloc_base (&lmb,4 ,1 , alloc_64k_end);ut_asserteq (b, alloc_64k_addr -4 ); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -4 ,0x10000 +4 , ram_end -4 ,4 ,0 ,0 );/* 2nd time */ c =lmb_alloc (&lmb,4 ,1 );ut_asserteq (c, ram_end -8 ); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -4 ,0x10000 +4 , ram_end -8 ,8 ,0 ,0 ); d =lmb_alloc_base (&lmb,4 ,1 , alloc_64k_end);ut_asserteq (d, alloc_64k_addr -8 ); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -8 ,0x10000 +8 , ram_end -8 ,8 ,0 ,0 ); ret =lmb_free (&lmb, a,4 );ut_asserteq (ret,0 ); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -8 ,0x10000 +8 , ram_end -8 ,4 ,0 ,0 );/* allocate again to ensure we get the same address */ a2 =lmb_alloc (&lmb,4 ,1 );ut_asserteq (a, a2); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -8 ,0x10000 +8 , ram_end -8 ,8 ,0 ,0 ); ret =lmb_free (&lmb, a2,4 );ut_asserteq (ret,0 ); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -8 ,0x10000 +8 , ram_end -8 ,4 ,0 ,0 ); ret =lmb_free (&lmb, b,4 );ut_asserteq (ret,0 ); -ASSERT_LMB (&lmb, ram, ram_size,3 , +ASSERT_LMB (&lmb,0 ,0 ,3 , alloc_64k_addr -8 ,4 , alloc_64k_addr,0x10000 , ram_end -8 ,4 );/* allocate again to ensure we get the same address */ b2 =lmb_alloc_base (&lmb,4 ,1 , alloc_64k_end);ut_asserteq (b, b2); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -8 ,0x10000 +8 , ram_end -8 ,4 ,0 ,0 ); ret =lmb_free (&lmb, b2,4 );ut_asserteq (ret,0 ); -ASSERT_LMB (&lmb, ram, ram_size,3 , +ASSERT_LMB (&lmb,0 ,0 ,3 , alloc_64k_addr -8 ,4 , alloc_64k_addr,0x10000 , ram_end -8 ,4 ); ret =lmb_free (&lmb, c,4 );ut_asserteq (ret,0 ); -ASSERT_LMB (&lmb, ram, ram_size,2 , +ASSERT_LMB (&lmb,0 ,0 ,2 , alloc_64k_addr -8 ,4 , alloc_64k_addr,0x10000 ,0 ,0 ); ret =lmb_free (&lmb, d,4 );ut_asserteq (ret,0 ); -ASSERT_LMB (&lmb, ram, ram_size,1 , alloc_64k_addr,0x10000 , +ASSERT_LMB (&lmb,0 ,0 ,1 , alloc_64k_addr,0x10000 ,0 ,0 ,0 ,0 ); +if (ram0_size) { +ut_asserteq (lmb.memory.cnt,2 ); +ut_asserteq (lmb.memory.region[0 ].base, ram0); +ut_asserteq (lmb.memory.region[0 ].size, ram0_size); +ut_asserteq (lmb.memory.region[1 ].base, ram); +ut_asserteq (lmb.memory.region[1 ].size, ram_size); + }else { +ut_asserteq (lmb.memory.cnt,1 ); +ut_asserteq (lmb.memory.region[0 ].base, ram); +ut_asserteq (lmb.memory.region[0 ].size, ram_size); + } +return 0 ; }static int test_multi_alloc_512mb (struct unit_test_state *uts,const phys_addr_t ram) { -return test_multi_alloc (uts, ram,0x20000000 , ram +0x10000000 ); +return test_multi_alloc (uts, ram,0x20000000 ,0 ,0 , ram +0x10000000 ); +} + +static int test_multi_alloc_512mb_x2 (struct unit_test_state *uts, +const phys_addr_t ram, +const phys_addr_t ram0) +{ +return test_multi_alloc (uts, ram,0x20000000 , ram0,0x20000000 , + ram +0x10000000 ); }/* Create a memory region with one reserved region and allocate */
@@ -159,6 +199,22 @@ static int lib_test_lmb_simple(struct unit_test_state *uts)DM_TEST (lib_test_lmb_simple,DM_TESTF_SCAN_PDATA |DM_TESTF_SCAN_FDT ); +/* Create two memory regions with one reserved region and allocate */ +static int lib_test_lmb_simple_x2 (struct unit_test_state *uts) +{ +int ret; + +/* simulate 512 MiB RAM beginning at 2GiB and 1 GiB */ + ret =test_multi_alloc_512mb_x2 (uts,0x80000000 ,0x40000000 ); +if (ret) +return ret; + +/* simulate 512 MiB RAM beginning at 3.5GiB and 1 GiB */ +return test_multi_alloc_512mb_x2 (uts,0xE0000000 ,0x40000000 ); +} + +DM_TEST (lib_test_lmb_simple_x2,DM_TESTF_SCAN_PDATA |DM_TESTF_SCAN_FDT ); +/* Simulate 512 MiB RAM, allocate some blocks that fit/don't fit */ static int test_bigblock (struct unit_test_state *uts,const phys_addr_t ram) {
Signature · 1 line
2.17.1
PATCH v2 2/2 test: lib: lmb: add lmb test for multiple RAM banks
Quoted 4 lines · Simon Goldschmidt
This adds one test case that checks that allocation with multiple DRAM banks works correctly.
Quoted 9 lines
Signed-off-by Simon Goldschmidt <[email protected]>---
Changes in v2:
- added testtest/lib/lmb.c | 94 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 19 deletions(-)
PATCH v2 2/2 test: lib: lmb: add lmb test for multiple RAM banks
In reply to Simon GoldschmidtQuoted 4 lines · Simon Goldschmidt
This adds one test case that checks that allocation with multiple DRAM banks works correctly.
Signed-off-by Simon Goldschmidt <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190202/7593d694/attachment.sig>
PATCH v2 1/2 lmb: handle more than one DRAM BANK
In reply to Simon GoldschmidtQuoted 11 lines · Simon Goldschmidt
This fixes the automatic lmb initialization and reservation for boards with more than one DRAM bank.
This fixes the CVE-2018-18439 and -18440 fixes that only allowed to load files into the firs DRAM bank from fs and via tftp.
Reported-by Heinrich Schuchardt <[email protected]>Signed-off-by Simon Goldschmidt <[email protected]>---
Quoted 8 lines
Changes in v2: None
common/bootm.c | 4 ++-- fs/fs.c | 3 +-- include/lmb.h | 7 +++++-- lib/lmb.c | 37 ++++++++++++++++++++++++++++++++----- net/tftp.c | 3 +-- 5 files changed, 41 insertions(+), 13 deletions(-)