From patchwork Wed Feb 5 01:22:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960383 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 30BD7C02194 for ; Wed, 5 Feb 2025 01:23:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 841FB280023; Tue, 4 Feb 2025 20:22:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 72BF5280016; Tue, 4 Feb 2025 20:22:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 53451280023; Tue, 4 Feb 2025 20:22:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 2BC1D280016 for ; Tue, 4 Feb 2025 20:22:39 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id DEF668047A for ; Wed, 5 Feb 2025 01:22:38 +0000 (UTC) X-FDA: 83084141196.09.A29EECD Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf27.hostedemail.com (Postfix) with ESMTP id 0079140004 for ; Wed, 5 Feb 2025 01:22:36 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=1dFIyYzj; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.43 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=1738718557; 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=opxHamP1ejpgUrZttGLg4zwDHWHLF3xPs1/Qb/08WRM=; b=HfbduSXEa+p8OLUB90frGKiq39PTDqLtiITkqTD34ADlfd8vQiIfmwuDasSTk5RsZb/VfC vZft+BG5qRNmgy6nDFGyLHOOzyd6XbPRX4f5OZf7r2HwiOzSQo2XZczJgIzrQRx/VTlO7W ZBdQhkh96f9vbHhFLrEnQpoVaJGludA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=1dFIyYzj; spf=pass (imf27.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.43 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718557; a=rsa-sha256; cv=none; b=7Zr+SyT/fFX8M8dL7zeEeMsFMxfBEXvOz5wFGFJ2D1nZgD8XJ9dUTd3n4rvEq2dFG33DVd mSdRuE83RWKbpvtRK/LROpFLj7E/hCjfmSqM6Eby3TXbHEmg8IPxmHCoorhhoo6sSDE2cE 3umoNwLwPp34j4krkr5ZfwoRqyVDQNw= Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-2f9b91dff71so2450235a91.2 for ; Tue, 04 Feb 2025 17:22:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718556; x=1739323356; 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=opxHamP1ejpgUrZttGLg4zwDHWHLF3xPs1/Qb/08WRM=; b=1dFIyYzjJZqoX6CKHMl1WjHDkkDN7/DRrL1lgly9eU6NiHwWg/Wy/3wWsUm2xGX0NU tf9XjNpZdhDlW/knWus6jY/kQ3GkPemrZDetDI0OAnZKFusQZ+4XJ4JhGLyGa8diVN4f dvX4rzJtBEjMYNxRa886XwQERoE+krsWRyyBITl99TDkbFxLNfyV4qmGoRJlVJSBH9EH U1mdAMpCsF0syptgnrt27rpj3NGeQ56icl9hnCs51Ih3C+ahkRMt4F2eg2bfhNJ6T/xR 4pEbE7ybCjiVx28JXJyjBkDkXke1gZwvHlm1rklfmTaXkAzoBua0HxWHKRKzD0CSt94P rkeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718556; x=1739323356; 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=opxHamP1ejpgUrZttGLg4zwDHWHLF3xPs1/Qb/08WRM=; b=j5LJfJxWvjiheEO2qnOZA3fooCVsqDGG4sznCdCa8MoPTPUBVrXX7DO1lQzBO/60sB Bg4aL3sJ44yMJuzAtxRFmLdYtpynhlFJu9fmVwToc8RFLbFqW1Gg/oajKZz2oVjPh9we iLS91NSW3oh0AULi8DNseQ3FIfIgyuXn8YzE9+cnbHDNqj8uUZTDz7WkxYTPslZSpxjl OohAo8iT/OYS5iPftaDq8XEvpw6g+T4F/4Ctph9lOQgblfBquTn611qnKUaj7Ag/Ae3A lh1F24yPgJVKXe6IxgBa8L50Bb0QDtDLtumKJCi2PYVMaOU6Fr8jnNBM0mnc3dHyzvoX DUqA== X-Forwarded-Encrypted: i=1; AJvYcCW3TB1Z6RsDILNWRzVUmZ1rB7eOjMrJeoKGHfv5764Qqa7HWAGidYJQnOPmOMOVc7aY65OcyjIssA==@kvack.org X-Gm-Message-State: AOJu0YxLWJy5Vp3oRLTPo9F16b7TtMaDyqD+B5kV9Zl67aDH7eIW6Gtt Ha+2HuLH4Ej3mlWWdU+iQ0hjML/mLlP/Y6shHloA9OT6uL1GbMNpO5zYN2y8fxE= X-Gm-Gg: ASbGncslcUlWrS0sixXHJEwDV0WRq7vHlMknX6JIsi84Tm6r/hHtKrOwwDopmEsuW4N jSH/B5EdschiTkgdjNz+G0fPpxct8jgrf0w++MERJrWT5O3slFvXzWrXI1iZ7ghBur8MRit2U0W dVtH+XBPew3/J3879YVczFYOIzijsztTGbVBzApYzUYcCuai9T9o+NlkZWfKpxCGoJZJK0oDJ43 B/AzbSMyl3/nr5Ar2Q8+PxxeVnM4LoZe2ftrBFduvjcALJqgZAI8rq3nMWZPi3d2/YAwfm8yW4b FdbB/9dRzNm2PTylz9KW4PKTdw== X-Google-Smtp-Source: AGHT+IF7aU3deMwt8hgfhlcc0/P4Onueg0OBpQL+amjmp/PRJZc8dKL/Qrb5rJ/l7MtlZbqHel59Ag== X-Received: by 2002:a05:6a00:6018:b0:724:bf30:3030 with SMTP id d2e1a72fcca58-73034fbc86bmr1933458b3a.0.1738718555911; Tue, 04 Feb 2025 17:22:35 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.22.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:35 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:09 -0800 Subject: [PATCH v9 22/26] riscv: kernel command line option to opt out of user cfi MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-22-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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 , Jann Horn , Conor Dooley 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-Queue-Id: 0079140004 X-Stat-Signature: qapy9w1sgb6t3ad1ou6rrhhqbkbhzacc X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1738718556-752890 X-HE-Meta: U2FsdGVkX1/4GHu8Dk5pbaXMs2TfQBCwZ8WsP0w6e5yVjWFWChsin5EPPqkvkzdOHWhnQtiO0VLaGPCtz6lJq1WdzIPquqZBQzHd9ntJBA4WDakkvopXiZcuDIvKEjU+XUx+P+z2Blut3rCBdLoOEhqUv00T+QNsq+2wZfifRq0XveYo/AbIftrGr22txhHpOFzACYeV2MEZR2Gy0h/Ih5EALcwjmrhjoSmDo6A8/EAMKSNcSyM6qvxtIk1sYfam3TWWZ47omEmq957cXFLtTdO/ctEnUcpQwQyjjvbbFzOe77GyyAmLA9OrGtqmgtUhvOoTKlMO2pKKc9HodLbH6Q4HrOzs8DK7M789Rm0TVurfEi4iIq15K7nDS1tyFtJe9qjw1PYW6N3fes545BOcoC+kFIigURuzdMhYiAAcJ/f5Bun6peo9lt7R2LAxnD44qv1c+LcEXDvF7JsRmage08EaovHCX5T33KVkofFRfE3tEMCWXh7PAiVHcsnHN4AyKyYlWhcomX+ZiI7Fx+LWLswOKqR5QuPrcE95sdd7wWH952n5vqQJ+0sPsCbkrTHkPJl639BAE2Vew5kL6S/2hDLZ1EylAs8RQ7JdsIiEtXaQNYXWswYZC9MhxfYO3QwDuWyYGAXwvvE6irCAg1hqr5tHclf16SckhJwxn45Pjrf+h2DNfd9YD1xGxK+YIaCkIhrnBiXBMdQaG3gqHOLMdGxk9P4lKrjwEhscCnC8GhIfFIdiYudIrGuEYStqVqhz1n7u7EJcxoEXDmmlxS5n+wG8MPD4WuNj6oyimPGdS/1YmUDBtwBUcef8t1dpEUmxakZOn7H7DlK9Yb9QyK8VSMLBoENw6lEDk7Ymf5txzfdPaDovBpbbJLrf6oi8Fbr99SMiXp9fNa606LNC/VwOzxRQ0LTAvbNCqXg+At0WV81gfbIogxpsY1QclMhZ4SiIbnTOYofG72EcZlVVlc7 s0vF2gHx NnqyqqUlNVs7Zxty2dwu0uXiD6EA/EPljoJoRXIr3u2VPaBRc0Yf2TcRLdThKXpUi8UzPZz1LUVE1TDyZVx9JWaGSRZYUDzwr7/h5de1wPGHrW2yzOFYKr/NuQo0INiNSRQnMHNm8e6NQ6HokFP60G+v9Jo1RLt5aBKQmQJ/y+b+Zug/tqoGQB0Isp9+oBMyzBiAg2Y1WM0YA5W9NojC+PP4Cq2hb+cjwn60KMPu6rFnQkY2Qs6kgS1jnBYDaiRdDlOjQmqOy2G5rBnePAbBQOUG9MCgTdL8jdMaq/eblJvCjeKu6ThrJuLCFJ6fqzlppC7k2ZdCzLwT8MX6BUUFl5fhpLFwHEuBA65j++AM69H6lHJEJ+chQmlq0FeEKRb/D1ZATGVsMUFD0iuY9Veg3KSUMeuJRKQbJz/0oAqjckbeZNARBiW3DAb82M/aBCz9NICYANoVFU7/tHvo= 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 commit adds a kernel command line option using which user cfi can be disabled. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/usercfi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 6e561256bfaf..be08e5bb6e62 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -17,6 +17,8 @@ #include #include +bool disable_riscv_usercfi; + #define SHSTK_ENTRY_SIZE sizeof(void *) bool is_shstk_enabled(struct task_struct *task) @@ -390,6 +392,9 @@ int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status) unsigned long size = 0, addr = 0; bool enable_shstk = false; + if (disable_riscv_usercfi) + return 0; + if (!cpu_supports_shadow_stack()) return -EINVAL; @@ -469,6 +474,9 @@ int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) { bool enable_indir_lp = false; + if (disable_riscv_usercfi) + return 0; + if (!cpu_supports_indirect_br_lp_instr()) return -EINVAL; @@ -501,3 +509,16 @@ int arch_lock_indir_br_lp_status(struct task_struct *task, return 0; } + +static int __init setup_global_riscv_enable(char *str) +{ + if (strcmp(str, "true") == 0) + disable_riscv_usercfi = true; + + pr_info("Setting riscv usercfi to be %s\n", + (disable_riscv_usercfi ? "disabled" : "enabled")); + + return 1; +} + +__setup("disable_riscv_usercfi=", setup_global_riscv_enable);