Skip to contentSkip to conversation

x86/head64: micro optimization: use memset instead of for loop

PATCH Superseded Alexander Kuleshov 4 participants 6 messages Jan 30, 2016 – Feb 9, 2016 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/head64: micro optimization: use memset instead of for loop

This patch simplifies clearing of page table directories, by the using of the fast memset() from the arch/x86/lib/memset_64.S. Besides this, we 25 bytes is 25 bytes less than original.

text data bss dec hex filename

9735144 4970776 15474688        30180608        1cc8500 vmlinux.old
9735119 4970776 15474688        30180583        1cc84e7 vmlinux
---
 arch/x86/kernel/head64.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
arch/x86/kernel/head64.c +3 -11
index f129a9a..4260ac4 100644
@@ -40,13 +40,8 @@ pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);
 /* Wipe all early page tables except for the kernel symbol map */
 static void __init reset_early_page_tables(void)
 {
-	unsigned long i;
-
-	for (i = 0; i < PTRS_PER_PGD-1; i++)
-		early_level4_pgt[i].pgd = 0;
-
+	memset(early_level4_pgt, 0, sizeof(pgd_t) * (PTRS_PER_PGD-1));
 	next_early_pgt = 0;
-
 	write_cr3(__pa_nodebug(early_level4_pgt));
 }
 
@@ -54,7 +49,6 @@ static void __init reset_early_page_tables(void)
 int __init early_make_pgtable(unsigned long address)
 {
 	unsigned long physaddr = address - __PAGE_OFFSET;
-	unsigned long i;
 	pgdval_t pgd, *pgd_p;
 	pudval_t pud, *pud_p;
 	pmdval_t pmd, *pmd_p;
@@ -81,8 +75,7 @@ again:
 		}
 
 		pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
-		for (i = 0; i < PTRS_PER_PUD; i++)
-			pud_p[i] = 0;
+		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);
@@ -97,8 +90,7 @@ again:
 		}
 
 		pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
-		for (i = 0; i < PTRS_PER_PMD; i++)
-			pmd_p[i] = 0;
+		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;
Signature · 1 line
2.7.0.25.gfc10eb5
#1 lore raw

[tip:x86/boot] x86/boot: Micro-optimize reset_early_page_tables()

x86/boot: Micro-optimize reset_early_page_tables()
Commit-ID:  5e9ebbd87a99ecc6abb74325b0ac63c46891f6f3
Gitweb:     http://git.kernel.org/tip/5e9ebbd87a99ecc6abb74325b0ac63c46891f6f3
Author:     Alexander Kuleshov <[email protected]>
AuthorDate: Sat, 30 Jan 2016 14:01:12 +0600
Committer:  Ingo Molnar <[email protected]>
CommitDate: Sat, 30 Jan 2016 09:20:55 +0100

x86/boot: Micro-optimize reset_early_page_tables()

Save 25 bytes of code and make the bootup a tiny bit faster:

     text    data bss             dec             filename
  9735144 4970776 15474688        30180608        vmlinux.old
  9735119 4970776 15474688        30180583        vmlinux
Cc Alexander Popov <[email protected]>
Cc Andrey Ryabinin <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
[ Fixed various small details. ]
---
 arch/x86/kernel/head64.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
arch/x86/kernel/head64.c +3 -11
index f129a9a..35843ca 100644
@@ -40,13 +40,8 @@ pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);
 /* Wipe all early page tables except for the kernel symbol map */
 static void __init reset_early_page_tables(void)
 {
-	unsigned long i;
-
-	for (i = 0; i < PTRS_PER_PGD-1; i++)
-		early_level4_pgt[i].pgd = 0;
-
+	memset(early_level4_pgt, 0, sizeof(pgd_t)*(PTRS_PER_PGD-1));
 	next_early_pgt = 0;
-
 	write_cr3(__pa_nodebug(early_level4_pgt));
 }
 
@@ -54,7 +49,6 @@ static void __init reset_early_page_tables(void)
 int __init early_make_pgtable(unsigned long address)
 {
 	unsigned long physaddr = address - __PAGE_OFFSET;
-	unsigned long i;
 	pgdval_t pgd, *pgd_p;
 	pudval_t pud, *pud_p;
 	pmdval_t pmd, *pmd_p;
@@ -81,8 +75,7 @@ again:
 		}
 
 		pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
-		for (i = 0; i < PTRS_PER_PUD; i++)
-			pud_p[i] = 0;
+		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);
@@ -97,8 +90,7 @@ again:
 		}
 
 		pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
-		for (i = 0; i < PTRS_PER_PMD; i++)
-			pmd_p[i] = 0;
+		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;
#2 lore raw

Re: [tip:x86/boot] x86/boot: Micro-optimize reset_early_page_tables()

arch/x86/kernel/head64.c pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);

Quoted 9 lines · tip-bot for Alexander Kuleshov
---
 arch/x86/kernel/head64.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
arch/x86/kernel/head64.c +0 -0
index f129a9a..35843ca 100644
@@ -40,13 +40,8 @@ pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);

.

Quoted 10 lines
arch/x86/kernel/head64.c +0 -1
@@ -54,7 +49,6 @@ static void __init reset_early_page_tables(void)
 int __init early_make_pgtable(unsigned long address)
 {
        unsigned long physaddr = address - __PAGE_OFFSET;
-       unsigned long i;
        pgdval_t pgd, *pgd_p;
        pudval_t pud, *pud_p;
        pmdval_t pmd, *pmd_p;

arch/x86/kernel/head64.c again: · line 78

Quoted 6 lines
arch/x86/kernel/head64.c +1 -2
@@ -81,8 +75,7 @@ again:
                }
 
                pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
-               for (i = 0; i < PTRS_PER_PUD; i++)
-                       pud_p[i] = 0;
+               memset(pud_p, 0, sizeof(pud_p) * PTRS_PER_PUD);

should be

                  memset(pud_p, 0, sizeof(*pud_p) * PTRS_PER_PUD);

arch/x86/kernel/head64.c again: · line 93

Quoted 10 lines
arch/x86/kernel/head64.c +1 -2
                *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
        }
        pud_p += pud_index(address);
@@ -97,8 +90,7 @@ again:
                }
 
                pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
-               for (i = 0; i < PTRS_PER_PMD; i++)
-                       pmd_p[i] = 0;
+               memset(pmd_p, 0, sizeof(pmd_p) * PTRS_PER_PMD);

should be

                    memset(pmd_p, 0, sizeof(*pmd_p) * PTRS_PER_PMD);
Quoted 3 lines
arch/x86/kernel/head64.c +0 -0
                *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
        }
        pmd = (physaddr & PMD_MASK) + early_pmd_flags;
#3 lore raw

Re: [tip:x86/boot] x86/boot: Micro-optimize reset_early_page_tables()

Quoted 39 lines · Yinghai Lu

arch/x86/kernel/head64.c pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);

Quoted 9 lines · tip-bot for Alexander Kuleshov
---
 arch/x86/kernel/head64.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
arch/x86/kernel/head64.c +0 -0
index f129a9a..35843ca 100644
@@ -40,13 +40,8 @@ pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);

.

Quoted 10 lines
arch/x86/kernel/head64.c +0 -1
@@ -54,7 +49,6 @@ static void __init reset_early_page_tables(void)
 int __init early_make_pgtable(unsigned long address)
 {
        unsigned long physaddr = address - __PAGE_OFFSET;
-       unsigned long i;
        pgdval_t pgd, *pgd_p;
        pudval_t pud, *pud_p;
        pmdval_t pmd, *pmd_p;

arch/x86/kernel/head64.c again: · line 78

Quoted 6 lines
arch/x86/kernel/head64.c +1 -2
@@ -81,8 +75,7 @@ again:
                }
 
                pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
-               for (i = 0; i < PTRS_PER_PUD; i++)
-                       pud_p[i] = 0;
+               memset(pud_p, 0, sizeof(pud_p) * PTRS_PER_PUD);

should be

                  memset(pud_p, 0, sizeof(*pud_p) * PTRS_PER_PUD);
Quoted 6 lines
arch/x86/kernel/head64.c +0 -0
                *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
        }
        pud_p += pud_index(address);
@@ -97,8 +90,7 @@ again:
                }
 
Quoted 7 lines

arch/x86/kernel/head64.c again: · line 93

Quoted 4 lines
arch/x86/kernel/head64.c +1 -2
                pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
-               for (i = 0; i < PTRS_PER_PMD; i++)
-                       pmd_p[i] = 0;
+               memset(pmd_p, 0, sizeof(pmd_p) * PTRS_PER_PMD);

should be

                    memset(pmd_p, 0, sizeof(*pmd_p) * PTRS_PER_PMD);

Indeed. Fortunately the two sizes are the same AFAICS, but this should nevertheless be fixed.

Thanks,

Ingo

#4 lore raw

PATCH v2 1/1 x86/head64: micro optimization: use memset instead of for loop

This patch simplifies clearing of page table directories, by the using of the fast memset() from the arch/x86/lib/memset_64.S. Besides this, we 25 bytes is 25 bytes less than original.

text data bss dec hex filename

9735144 4970776 15474688        30180608        1cc8500 vmlinux.old
9735119 4970776 15474688        30180583        1cc84e7 vmlinux

---
Changelog:

v2: We got sizeof pud_p/pmd_p in the v1, but actually we need to take sizeof of pud_p/pmd_p pointer, although their sizes are the same.

 arch/x86/kernel/head64.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
arch/x86/kernel/head64.c +3 -11
index 2c0f340..1f4422d 100644
@@ -40,13 +40,8 @@ pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);
 /* Wipe all early page tables except for the kernel symbol map */
 static void __init reset_early_page_tables(void)
 {
-	unsigned long i;
-
-	for (i = 0; i < PTRS_PER_PGD-1; i++)
-		early_level4_pgt[i].pgd = 0;
-
+	memset(early_level4_pgt, 0, sizeof(pgd_t)*(PTRS_PER_PGD-1));
 	next_early_pgt = 0;
-
 	write_cr3(__pa_nodebug(early_level4_pgt));
 }
 
@@ -54,7 +49,6 @@ static void __init reset_early_page_tables(void)
 int __init early_make_pgtable(unsigned long address)
 {
 	unsigned long physaddr = address - __PAGE_OFFSET;
-	unsigned long i;
 	pgdval_t pgd, *pgd_p;
 	pudval_t pud, *pud_p;
 	pmdval_t pmd, *pmd_p;
@@ -81,8 +75,7 @@ again:
 		}
 
 		pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
-		for (i = 0; i < PTRS_PER_PUD; i++)
-			pud_p[i] = 0;
+		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);
@@ -97,8 +90,7 @@ again:
 		}
 
 		pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
-		for (i = 0; i < PTRS_PER_PMD; i++)
-			pmd_p[i] = 0;
+		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;
Signature · 1 line
2.7.0.25.gfc10eb5
#5 lore raw
Quoted 9 lines · Alexander Kuleshov

This patch simplifies clearing of page table directories, by the using of the fast memset() from the arch/x86/lib/memset_64.S. Besides this, we 25 bytes is 25 bytes less than original.

text data bss dec hex filename

9735144 4970776 15474688        30180608        1cc8500 vmlinux.old
9735119 4970776 15474688        30180583        1cc84e7 vmlinux
Quoted 7 lines

---
Changelog:

v2: We got sizeof pud_p/pmd_p in the v1, but actually we need to take sizeof of pud_p/pmd_p pointer, although their sizes are the same.

Please send a delta patch (with changelog) as the v1 commit is already deep within the tip:x86/boot branch.

Thanks,

Ingo