Commit a91bbe01 authored Feb 09, 2016 by Alexander Kuleshov Committed by Ingo Molnar Feb 09, 2016

x86/boot: Use proper array element type in memset() size calculation



I changed open coded zeroing loops to explicit memset()s in the
following commit:

  5e9ebbd8 ("x86/boot: Micro-optimize reset_early_page_tables()")

The base for the size argument of memset was sizeof(pud_p/pmd_p), which
are pointers - but the initialized array has pud_t/pmd_t elements.

Luckily the two types had the same size, so this did not result in any
runtime misbehavior.

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Cc: Alexander Popov <alpopov@ptsecurity.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1455025494-4063-1-git-send-email-kuleshovmail@gmail.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 8c051775

arch/x86/kernel/head64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ again:
		}

		pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
		memset(pud_p, 0, sizeof(pud_p) * PTRS_PER_PUD);
		memset(pud_p, 0, sizeof(pud_p) PTRS_PER_PUD);
		*pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
		}
		pud_p += pud_index(address);
		@@ -90,7 +90,7 @@ again:
		}

		pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
		memset(pmd_p, 0, sizeof(pmd_p) * PTRS_PER_PMD);
		memset(pmd_p, 0, sizeof(pmd_p) PTRS_PER_PMD);
		*pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
		}
		pmd = (physaddr & PMD_MASK) + early_pmd_flags;

Admin message