From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932184AbcIJSb1 (ORCPT ); Sat, 10 Sep 2016 14:31:27 -0400 Received: from mx1.polytechnique.org ([129.104.30.34]:50460 "EHLO mx1.polytechnique.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754623AbcIJSb0 (ORCPT ); Sat, 10 Sep 2016 14:31:26 -0400 From: Nicolas Iooss To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Cc: linux-kernel@vger.kernel.org, Dave Hansen , Nicolas Iooss Subject: [PATCH 1/1] x86: do not skip PKRU register if debug registers are not used Date: Sat, 10 Sep 2016 20:30:45 +0200 Message-Id: <20160910183045.4618-1-nicolas.iooss_linux@m4x.org> X-Mailer: git-send-email 2.9.3 X-AV-Checked: ClamAV using ClamSMTP at svoboda.polytechnique.org (Sat Sep 10 20:31:23 2016 +0200 (CEST)) X-Spam-Flag: No, tests=bogofilter, spamicity=0.000003, queueID=601AC56473E Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When commit c0b17b5bd4b7 ("x86/mm/pkeys: Dump PKRU with other kernel registers") made __show_regs() show PKRU, this register was only printed if the debug registers were not in their default state (there is an if(...) return; before). Change the logic to report PKRU value even when debug registers are in their default state. Signed-off-by: Nicolas Iooss --- arch/x86/kernel/process_64.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 63236d8f84bf..a21068e49dac 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -110,12 +110,13 @@ void __show_regs(struct pt_regs *regs, int all) get_debugreg(d7, 7); /* Only print out debug registers if they are in their non-default state. */ - if ((d0 == 0) && (d1 == 0) && (d2 == 0) && (d3 == 0) && - (d6 == DR6_RESERVED) && (d7 == 0x400)) - return; - - printk(KERN_DEFAULT "DR0: %016lx DR1: %016lx DR2: %016lx\n", d0, d1, d2); - printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", d3, d6, d7); + if (!((d0 == 0) && (d1 == 0) && (d2 == 0) && (d3 == 0) && + (d6 == DR6_RESERVED) && (d7 == 0x400))) { + printk(KERN_DEFAULT "DR0: %016lx DR1: %016lx DR2: %016lx\n", + d0, d1, d2); + printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", + d3, d6, d7); + } if (boot_cpu_has(X86_FEATURE_OSPKE)) printk(KERN_DEFAULT "PKRU: %08x\n", read_pkru()); -- 2.9.3