From patchwork Tue Oct 1 16:06:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13818433 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 22E07CEACE4 for ; Tue, 1 Oct 2024 16:08:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE0CA2800B9; Tue, 1 Oct 2024 12:08:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D8F66280068; Tue, 1 Oct 2024 12:08:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE3D12800B9; Tue, 1 Oct 2024 12:08:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9BD8C280068 for ; Tue, 1 Oct 2024 12:08:23 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 202FF141653 for ; Tue, 1 Oct 2024 16:08:23 +0000 (UTC) X-FDA: 82625515686.08.C852574 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf18.hostedemail.com (Postfix) with ESMTP id 07A701C0010 for ; Tue, 1 Oct 2024 16:08:20 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=iCiiivm2; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727798732; 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:in-reply-to:references:references:dkim-signature; bh=a4qrRFCNXnOZYa1fD74V0zlcrdQ+HWyEoqE9F8mKpFo=; b=tjD91ClAcX0orMfQOoUfEoQW25bwBwUINpDvA6D6K66MIn0GgUWtzfnqar/U/CJjW/YThw wfs+td8Le3HHSZ6ffMSDGxDvy3Z4HgKJiwhgzqmKcj/a+uO8ZibnYeR/NnpzMmmt/iW2dA GNQ7Ade5ux6vPQtM4W+qwRiOkceAxic= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=iCiiivm2; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727798732; a=rsa-sha256; cv=none; b=OhKcleBeyg/W2JXBBKwG6QZ+ySGhKGG04suKPnoo841pJxzv7i4aiQrwr8XzC3inYIc9gr m7ahbS7N7jQvVa/sqPHcB/5GihzQ817BTYCGoR6FBaJIBA7H/IGveA6hoJoo0AaBvyNqAR SdSkskevWQOtt58yojQ+IGk35hZlES8= Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-7d50a42ce97so2448681a12.0 for ; Tue, 01 Oct 2024 09:08:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1727798900; x=1728403700; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=a4qrRFCNXnOZYa1fD74V0zlcrdQ+HWyEoqE9F8mKpFo=; b=iCiiivm2FlXnKFrE9eYy5gObMX66xhCNz59kAUaZONh9I5L+hvCwGZrnwkbOK8Ob+y nNRj/IlpdokRlaRRH2VaDC6BbOHZak1YMJq0T7g93bGR30kqQV7wlq8sGhiaIUziGd/b sav0ZkluPijhwIo6EUUwtc7KrkGv0CdR69spEIa/3Izn+OSiG/cNg715o5rlPBF2YlHu a39CO0oTCd0+Lin++dP2MOYS5CT53EM1X0HzoXpccKbZbKS1ly+ktgh2kXmirgURfY8S 5PGfH7ndRlwAU5aH2/Kly2WFCi01ivt6BkVX8PNgrSc0l2SW/l3MuKUIw2WH/7B5WPdA Y8bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727798900; x=1728403700; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a4qrRFCNXnOZYa1fD74V0zlcrdQ+HWyEoqE9F8mKpFo=; b=bk7eddkbMhW8iswEsH9W1fAg9l9zif3Zi101pDu5frR5H1eRDqMYQ9pBumiFA+i5qe SdFmtCg+LpSe6P5GvvzjC0sV6MX+gAZsemsSIOQ6n4SeYFzUmKw1TCzDYyOGn5oB5hlY fzTypGpwu9/37iN/ofL/r777Uf8b7yZshzp180xqMV5oeMs0+epHcsILdUBg6ty1zbAk WsYvMHMCV3Ypp1W9LS9JCF3RzAN37equPvTikQBN/UFqdJ4h2Dka0ZMIikJZqG3QufI1 H2eQX7AX6RPtKTlum5Ri67AejP6qO5l5J0lijpGp8Y4LHZEFVvTzkow90KVMfrcDitvz B4KA== X-Forwarded-Encrypted: i=1; AJvYcCXvkOb5tu9KcGJtjSvhBEAxmvjQWK8URbYLLk8mqtSS7JDIENy/GT2wE7fXRlocC8MAz0Pb5SkOXw==@kvack.org X-Gm-Message-State: AOJu0Yyzid2yoU+s6tZ8h89Gqw5RppZgXJhmtUdL3JXvEFX+T0aPIbFk Cw9Uo8aCuE/uDr1pqVxBtaV1MHsFN85vbLFS2DLVXviKgo7D3ORxF2uwWdN1F9A= X-Google-Smtp-Source: AGHT+IGiAxXYx6yXeYkA/G/la8C9nBfo7vSN2Z7fy96K3UGQ0W+8BbkIQQBBecsOmRmnWw0/cNAzkw== X-Received: by 2002:a17:90b:3543:b0:2d8:8175:38c9 with SMTP id 98e67ed59e1d1-2e184804fc6mr237651a91.20.1727798899815; Tue, 01 Oct 2024 09:08:19 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e06e1d7d47sm13843973a91.28.2024.10.01.09.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 09:08:19 -0700 (PDT) From: Deepak Gupta Date: Tue, 01 Oct 2024 09:06:35 -0700 Subject: [PATCH 30/33] riscv: create a config for shadow stack and landing pad instr support MIME-Version: 1.0 Message-Id: <20241001-v5_user_cfi_series-v1-30-3ba65b6e550f@rivosinc.com> References: <20241001-v5_user_cfi_series-v1-0-3ba65b6e550f@rivosinc.com> In-Reply-To: <20241001-v5_user_cfi_series-v1-0-3ba65b6e550f@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 07A701C0010 X-Stat-Signature: wce5rakuatwy5m6trbmqaieqbhq14pdi X-Rspam-User: X-HE-Tag: 1727798900-332904 X-HE-Meta: U2FsdGVkX19h9Vyw7gOWwz3S38i1q0jab+P40iLH47dHlB5i+1AwoKCH6hRvBa1Yx43EMNDC4D8YMddsGLWd8kAL1qsSNUimmOuYygJ0qz0Wqyp/onKmveKgLRMOuMZRFq1cWhHsekL2Kj7MqzJeAIJtxwnWS9n59pFLvl/lIMwv+Lp9iGwosTIqjWwMje2IydXkn9rddBLr5vwULHS9PhDCkF7TkMc3P5waMtrkJ10k1T9A5tG/hLnyAQq5e2kNkbKsYUgCILV05/BPA347kma/2b/slTNi2uNF0e1s7Bjn3KMVWVqlo2ihhotjVR4Ol5txkZi4jhAJyaKPduSvThQwMSVUthJuX73HFWJmqIfEHu2AfMp8HAXk2v9jobwSpzatMOQ92WEPejyYU762WzhF1V2NpYsqcwZyk7yUnjd7y/qGB51h5KjHwFQrM8YQcroxOEFfqJmGaa8xtmU8tEk3AHAqgnmahzs+88e6u1KRDR6GMTSvYaL6+pk56yQHdaiPrgjm5m7q7wqiwDBLucwlEPURl0LoP3OWl8pJiOWm7nBfUSmRx1SOeabmVA5cZ0qpMwRjiaQktVK7HMImtug2gXBaELMVP3LZ2GpDXwiMgGmQhYsDNGeDXZ9YAIvz8/8oN7y2SuKvHkUuhzOFepApJjB1KCKQQKIA2AznP+wGiUjNRvzH8nk6F35+YNPHNSXi7sbubo442JusrCcXb60hMNvZb1xJ46r4A025Ec2i9p53HzhGWnoK48fRvfWVf0w2KDklchBcB6G8HkqwOV/n1Q0oAOTp+1f1Xk0bzwsdKHn5wN8mHAUdRj11Qf9sL5HCLzuuc/YZdCpguyCyTolTwVfDv61BAxVIHzDpDJSVpPd6OZy+1u0z4qPADjI5WjMFjWFCGU7wnjaIIH/ShYm5//KhzGPTvFM8gDWHlBpIA+PUuMgYjQJBiCiHx9yaL+osbjz8icPzw/zo/3L vKSUGJ/G u6IkdywHtI/Yf2kqdm03c+Jrq9CoIx1tEEgx17fk+cq+MUg8iWti5Iu3URS7/TgOrIZguLOQ48WdsXmMWEeBa9cFuIdFLyOxANxQ2mwOWPmHvrqt6mWq6txEhlr/k41zb51KjZBhWa0QYctgcS98ZewW9sPIJ6lrTaGaAbuCee/QHqeybIN/TbUbkKkmp45G27L330hoZFH3GxCYHWoQA2WRCCzn4OWjNenU329nG02GX0VZmVfT2Cke7mMoC/BO25lwMl4McGDbwIXEi/UP9Xr+vMJS7Lc7XEhRSD/ezPgY73Coa3G4uoxxKVkAd2AiFrD3ZlPiULteg9Z6Bf7v3901HW8M6Rtuvkl46vaD8NRi+8UeP5wUKAx1CiaLHtOrDnBi+iSUNmXALr27vrNe1HzZ8z6HIM8JTAE4DqXvjD6p7EdApAsmjdUoeb3N5LC90Ct0zWIxNelAJEVevQ/rQf8c7vULlwqZv8oi6bvqjxxEIlPo= 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: This patch creates a config for shadow stack support and landing pad instr support. Shadow stack support and landing instr support can be enabled by selecting `CONFIG_RISCV_USER_CFI`. Selecting `CONFIG_RISCV_USER_CFI` wires up path to enumerate CPU support and if cpu support exists, kernel will support cpu assisted user mode cfi. If CONFIG_RISCV_USER_CFI is selected, select `ARCH_USES_HIGH_VMA_FLAGS` and `ARCH_HAS_USER_SHADOW_STACK` for riscv. Signed-off-by: Deepak Gupta --- arch/riscv/Kconfig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 808ea66b9537..d0cc2879fcd4 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -245,6 +245,25 @@ config ARCH_HAS_BROKEN_DWARF5 # https://github.com/llvm/llvm-project/commit/7ffabb61a5569444b5ac9322e22e5471cc5e4a77 depends on LD_IS_LLD && LLD_VERSION < 180000 +config RISCV_USER_CFI + def_bool y + bool "riscv userspace control flow integrity" + depends on 64BIT && $(cc-option,-mabi=lp64 -march=rv64ima_zicfiss) + depends on RISCV_ALTERNATIVE + select ARCH_HAS_USER_SHADOW_STACK + select ARCH_USES_HIGH_VMA_FLAGS + help + Provides CPU assisted control flow integrity to userspace tasks. + Control flow integrity is provided by implementing shadow stack for + backward edge and indirect branch tracking for forward edge in program. + Shadow stack protection is a hardware feature that detects function + return address corruption. This helps mitigate ROP attacks. + Indirect branch tracking enforces that all indirect branches must land + on a landing pad instruction else CPU will fault. This mitigates against + JOP / COP attacks. Applications must be enabled to use it, and old user- + space does not get protection "for free". + default y + config ARCH_MMAP_RND_BITS_MIN default 18 if 64BIT default 8