From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: ACJfBotTEGbiIBqOikEevYrKS1MgkZhocn/TgYP6SAhRVE0rTJvUw0t8uA+BXeYR7IRF8fIkiWwI ARC-Seal: i=1; a=rsa-sha256; t=1516326757; cv=none; d=google.com; s=arc-20160816; b=DUg7K1XnF03Y4XVlsS9IQwlQ5aH7NJ8tBci07IXqMX+Dp7gI1Xm+fXAYMxi61fFQdN YW+tjN2ghBIGwCPgP8G8jmb8JixL/iSoaQTsSTRZfBtzKNVVRGAhGs34zvaEjX86o2o/ 98blZNq22Uo+UeHlbR+YDO/BAL+WYfxuEo53ALNA+0nhVqWDjPL+hItkz1aoc8tjXNSf quIVz8jeQw/pBAB6elp0ju3LMtduw7SimiV99zlhVEqaG5JxSA5bsKJG/W9szoNWqTM8 gNlcidh9gjMmN8TcG0Dr4tUgnNp5YsxD7nTqy2t9IkMtDZF2SOJ6NqDBY7VLULLqmNo5 gaeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Tc15UZeax39h0EWYlq1J1C7rjoDgIOFOarwLCxGilrw=; b=ZZZ/dD+LaYppmZoOBv6OZx3E9zhB1luJEKpMxAhqEgzIW7Es7z0J8H0RYoEFDer0ua bEK7k1tYGfI/B+jqshEGd2NmAmOZqS5u0iU31Wp3UjJO4xNlEM43AEQC6sEnYEusu1MD M2MKDPqXRjYTw/44lSxKM/qdoUzZlDJhEYGipdY2v9qe8NG7GGGHNrJSAlzhdoLzVpAK TR6Graiy9ILuK7CZuQRobIPuWG7k2uSf0vFeANO+cwDy0sGc73ilVg1Nh3EmuBz/gSBW ZhrDFjfVtPtb78DBEyZoTiObAuRy3k+cLUZviDBEERDeoABOglw71JT17PYtpw8mrhUL 3yvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bdoagEL1; spf=pass (google.com: best guess record for domain of linux-kselftest-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bdoagEL1; spf=pass (google.com: best guess record for domain of linux-kselftest-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kselftest-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755728AbeASBwf (ORCPT ); Thu, 18 Jan 2018 20:52:35 -0500 Received: from mail-qt0-f194.google.com ([209.85.216.194]:42217 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755524AbeASBwG (ORCPT ); Thu, 18 Jan 2018 20:52:06 -0500 From: Ram Pai To: mpe@ellerman.id.au, mingo@redhat.com, akpm@linux-foundation.org, corbet@lwn.net, arnd@arndb.de Cc: linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, dave.hansen@intel.com, benh@kernel.crashing.org, paulus@samba.org, khandual@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com, bsingharora@gmail.com, hbabu@us.ibm.com, mhocko@kernel.org, bauerman@linux.vnet.ibm.com, ebiederm@xmission.com, linuxram@us.ibm.com Subject: [PATCH v10 09/27] powerpc: ability to create execute-disabled pkeys Date: Thu, 18 Jan 2018 17:50:30 -0800 Message-Id: <1516326648-22775-10-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1516326648-22775-1-git-send-email-linuxram@us.ibm.com> References: <1516326648-22775-1-git-send-email-linuxram@us.ibm.com> Sender: linux-kselftest-owner@vger.kernel.org X-Mailing-List: linux-kselftest@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1589983846891697742?= X-GMAIL-MSGID: =?utf-8?q?1589983846891697742?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: powerpc has hardware support to disable execute on a pkey. This patch enables the ability to create execute-disabled keys. Signed-off-by: Ram Pai --- arch/powerpc/include/uapi/asm/mman.h | 6 ++++++ arch/powerpc/mm/pkeys.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/include/uapi/asm/mman.h b/arch/powerpc/include/uapi/asm/mman.h index e63bc37..65065ce 100644 --- a/arch/powerpc/include/uapi/asm/mman.h +++ b/arch/powerpc/include/uapi/asm/mman.h @@ -30,4 +30,10 @@ #define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */ #define MAP_HUGETLB 0x40000 /* create a huge page mapping */ +/* Override any generic PKEY permission defines */ +#define PKEY_DISABLE_EXECUTE 0x4 +#undef PKEY_ACCESS_MASK +#define PKEY_ACCESS_MASK (PKEY_DISABLE_ACCESS |\ + PKEY_DISABLE_WRITE |\ + PKEY_DISABLE_EXECUTE) #endif /* _UAPI_ASM_POWERPC_MMAN_H */ diff --git a/arch/powerpc/mm/pkeys.c b/arch/powerpc/mm/pkeys.c index eca04cd..39e9814 100644 --- a/arch/powerpc/mm/pkeys.c +++ b/arch/powerpc/mm/pkeys.c @@ -29,6 +29,14 @@ int pkey_initialize(void) int os_reserved, i; /* + * We define PKEY_DISABLE_EXECUTE in addition to the arch-neutral + * generic defines for PKEY_DISABLE_ACCESS and PKEY_DISABLE_WRITE. + * Ensure that the bits a distinct. + */ + BUILD_BUG_ON(PKEY_DISABLE_EXECUTE & + (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE)); + + /* * Disable the pkey system till everything is in place. A subsequent * patch will enable it. */ @@ -181,10 +189,18 @@ int __arch_set_user_pkey_access(struct task_struct *tsk, int pkey, unsigned long init_val) { u64 new_amr_bits = 0x0ul; + u64 new_iamr_bits = 0x0ul; if (!is_pkey_enabled(pkey)) return -EINVAL; + if (init_val & PKEY_DISABLE_EXECUTE) { + if (!pkey_execute_disable_supported) + return -EINVAL; + new_iamr_bits |= IAMR_EX_BIT; + } + init_iamr(pkey, new_iamr_bits); + /* Set the bits we need in AMR: */ if (init_val & PKEY_DISABLE_ACCESS) new_amr_bits |= AMR_RD_BIT | AMR_WR_BIT; -- 1.7.1