From patchwork Sun Jul 16 03:56:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 789027 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x9Djr607nz9s4s for ; Sun, 16 Jul 2017 14:59:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g4JC7jcN"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3x9Djr4sNPzDqmw for ; Sun, 16 Jul 2017 14:59:28 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g4JC7jcN"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-qk0-x241.google.com (mail-qk0-x241.google.com [IPv6:2607:f8b0:400d:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3x9CNV0r8czDqmM for ; Sun, 16 Jul 2017 13:59:22 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g4JC7jcN"; dkim-atps=neutral Received: by mail-qk0-x241.google.com with SMTP id c18so6918510qkb.2 for ; Sat, 15 Jul 2017 20:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BuPLZ3qoIffvBxs82lPc7hnuRHI8ZFFAWPafc/WcZ/w=; b=g4JC7jcNOEaop/ngk/2ik8L+lsq231kPYJWuK3TihP/qd5UXMePnuPvBHpzStyJPNw TYNjK6CDHhrH8e4Jf1PGoD0FOMlnqCSqd6Q9ULbGiFkPEUJKKhR+fqYMsejgjtyaLnKo dZDguGTh9cx14F8xCL75RwFDKDMygVM6c/K8atESnSZiFe+uQIl7kEX4lFg3iEkOXRh5 z0AUcmtTIRPn1wKpKEdHSwUUYI8EueOYzGw4Wv7EIx3m9xlRDAQDKperNMWj36kAuEOS OWN3ekZ6yL2p9unDzU95MdYlzEaWv4EoRMOYCgEsFDrsObr/1jmqD8FwoaAEGF7WFxMG BdlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BuPLZ3qoIffvBxs82lPc7hnuRHI8ZFFAWPafc/WcZ/w=; b=EMKTKhkXmeVRvYAQHaAlCg++2MGKReyH5EidhY7Jpp4Uh8H1AylODsUJP3fiKyAFln cc1FPIzISYKr5LCUAM/mjEJQe3ZrhomVE0Xv3rg3UwNbbkoP6Uspwvx8u7bFtiomU9sK juOxW+yhQoaN4VadqKeqQcgIeOKme1tL9hQu9QQcGqDApq+CgAo3EIE8EQvbk3oCgH0s PA2N9sOoIu5CkRox6mzncBbrXNyM8f/g1IP168vhwUs42jnMHp7oLRH5MjJ1nhm0g3E9 RIr6/ntyH//x2D4s6bIYs3U77KYTbxAFLIhOjiWlDF3aI2yRRoJD5v2CPBLERKKPgt4A eyHA== X-Gm-Message-State: AIVw111PB6BGMFU93BuIx/555CqPNNXGGOXf/QkgsbLy0+1uLpj2BX4z kjQZ/PDDw8toCYRXl5k= X-Received: by 10.55.78.85 with SMTP id c82mr19536497qkb.154.1500177560147; Sat, 15 Jul 2017 20:59:20 -0700 (PDT) Received: from localhost.localdomain (50-39-103-96.bvtn.or.frontiernet.net. [50.39.103.96]) by smtp.gmail.com with ESMTPSA id q46sm2290345qtc.54.2017.07.15.20.59.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 20:59:19 -0700 (PDT) From: Ram Pai To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [RFC v6 32/62] powerpc: capture AMR register content on pkey violation Date: Sat, 15 Jul 2017 20:56:34 -0700 Message-Id: <1500177424-13695-33-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1500177424-13695-1-git-send-email-linuxram@us.ibm.com> References: <1500177424-13695-1-git-send-email-linuxram@us.ibm.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: arnd@arndb.de, corbet@lwn.net, linuxram@us.ibm.com, mhocko@kernel.org, dave.hansen@intel.com, mingo@redhat.com, paulus@samba.org, aneesh.kumar@linux.vnet.ibm.com, akpm@linux-foundation.org, khandual@linux.vnet.ibm.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" capture AMR register contents, and save it in paca whenever a pkey violation is detected. This value will be needed to deliver pkey-violation signal to the task. Signed-off-by: Ram Pai --- arch/powerpc/include/asm/paca.h | 3 +++ arch/powerpc/kernel/asm-offsets.c | 5 +++++ arch/powerpc/mm/fault.c | 2 ++ 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h index 1c09f8f..c8bd1fc 100644 --- a/arch/powerpc/include/asm/paca.h +++ b/arch/powerpc/include/asm/paca.h @@ -92,6 +92,9 @@ struct paca_struct { struct dtl_entry *dispatch_log_end; #endif /* CONFIG_PPC_STD_MMU_64 */ u64 dscr_default; /* per-CPU default DSCR */ +#ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS + u64 paca_amr; /* value of amr at exception */ +#endif /* CONFIG_PPC64_MEMORY_PROTECTION_KEYS */ #ifdef CONFIG_PPC_STD_MMU_64 /* diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 709e234..17f5d8a 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -241,6 +241,11 @@ int main(void) OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id); OFFSET(PACAKEXECSTATE, paca_struct, kexec_state); OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default); + +#ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS + OFFSET(PACA_AMR, paca_struct, paca_amr); +#endif /* CONFIG_PPC64_MEMORY_PROTECTION_KEYS */ + OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime); OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user); OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime); diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index ea74fe2..a6710f5 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -264,6 +264,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, #ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS if (error_code & DSISR_KEYFAULT) { code = SEGV_PKUERR; + get_paca()->paca_amr = read_amr(); goto bad_area_nosemaphore; } #endif /* CONFIG_PPC64_MEMORY_PROTECTION_KEYS */ @@ -451,6 +452,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, #ifdef CONFIG_PPC64_MEMORY_PROTECTION_KEYS if (!arch_vma_access_permitted(vma, flags & FAULT_FLAG_WRITE, is_exec, 0)) { + get_paca()->paca_amr = read_amr(); code = SEGV_PKUERR; goto bad_area; }