From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754502AbcK1HWH (ORCPT ); Mon, 28 Nov 2016 02:22:07 -0500 Received: from terminus.zytor.com ([198.137.202.10]:33496 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754465AbcK1HVz (ORCPT ); Mon, 28 Nov 2016 02:21:55 -0500 Date: Sun, 27 Nov 2016 23:19:23 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: brgerst@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, luto@kernel.org, dvlasenk@redhat.com, jpoimboe@redhat.com, bp@suse.de, peterz@infradead.org Reply-To: brgerst@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, hpa@zytor.com, torvalds@linux-foundation.org, tglx@linutronix.de, luto@kernel.org, dvlasenk@redhat.com, jpoimboe@redhat.com, bp@suse.de, peterz@infradead.org In-Reply-To: <20161125111448.23623-1-bp@alien8.de> References: <20161125111448.23623-1-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot/64: Optimize fixmap page fixup Git-Commit-ID: 6248f4567442081994ad61c63bd9870e147983e0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6248f4567442081994ad61c63bd9870e147983e0 Gitweb: http://git.kernel.org/tip/6248f4567442081994ad61c63bd9870e147983e0 Author: Borislav Petkov AuthorDate: Fri, 25 Nov 2016 12:14:48 +0100 Committer: Ingo Molnar CommitDate: Mon, 28 Nov 2016 07:45:17 +0100 x86/boot/64: Optimize fixmap page fixup Single-stepping through head_64.S made me look at the fixmap page PTEs fixup loop: So we're going through the whole level2_fixmap_pgt 4K page, looking at whether PAGE_PRESENT is set in those PTEs and add the delta between where we're compiled to run and where we actually end up running. However, if that delta is 0 (most cases) we go through all those 512 PTEs for no reason at all. Oh well, we add 0 but that's no reason to me. Skipping that useless fixup gives us a boot speedup of 0.004 seconds in my guest. Not a lot but considering how cheap it is, I'll take it. Here is the printk time difference: before: ... [ 0.000000] tsc: Marking TSC unstable due to TSCs unsynchronized [ 0.013590] Calibrating delay loop (skipped), value calculated using timer frequency.. 8027.17 BogoMIPS (lpj=16054348) [ 0.017094] pid_max: default: 32768 minimum: 301 ... after: ... [ 0.000000] tsc: Marking TSC unstable due to TSCs unsynchronized [ 0.009587] Calibrating delay loop (skipped), value calculated using timer frequency.. 8026.86 BogoMIPS (lpj=16053724) [ 0.013090] pid_max: default: 32768 minimum: 301 ... For the other two changes converting naked numbers to defines: # arch/x86/kernel/head_64.o: text data bss dec hex filename 1124 290864 4096 296084 48494 head_64.o.before 1124 290864 4096 296084 48494 head_64.o.after md5: 87086e202588939296f66e892414ffe2 head_64.o.before.asm 87086e202588939296f66e892414ffe2 head_64.o.after.asm Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161125111448.23623-1-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/head_64.S | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index b4421cc..a4a814f 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -147,6 +147,9 @@ startup_64: decl %ecx jnz 1b + test %rbp, %rbp + jz .Lskip_fixup + /* * Fixup the kernel text+data virtual addresses. Note that * we might write invalid pmds, when the kernel is relocated @@ -154,9 +157,9 @@ startup_64: * beyond _end. */ leaq level2_kernel_pgt(%rip), %rdi - leaq 4096(%rdi), %r8 + leaq PAGE_SIZE(%rdi), %r8 /* See if it is a valid page table entry */ -1: testb $1, 0(%rdi) +1: testb $_PAGE_PRESENT, 0(%rdi) jz 2f addq %rbp, 0(%rdi) /* Go to the next page */ @@ -167,6 +170,7 @@ startup_64: /* Fixup phys_base */ addq %rbp, phys_base(%rip) +.Lskip_fixup: movq $(early_level4_pgt - __START_KERNEL_map), %rax jmp 1f ENTRY(secondary_startup_64)