From patchwork Mon Aug 7 22:00:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13345065 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 84675C001B0 for ; Mon, 7 Aug 2023 22:01:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9DE106B0071; Mon, 7 Aug 2023 18:01:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 966F28D0003; Mon, 7 Aug 2023 18:01:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7B9728D0001; Mon, 7 Aug 2023 18:01:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 667026B0071 for ; Mon, 7 Aug 2023 18:01:36 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3B32F1C8A59 for ; Mon, 7 Aug 2023 22:01:36 +0000 (UTC) X-FDA: 81098680992.04.BEB5602 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id 878CF180011 for ; Mon, 7 Aug 2023 22:01:33 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T8T8Xx4A; spf=pass (imf24.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691445693; 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:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=7hGAzN9Q6nEXRFW3j/ad+oAmOZFHzfSbl3r6yZw+ICk=; b=NQDeufzi7d9yYICr9lnmuyCwsIinE6JrQakvK1tcz9kJ2JsJKDFS42ThQUJuLm50+LL8zS 11A6Kxc8yRMTGqEllX8Hc2ASzGiByE9eTZg6Wy+1lVM2LzSGwIfQ4wf6MkaW38KQlaHjiH wkctaXAe+3CbqULqn899stjZdvGPE6k= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T8T8Xx4A; spf=pass (imf24.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691445693; a=rsa-sha256; cv=none; b=knLF5Z0Fkypn/OIhkpjXAJ7OKda90agqUNZDSb619iemehQt+PlQKSUlISfjg/FbfDybe4 rVyFRNxNUJ45ZHj8Y8FzY/AGIteSLHy6B2UAQ99hobj+HMz1qB3/2CD+G9c85lgAoI5rF0 R4wzodIxK3iR7WeEJN+8veSpNqPClDU= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 26AE262233; Mon, 7 Aug 2023 22:01:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A37D1C433C9; Mon, 7 Aug 2023 22:01:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691445691; bh=5h75UStK+DskPC55whICX+QjKX1XfHqMUW2ZTrq2RP4=; h=From:Subject:Date:To:Cc:From; b=T8T8Xx4AyKOTOlAmtujUGmW+sXFzz7XrrOBeilKC1Hwf4YIUeYJD65mSyzQ+A5loh dSHcy9rQoGmRoNTjqx1vUIgEi4HpiEKMxrPw3gulyEnXDkDJB5UvBJeJ7U9+PV4sOA yC98VScjVqdmTOMka+Hsp9dBjQhJaOd3FymIQyfFf6dBgmdhjMI3r9Ajn0Pt9SBmYf iuQG3YNuUwESZmiZsiyEy6nc4VFKBVJubE7ni4AvkvsNbUs68nR56xZhS0i3s6INNA GP9mmtHa8xCHa2A9XkNgX7IyKC3kbFRz+lVNEpKwaMgU8GJYF7iCdu+bsGXc1XbXiF DQgMMtDbrccMw== From: Mark Brown Subject: [PATCH v4 00/36] arm64/gcs: Provide support for GCS in userspace Date: Mon, 07 Aug 2023 23:00:05 +0100 Message-Id: <20230807-arm64-gcs-v4-0-68cfa37f9069@kernel.org> MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAGZp0WQC/2XNyw6CMBAF0F8hXVvTl0Bd+R/GRR9TaNRCWkI0h H+34KbGzOpO5txZUILoIaFztaAIs09+CDmIQ4VMr0IH2NucESOMkzxYxWctcGcSBk6p0sS2DZM o32uVAOuoguk3MT3HbTtGcP61f7jecu59mob43h/OdNt+uxtaF90zxQRrd6obJ7nWqr7cIQZ4H IfYoa1mZgVloqQsU2uYoVYIw0D/UV5QTkvKMzXWOulkS6xsf+i6rh+fVKICLwEAAA== To: Catalin Marinas , Will Deacon , Jonathan Corbet , Andrew Morton , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Arnd Bergmann , Oleg Nesterov , Eric Biederman , Kees Cook , Shuah Khan , "Rick P. Edgecombe" , Deepak Gupta , Ard Biesheuvel , Szabolcs Nagy Cc: "H.J. Lu" , Paul Walmsley , Palmer Dabbelt , Albert Ou , 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, Mark Brown X-Mailer: b4 0.13-dev-034f2 X-Developer-Signature: v=1; a=openpgp-sha256; l=11777; i=broonie@kernel.org; h=from:subject:message-id; bh=5h75UStK+DskPC55whICX+QjKX1XfHqMUW2ZTrq2RP4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBk0WmXQjCRbqTbdNb2gKgonZTRrAwoj1woOqTJWrIC xtSnK/6JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZNFplwAKCRAk1otyXVSH0Op5B/ 4/BNi252yYsCnQ6r/oAtjQs98A6Wa7rnFedOqvcNnirmuDVXvwTX9ffRUbGc/Ob+0PRSY2KOY3ybLh LVu7+fk9FKBEZHR51cnNovBtB399D91i1toVnO868yA87LBgLkFicSOT4sF3ZEKUh3u6Qux/BEF0XH L9qy03UoqRyexpJHa7f6Ao45pbfarJnA2ZA7/YPE7s4CnOBuz+OF4k5ahjTN4tO3JdWjQ7kvX5Wme8 dWeqzxSCM9qZdd8+lqJ71Zz6r7ugpNoN6MS2Pn5e0HQDdngpMdn6VFXzWEY7xEsDgQxZvicPdZpYXz u0tGohV4hU5Fqqss3vyXzhNbk0sv8x X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Queue-Id: 878CF180011 X-Rspam-User: X-Stat-Signature: ump87obq53o4mo4a1nwytxhfrmsdbqao X-Rspamd-Server: rspam01 X-HE-Tag: 1691445693-209566 X-HE-Meta: U2FsdGVkX1+pH1v90sRocEiQcBxrrVFQ6G3D7TcCSgLlmzw26qvl5hejX/dTREvv09e5MZUIcPCJ1sZKNua43gMaScTlEnl45BV6jfGZNnqIhMWbUWbmOk6NDYxA8NQ4LgpE+7aGKDykC+ui/jZmbpCnAfBD688wcqRBM//YUyuSqCe4CSmraNo9lDedXcTkLLXVc/e8wfCISSH3Ngis30xVEzsn1gLcN9U7Q98pHAACn7g3bgMBGCySXXYRvp6WgwPMepCrclG44mEqI38BTqQb82h+VqA2fl77Npe+Z5XpEMMd/xTjQRUrW2NKLx/EpE+5mSDCxu48DnqKJQt9+eADXaR7DF1mXwCgU7GQJsCegy5hR/teedK74IkELUOmrBc0kJuDPqYqVCxR4/KsVQk+mUCF7j18DPlH5TYw3Vpxj0KzpRMPQe/gp08WGQMqJuuqujbA/c1maQVayoxY4sDwS7yiLjwxjsMlHU+CPDMC3igWlWIlwuOa3WHpefqtpY65cK01gTKW2GioOeljxQ9r+f20rWsEpKvFysx3uxId3i6iTeKV3XbGwl1aGhumtSX5UJpgG9K0zdd5+I6ficJU5I2hjOijVKouyDeyUpyJvYDjrnVR2SRryV8GJ7hw0SfwAuECcHRd8Orb4noyD5dF4UecEFZcF43ORDVB78nV3PZt/X4my+g92xio/OF4zWBXrAyjEqUnh5CDDdFNQRZouYSZTC7VzK4Gy2x6kq+/Fj8sWOpiHKr85YNNuXzJhrGDbVEkDMOysW9UgzDX4QUIT4FQuXccXC9Lebv/oF/9h7pUN/yK/OZfiatxKlEN8K4cxISrZXQlyxvy3n/qmA4bkYHNamOxm1e1PFMJTgKdzvqd5YlGUbYBRo/4u8J+NGPuhmN9wBYPXKfNfMPJ9gKGIjnu0Lhy8wNYLwF7Ds7fIVRSzrIRMK6EbOtaij/QQaV1QvuSO6jjePxhV2k p/GxbPu+ RAK2jcdM4sBmozubn3c4wsUoVFIUk9erLMYU9vr+vT/64eS9QvByNIc908juYQ/q94P7dqusRmh3d4r69rOSB/UKXWY60XUz5l1cy3Nwsm92IZpCaiw0igJKztAUZGDRLphtHBQrALauBlNb11WPlw2fhZhW8m58/YAzY/uLqTtq8k/hasCgtjdzHH/Ta4sDVk2609Sm8HmdNJ3CMqjmFxvpLvJx97SdxcFKt+qGnIlC2l7ssQ0/KFwYg8RVpifBQ7xyrkhlvZptviA1MDl68VOsy3hs09XKvjU2Q5BeAGGsN3hOJpBbmcpQrFQXQh3yXVZSR9K/Hhd+RDQgD/DEGfuYP2OIukZYLk7EMVJTpeHkDsAds+wvLNHoVF98tSy0Tgqca1UHLnReyx+v9jRAHvQWSsm4xwz8zvy3WkENBuNzpMfGkNLwyXEpXUu/9CZpxKz3pb/am+0bi/i8xjih9GZnJYY39yDccypmimnEQhn7h2cGvrbpK9/PeupymRswByKH/ 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: The arm64 Guarded Control Stack (GCS) feature provides support for hardware protected stacks of return addresses, intended to provide hardening against return oriented programming (ROP) attacks and to make it easier to gather call stacks for applications such as profiling. When GCS is active a secondary stack called the Guarded Control Stack is maintained, protected with a memory attribute which means that it can only be written with specific GCS operations. The current GCS pointer can not be directly written to by userspace. When a BL is executed the value stored in LR is also pushed onto the GCS, and when a RET is executed the top of the GCS is popped and compared to LR with a fault being raised if the values do not match. GCS operations may only be performed on GCS pages, a data abort is generated if they are not. The combination of hardware enforcement and lack of extra instructions in the function entry and exit paths should result in something which has less overhead and is more difficult to attack than a purely software implementation like clang's shadow stacks. This series implements support for use of GCS by userspace, along with support for use of GCS within KVM guests. It does not enable use of GCS by either EL1 or EL2, this will be implemented separately. Executables are started without GCS and must use a prctl() to enable it, it is expected that this will be done very early in application execution by the dynamic linker or other startup code. x86 has an equivalent feature called shadow stacks, this series depends on the x86 patches for generic memory management support for the new guarded/shadow stack page type and shares APIs as much as possible. As there has been extensive discussion with the wider community around the ABI for shadow stacks I have as far as practical kept implementation decisions close to those for x86, anticipating that review would lead to similar conclusions in the absence of strong reasoning for divergence. The main divergence I am concious of is that x86 allows shadow stack to be enabled and disabled repeatedly, freeing the shadow stack for the thread whenever disabled, while this implementation keeps the GCS allocated after disable but refuses to reenable it. This is to avoid races with things actively walking the GCS during a disable, we do anticipate that some systems will wish to disable GCS at runtime but are not aware of any demand for subsequently reenabling it. x86 uses an arch_prctl() to manage enable and disable, since only x86 and S/390 use arch_prctl() a generic prctl() was proposed[1] as part of a patch set for the equivalent RISC-V zisslpcfi feature which I initially adopted fairly directly but following review feedback has been revised quite a bit. There is an open issue with support for CRIU, on x86 this required the ability to set the GCS mode via ptrace. This series supports configuring mode bits other than enable/disable via ptrace but it needs to be confirmed if this is sufficient. There's a few bits where I'm not convinced with where I've placed things, in particular the GCS write operation is in the GCS header not in uaccess.h, I wasn't sure what was clearest there and am probably too close to the code to have a clear opinion. The reporting of GCS in /proc/PID/smaps is also a bit awkward. The series depends on the x86 shadow stack support: https://lore.kernel.org/lkml/20230227222957.24501-1-rick.p.edgecombe@intel.com/ I've rebased this onto v6.5-rc4 but not included it in the series in order to avoid confusion with Rick's work and cut down the size of the series, you can see the branch at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git arm64-gcs [1] https://lore.kernel.org/lkml/20230213045351.3945824-1-debug@rivosinc.com/ Signed-off-by: Mark Brown --- Changes in v4: - Implement flags for map_shadow_stack() allowing the cap and end of stack marker to be enabled independently or not at all. - Relax size and alignment requirements for map_shadow_stack(). - Add more blurb explaining the advantages of hardware enforcement. - Link to v3: https://lore.kernel.org/r/20230731-arm64-gcs-v3-0-cddf9f980d98@kernel.org Changes in v3: - Rebase onto v6.5-rc4. - Add a GCS barrier on context switch. - Add a GCS stress test. - Link to v2: https://lore.kernel.org/r/20230724-arm64-gcs-v2-0-dc2c1d44c2eb@kernel.org Changes in v2: - Rebase onto v6.5-rc3. - Rework prctl() interface to allow each bit to be locked independently. - map_shadow_stack() now places the cap token based on the size requested by the caller not the actual space allocated. - Mode changes other than enable via ptrace are now supported. - Expand test coverage. - Various smaller fixes and adjustments. - Link to v1: https://lore.kernel.org/r/20230716-arm64-gcs-v1-0-bf567f93bba6@kernel.org --- Mark Brown (36): prctl: arch-agnostic prctl for shadow stack arm64: Document boot requirements for Guarded Control Stacks arm64/gcs: Document the ABI for Guarded Control Stacks arm64/sysreg: Add new system registers for GCS arm64/sysreg: Add definitions for architected GCS caps arm64/gcs: Add manual encodings of GCS instructions arm64/gcs: Provide copy_to_user_gcs() arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) arm64/mm: Allocate PIE slots for EL0 guarded control stack mm: Define VM_SHADOW_STACK for arm64 when we support GCS arm64/mm: Map pages for guarded control stack KVM: arm64: Manage GCS registers for guests arm64/gcs: Allow GCS usage at EL0 and EL1 arm64/idreg: Add overrride for GCS arm64/hwcap: Add hwcap for GCS arm64/traps: Handle GCS exceptions arm64/mm: Handle GCS data aborts arm64/gcs: Context switch GCS state for EL0 arm64/gcs: Allocate a new GCS for threads with GCS enabled arm64/gcs: Implement shadow stack prctl() interface arm64/mm: Implement map_shadow_stack() arm64/signal: Set up and restore the GCS context for signal handlers arm64/signal: Expose GCS state in signal frames arm64/ptrace: Expose GCS via ptrace and core files arm64: Add Kconfig for Guarded Control Stack (GCS) kselftest/arm64: Verify the GCS hwcap kselftest/arm64: Add GCS as a detected feature in the signal tests kselftest/arm64: Add framework support for GCS to signal handling tests kselftest/arm64: Allow signals tests to specify an expected si_code kselftest/arm64: Always run signals tests with GCS enabled kselftest/arm64: Add very basic GCS test program kselftest/arm64: Add a GCS test program built with the system libc kselftest/arm64: Add test coverage for GCS mode locking selftests/arm64: Add GCS signal tests kselftest/arm64: Add a GCS stress test kselftest/arm64: Enable GCS for the FP stress tests Documentation/admin-guide/kernel-parameters.txt | 3 + Documentation/arch/arm64/booting.rst | 22 + Documentation/arch/arm64/elf_hwcaps.rst | 3 + Documentation/arch/arm64/gcs.rst | 228 +++++++++ Documentation/arch/arm64/index.rst | 1 + Documentation/filesystems/proc.rst | 2 +- arch/arm64/Kconfig | 19 + arch/arm64/include/asm/cpufeature.h | 6 + arch/arm64/include/asm/el2_setup.h | 17 + arch/arm64/include/asm/esr.h | 28 +- arch/arm64/include/asm/exception.h | 2 + arch/arm64/include/asm/gcs.h | 106 ++++ arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/asm/kvm_arm.h | 4 +- arch/arm64/include/asm/kvm_host.h | 12 + arch/arm64/include/asm/pgtable-prot.h | 14 +- arch/arm64/include/asm/processor.h | 7 + arch/arm64/include/asm/sysreg.h | 20 + arch/arm64/include/asm/uaccess.h | 42 ++ arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/include/uapi/asm/ptrace.h | 8 + arch/arm64/include/uapi/asm/sigcontext.h | 9 + arch/arm64/kernel/cpufeature.c | 19 + arch/arm64/kernel/cpuinfo.c | 1 + arch/arm64/kernel/entry-common.c | 23 + arch/arm64/kernel/idreg-override.c | 2 + arch/arm64/kernel/process.c | 85 ++++ arch/arm64/kernel/ptrace.c | 59 +++ arch/arm64/kernel/signal.c | 237 ++++++++- arch/arm64/kernel/traps.c | 11 + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 17 + arch/arm64/kvm/sys_regs.c | 22 + arch/arm64/mm/Makefile | 1 + arch/arm64/mm/fault.c | 78 ++- arch/arm64/mm/gcs.c | 234 +++++++++ arch/arm64/mm/mmap.c | 12 +- arch/arm64/tools/cpucaps | 1 + arch/arm64/tools/sysreg | 55 +++ fs/proc/task_mmu.c | 3 + include/linux/mm.h | 16 +- include/linux/syscalls.h | 1 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/elf.h | 1 + include/uapi/linux/prctl.h | 22 + kernel/sys.c | 30 ++ kernel/sys_ni.c | 1 + tools/testing/selftests/arm64/Makefile | 2 +- tools/testing/selftests/arm64/abi/hwcap.c | 19 + tools/testing/selftests/arm64/fp/assembler.h | 15 + tools/testing/selftests/arm64/fp/fpsimd-test.S | 2 + tools/testing/selftests/arm64/fp/sve-test.S | 2 + tools/testing/selftests/arm64/fp/za-test.S | 2 + tools/testing/selftests/arm64/fp/zt-test.S | 2 + tools/testing/selftests/arm64/gcs/.gitignore | 5 + tools/testing/selftests/arm64/gcs/Makefile | 24 + tools/testing/selftests/arm64/gcs/asm-offsets.h | 0 tools/testing/selftests/arm64/gcs/basic-gcs.c | 356 ++++++++++++++ tools/testing/selftests/arm64/gcs/gcs-locking.c | 200 ++++++++ .../selftests/arm64/gcs/gcs-stress-thread.S | 311 ++++++++++++ tools/testing/selftests/arm64/gcs/gcs-stress.c | 532 +++++++++++++++++++++ tools/testing/selftests/arm64/gcs/gcs-util.h | 87 ++++ tools/testing/selftests/arm64/gcs/libc-gcs.c | 500 +++++++++++++++++++ tools/testing/selftests/arm64/signal/.gitignore | 1 + .../testing/selftests/arm64/signal/test_signals.c | 17 +- .../testing/selftests/arm64/signal/test_signals.h | 6 + .../selftests/arm64/signal/test_signals_utils.c | 32 +- .../selftests/arm64/signal/test_signals_utils.h | 39 ++ .../arm64/signal/testcases/gcs_exception_fault.c | 59 +++ .../selftests/arm64/signal/testcases/gcs_frame.c | 78 +++ .../arm64/signal/testcases/gcs_write_fault.c | 67 +++ .../selftests/arm64/signal/testcases/testcases.c | 7 + .../selftests/arm64/signal/testcases/testcases.h | 1 + 72 files changed, 3823 insertions(+), 34 deletions(-) --- base-commit: ed0e1456f04be7a93c9a186e8e13aed78b555617 change-id: 20230303-arm64-gcs-e311ab0d8729 Best regards,