From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0119BC3DA4A for ; Fri, 16 Aug 2024 14:17:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C3588D007F; Fri, 16 Aug 2024 10:17:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 773498D007E; Fri, 16 Aug 2024 10:17:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 661F28D007F; Fri, 16 Aug 2024 10:17:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4A2D68D007E for ; Fri, 16 Aug 2024 10:17:08 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D45AB121BE7 for ; Fri, 16 Aug 2024 14:17:07 +0000 (UTC) X-FDA: 82458310494.10.976B51D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 1D8C84000D for ; Fri, 16 Aug 2024 14:17:05 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723817789; a=rsa-sha256; cv=none; b=qpLTxc+4WtPTPxDKl8FgLeNsJPkVISP2IUBYBKcJH6ysNKn/5/CYtyjlL9YhYiF2M5Yjy+ bsIh1/D8ZrhLyoTTVUP757C8a4z/57hrPC/X5tDlDCYpR+pZ5S7Wxw8DzCsuF7QVNuBYQe iOLxhme7CXZcerVjK5AkGiP++1Q9p4s= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; spf=pass (imf11.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723817788; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vrY2sOlVJ0UJ56PU8NJWAu5fYS33qEYwsBfP3deGPUs=; b=wH1HkAOP+wJsDdPTz8Z+GnfnFYwr67zKCHzxMU1XYuN5ZxBFz4OGpKzOGF118aqTcHwAUJ MRi4F1do78hlI5iEr/YkxNL+gAa91Pi/8H1pY0Lj6BEXaLbub4VxAfDnTvKILyasTENzYA Jiqvf0dQgwN1cpD2c6+p7QS9x4ZgSZk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 44DE1621F5; Fri, 16 Aug 2024 14:17:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99A30C32782; Fri, 16 Aug 2024 14:16:59 +0000 (UTC) Date: Fri, 16 Aug 2024 15:16:57 +0100 From: Catalin Marinas To: Mark Brown Cc: Will Deacon , Jonathan Corbet , Andrew Morton , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Arnd Bergmann , Oleg Nesterov , Eric Biederman , Shuah Khan , "Rick P. Edgecombe" , Deepak Gupta , Ard Biesheuvel , Szabolcs Nagy , Kees Cook , "H.J. Lu" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Florian Weimer , Christian Brauner , Thiago Jung Bauermann , Ross Burton , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: Re: [PATCH v10 11/40] arm64/mm: Allocate PIE slots for EL0 guarded control stack Message-ID: References: <20240801-arm64-gcs-v10-0-699e2bd2190b@kernel.org> <20240801-arm64-gcs-v10-11-699e2bd2190b@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240801-arm64-gcs-v10-11-699e2bd2190b@kernel.org> X-Stat-Signature: df8me3etmrar8gwm55cdo7bcrfn9z6p1 X-Rspamd-Queue-Id: 1D8C84000D X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1723817825-958635 X-HE-Meta: U2FsdGVkX19QA5ddDczIFWqnOymy47q+R3S5n+LqimMaGaXWGfnfk/BADUcyAgSboLb8m+JRPZikzNP5YoH5zJlBp4oth0Boi8a0G3pLetImKpv9w69NaEdsrWsnHUorGPv8QZDHpO7VSakojVoLLgvDdBSrxfIMvJ+WlEsGSjwEXrqtuU1nw/iJeQZyuB/vPj0L8PO6q8HcFjUFlY++nNKwqVAzzZIx1IYXLMJOBZCRWJzf1MeIUvMvQepsiAf4Dm01ciK1DZjtET7WvQcRNGuL0GRmULO0pSQi+Zb1K8om2AutX8RzMOg+sAcKBuND3OB5O/Wj0/yJpXh+AzHeugqbfyRKArNDs+vCNN//hw2xwjRQs4lqmVdntH/NS8a4FJZ9iYKcgIMzbd6+dX197RPDOcGHFXAoJB3ZSVZThSYoewzYJ45wVJawawrvaabZM2zxRTSNgMlPMHMTg4r+hws+YBkobKAyEpdXPbJi5V2vMCZ/GfDT/19edGMatTMiRwwS9ddOiKiJErofzXgQAeEYm9dC4aKcXF4wqW1M/Nw16dq99es3gBGyNaIgzRDdn5Kqg1j32bdibcxAPM3njZPF7Yx/jo1igqbMRXOXPOsD/43ioiAeBcTfDKtlEzN4Zo3FTwf6HAfRsSAFMmwChV1a66DbSatYaNMiPa6xRe+SX0+jTVzMal9NMbPkHsUMpXaVoiOyl2ara/C+9Ky/K1zteIPE58oWiDR332FUaDZFmJW0wxwbJjWis7oQtITnp550/DJToxUEu9RpZe6aYUM5ZvLCCJm3gM64VNhmWSAhylf7PqRhptQsTFsrXD9fGaQ1AxnDpStbmao0D2826p5ZM/ZUOaHp8OTbYPmecxiX55ykeYkf+nd+8jwlPIOOSg3YXzPqUFhds32FM3HuoLwwyyVOzzNCszASfvkc5nPo/okPaVermRfc8GVT8614dyVyWs6tgjsHdCniZK2 LAISmRq4 jNpgneawovT+3qO6rPtaz+AE6qju3SNnfziQniVI00hfR3zVZtputnecx8o4bSMPLcNKpCzxPbsu5XZnM8yik9ecM8uyns8L6quO2roKMUINk/+m9kQxWABcD+bjGTVI+K/pXlzH72PdsTMHF8edZRZJ+huIG/d/YZS4U6LYR/sU8U6kzYwTvj9uJ9CIUCBqMJaodB/IZguI7r9MoLMk4rfkpwH6blkw+OSGBzjxE+HR4Am9r06PDyADOVMX21+uV7wQ7vRSWY2aDOKyeKSX0d06AJ3OLkuQW9BzeN7ISo5G6SpOp5BNM++ujT2juYQwISkONY6oxjNjwIZ1uoO/FgZkwZo1BzYCVKbYX/5wpB5ZosIN2FjEWjOVgtkpUOWmtcOYwyRYcOmRGNfwUFg3ipzSZ14rE39kJ03NXm32IS8++wsE84lGzYRauIWDjDmGbq0e+HxKkJNTrDHVvCdfTt9KVEhnoau0POuI2 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Thu, Aug 01, 2024 at 01:06:38PM +0100, Mark Brown wrote: > diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h > index b11cfb9fdd37..545d54c88520 100644 > --- a/arch/arm64/include/asm/pgtable-prot.h > +++ b/arch/arm64/include/asm/pgtable-prot.h > @@ -144,15 +144,23 @@ static inline bool __pure lpa2_is_enabled(void) > /* 6: PTE_PXN | PTE_WRITE */ > /* 7: PAGE_SHARED_EXEC PTE_PXN | PTE_WRITE | PTE_USER */ > /* 8: PAGE_KERNEL_ROX PTE_UXN */ > -/* 9: PTE_UXN | PTE_USER */ > +/* 9: PAGE_GCS_RO PTE_UXN | PTE_USER */ > /* a: PAGE_KERNEL_EXEC PTE_UXN | PTE_WRITE */ > -/* b: PTE_UXN | PTE_WRITE | PTE_USER */ > +/* b: PAGE_GCS PTE_UXN | PTE_WRITE | PTE_USER */ > /* c: PAGE_KERNEL_RO PTE_UXN | PTE_PXN */ > /* d: PAGE_READONLY PTE_UXN | PTE_PXN | PTE_USER */ > /* e: PAGE_KERNEL PTE_UXN | PTE_PXN | PTE_WRITE */ > /* f: PAGE_SHARED PTE_UXN | PTE_PXN | PTE_WRITE | PTE_USER */ > > +#define _PAGE_GCS (_PAGE_DEFAULT | PTE_NG | PTE_UXN | PTE_WRITE | PTE_USER) > +#define _PAGE_GCS_RO (_PAGE_DEFAULT | PTE_NG | PTE_UXN | PTE_USER) > + > +#define PAGE_GCS __pgprot(_PAGE_GCS) > +#define PAGE_GCS_RO __pgprot(_PAGE_GCS_RO) > + > #define PIE_E0 ( \ > + PIRx_ELx_PERM(pte_pi_index(_PAGE_GCS), PIE_GCS) | \ > + PIRx_ELx_PERM(pte_pi_index(_PAGE_GCS_RO), PIE_R) | \ > PIRx_ELx_PERM(pte_pi_index(_PAGE_EXECONLY), PIE_X_O) | \ > PIRx_ELx_PERM(pte_pi_index(_PAGE_READONLY_EXEC), PIE_RX) | \ > PIRx_ELx_PERM(pte_pi_index(_PAGE_SHARED_EXEC), PIE_RWX) | \ > @@ -160,6 +168,8 @@ static inline bool __pure lpa2_is_enabled(void) > PIRx_ELx_PERM(pte_pi_index(_PAGE_SHARED), PIE_RW)) > > #define PIE_E1 ( \ > + PIRx_ELx_PERM(pte_pi_index(_PAGE_GCS), PIE_NONE_O) | \ > + PIRx_ELx_PERM(pte_pi_index(_PAGE_GCS_RO), PIE_NONE_O) | \ It's fine to keep PIE_NONE_O here, the kernel wouldn't need to access this memory with unprivileged instructions (it only matters for the futex code using LDXR/STXR). Reviewed-by: Catalin Marinas