From patchwork Wed Feb 28 03:56:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 129885 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp567377lja; Tue, 27 Feb 2018 19:57:42 -0800 (PST) X-Google-Smtp-Source: AH8x226Q52Jpc/a2OjhDftFL1AolVTm13xj55gq3SGfEoAyG2Q5BZv+2Plt4FqIE+EfDsTuBhuyb X-Received: by 2002:a17:902:904b:: with SMTP id w11-v6mr16617185plz.11.1519790262072; Tue, 27 Feb 2018 19:57:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519790262; cv=none; d=google.com; s=arc-20160816; b=gtCPKDbQDa6gJJbUQn8CA3rNm95u89uUHr671QxGTUdSZoWEDES2qAw2CCtC+I8Xmf mdFgT5KM8E+nkg33KVMUPByS0qHvi+KnEwvJRb5repED+sKv+/7n1UhYJ5LZDyo0PFEE ykfwOFr7Z6ebCVPOllNfldPBXbdqyIp/eg0DJZGqqHZNDzOTdmi9x3LXLirSoMILJA6n AuaM1umesNX0Gg9xiuZlsXA2tMvoChXrYg4SM47ZWSuG+lu7vTJk5oymmAcYboo+oF4C aOU8UV/+K5kIC3YkpdLWnbXswotUDWb+6xLn/+rFEpkDSryDNvfxLaQSBpM2/CmjM3eS W8jw== 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=hqY92IyaOn566ESbjSLskW0cc57GoyIQ8cfMxC4afJE=; b=X+SRcPo3CS06snHj0F+kqhq2yCDvBWmbYbntQkfHJdChDjTOSukv/9bXKEjir1WSXg LRkiiAbCvEbxPl6CNso0QtbA8oBZQcP09l0RgjdUqfIXcAYKbY6uwZUqQIydjbvJBBLS psGpa8Fk6QhODDhYFVIL5kKUJAbd9Jh18sxLhSqYMIA1D/Ob65S0qlHyFxJ/7uYkMNol ngZzLmYwvxByVtbJ3DGqHDxaMZWWSP7JGTmFW1hzryflAdduLKfVubHzMebH4OUiwf53 +W3JH9OdY5d1WOM+vE/abqchJXhVHalQ9/Q4UCS/QgSnIt2DoPwM/n9xShktL9aNzMuC vHrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UghItTln; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6-v6si567987pla.619.2018.02.27.19.57.41; Tue, 27 Feb 2018 19:57:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UghItTln; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751821AbeB1D5j (ORCPT + 10 others); Tue, 27 Feb 2018 22:57:39 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34119 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751793AbeB1D5h (ORCPT ); Tue, 27 Feb 2018 22:57:37 -0500 Received: by mail-pf0-f193.google.com with SMTP id j20so513416pfi.1 for ; Tue, 27 Feb 2018 19:57:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hqY92IyaOn566ESbjSLskW0cc57GoyIQ8cfMxC4afJE=; b=UghItTlnmrIu+FmVYwuGgCTbkf8lc1x4j6i+X0l2vHsOGkqDDr2JfFGN/EcEncC7vX 5WibJtVoQyv2gDQm1g05k6fl8tySKz0AwxTLz1jE4CR0ouHlyyKDpFlh0mrYvLvNpMwD PCoUNqE5n6nZLXL0QoCbm+an8+4NmBVasTsVU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hqY92IyaOn566ESbjSLskW0cc57GoyIQ8cfMxC4afJE=; b=RQv0iDtbIlVK54dPIstPh8bMuyn+GDe6j35eMxCScFGNLIj82nyp4SerInX0YGYoJV qip4qyCyS7Vvp+XuInU+/tSY0drs3gzexzKmcaqau77LbnslRzfjMm40AZkZq0+zVvo5 O0mvTTLl0a+mwrDn+3uZjFQtTDu6QQm7NxFcovwaJ2lyX2pfw2alzRChprvksEpbZQCm M7v/ykgHcp24fAe2W9pPpy020sDEA3HiU/7Pm9F9vIefP3KGieuntU1oI54suricKdCv kBh64BPETPktT+yhJxKO8nuMwhW7Ixe7mBMoSRT0LY8YNtwiEtTnCMqXXom6bVDQrazB Pdmg== X-Gm-Message-State: APf1xPDkv37N7EAdp+utSvUapXeAqavYoghj8vMg1VseDCWOjSIIny91 8r3cg/KBuFlEicnZD38kyinD0Q== X-Received: by 10.98.35.68 with SMTP id j65mr11761651pfj.5.1519790255665; Tue, 27 Feb 2018 19:57:35 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id q17sm739911pgt.7.2018.02.27.19.57.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Feb 2018 19:57:34 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alex Shi Subject: [PATCH 01/29] arm64: mm: Use non-global mappings for kernel space Date: Wed, 28 Feb 2018 11:56:23 +0800 Message-Id: <1519790211-16582-2-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> References: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit e046eb0c9bf2 upstream. In preparation for unmapping the kernel whilst running in userspace, make the kernel mappings non-global so we can avoid expensive TLB invalidation on kernel exit to userspace. Reviewed-by: Mark Rutland Tested-by: Laura Abbott Tested-by: Shanker Donthineni Signed-off-by: Will Deacon Signed-off-by: Alex Shi Conflicts: skip PTE_RDONLY of PAGE_NONE in arch/arm64/include/asm/pgtable-prot.h --- arch/arm64/include/asm/kernel-pgtable.h | 12 ++++++++++-- arch/arm64/include/asm/pgtable-prot.h | 21 +++++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) -- 2.7.4 diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h index 7e51d1b..e4ddac9 100644 --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -71,8 +71,16 @@ /* * Initial memory map attributes. */ -#define SWAPPER_PTE_FLAGS (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) -#define SWAPPER_PMD_FLAGS (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) +#define _SWAPPER_PTE_FLAGS (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) +#define _SWAPPER_PMD_FLAGS (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) + +#ifdef CONFIG_UNMAP_KERNEL_AT_EL0 +#define SWAPPER_PTE_FLAGS (_SWAPPER_PTE_FLAGS | PTE_NG) +#define SWAPPER_PMD_FLAGS (_SWAPPER_PMD_FLAGS | PMD_SECT_NG) +#else +#define SWAPPER_PTE_FLAGS _SWAPPER_PTE_FLAGS +#define SWAPPER_PMD_FLAGS _SWAPPER_PMD_FLAGS +#endif #if ARM64_SWAPPER_USES_SECTION_MAPS #define SWAPPER_MM_MMUFLAGS (PMD_ATTRINDX(MT_NORMAL) | SWAPPER_PMD_FLAGS) diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h index 2142c77..84b5283 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -34,8 +34,16 @@ #include -#define PROT_DEFAULT (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) -#define PROT_SECT_DEFAULT (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) +#define _PROT_DEFAULT (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) +#define _PROT_SECT_DEFAULT (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) + +#ifdef CONFIG_UNMAP_KERNEL_AT_EL0 +#define PROT_DEFAULT (_PROT_DEFAULT | PTE_NG) +#define PROT_SECT_DEFAULT (_PROT_SECT_DEFAULT | PMD_SECT_NG) +#else +#define PROT_DEFAULT _PROT_DEFAULT +#define PROT_SECT_DEFAULT _PROT_SECT_DEFAULT +#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ #define PROT_DEVICE_nGnRnE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRnE)) #define PROT_DEVICE_nGnRE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRE)) @@ -48,6 +56,7 @@ #define PROT_SECT_NORMAL_EXEC (PROT_SECT_DEFAULT | PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL)) #define _PAGE_DEFAULT (PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL)) +#define _HYP_PAGE_DEFAULT (_PAGE_DEFAULT & ~PTE_NG) #define PAGE_KERNEL __pgprot(_PAGE_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE) #define PAGE_KERNEL_RO __pgprot(_PAGE_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_RDONLY) @@ -55,15 +64,15 @@ #define PAGE_KERNEL_EXEC __pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY | PTE_WRITE) #define PAGE_KERNEL_EXEC_CONT __pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_CONT) -#define PAGE_HYP __pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_HYP_XN) -#define PAGE_HYP_EXEC __pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY) -#define PAGE_HYP_RO __pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY | PTE_HYP_XN) +#define PAGE_HYP __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_HYP_XN) +#define PAGE_HYP_EXEC __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY) +#define PAGE_HYP_RO __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY | PTE_HYP_XN) #define PAGE_HYP_DEVICE __pgprot(PROT_DEVICE_nGnRE | PTE_HYP) #define PAGE_S2 __pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY) #define PAGE_S2_DEVICE __pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_UXN) -#define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_PXN | PTE_UXN) +#define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_NG | PTE_PXN | PTE_UXN) #define PAGE_SHARED __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN | PTE_UXN | PTE_WRITE) #define PAGE_SHARED_EXEC __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN | PTE_WRITE) #define PAGE_COPY __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN | PTE_UXN) From patchwork Wed Feb 28 03:56:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 129895 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp568133lja; Tue, 27 Feb 2018 19:58:59 -0800 (PST) X-Google-Smtp-Source: AG47ELtGnSF/dsVpoDXex+BIyv5/JgJ2lZ9NC+PC02ZtL15n4Q+xNN4oQoC5VunVrNJdxw4bx+Pf X-Received: by 2002:a17:902:a613:: with SMTP id u19-v6mr11385053plq.92.1519790338888; Tue, 27 Feb 2018 19:58:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519790338; cv=none; d=google.com; s=arc-20160816; b=RB5FofnjFZrrhDN1/u9GZphGHAti+N5NwIcGx2aspFbUDQHTyjpwbFiaRhU03Sst6s kzqOXFVL/pxhxWd9xJypq7/2Ypqxx0840dAgVB6YDVXp6w+e2ySbwpbDbtYAE7gAu6WG +r13uPUkfhCedILhlkGaSMdbZgzN8IyrK/moSJmUezmZNMA6cgDuNVWcdJxXSYTSbOn4 N0HGxOhotLTIOmtrQ1BDbSz2pobaAbH1EVtd45XtgQn56YAcV9rTj3Lw+xKBfElafQSf ISjXdmxcHbVWJsS82FOcjsL1w81qUSGSNElHGCEi8MRc1DtZ3gNj+hrQdzyrFiRG2dEu JZ3Q== 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=GyALvW8YeD+0MJZ/yzzKdZ537ez2Q1z5R4zg8/QPH8A=; b=E//2bMUaDAH8t5jcw6RLxtQoPT5s0YAOnTd0ypXHU+/8JxcHB5RGLM+TUpabn3+2zs CoZ9rE+LU3jx1tp2e4NhhzRh1JkQQinT1hDBdL+GtA1OJO6122N7zvQE5AdWdxByebRf Md34YAU5lzgaz6Now49ebq03gLADSOi5ibMVVVaJWOzhNlxvvTptF4CyAklqpCjCj26U zlOA7Amo0Fn0jszKv4RLsEOLttf5SGzNbxfdFPzCxku/zbhvlrAIQy+/AaZQbgWvVGn6 yWThVx+hC9butpCR0ON70D6R+w3aY5NFy66xOIvnYMm8Pfbb3Pmg5faa5oQf5kdwNJ5t Y8+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DdvPmhiC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x14si474395pgq.168.2018.02.27.19.58.58; Tue, 27 Feb 2018 19:58:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DdvPmhiC; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751764AbeB1D64 (ORCPT + 10 others); Tue, 27 Feb 2018 22:58:56 -0500 Received: from mail-pl0-f66.google.com ([209.85.160.66]:40598 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbeB1D6z (ORCPT ); Tue, 27 Feb 2018 22:58:55 -0500 Received: by mail-pl0-f66.google.com with SMTP id i6-v6so770474plt.7 for ; Tue, 27 Feb 2018 19:58:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GyALvW8YeD+0MJZ/yzzKdZ537ez2Q1z5R4zg8/QPH8A=; b=DdvPmhiCUper7kGPYu9IsYe8LnYjqQDwut7q/Pgjt6ABptGQETKOR7hJbEkAj5FyFp p3WXAYuzrrfnJsz8F4Jf6xj4dhiMfxMLBVjcC8rNeNxGnPpXf6HNRIaElqwNHoYjZsPi vqy+lPycvj5WTS1lcUkRIRGSAIrVtm7n5Q0Qg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GyALvW8YeD+0MJZ/yzzKdZ537ez2Q1z5R4zg8/QPH8A=; b=gPk4YmWzqNYhkUEgfYyUswJtFq6bjoAHoxLjwXvcZKf+YXTdm16pL9Bic0eDgriXv7 CpCHLWSVS/oilaz5cJLrJXp1zhMV8tPHUA7mHy9TFD+CDZKsBaGvx+dKHWKVkGm9U4Lk Ygc6ibEDeTz1SgOArhe4D9OksV1eyCzdr8v86k8T4GQPoZHXwZi2887y510p65dCudA9 KNId38O0dqlhKwi8CPJo0xSNsPehGeIqzDwrjXwjInh2cdf1BddkZxjVMkFOZXlLV4oF Tagssc8a8nz3uoTkF0x8Py14dSSHkf0jC+piM1GXihdJjlwgA6YW/2Fjpd4PB0Dl2oc1 YBJA== X-Gm-Message-State: APf1xPCuaPs1+37egar3xvPrX9BD9OAEearQBClb9J/EwyWcf5LXw4+1 b9XNHHsnJDW8rIisC37LK6RXRA== X-Received: by 2002:a17:902:2006:: with SMTP id n6-v6mr16536609pla.149.1519790334519; Tue, 27 Feb 2018 19:58:54 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id q17sm739911pgt.7.2018.02.27.19.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Feb 2018 19:58:54 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alex Shi Subject: [PATCH 11/29] arm64: entry: Explicitly pass exception level to kernel_ventry macro Date: Wed, 28 Feb 2018 11:56:33 +0800 Message-Id: <1519790211-16582-12-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> References: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit 5b1f7fe41909 upstream. We will need to treat exceptions from EL0 differently in kernel_ventry, so rework the macro to take the exception level as an argument and construct the branch target using that. Reviewed-by: Mark Rutland Tested-by: Laura Abbott Tested-by: Shanker Donthineni Signed-off-by: Will Deacon Signed-off-by: Alex Shi Conflicts: no vmap_stack in arch/arm64/kernel/entry.S --- arch/arm64/kernel/entry.S | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) -- 2.7.4 diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index f0c6b37..7b1be51 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -70,10 +70,10 @@ #define BAD_FIQ 2 #define BAD_ERROR 3 - .macro kernel_ventry label + .macro kernel_ventry, el, label, regsize = 64 .align 7 sub sp, sp, #S_FRAME_SIZE - b \label + b el\()\el\()_\label .endm .macro kernel_entry, el, regsize = 64 @@ -264,31 +264,31 @@ tsk .req x28 // current thread_info .align 11 ENTRY(vectors) - kernel_ventry el1_sync_invalid // Synchronous EL1t - kernel_ventry el1_irq_invalid // IRQ EL1t - kernel_ventry el1_fiq_invalid // FIQ EL1t - kernel_ventry el1_error_invalid // Error EL1t + kernel_ventry 1, sync_invalid // Synchronous EL1t + kernel_ventry 1, irq_invalid // IRQ EL1t + kernel_ventry 1, fiq_invalid // FIQ EL1t + kernel_ventry 1, error_invalid // Error EL1t - kernel_ventry el1_sync // Synchronous EL1h - kernel_ventry el1_irq // IRQ EL1h - kernel_ventry el1_fiq_invalid // FIQ EL1h - kernel_ventry el1_error // Error EL1h + kernel_ventry 1, sync // Synchronous EL1h + kernel_ventry 1, irq // IRQ EL1h + kernel_ventry 1, fiq_invalid // FIQ EL1h + kernel_ventry 1, error // Error EL1h - kernel_ventry el0_sync // Synchronous 64-bit EL0 - kernel_ventry el0_irq // IRQ 64-bit EL0 - kernel_ventry el0_fiq_invalid // FIQ 64-bit EL0 - kernel_ventry el0_error // Error 64-bit EL0 + kernel_ventry 0, sync // Synchronous 64-bit EL0 + kernel_ventry 0, irq // IRQ 64-bit EL0 + kernel_ventry 0, fiq_invalid // FIQ 64-bit EL0 + kernel_ventry 0, error // Error 64-bit EL0 #ifdef CONFIG_COMPAT - kernel_ventry el0_sync_compat // Synchronous 32-bit EL0 - kernel_ventry el0_irq_compat // IRQ 32-bit EL0 - kernel_ventry el0_fiq_invalid_compat // FIQ 32-bit EL0 - kernel_ventry el0_error_compat // Error 32-bit EL0 + kernel_ventry 0, sync_compat, 32 // Synchronous 32-bit EL0 + kernel_ventry 0, irq_compat, 32 // IRQ 32-bit EL0 + kernel_ventry 0, fiq_invalid_compat, 32 // FIQ 32-bit EL0 + kernel_ventry 0, error_compat, 32 // Error 32-bit EL0 #else - kernel_ventry el0_sync_invalid // Synchronous 32-bit EL0 - kernel_ventry el0_irq_invalid // IRQ 32-bit EL0 - kernel_ventry el0_fiq_invalid // FIQ 32-bit EL0 - kernel_ventry el0_error_invalid // Error 32-bit EL0 + kernel_ventry 0, sync_invalid, 32 // Synchronous 32-bit EL0 + kernel_ventry 0, irq_invalid, 32 // IRQ 32-bit EL0 + kernel_ventry 0, fiq_invalid, 32 // FIQ 32-bit EL0 + kernel_ventry 0, error_invalid, 32 // Error 32-bit EL0 #endif END(vectors) From patchwork Wed Feb 28 03:56:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 129897 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp568275lja; Tue, 27 Feb 2018 19:59:14 -0800 (PST) X-Google-Smtp-Source: AG47ELtIT+iOXswgyOfglADpLBdckRu1nbCPT0NSUpkEkzD8nVgh3qeh3IpEUeEzHfJ2FhBUc6Ak X-Received: by 10.99.168.8 with SMTP id o8mr7018845pgf.246.1519790354805; Tue, 27 Feb 2018 19:59:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519790354; cv=none; d=google.com; s=arc-20160816; b=lfXgnkbtb0uK0JGeDS+f9UWdHkS7PFeXrvaPUfHhGIPQrKvzmJjUUUEzks2M/Bg2p3 K/INLa4PT+4FbCgDc5XbH6If/3VL5+W7Q5D2TsqzNrk9zV26VkjaUpcy9YuBpdt0f7RD 5T/5mulNgmO0KbZ/LWFDH86NAe4v7e7mKYUHTvwxP9bNqQZohJY79+JC3Mb7gt3l0zfD luNVc1pTdZxVWcmDkf3TOACHXxJzNcgY32AadXi0fWKQ+aBiERs0ajCfDQsPm2lW3oQm xMWJfEOEjm1ElfBDvCIUeYwUC96h/acsgCdlOEKOx18ZN+u2T5nSB8mbcaU43wv1xIY8 XQBw== 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=pUvcFHZB0gmxXIk6KYrb0J8r+/ie6VTOJuvKP5z63GU=; b=x2gGWL1FP3okZKpo2UsQzppwA49MK7FOli9DSNrAcxrqAiJHWcongFYi0KrfSlik1E YkyMtv0YzILGn0yFEsQrLnUct1YN2+lnrBZK6NPcsG1wZOjX5gi6lsZ55YS9VhghIJ83 ERecvOaXzPR4p2nWndj7g/ZLDR5v9wzTiFo1rsynWuRj10s85L95GfktpFjtlG9U+GY0 ClXexjA/emRQYqVntQo1YiSEKkE7Lh8uJtJOu8PI7saXNeCbUInRjVIN///fnkTsyLPg ssEcrCP/vv2rCXkZx3CPdPFYicp+BZrT+wrzZTcEB956yd+OIaKQWdMSp3NHuetxF8s8 KVbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TSxrL4HE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x2-v6si603010plr.334.2018.02.27.19.59.14; Tue, 27 Feb 2018 19:59:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TSxrL4HE; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752254AbeB1D7L (ORCPT + 10 others); Tue, 27 Feb 2018 22:59:11 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36249 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752249AbeB1D7J (ORCPT ); Tue, 27 Feb 2018 22:59:09 -0500 Received: by mail-pg0-f65.google.com with SMTP id i14so487954pgv.3 for ; Tue, 27 Feb 2018 19:59:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pUvcFHZB0gmxXIk6KYrb0J8r+/ie6VTOJuvKP5z63GU=; b=TSxrL4HEX6qHL5OZctrCfHUc8hJC4pV6aomyCHyljm+Hv3cGgvhKfDvdiWrkJcfEAI wbyA6qlhwkXQ4XsdI1jnqyM2aGCBYHIbxO53Gv5BZ2HgzOrYJsWJ7KNTdPVduAEsyr3a h9JFV0gnHXZQgDk8nq+wG3nZuEfZrmDu2UtpA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pUvcFHZB0gmxXIk6KYrb0J8r+/ie6VTOJuvKP5z63GU=; b=BcVP9n7OP6GQ13sPdmOt8/vPkG00b0tBH4ZMkqJrfQ10d/fAP2QODOeaJwct3uilrz Tmr83SY9D+xOP/8/Wx3QWtVZVKVbgmQl1MD5VeFh96zChby8AyOiLnzbJ0RlXCouAvE/ Xr9la41I3zO61Z741SSFmY0qXRp2MQr/sbWakbzcb3IQuDEi3E9rDOtimBEuyBIxpK8v Td2yy0H+tOyXcBGMegtxffOur5uBMwJ6Ych5cR1w9VThjadCqi0luvpcbyNQNYNRcQ8f bKvs3VbW+pGBf9vI5Za72q4Op1s+JBBKdHi4obVlIq3iIlfJQAM20bxMUX59BYMM7z53 N4uQ== X-Gm-Message-State: APf1xPBWGmoanC9bzYrOKEs2H4tnQt7/uTkqyEsC4MJVhDZ90hdEUdKw m8dYJ6Zok4AmleuMlz+yegKaGg== X-Received: by 10.101.98.85 with SMTP id q21mr12848320pgv.182.1519790349384; Tue, 27 Feb 2018 19:59:09 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id q17sm739911pgt.7.2018.02.27.19.59.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Feb 2018 19:59:08 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alex Shi Subject: [PATCH 13/29] arm64: tls: Avoid unconditional zeroing of tpidrro_el0 for native tasks Date: Wed, 28 Feb 2018 11:56:35 +0800 Message-Id: <1519790211-16582-14-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> References: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit 18011eac28c7 upstream. When unmapping the kernel at EL0, we use tpidrro_el0 as a scratch register during exception entry from native tasks and subsequently zero it in the kernel_ventry macro. We can therefore avoid zeroing tpidrro_el0 in the context-switch path for native tasks using the entry trampoline. Reviewed-by: Mark Rutland Tested-by: Laura Abbott Tested-by: Shanker Donthineni Signed-off-by: Will Deacon Signed-off-by: Alex Shi Conflicts: fold tls_preserve_current_state() in arch/arm64/kernel/process.c --- arch/arm64/kernel/process.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 0e73949..0972ce5 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -306,17 +306,17 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, static void tls_thread_switch(struct task_struct *next) { - unsigned long tpidr, tpidrro; + unsigned long tpidr; tpidr = read_sysreg(tpidr_el0); *task_user_tls(current) = tpidr; - tpidr = *task_user_tls(next); - tpidrro = is_compat_thread(task_thread_info(next)) ? - next->thread.tp_value : 0; + if (is_compat_thread(task_thread_info(next))) + write_sysreg(next->thread.tp_value, tpidrro_el0); + else if (!arm64_kernel_unmapped_at_el0()) + write_sysreg(0, tpidrro_el0); - write_sysreg(tpidr, tpidr_el0); - write_sysreg(tpidrro, tpidrro_el0); + write_sysreg(*task_user_tls(next), tpidr_el0); } /* Restore the UAO state depending on next's addr_limit */ From patchwork Wed Feb 28 03:56:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 129909 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp569425lja; Tue, 27 Feb 2018 20:00:38 -0800 (PST) X-Google-Smtp-Source: AH8x225wUYNCRb7Yr/HRH3nFyyS96s3tcxQdMUpxaKYLHiJ+rvsfD6qGhj5cvNmmksntxsBQhF0+ X-Received: by 2002:a17:902:b28a:: with SMTP id u10-v6mr16250569plr.292.1519790438416; Tue, 27 Feb 2018 20:00:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519790438; cv=none; d=google.com; s=arc-20160816; b=y4648Xaf3ESDjuGDukM8csWln0YRJMbKGJGSA8FNkzT6t1VD6fPIqapggWKyOJXttQ 9OzBqQ6z9rzmDjjj4xyrwX3mcHr8Y0hdmEmBQ3iy1FWDr9TVGz6yW8Ey5qmF7uWzNRfL OvcD774dtNBvW6QCDlSWrNxXyJUQftcC++puFt2XOkcQwF91gjPI1m/nLFibMTJWYDAr 2x0i2TrZ8eZ9QdKxGJElzja2o9stPdE3B4rZcgzIOslpNO5dghQfMLdZ5boSLD9NQd0f 6ztySEdc+j0tXbn5IbO5WI+hpqFdChnkVrIJntqDERJWPWH3lsLn1dFqWCVK2kc0pTI8 ioNA== 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=mYI9hVlX+A1UhBZZtOVFtY/jGzDIohyGCUWHl33Z7RM=; b=e0ZQ0PhY/FxOADwTcyIb64ruKZG+UCxIAxsz8lBfxeDCSzGDjTWurydT4rUFyDWGFU sdn3F2nbWJSlYKTwfzzVYzVwaYnlkRqk1VZp53F0mOOcp6aTdRC3Epk1ZcC8oThX66II iYFQmicYFMU/OcSGBeLZtKqJLonJTQcjvA459/dnu4EAcrsoc5sWzUhcBz2/fFknfbzI UGLGZzO7Dt8jGelYF9XRh5RgX58t33zMiO5wE+Hc839EfbeUjIoJbOCuZH8RhwPGI0tK z49iWWvQZgeDaEenVxdzodjiz0V+7KzF3Kv0oeajCMQhUTI13f/qtBEFAwnVhcOSsX/k MkEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A6UnT8xk; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g17-v6si571790plo.357.2018.02.27.20.00.38; Tue, 27 Feb 2018 20:00:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A6UnT8xk; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368AbeB1EAf (ORCPT + 10 others); Tue, 27 Feb 2018 23:00:35 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:35208 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752339AbeB1EAc (ORCPT ); Tue, 27 Feb 2018 23:00:32 -0500 Received: by mail-pl0-f67.google.com with SMTP id bb3-v6so779837plb.2 for ; Tue, 27 Feb 2018 20:00:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mYI9hVlX+A1UhBZZtOVFtY/jGzDIohyGCUWHl33Z7RM=; b=A6UnT8xkC++L73mAAWRsuF0rN9V4e2vc6BAUuHpJHmWyRJy/DHTUDkXwGL14bh7mjK ViNx1I/sgQTTHh6U2ZMY/i/iYzuvpIVCtcieqaVjq+OO8nu77YbUPQYfLsun+/Jx1LoV bFaYY21cUFSwZsF1pPHRUaLXAV9YbKAR69dqI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mYI9hVlX+A1UhBZZtOVFtY/jGzDIohyGCUWHl33Z7RM=; b=BnPEUhqx9MLFzWku8x4gVspb+lNJvIdO9C4DWtwIi6sgDKMF/yTQ0iaCWOcYWJ0yb8 PjDuR9v0+drPJmcEiR+VsWwCCb667EBCCa4hHEZ3TSYGSWCn+1iCF0x4DGYYi1p9HLny Jk6xu1L8yxY49JfYchph5tXE9Q2TaDnGtTkEXirRQOyOEZPbXZRWqXlAPI7mKvtQlwb4 2r0RKCL0h2RjDk/Zs+c8t3HL62iTUc/kQzzAT2QITSBGafSVGo/MsRkFIkmv2IEDPoq0 JfctCKmgdJryiqu3M6X9JVND6G+EKuRV7I93uUpus2eNupjQRUHJ0fCe1oEvIEI1Bh6+ o7Ag== X-Gm-Message-State: APf1xPAbEJs5dfj8Js3x/6PQfLHq6EIBy5KtNUzvuzrpC7bHpz3hc4Xe OQ7mzUjv8nETwAgwOT4+TmC9bLBctHY= X-Received: by 2002:a17:902:10d:: with SMTP id 13-v6mr16322078plb.266.1519790432043; Tue, 27 Feb 2018 20:00:32 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id q17sm739911pgt.7.2018.02.27.20.00.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Feb 2018 20:00:31 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alex Shi Subject: [PATCH 25/29] arm64: kpti: Make use of nG dependent on arm64_kernel_unmapped_at_el0() Date: Wed, 28 Feb 2018 11:56:47 +0800 Message-Id: <1519790211-16582-26-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> References: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon commit 41acec624087 upstream. To allow systems which do not require kpti to continue running with global kernel mappings (which appears to be a requirement for Cavium ThunderX due to a CPU erratum), make the use of nG in the kernel page tables dependent on arm64_kernel_unmapped_at_el0(), which is resolved at runtime. Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Alex Shi --- arch/arm64/include/asm/kernel-pgtable.h | 12 ++---------- arch/arm64/include/asm/pgtable-prot.h | 30 ++++++++++++++---------------- 2 files changed, 16 insertions(+), 26 deletions(-) -- 2.7.4 diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h index 135e829..be151cc 100644 --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -73,16 +73,8 @@ /* * Initial memory map attributes. */ -#define _SWAPPER_PTE_FLAGS (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) -#define _SWAPPER_PMD_FLAGS (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) - -#ifdef CONFIG_UNMAP_KERNEL_AT_EL0 -#define SWAPPER_PTE_FLAGS (_SWAPPER_PTE_FLAGS | PTE_NG) -#define SWAPPER_PMD_FLAGS (_SWAPPER_PMD_FLAGS | PMD_SECT_NG) -#else -#define SWAPPER_PTE_FLAGS _SWAPPER_PTE_FLAGS -#define SWAPPER_PMD_FLAGS _SWAPPER_PMD_FLAGS -#endif +#define SWAPPER_PTE_FLAGS (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) +#define SWAPPER_PMD_FLAGS (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) #if ARM64_SWAPPER_USES_SECTION_MAPS #define SWAPPER_MM_MMUFLAGS (PMD_ATTRINDX(MT_NORMAL) | SWAPPER_PMD_FLAGS) diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h index 84b5283..f705d96 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -37,13 +37,11 @@ #define _PROT_DEFAULT (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) #define _PROT_SECT_DEFAULT (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) -#ifdef CONFIG_UNMAP_KERNEL_AT_EL0 -#define PROT_DEFAULT (_PROT_DEFAULT | PTE_NG) -#define PROT_SECT_DEFAULT (_PROT_SECT_DEFAULT | PMD_SECT_NG) -#else -#define PROT_DEFAULT _PROT_DEFAULT -#define PROT_SECT_DEFAULT _PROT_SECT_DEFAULT -#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ +#define PTE_MAYBE_NG (arm64_kernel_unmapped_at_el0() ? PTE_NG : 0) +#define PMD_MAYBE_NG (arm64_kernel_unmapped_at_el0() ? PMD_SECT_NG : 0) + +#define PROT_DEFAULT (_PROT_DEFAULT | PTE_MAYBE_NG) +#define PROT_SECT_DEFAULT (_PROT_SECT_DEFAULT | PMD_MAYBE_NG) #define PROT_DEVICE_nGnRnE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRnE)) #define PROT_DEVICE_nGnRE (PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_ATTRINDX(MT_DEVICE_nGnRE)) @@ -55,22 +53,22 @@ #define PROT_SECT_NORMAL (PROT_SECT_DEFAULT | PMD_SECT_PXN | PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL)) #define PROT_SECT_NORMAL_EXEC (PROT_SECT_DEFAULT | PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL)) -#define _PAGE_DEFAULT (PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL)) -#define _HYP_PAGE_DEFAULT (_PAGE_DEFAULT & ~PTE_NG) +#define _PAGE_DEFAULT (_PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL)) +#define _HYP_PAGE_DEFAULT _PAGE_DEFAULT -#define PAGE_KERNEL __pgprot(_PAGE_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_WRITE) -#define PAGE_KERNEL_RO __pgprot(_PAGE_DEFAULT | PTE_PXN | PTE_UXN | PTE_DIRTY | PTE_RDONLY) -#define PAGE_KERNEL_ROX __pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY | PTE_RDONLY) -#define PAGE_KERNEL_EXEC __pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY | PTE_WRITE) -#define PAGE_KERNEL_EXEC_CONT __pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY | PTE_WRITE | PTE_CONT) +#define PAGE_KERNEL __pgprot(PROT_NORMAL) +#define PAGE_KERNEL_RO __pgprot((PROT_NORMAL & ~PTE_WRITE) | PTE_RDONLY) +#define PAGE_KERNEL_ROX __pgprot((PROT_NORMAL & ~(PTE_WRITE | PTE_PXN)) | PTE_RDONLY) +#define PAGE_KERNEL_EXEC __pgprot(PROT_NORMAL & ~PTE_PXN) +#define PAGE_KERNEL_EXEC_CONT __pgprot((PROT_NORMAL & ~PTE_PXN) | PTE_CONT) #define PAGE_HYP __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_HYP_XN) #define PAGE_HYP_EXEC __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY) #define PAGE_HYP_RO __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY | PTE_HYP_XN) #define PAGE_HYP_DEVICE __pgprot(PROT_DEVICE_nGnRE | PTE_HYP) -#define PAGE_S2 __pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY) -#define PAGE_S2_DEVICE __pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_UXN) +#define PAGE_S2 __pgprot(_PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY) +#define PAGE_S2_DEVICE __pgprot(_PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_UXN) #define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) | PTE_PROT_NONE | PTE_NG | PTE_PXN | PTE_UXN) #define PAGE_SHARED __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN | PTE_UXN | PTE_WRITE)