[LMB]: Fix bug in __lmb_alloc_base(). (eea89e13) · Commits · 戴 / test

We need to check lmb_add_region() for errors, it can run out of regions etc. Also, the size needs to be padded to the given alignment or else the lmb.reserved regions don't get expanded and instead we get tons of holes and eventually run out of regions prematurely. Signed-off-by:

David S. Miller <davem@davemloft.net>

lib/lmb.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -245,6 +245,11 @@ static unsigned long lmb_align_down(unsigned long addr, unsigned long size)
		return addr & ~(size - 1);
		}

		static unsigned long lmb_align_up(unsigned long addr, unsigned long size)
		{
		return (addr + (size - 1)) & ~(size - 1);
		}

		unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
		unsigned long max_addr)
		{
		@@ -281,7 +286,8 @@ unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
		if (i < 0)
		return 0;

		lmb_add_region(&lmb.reserved, base, size);
		if (lmb_add_region(&lmb.reserved, base, lmb_align_up(size, align)) < 0)
		return 0;

		return base;
		}

Admin message