| Message ID | 20240304150227.166053-1-skseofh@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | of: fdt: modify small size memory check | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 1 errors, 5 warnings, 22 lines checked |
| robh/patch-applied | success |
On Mon, Mar 4, 2024 at 9:03 AM <skseofh@gmail.com> wrote: > > > >> > >> From: Daero Lee <skseofh@gmail.com> > >> > >> After page aligning, the size may become zero. So I added exception > >> handling code for size 0. > > > >That may be true, but when would anyone only have memory regions of > >less than 2 pages. In any case memblock_add will just do nothing. What > >is the actual problem you are having? > > > >Rob > > Ignore the previous mail. > I modified the patch to clear this size check routine. Please check You still haven't answered my questions above. Though the patch below is a bit more readable than what we currently have... > > ------------------------------------------------------------------------- > From 2135d37c37f8c369033f79102b17ddf5bb3ff838 Mon Sep 17 00:00:00 2001 > From: Daero Lee <skseofh@gmail.com> > Date: Mon, 4 Mar 2024 23:21:14 +0900 > Subject: [PATCH] of: fdt: modify small size memory check > > Small size memory which is less than 1 PAGE_SIZE after page align > should not be added to memblock. > > In this patch, the size check was modified to make it clear. > > Signed-off-by: Daero Lee <skseofh@gmail.com> > --- > drivers/of/fdt.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index bf502ba8da95..9cf844e664b0 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -1220,18 +1220,16 @@ int __init early_init_dt_scan_chosen(char *cmdline) > void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) > { > const u64 phys_offset = MIN_MEMBLOCK_ADDR; > + u64 abase = PAGE_ALIGN(base), aend = PAGE_ALIGN_DOWN(base + size); > > - if (size < PAGE_SIZE - (base & ~PAGE_MASK)) { > + if((aend - abase) < PAGE_SIZE) { > pr_warn("Ignoring memory block 0x%llx - 0x%llx\n", > base, base + size); > return; > } > > - if (!PAGE_ALIGNED(base)) { > - size -= PAGE_SIZE - (base & ~PAGE_MASK); > - base = PAGE_ALIGN(base); > - } > - size &= PAGE_MASK; > + base = abase; > + size = (aend - abase) & PAGE_MASK; > > if (base > MAX_MEMBLOCK_ADDR) { > pr_warn("Ignoring memory block 0x%llx - 0x%llx\n", > -- > 2.25.1 > >
> > > > > > >> > > >> From: Daero Lee <skseofh@gmail.com> > > >> > > >> After page aligning, the size may become zero. So I added exception > > >> handling code for size 0. > > > > > >That may be true, but when would anyone only have memory regions of > > >less than 2 pages. In any case memblock_add will just do nothing. What > > >is the actual problem you are having? > > > > > >Rob > > > > Ignore the previous mail. > > I modified the patch to clear this size check routine. Please check > > You still haven't answered my questions above. > > Though the patch below is a bit more readable than what we currently have... Well.. I don't see any 'real' problem with this. But I'm not sure if it's appropriate to leave a part that will be returned directly in the next fuction called. Wouldn't it be better to handle the part can be handled in this function, rather than expecting the next function to handle this exception?
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index bf502ba8da95..9cf844e664b0 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1220,18 +1220,16 @@ int __init early_init_dt_scan_chosen(char *cmdline) void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) { const u64 phys_offset = MIN_MEMBLOCK_ADDR; + u64 abase = PAGE_ALIGN(base), aend = PAGE_ALIGN_DOWN(base + size); - if (size < PAGE_SIZE - (base & ~PAGE_MASK)) { + if((aend - abase) < PAGE_SIZE) { pr_warn("Ignoring memory block 0x%llx - 0x%llx\n", base, base + size); return; } - if (!PAGE_ALIGNED(base)) { - size -= PAGE_SIZE - (base & ~PAGE_MASK); - base = PAGE_ALIGN(base); - } - size &= PAGE_MASK; + base = abase; + size = (aend - abase) & PAGE_MASK; if (base > MAX_MEMBLOCK_ADDR) { pr_warn("Ignoring memory block 0x%llx - 0x%llx\n",