From patchwork Fri Mar 14 21:39:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017510 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 7ACE0C282EC for ; Fri, 14 Mar 2025 21:40:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5BCA2280028; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 53DCC28001D; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3461D280028; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0A8DA28001D for ; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3E27A120551 for ; Fri, 14 Mar 2025 21:40:31 +0000 (UTC) X-FDA: 83221475862.23.ABF9CB0 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf23.hostedemail.com (Postfix) with ESMTP id 5125C140007 for ; Fri, 14 Mar 2025 21:40:29 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xAilaJ+Z; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 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=1741988429; 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=a7L6jEjphmSCVBHcxl5XAt3Us7qrk/UvaMSfIdPEx6k=; b=mLOVCrv/NqeySJiu6mhyzTuhxyckAnObpUYDST7NSCBe7d7O6HYR/xXtlYkSbZWEbkiaqs XRNaHZRVpWy0wGyPni+ANm6a88+WUcp2YwJwo21DUwno0f7LUT/d/Vw0HiCU+ianTD+AmP GJQLtR0ssCnn8A1IM3/kfT669B75mgg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988429; a=rsa-sha256; cv=none; b=m8qvFxgJ1ntTnhpJGgBBqKUK/2iyN3NAetavkcByZnoU6H75GwYsunUwsTjpLfhPW1fMwh zWVsNu1uOytvnoZ92hs+rGUK6FMJPopZ6o5XeepxWHyqzS+SbsvGavOPh9zEfomfygL/zH OSllHqFnKk/LNH5gMatzAKyldhJqyyI= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xAilaJ+Z; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-223a7065ff8so70890045ad.0 for ; Fri, 14 Mar 2025 14:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988428; x=1742593228; 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=a7L6jEjphmSCVBHcxl5XAt3Us7qrk/UvaMSfIdPEx6k=; b=xAilaJ+Z3kdzQ0B/8K9Mthp3QQhjy7ny1gJsLby61zxi0M99lfTEVXUvnhnXYVDHKZ 6KBTLRJsHDC1KrQC+Mtn15m37AKTg8104rv23caintNNWTHPKAH8kAHUi7pe7kruKzw8 5LXnz85QDzpgjicWxe7WqtNP62C925vYH+sMchuVOXjNYCwBUpV4z63Slw5haF+a/PEf vhqtXh0VPGXS3V0us9rI5FZbNueoZHNUdZzlo1rhQLMZqr6tzEqzS06F537qV4AqwfAj 41Y5KCs/cnKqYsQScHng5f4oKFhwuWqxeviHeWUDrlSxXq3kALCfS83sv7Q5kgK2N0lA u/Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988428; x=1742593228; 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=a7L6jEjphmSCVBHcxl5XAt3Us7qrk/UvaMSfIdPEx6k=; b=ayOnRYnpJuBWMow41jplSfC7P+cjlP7dKhjWd2KrBZSXgez3eyTIT1J+2eC7TFwqtM E9NbvYahTvYgCpS3jDaFAzIXyWY1m8Kw6dvPd/QZBxZdgvQP4iTjYsCePSxq+A933ULa cBsh91ErEaqrI5Rghgr0XzpNCmuwX2ctnn0/HL7dfnPBQcNqNJcWkXfro/GdP12Fs+LH S0krKZj4e5IF5s3xIerz3+k3j3t66obqIGCdvWM3kf3gXIEi9oD5bfkjd0hQReXL4B6C mep3D7cHhBF3P4CVkZtKSE3ZpW5jQwFZvNrCLo2RYyW9if5CSj5hUx5vy7cGXSb2Ev+y Ifrg== X-Forwarded-Encrypted: i=1; AJvYcCVXwhduJVuHlbIkAqOu2uIJxaW6QjcWLIpk1tmvbHrBrtmKRXahn94JcQDR0MR0OSy2eNvQtw5KGw==@kvack.org X-Gm-Message-State: AOJu0Yw+NSpaAWzq0b6GOIaRR5+Jex9Ho3ez5gYb88SOoULgOm3EzELA DRgudqxLNshVFMAUtK9J4IDGoJ6459D5shDIDjZqfS/BKSj4i2bPMtoG1OokZk8= X-Gm-Gg: ASbGncsF9DDunPU8S/ofHArFNkC2nSp+g1NH1XgGBgV3W8XLqHpV/4YAIayBMYgW3HA VfBP8ibYDrEDjR0LsKrJrEkYWtY7iXaly9iRvpfO/T1XXzlyyshv8O56pC0ecJTzhrj5BiyVx4S 5tC0lcwejpIHbBln8f1p5f1c9Z4qW6I5E5rPE6nL0W/dQGL9F0SC7Rf9Sl1oQeOs0SuIc5b2xO/ ciaWaSpExvvbbqUxO/QvOM6i8tdL6PEOewnNpTS36DKW/o080QXCi3pn0EeGc3dbPSEwND72QeW sfhv6tvNl3YlfZwu8otZRZAfTCIxS2AjhETmuCcnSF1LjOfrquQk+Qo= X-Google-Smtp-Source: AGHT+IHAGPYqUS71chjGuiJ8YNLnk78WQ4QXPzZzrnBV+tP+kBaD6/rfE4E8XKuF5NR7jHoZswbG+g== X-Received: by 2002:a17:902:aa4a:b0:224:1dd5:4878 with SMTP id d9443c01a7336-225e0a62f2emr37059015ad.7.1741988428224; Fri, 14 Mar 2025 14:40:28 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:27 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:42 -0700 Subject: [PATCH v12 23/28] riscv: kernel command line option to opt out of user cfi MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-23-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@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-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 5125C140007 X-Stat-Signature: kyh4ayt1tq3z4q6mciuc66b9up6xy6xb X-HE-Tag: 1741988429-10298 X-HE-Meta: U2FsdGVkX1+GJ0XZFcA6uVb4KAZxPaKmRkEQYBp4HgWgPpaGxCP0kwRoj9uxt06EonKnloa3xl2K9AmUPaAImJ2SdELJZA7+M0/urf32NNMR8mbNAV7ihjGLYWzx9z5cqPPghimtuTS2h0WjJFoJt50pSl6unEl5Vnp5pZm8+kqiOkCbxC/T21NmhkC9WKzkckvWVeiAGFrSChtNR5I13q3SCj7tuNnc8us41OY4KBM5VQ1epNNfNVbQ298kkqHYIAcoRPMmDnI9TJPAd8mwI6FiVMAY1JlQCYxpIsbvpMrVzM0keov88xFTnls+Sq2ysK/0HqLYJok2RnhaifIAodztMAAkyJmG7dbTwaq/01onM2hQWzqrJabgy4NRvXAXkqiOfz8OP/7yjy7wCyyVPXpyVARcvFfrvaNhXUeoU/dqzMbmufJ2NwRaMWOgM2ElN4p4/fupBJPxa9Znc9Uu7SI9fcAL6FiEmKkL48XgpyH8CVI93ES3UTjERW0tuwsqaNJnp5wiKvio2Hl/T4A1bf4hueYxMFiNMqhG0eey3tL25+WBhoj/xt0zIBQ/DmCt437rXDMpuUcggpnoJ9heYfotub3v09IkniISnrdGhifGKX6wz3eeaDQId75fTMrv6lqK256k/WTndDv/AghJzF55fvLbuioaRxxnO6qxAFUnvbETl5f3b6A9j74xSyoGLJxWGMe6EEmPd9fpUy9di4pFgBHG3ZnTkiDiuGUILBt3qiVNAA2ZwRbLrB6EPKyOmCqi6CsiQI4GMu/oGzo6aUAGYz2SCvtCfNhB/aGfU5KCuYibuM4dOfaPwAial0vaRHeGKTuP6dG/dO/F6ckiC+1/V7AFISWEG6pCrjHX4v4o0NUux9RJunuTKgiM1lCUOms70q6ZUmRvw4leURC5uz22Pykbct/hjMk66uzSWiy56cxE1uB0Vf7EwQlwvCvhTndU0pCx3gkKfORNJYT nAvj3W3+ qk5Egh1RUuEPYD26Qiw7mW4gbeim6Z8lEt7jXgadnu/Skzg8J2FtSvwzP0o5CObVLu9NqwhZdyNdQIOYwBPQRYUAxzzatBzuNXmAkI31cpvm6Z2ws1AZcP9+Owm+BnDHxBfB/NGIDSQmd6Bcb+cdOMFx7P8jkS4ERYGXbIZbd3OYttNgKHHR/uwYHf6dlBBkR/8kMAwpHQt+KFhDwQwYQYeZ5OkPNagzskYelzUdjDSSez4NGxP4LGOUFyLrsnHI8JCBgGCyk89E6EhF6Qd9P9I69PtdaWMJMO7F2G1jZOwJ3qzd+g04qpPTeJ/MDO91e99ss+hwksazIbxlN2s+PrzNoK3nEeWv2MGTbFBXaOmGq8x0jux4Ojlbg9+cooGAuMItmguZp2EpeAHujHh1iADosiHTQDIdZmtr+11Fs7rE7lweK7uqQ+xbY26joZEk33EG4AJZGHsr1vMilEepfONKpOw== 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 d31d89618763..813162ce4f15 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) @@ -396,6 +398,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; @@ -475,6 +480,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; @@ -507,3 +515,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);