From patchwork Wed Feb 5 01:21:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960362 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 CCDA2C02196 for ; Wed, 5 Feb 2025 01:21:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 24B3728000C; Tue, 4 Feb 2025 20:21:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1FC6F280001; Tue, 4 Feb 2025 20:21:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F40D228000C; Tue, 4 Feb 2025 20:21:58 -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 CCF10280001 for ; Tue, 4 Feb 2025 20:21:58 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5D40C47A3F for ; Wed, 5 Feb 2025 01:21:58 +0000 (UTC) X-FDA: 83084139516.19.2E560A8 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf19.hostedemail.com (Postfix) with ESMTP id 785641A0006 for ; Wed, 5 Feb 2025 01:21:56 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lJq0NJEy; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1738718516; 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=PZsmyzkl0ZY8OELLzFzrWZpLBbmgmsnkcCCgL90vWsc=; b=12bH12u/eQpQWqf33oAKDLKR+82HVj8rhToYjWi40m7BOyb7DD1xXB0w6JEAifTiNdF9Im D1PtriitL0VwlAl3+XWDYXJYFCUOd0W/U2aR+EUqCB9QhWIjVj8ys0Vlz5ylpy1aqzK4JN x+5uYGpxs2ra/OsC8XdubWcHWGt25iU= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lJq0NJEy; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718516; a=rsa-sha256; cv=none; b=EYadE0Dug/8PhSRKId9af8Ntw9G+RvuyllYMLeJDslKsMx4bm1jnx0Vpe4ufeX6gO6y4g/ xKiKbPToGlZga0YWSuLJqCyfZRlvm7Z1aGOmkhejnyqneMdyhAn4qk3vXGGIPVbqnpCinA Sbc1+Hd29HdFlJYusO7uaaIKk0o5bTQ= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2166651f752so26834005ad.3 for ; Tue, 04 Feb 2025 17:21:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718515; x=1739323315; 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=PZsmyzkl0ZY8OELLzFzrWZpLBbmgmsnkcCCgL90vWsc=; b=lJq0NJEyU595DM7p8AF1MvbU6kNEUVxtxORs9nlEAy9izyYfdaqfql8UDkURtlX6Kb bI1xa8oM+janyDgc76V3ab7I6MBwtXxRzIUeki3Jk++DvyHsUWkNGVk2Fd7AYnWCcblc CRpioU4kLrR+Dzn0nyoxLvjvUA7zgWCpXHPFQx8cWYZ5PMQnkg4Dj9dbKNAxnVuLOmXR PdZf4MwdcHAT+4BRCvM/eR5O+arYowPBPVouxGQdXJ2YmpVIFkLaTuW5AuilhlZ/hPKf BvxTYdSgMW83I8+525zGVWtROHTzwzzapxkM9Zbbe3l30MoUJ3OH2OBr4KfE3PcJZmgL CAlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718515; x=1739323315; 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=PZsmyzkl0ZY8OELLzFzrWZpLBbmgmsnkcCCgL90vWsc=; b=jB66FV0D+CEKRI4HvWGqhAu5GBvQWcnoQxeYPacDnxv82gbzORaCtOl/7UPCE7mxji NjPvZDhSUCBGnbhdeUJByLRVSVkU5OeyMigz1WXPaalVa/jp1tt1BRCP7mdVKfjIYIHA at2UsKyI2F4+kEn73MNzIsJBo/EVQocFYG6N192zzpjG0gpZj5VdVeJEXoffaTm1Tt35 65Qia3QLLJL53wTWlDiCzl1k9dSx//NmWIrKqhTQd8ombiMJ30sKuphWRiduETfbXeBA Sg8H8PgVh5SSyLXnTEB7BoIHGNT9joy+fYQlxtthN0MYSlahXyawbxrleW42Vq/MAOD3 8zQw== X-Forwarded-Encrypted: i=1; AJvYcCW/VU3SNq3Buz//xC6lV3w0lMLnmIKtSMFrwoS3PMRmqG7txN3wjNNLvlQOf7POI1Pq+wR3FOahpQ==@kvack.org X-Gm-Message-State: AOJu0Yy/htX+nCVNDDXpck2/VqA0NG+z8FYo+rOlrjuzCyLR1L2zCHwG a7rxcxaS1IiYh71mVWfr9yafEo2OcFr1CvR3BbPGp15EjVsf0azxS3l9sYaA4zg= X-Gm-Gg: ASbGncunBwdmYJARmeQBiowQtMtO+6cM9l/RUs8bUAVOfkmCH6VypJwsXzT6TAlsfGz 9Rh7MQmyU/KKKPUUswd8ck/GHpaOw1DQJ2GpfeM05coMsqNrxvswkpZjy0lphHIaCZy2wNa3DDT CHHTdHHEB6ri399OTrrj01/pyLAvFxxCTqblc7lGwJUN0J5sAR++NUXABMzj0ipkDbVZiZmd+SX 1RFQzdWipKiKUV1AT5B3NwLv4aI6/x9uLdtLLbZ6Im7Qbe3JfGtEWP5lrNKpH2acdgHbQI1aSGB xEynhoUA4Yql4E6l1u4WP+FxHg== X-Google-Smtp-Source: AGHT+IEGfToRmeKwtJLwJvQfR9G8FomtSd4VlGvn3V3djANNYRSyP8PCgL91KTN4ECR+cbbbSTicog== X-Received: by 2002:a05:6a21:9007:b0:1ed:9e58:5195 with SMTP id adf61e73a8af0-1ede8834f7cmr1948485637.13.1738718515327; Tue, 04 Feb 2025 17:21:55 -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.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:21:55 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:48 -0800 Subject: [PATCH v9 01/26] mm: helper `is_shadow_stack_vma` to check shadow stack vma MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-1-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: 785641A0006 X-Stat-Signature: noqd8wbpmq7nbd6yponyrspiwe3dpejk X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1738718516-672323 X-HE-Meta: U2FsdGVkX1+amhMSnJP4QBl0idUT2LadkLIQa1+UHLpPMH7Z1WMGAzCMr+BeNd3IC6t8YopxwsPNsyvcJNt6+aRtxopjToEIBRSRKMVKGDXVyx8UKGr+KZMJE7FTFLXGKsQHM97v4iPfooAc84SN3qv/19yPVD3xTQD0P0VwFLPnEguxfUWDaLSad1zqG4Izqxzx8HyqnqSVHkKZEEdtAa/cCjVx3IDcnjh4VfUFUxgagwbarWRGuuwKoaT/6d0OO50st0yrCwNH/o9G4Gy7HDOxyBJ/rmYfSFogfC8jYKkpK3idskhnHB6N4NqVlLTq9hx/JnWvUFIhsL2U8OGKTkbCxhIvHZXYSDnRVTeMHBHCCoUuYmlPKxCrApMtjwqEvT6zdGZx+unMDAZPolu6+Wm+credssqafkGNaHIjr/u8j84UBUHyocKM7RmHU6mIh/hoWd+LFnmXkbmEzJW34x5EZEMwgpKao2wBLSq1FbRsbJjF3g6uWvwQoWkognuKav81Biun0RWf6JAYI2jeMmNoEEoU1PPm8NlSMtqAtzwaW4M3PNOB83PcDxggOFR7p+oi5kPhB3U+IDcLYV+mY0anLVOHqJaFchTp3D+mG8Hqf90a5KinBROtxLWnmPkcIRPtqVNu8iQXIn2TsR+ZcbPe95HpgMk0VufZ7UpVTmXr0+9qIaMMhM0kFAAJosP4v7Fu39hFWUNgQoCqeJOzNGbNWAjgi8qTEsoOnZLxVIB45QHGhPRSLy0QGuhCr4kf2YKSUdYn/JuSOU/EXezHiStzi0RvvXdZvwMcJRcDmpTHBO7lBES6DlDH+Q3b9UoqAHAtkytPHKEtz82rbdcBgh+GySsdUcDQ12FeKn4t4hxrWxkOjgJ5mvpml2i2rZWhHB9O3vtyQPnfrrIHVN17jJj/CQ3PexabcUOr2fnRnpcsqCaitlc/jSv/cxTOjJHSYxMOi2NpYJzbLpw+MAT fWG5Zorc NRKfGtBAHvTnAGm96aM5CfDJ+0YH3xzTs2Gw07bd3YGPjBSGtF2UWhqVKrnn2LcXEiWyHHWqcJB6GtKSnUXt4vJdayf+OW9ai3MnYh3gQHZhsTIwW4btiL8r5ns5b6ZXwV8eA88qDT4z65VA8OHFIxk5bd47OTh15L5GjKUztkFKHkqsVDdVZD2+VGCmrWEXLcusuArThygOotcJCrQu0bWmQjGg7ZeLNs9lMg2X3hfUC56eT/AXPNiwn/AlVF4bWD2jytjuuan2hSUxwzuTgFBTlw4BUIZmw2vRduD7cx71uHECyK6h7PGbo0J9+6zWmbQw7G6qNLVxMVcSV1WYpQxoA52Gt9iqvHU6RnFogFaznvc/ejCiMBBHmgumIrQX8GGBKbYfUEqDa5uA3DCwDb15xpPbEtyXDHU1c25GWlUqOZkMFWjX0Dky6P4atIkOSChDsBzYxccXRxHdujWlpxRDHEMb7eS3kD6KnDMJVR0YEdWI6nvBB00EAfjlLL2japAuJ0xmVhe9aZedf+z2VXAdf8g== 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: VM_SHADOW_STACK (alias to VM_HIGH_ARCH_5) is used to encode shadow stack VMA on three architectures (x86 shadow stack, arm GCS and RISC-V shadow stack). In case architecture doesn't implement shadow stack, it's VM_NONE Introducing a helper `is_shadow_stack_vma` to determine shadow stack vma or not. Signed-off-by: Deepak Gupta Reviewed-by: Mark Brown --- mm/gup.c | 2 +- mm/mmap.c | 2 +- mm/vma.h | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index 3883b307780e..8c64f3ff34ab 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -1291,7 +1291,7 @@ static int check_vma_flags(struct vm_area_struct *vma, unsigned long gup_flags) !writable_file_mapping_allowed(vma, gup_flags)) return -EFAULT; - if (!(vm_flags & VM_WRITE) || (vm_flags & VM_SHADOW_STACK)) { + if (!(vm_flags & VM_WRITE) || is_shadow_stack_vma(vm_flags)) { if (!(gup_flags & FOLL_FORCE)) return -EFAULT; /* diff --git a/mm/mmap.c b/mm/mmap.c index cda01071c7b1..7b6be4eec35d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -648,7 +648,7 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg) */ static inline unsigned long stack_guard_placement(vm_flags_t vm_flags) { - if (vm_flags & VM_SHADOW_STACK) + if (is_shadow_stack_vma(vm_flags)) return PAGE_SIZE; return 0; diff --git a/mm/vma.h b/mm/vma.h index a2e8710b8c47..47482a25f5c3 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -278,7 +278,7 @@ static inline struct vm_area_struct *vma_prev_limit(struct vma_iterator *vmi, } /* - * These three helpers classifies VMAs for virtual memory accounting. + * These four helpers classifies VMAs for virtual memory accounting. */ /* @@ -289,6 +289,11 @@ static inline bool is_exec_mapping(vm_flags_t flags) return (flags & (VM_EXEC | VM_WRITE | VM_STACK)) == VM_EXEC; } +static inline bool is_shadow_stack_vma(vm_flags_t vm_flags) +{ + return !!(vm_flags & VM_SHADOW_STACK); +} + /* * Stack area (including shadow stacks) * @@ -297,7 +302,7 @@ static inline bool is_exec_mapping(vm_flags_t flags) */ static inline bool is_stack_mapping(vm_flags_t flags) { - return ((flags & VM_STACK) == VM_STACK) || (flags & VM_SHADOW_STACK); + return ((flags & VM_STACK) == VM_STACK) || is_shadow_stack_vma(flags); } /* @@ -308,7 +313,6 @@ static inline bool is_data_mapping(vm_flags_t flags) return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE; } - static inline void vma_iter_config(struct vma_iterator *vmi, unsigned long index, unsigned long last) { From patchwork Wed Feb 5 01:21:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960363 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 479FCC02194 for ; Wed, 5 Feb 2025 01:22:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8671128000D; Tue, 4 Feb 2025 20:22:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7EE67280001; Tue, 4 Feb 2025 20:22:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61BC228000D; Tue, 4 Feb 2025 20:22:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 407B7280001 for ; Tue, 4 Feb 2025 20:22:01 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id DE2091203C8 for ; Wed, 5 Feb 2025 01:22:00 +0000 (UTC) X-FDA: 83084139600.27.D41882A Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf16.hostedemail.com (Postfix) with ESMTP id 0323B180012 for ; Wed, 5 Feb 2025 01:21:58 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mZi6DN+1; dmarc=none; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718519; a=rsa-sha256; cv=none; b=Zvznlfn7Zgwsa3P11/FincF67PcANzFi3Dj4aFxhSe3u+0OK1GyMFxexf8imGh8VYfdeYF CmXeGT/VKn8GFBF0S24KU1S+r3EvUTuoCTphsCwEqW47S5S3ay3jbNYkLKQ9PqpbZ1hUZm mey6/TPDXHcM4ls3fUusmpZJva8dHZA= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mZi6DN+1; dmarc=none; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738718519; 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=kHEXIimjUTXAyC0fOzh8XAkym19Q72QcmDI6hc+cq4k=; b=TZljlKpkIhI8kSr9jvj6WvUYeTE8jP6KIkI8/6vG0mZ3spIP9fTG5G6bZaz4XLY1++4EJp ALvM+PKiV6F+1F/gZYfiOFOCsYadWruJYcsDsj2fA+iC2Dsjd1s7w/NiRs5y/eWOYl+KMP NE20pNPlq+9vhS9iJBuW+GwrnAtQCtg= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21f0bc811dbso5059345ad.1 for ; Tue, 04 Feb 2025 17:21:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718518; x=1739323318; 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=kHEXIimjUTXAyC0fOzh8XAkym19Q72QcmDI6hc+cq4k=; b=mZi6DN+17exQvVcSFO0bNDnNnzH40MjkYHhJHnjSpZO9wT12MZJX1yhx1qZWqqbqeV xe9xl5LkB17lWijo61LrNsZb+Q+eQkim/Ofgkw8bCm1OeXqf7y2ioyIN9By8S9fsi2a3 w71Nb8mVQPsGTv7sr8danxlTe3KqMBwnb4cSfMY/bv5UKHtYdefCBarVBFfTSoXa45RU sZ2JITD+V0VNb7pRQccIwb+Yg71w8/N1aiwK+y9jxU/9DAkYdhbQeqMgYrBw9kdYc1bH pr4zzk+VrxgMiZFU5vP8pD+QP1zIVX5lNVAUBWa9VTL2t5963tkPl2KsbDk9fKyCIYfa YTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718518; x=1739323318; 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=kHEXIimjUTXAyC0fOzh8XAkym19Q72QcmDI6hc+cq4k=; b=d2JKMsfkvD0Q8THvtDgGJJ5OqAg8YUF3VsViklyVrm6ExlWCwToo6Seutlr4VZQALY KDK50JvwOt6j3I27cX2fxtE6rDH82rD67fx5UtIaUlQ0FGVOD1hI27cANJrd4OK576AB MH80vDmaL5EgalvqOP7siG4eVFh9WovHBW7rRXJZUQAuD95Wiotch8Ysm88Bqt4CujVt 2rFWmyv1PV4yTOc9pzZPyj+VEPW87EPTu7k3RjyzMJZXoKfA0hpraseGm4UFagXUC1zD ze6uEEYqx3SKy2TgT816cngiQ2WVzueKAUnxh7z+VdBbjL6CRcgQX6UccE3YWSlW5OnV icsA== X-Forwarded-Encrypted: i=1; AJvYcCVzp7qaAfyQlvyMyyOlfn27SxWSjO3Gl4yCFfkwoaM/jxWdyhBKf2wi+hO/HGEwc6zJRNbhP4BxYw==@kvack.org X-Gm-Message-State: AOJu0Ywy7vTkpHyhiC9qFuub89ZDcO3UvF+W7SVWXnlg+4JgWECussDc 4uWQRjx+Q5IUlCOmBBjXqXQNvWwyuiP4HNvCbLPUtFTqqn9zKE93pY2KgUvCnt4= X-Gm-Gg: ASbGncvf3L3guzG9t0BjeT51Xihgz0ZkEjBKkBsg90vWkalYlrIwjKCzxAUIwbfOpnq FpRIeaN0y0WhOiKOQydt6DElvEbiDem5sLSvmfxd6xWizIvrDpNi9ww3jwTiW5PvhRUdHXp+dBK pbq5Sh/9cdsWF8E44hcfv4CRFdTXPruEqPcY94T8W0u+F7laF7phsttVqtvfXxfVeDkVDgdND0D jZJvtgJsCFJHmJUrAsiTaKjE4Qj9CFdVLhJtP0pVI4utVKwc3EJdwjv6nJlyEqFAmzSth2MWlsl FT6SafHM6CWxPQQdKFF0qJaVXw== X-Google-Smtp-Source: AGHT+IHzHonQ1oXGudf3ZfMVrMZV3mKwGoRuXs9FutPohSBaJGIm20BPBEq9+EHRoF58EkXIbMe1gA== X-Received: by 2002:aa7:888c:0:b0:726:a820:921d with SMTP id d2e1a72fcca58-7303523eaaamr1533935b3a.10.1738718517175; Tue, 04 Feb 2025 17:21:57 -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.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:21:56 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:49 -0800 Subject: [PATCH v9 02/26] dt-bindings: riscv: zicfilp and zicfiss in dt-bindings (extensions.yaml) MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-2-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-Rspam-User: X-Rspamd-Queue-Id: 0323B180012 X-Rspamd-Server: rspam10 X-Stat-Signature: f7j8yrddhb6d9h88axtawjwayesemusm X-HE-Tag: 1738718518-736167 X-HE-Meta: U2FsdGVkX193wU7n3s2fJ50NJVw0OyKC8IWcuiQHhw4mqhILeNpHGXtpvR1J+hAFnyFKDVKNbNPxq3dvf/qiuhu6mQqB4/cl4aITSVNGT8H1ojQ718+Wu0gqGM0WtFLiev90yMNIVfLVEqVm/FDJ9vIsxuXKJOddut2NKKASY65npn0RmUdEeD+Fb/+y62aadCN778kcxjzJ9RuVPsLjlwmUfSzDHwBzjvRLRa5Fvu/zgntNM9ls/HlK137KHR+Zn72gru7FzT4FvdYClYfUf+huy3bGgQYhvYv2YSNrNO5EkvSXQsfLHGpseO/FSimHpGYHXZhcQDmagAJnUY0lxgFAwjI2xV5UGPg7kdlJtmEPdMOOWocG6lVvakZ0T7qPkyCuqjRyDazXbpu0m37E52o6xgPcuXCbDg66dRSAp96G8lY5jwl7s+2cR2i1RHI1mJEtXw+ex+d5KGTgguTrJIniX2B9bT61rG5vE/ZghH+kooePvU3ZeoFJ0Nj+EFGuRvDGahhFF9SXQWWsnuLB7tcG1KFN/nrBMMmpNNMvkSez7VE0oZ0+a4wy+ku6Go9kkQYxzv5yaUR136MKq9VgkXJFtN77afctxmm4/2Yp0fd5AF+VYwa2aYpnHcJE7lEtdGHCmI7wi8kJsaXeX619ncdB1LYxX5m/c24SdXip+nca//+G4IbOUQcNG70iEiEeG0hJWART0RhROYPl1FSc0PzyLRB+CjLNkIIlqjCifscQJy8aERHkgg09hjFbV2JT9nIcES/2HyazzslDai7hFhb1lGAbe3lBGFt3burXghJIPWWM5M3X6FZYTk/uIGrPusYRND1Uu2G4IPz2PwzsIOnGNJ4MsPP6VrONaw4MU7jJQWCc5yPD3d0qv7ZLbu66F8+l3dRjFfAZtIc69RO8pb8nqunFVHpCjV4CsZx8+/nmRCG2hfmL27up4RxG9SF5pxAps5XqbUXEJVhOgJc GkdAIzWx 73xQHzeNy2vuQ2OyUXpDyGKkdTTUBndMV1dcyId3K3wW6TkFp6sv/mhOVABB3VvBNbW7F6ghOndeBIOSKUJGco6XwfYFki5fN3sF863bjKVoK/fwBRO0jpx3khP9ZUj0dxkmx9z/KVPhYZ85QU5k0nbTB42OThCBOKVZ8LqVjLrSuKjNw570fsFDzkKRqMLq/whJUHvwHEMElWzPXAnyquJ74DAIVDPRfCjFfaIjFQoa/Iw829Zs9smIIIodVn4byMtXXmYQcAhbo9aPuJg1cFppUP3I4PSyWk2FbOGROAJ7HUrdrCvdmRWzt59Hp8kXkN8KQs3Vc6KvXJXc4OICs1/QXPGAOFmoMDFdYiSZ+bjqsu/qsn5ZUZuHoZroICidmhIM/gbqyfhWBg11H8j8oAL9SoWYSqcDgbH/BFVtk7QSRLOK1Ch40UzMNlulKGmgg8n3UxzPKuStRsnrvpyelP0ToGVR0rW2o8owaGN/AF8NlpIA= 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: Make an entry for cfi extensions in extensions.yaml. Signed-off-by: Deepak Gupta Acked-by: Rob Herring (Arm) --- Documentation/devicetree/bindings/riscv/extensions.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Documentation/devicetree/bindings/riscv/extensions.yaml b/Documentation/devicetree/bindings/riscv/extensions.yaml index a63b994e0763..9b9024dbc8d2 100644 --- a/Documentation/devicetree/bindings/riscv/extensions.yaml +++ b/Documentation/devicetree/bindings/riscv/extensions.yaml @@ -426,6 +426,20 @@ properties: The standard Zicboz extension for cache-block zeroing as ratified in commit 3dd606f ("Create cmobase-v1.0.pdf") of riscv-CMOs. + - const: zicfilp + description: | + The standard Zicfilp extension for enforcing forward edge + control-flow integrity as ratified in commit 3f8e450 ("merge + pull request #227 from ved-rivos/0709") of riscv-cfi + github repo. + + - const: zicfiss + description: | + The standard Zicfiss extension for enforcing backward edge + control-flow integrity as ratified in commit 3f8e450 ("merge + pull request #227 from ved-rivos/0709") of riscv-cfi + github repo. + - const: zicntr description: The standard Zicntr extension for base counters and timers, as From patchwork Wed Feb 5 01:21:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960364 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 CB5DEC02193 for ; Wed, 5 Feb 2025 01:22:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D077280010; Tue, 4 Feb 2025 20:22:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 531B1280001; Tue, 4 Feb 2025 20:22:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27B6428000F; Tue, 4 Feb 2025 20:22:05 -0500 (EST) 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 02D80280001 for ; Tue, 4 Feb 2025 20:22:04 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A05E81403CA for ; Wed, 5 Feb 2025 01:22:04 +0000 (UTC) X-FDA: 83084139768.10.1C9A777 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf01.hostedemail.com (Postfix) with ESMTP id 1536940008 for ; Wed, 5 Feb 2025 01:22:00 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="W2Ld/ilZ"; dmarc=none; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718521; a=rsa-sha256; cv=none; b=XRBbbqAvqQtpF/LscOPMhGjuWs409yB2mvrfVWFxDJIhGbv2s82/snBpMH7Fu8FF880+II HB9S1KH8RhIf2d8Qv3JGG8f85ZctBmM0FvDOdhyiXc+HyJY0u42xjiLDfqH0U78FqOm1ET sikCng3RYKsGOABVbF1+ec2wqWU9n3c= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="W2Ld/ilZ"; dmarc=none; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738718521; 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=8tcFAXVAWiQrY6HWFsnaHkFz6kw+io7jzixAAtP9lAg=; b=7jDbT8aN9GdWS+C+warjct9gINgMdf32xEmDlCkFgnDEIirf+mPY1gJkvxutl2PP+/Czgc Cqk0CCsFUE9vYQmv3Vd3DfcSdabNXYfIKZZvZ7UmOEgq7+0YtA8/JOXwMxu4tQmDatDFMI FgxQVdEsfAzftAc/UKZWVh5VvVCqAfY= Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2f9bed1f521so2239134a91.3 for ; Tue, 04 Feb 2025 17:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718520; x=1739323320; 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=8tcFAXVAWiQrY6HWFsnaHkFz6kw+io7jzixAAtP9lAg=; b=W2Ld/ilZ4exwS9Dyg6NaBoiQmuOvgQNAH3LItH/ic258QcJQLgHUGLgcHMv5DajNKM LV+CWEtw+KoZ8FA+TfUDjMaWg7zLr3zGLJuBi9Nd/fd3Q2is/aoj2gCcbHJtheHGNafs SxQe6tEp1/DOklPKhiXobVu+IYVzjFSnvL41xQ+BjfItpzpx/llN0LAr+H0RRRrs2LGC 8Y6lFTOK7+i7d48Zzboipp8J2scjwyk3aKRbLazud/Fj9agNdx+9b3+ivPJQAMLWh7Ro n99EBSLnrRBJVLrNDLqYxX96Zvt4JNmrkGMu02kSOgFwcBnksd1Ao7be8DaLlx26An4L 0IUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718520; x=1739323320; 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=8tcFAXVAWiQrY6HWFsnaHkFz6kw+io7jzixAAtP9lAg=; b=uM13dJ8vZcM8IuXjB+ATbg3D+P9MH7t3uvIPIJr9apVBT4wqzehftL/tUNmam75D49 P3xuaqdGBV6L4+BZMKk0G8aFXxUo04xgx7Kwtkag7zSkmxwWOranFkSsjW5Ap62x4eDy WTuHvVLdD0Hwq13YWw87Mw0B8WtOthj9OT9KUPDUkBcKGMB34/vSBNKhwvHt+rqaDzSs AYgqqtIbeZEZfLqaODbVLF4A1Gle1KFK6qV2jp4eZQeaBDeth5K1/v9rAATGe1nWFDrw Jsvcefg/mESdEGSIi3RzRY02DkFMKsXhM1eLX8nVKz8pwEtB4uCSolazCAXLgsPzI19l yxAw== X-Forwarded-Encrypted: i=1; AJvYcCWlcGh/uJIjoiPicJmV7dQLLP8mP+GbSZDxvullOnZ/VZ8PFfISQWKXsMjUEyB3Fn2qjo9mPOcKtA==@kvack.org X-Gm-Message-State: AOJu0YytEEfWbx2qI9ozvuWArkDrdjYC/ThyfJ+5oOmft7cmDLFE8d7p o7tXwkPeewDUmIpTMp1dSFFM5PDSA/85RKqKaKveLgxwr6Ck5PtyKTz8xRJc2SY= X-Gm-Gg: ASbGncsQteOjwLz58BsGMAU8ODbqKmIXs77fbnAXbwqmbJVe0lG+FK9gE6u4Tn8XbHL j2EHHzoFvsqpU236bCFcSyhcYpkWFTPE0ZbnMUyDy+7mcUb/opWlW4ayh4hWdAIwKRqcSIa0dVI Sc0wClkKZ2txYfC3LxX6LknV7f6NAGmpy/KTGvvgRaMd/HIWDfdIbF5NTP7Qf6wBwq0BaGaA85H cyLmfthfN6rhpiM9Oa+8d48XYVmeFnq/KJbZKgcE/TuC3eKE5TtibGg6fvGn9PzOZC8IlRO0dhn q99V7NnEIHY5M9WaGEGUmxmy5Q== X-Google-Smtp-Source: AGHT+IGcLpXN7H1Vb3ytJk/GwyCBkowKecTGXsuuIYbq2cDK4TUx8xLv1sxd9tib0WLuvG/ZPY9AqQ== X-Received: by 2002:a05:6a00:acc:b0:725:f18a:da52 with SMTP id d2e1a72fcca58-730350e50c2mr1616706b3a.4.1738718519861; Tue, 04 Feb 2025 17:21:59 -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.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:21:59 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:50 -0800 Subject: [PATCH v9 03/26] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-3-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-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1536940008 X-Stat-Signature: zoiigqjgdpucd95dsmn4a6mfo3j743ij X-HE-Tag: 1738718520-406715 X-HE-Meta: U2FsdGVkX180IAgWwoSen6lQ9V5rcsqPK2WM7qL/VfnBstwtwdxcnPxazcwYAwAMhnu8tjt9I+Ira0+z7l6aO6zxKiowIBOnLKzsaxPADza9LnAa6b107xFaBL03KnYNCBIzAbp5YhhwDv2gyxh03tIAdgetU3MwpGEsjPEuHIwtEzGw2CGjx+c0Y5VDupBxgiSgGIHEpzzI3hWZp/FCxrNi3P1k6Zc6h4sDtPiEgKObtxT+eb8ehuoEwlnnoXG4yjabuqoWvWksv+QvefrrepcD+Wd9rFELyGohTgyzRDlAhCcyE/GcWLpgvQKAfhmGymcYCGUXXHU2hT85sUAtk2xvPZI+O9cjuBGU729ZpEeYGRst823VM3je44p5bIPJyB++nl1KrhrnHajvzGEL1UjNY323e3yGmH0kzJwdZiVSZXnE1GdyhDDRiSy8PJzJMYZaNuw8XCfJyWYV0rnn+/GR648ACF6cw4Yzyfr54B+dyxTlhLvZngzoyYoRxWHQMvuiI4irfq9HqICLfu5ht566Dz31MHQQL6pyjKUxMj1iUk4iqqQu5vApforEW8p3JXQpvNAFNTAnKyZz2l3KlBM5NqNs8xaXeiWFh3uGO38oV7wQoBdIB6saz/rW6QFFUMDfAq8AVX8LE9NB8f9YjrJNoq8KIIwpOvd2gRuaQh9sZKKF1zDSilidXRcKRYC6opcRuvAFzDEuaPNC+BilnbW3F14OTpc4xAmO+RPp7e0kJeCxjHjYNsqWDLkE0xnL49ZxQvtPDrrqVeFU6tpy88mLOZhTMkX6DL4XMQEBB0RyPDeRR/36FXd7vcQURTh/cocsBKABtcU3q7vNNCqovTHa/jENb/Xz8db7L6SaJoGKa8YtX0a6wRR2LRqzcD3kkehfGWQhrjuIhuXjkwaCAHXpznImUv74XmENdLCOHy3ERzmnNcjgYvMwGOQaNHsm74GtaIVgmKzUnAPYxdk rb14a4Y2 2BfSpf8gXtexxC43SH2H/rHHzbujmdws+F8Wu+euae4t4RgqZxEQgudzqis6u7h0AdaRTi9xW7RbhZkzm/z+Z1nkD+sIGyT9JgCS57wxKZ9wJiQEKFyEGiycVGL5Lppz2/PA99lBOn4LtnDz7TYhsSOigaBANUhyvdz68JnVi8pS2pCVDb3Fa3iPseQaKu5xDkTEA5wknwyn5UY9P3TS24zTtNLFfwXJTWMQ6vlLFh/Y+JL+DJfQ/g2lStZ90f698si/zu3Q7cPU8brTMBafwYa+rRuxzha/j8nOX3uWO58j84L/04ipZpbyZa7sl3FhPkTIol1tLFUHzdcOgCEbB/nMRPZfbRVkYxd99spy0G8r78umYeByu07MrBMSKjN4Ao4K8+GhmGrkdJ/Hl++vDI/7eNgX1djUbZIQKRdFtSiDCUSPKN0MHSJVtWtpCWppGxR0HsqN/Y+Q8rrXGB/VmF2DyhhJZUrV4LKleQ9C6AJAPmWBL90fA7K9VVw== 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 adds support for detecting zicfiss and zicfilp. zicfiss and zicfilp stands for unprivleged integer spec extension for shadow stack and branch tracking on indirect branches, respectively. This patch looks for zicfiss and zicfilp in device tree and accordinlgy lights up bit in cpu feature bitmap. Furthermore this patch adds detection utility functions to return whether shadow stack or landing pads are supported by cpu. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/cpufeature.h | 13 +++++++++++++ arch/riscv/include/asm/hwcap.h | 2 ++ arch/riscv/include/asm/processor.h | 1 + arch/riscv/kernel/cpufeature.c | 2 ++ 4 files changed, 18 insertions(+) diff --git a/arch/riscv/include/asm/cpufeature.h b/arch/riscv/include/asm/cpufeature.h index 569140d6e639..69007b8100ca 100644 --- a/arch/riscv/include/asm/cpufeature.h +++ b/arch/riscv/include/asm/cpufeature.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -137,4 +138,16 @@ static __always_inline bool riscv_cpu_has_extension_unlikely(int cpu, const unsi return __riscv_isa_extension_available(hart_isa[cpu].isa, ext); } +static inline bool cpu_supports_shadow_stack(void) +{ + return (IS_ENABLED(CONFIG_RISCV_USER_CFI) && + riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_ZICFISS)); +} + +static inline bool cpu_supports_indirect_br_lp_instr(void) +{ + return (IS_ENABLED(CONFIG_RISCV_USER_CFI) && + riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_ZICFILP)); +} + #endif diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 869da082252a..2dc4232bdb3e 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -100,6 +100,8 @@ #define RISCV_ISA_EXT_ZICCRSE 91 #define RISCV_ISA_EXT_SVADE 92 #define RISCV_ISA_EXT_SVADU 93 +#define RISCV_ISA_EXT_ZICFILP 94 +#define RISCV_ISA_EXT_ZICFISS 95 #define RISCV_ISA_EXT_XLINUXENVCFG 127 diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 5f56eb9d114a..e3aba3336e63 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -13,6 +13,7 @@ #include #include +#include #define arch_get_mmap_end(addr, len, flags) \ ({ \ diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index c6ba750536c3..e72de12e5b99 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -333,6 +333,8 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicboz, RISCV_ISA_EXT_ZICBOZ, riscv_xlinuxenvcfg_exts, riscv_ext_zicboz_validate), __RISCV_ISA_EXT_DATA(ziccrse, RISCV_ISA_EXT_ZICCRSE), + __RISCV_ISA_EXT_SUPERSET(zicfilp, RISCV_ISA_EXT_ZICFILP, riscv_xlinuxenvcfg_exts), + __RISCV_ISA_EXT_SUPERSET(zicfiss, RISCV_ISA_EXT_ZICFISS, riscv_xlinuxenvcfg_exts), __RISCV_ISA_EXT_DATA(zicntr, RISCV_ISA_EXT_ZICNTR), __RISCV_ISA_EXT_DATA(zicond, RISCV_ISA_EXT_ZICOND), __RISCV_ISA_EXT_DATA(zicsr, RISCV_ISA_EXT_ZICSR), From patchwork Wed Feb 5 01:21:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960365 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 649B5C0219A for ; Wed, 5 Feb 2025 01:22:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9053828000E; Tue, 4 Feb 2025 20:22:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 88C05280001; Tue, 4 Feb 2025 20:22:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5CE3F28000F; Tue, 4 Feb 2025 20:22:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 235C328000E for ; Tue, 4 Feb 2025 20:22:05 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D46A51A015D for ; Wed, 5 Feb 2025 01:22:04 +0000 (UTC) X-FDA: 83084139768.02.DFD5C37 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf01.hostedemail.com (Postfix) with ESMTP id E6B8C40010 for ; Wed, 5 Feb 2025 01:22:02 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=w44Jvhm4; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.47 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=1738718523; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=sEEc865pVNuyEwZZIWvbl3zx7yW4eO6leNmaG28tcsShuu2I8ars/6toC0FqNHb858Ty5u pqMyeivjbrGb6uwKEa3M4pS5oTr5nIBIusagR5ioGBqD5XG0EYPWCoqK1cZld6NfY6bH/1 oZdM8fSvb2CjR0/nE/UsMmIPJyr4Gr8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718523; a=rsa-sha256; cv=none; b=UjDhrldW9aVE5t+GVmtjNxp6HnW+njnXpsKbFhN1w6POndcVbX4WTsW+DZZvM5iAlZ3YWO U2S3n4jLA79r/HeissdDBsNb57uYGz8Sfqk7WwDz1IStAkd0uGWBMEFeh4nB8nLVXPQpBR X69T23bIOjBqPvPYvChf6C/clGCOF80= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=w44Jvhm4; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2f9dbd7d80dso907583a91.1 for ; Tue, 04 Feb 2025 17:22:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718522; x=1739323322; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=w44Jvhm4sDHMnH2vfK0NY6QBRVB3X+kotNegLsUVimyFJ5DwvckUXi5BGK907w9CtZ 3gOUouhWhukn3kRGICNCtCJ5IxFTtc+UKYJ19MSJp8SIKkaDbKvElNjn83nmlx1/7CWw JHNYmdnutlJeNpaZI+E0vr7fXO3xqyvHKmtFf7RETbrUdh30F8g4e25LyTJsnOU75Oo3 RMgk8FzRcztg4odGRy/dHGUSw3Q3E6+XZ4Zq6FN9s2ruUBCfCe33L2zJGhjITCvaBSnU pRu+t0QXVfeQGhqj4/LIb6PEJz9fguYbvPMyliIQnEtOoue1zsS+3S+LFw/7a7B4OTmW mDzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718522; x=1739323322; 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=n3DM8zy+WllPP0TujEXFZ0Ycc0zGrpNRrMRWPkPmGZc=; b=XD0T3MnWdiNEfBWp4FvqOSyc6T+Bfodb5ssYrG03d7NtVvh8vM57TDsnlnvEQMMegR z036ReEEjGDrwCoNV5hjj5HFM2+SgHULAposQS/BMhLvpJn/e+EuzfkClHwYiGmJZiJs pweJB++IAgrIzfOGaAR318cVL7jiM5wuofSnqdoksY8ZZ8USlrndC1FUPia+yQvCYFoA B6KkFftbKVwlsSlyawFTUA4RQofQbIwbKvLz0hgTeZynnXhYrpm8vJAhZc5+ybwrPTYM vlno329crd/aVaEym1Ix8GDzUsR66csqWULlg+dZ2cIgAFAfEFeBn6kYR0+mkKzOyNuZ 0Rhg== X-Forwarded-Encrypted: i=1; AJvYcCVSuqgqmTo/8O2X1q+Q6I0iJ29eK1Yw4ePdBSnNUZLxap2YNghZHMoGExM3+VfVqmFZ98QJlkhuyg==@kvack.org X-Gm-Message-State: AOJu0YwwdjJEyJgUV3E+eBkj3Ehgi1jTJ9mSoTRuawRdylfzWPfTq+7V 7q3wdZni7KffUMgfzPP6ovc8KLQsolGLViow0MujJF5j5bzNQQQxpNlWO/N/JWY= X-Gm-Gg: ASbGncuJgXA6yNiqICOyCkWKaw9jfj9iZhZEno5A10bB1GJRQy6a8hvkTPW7djQoyoT SNiAIVwT6kBDLmTq5BG9pCuitabcJdbDxHCImhFZnV1kuLqrdk98E3N170SdFUXbeKP9qSEdbd1 XQ907tmo243gnAYgtHqVrbzcu64Ta7/ZpzirWWNx6z7Fjy9UCi4769uM1H+LP2P3QR5uTxwkJ4D vp2zkrgJcGNo7dbYIaarAR3oCX/lSwdfCYK3kajdZAkxgGACVnvaxgmoJK0i16ONf4VrDWPfCgM SIk27cYkPPjByN2U7iG1JnPH5Q== X-Google-Smtp-Source: AGHT+IGTMhaxmFsvWrTefkXBFDqJevilxfDmNJ8PU7kLoH+rq+SB81MDslBfLWbGGJU9DTXRp8pAhQ== X-Received: by 2002:a05:6a00:2287:b0:725:e499:5b86 with SMTP id d2e1a72fcca58-7303521977bmr1539398b3a.20.1738718521754; Tue, 04 Feb 2025 17:22:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:01 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:51 -0800 Subject: [PATCH v9 04/26] riscv: zicfiss / zicfilp extension csr and bit definitions MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-4-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: E6B8C40010 X-Stat-Signature: 1uohutgtes85ktssibwaan8mrdqs8uha X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738718522-765475 X-HE-Meta: U2FsdGVkX18IVlwr8L1JpGLH6L3Yhf9iKDhEYtBFe5IwxYT1sh3SfLxV7Rg0ICr3+l9EEG98GdwIvi+AjwIPLqNDotGK8Ws6OmA3RCQ/38bqzJkCDr/yKgj5zCKiaoA3l7ERkAnX/B/CcyynCl+NIAs3gc1N97R56VdOqVBdZkoAwa33ShJhHW+Gkz/KlEEDrzNEA4g1iUSnFioCIN8U5piz+cO0b67VRR4ikr4v5zZGd3lY9AMJk5hQfQzbXAPi/6bF+TPuSUvPD9r+e7KVnc+/GcWKvlwK+W3vY9WtC+kw7TkkG4EnixZBoiDDEWtACBVbHt6tpBb3Ty37zBwWxZAQKz4SGqJU3eLpZdJKHjwCWa4JkYCwwkOvlaUFHnZMynrSrMYH46ckFfVXBaY9wJiopC8BJX7BpzskTvBQShbgrwkHHKXjmFEnc0RkokgvHlRt+wB/8kVnD4n4/eUqk9BttEnyhZE3wKFUylPhzEQEMaQ9FBhlNYIdsyixAPl9HN/a23t7Vi4a4Kh5vs5paTNDLS1IyTt7meBXqM/55IvCpnA6jeuf78N+WFaDQq6AQi/6O8n1wN4lBRWwWKWxlZcXGAl62eWwHVqxvpmLmhk/UnIprKbGW/hSxST2I8kkZDeyvK1pHci6LOEpyqcgQeKzK5+mmvUCjElabJzzFWFjITAzYJGsv8wCV2NAKnAgBMn5eVi3jDhI1fVLbvkFuvA1evgYO99bvo+2mhmA1DU8DOlMeHkyzPQh/Wbvfa2HkjVnJU28/tu50U37Bx2BfKyIFDYr2nfvfhj1kiHRLG/cXgxcqekUNyd3XvplWNIl4FtwKgTrBPHizBHLbvTPG/upoBhQGLLgsSu82hk6JbJseGQstyOuKVYL0il5IfelpLzsmzf7EVQH20hpn/K2m3tHyBjXgOzzq1DSxD6fbGTK0iSy8oiCRsFI4UGyOnsEUI8wmRl2tJ27lKNA1Ab OOebCoL1 59gx7iYTS2xabE1F4bfOHHd18bJXWrsEgX9BSc78rP2aRo0HnbOx5jplITV1eutMYOOz6FccydF91tCj4IulrzUWNRSukzr+Tu/H0eW5/bNa845IQL3pMAgy55fqDexOnP/EwQk+SzIyjKGYZnjZhDUaY5ZQoW/wWxROOqJc6UFAGIwcTqKEPGk3FzldwsJtWq9qhhrxxeWl1bgBtUU3Knjbz8HfxPRCmHWO+/FBYbQFMS28Q2SrBYjmF/fZFAbCmPBfnUCMcLqIX3myJif1vR5e2c0sj2AkEOYEMIRg/kIWICl6Egdkp6fukXdjyA1mJPhY7Z5x23Tx/9gSKN8cglMK838v9Y6liC2AhhVM7aIDVoiYQLGeCQWcrh0CqGLOnnytUQedyjktQMEx82XwsMDT7xAE7EK/eKdv6CE5IB35Nmj+kSt1416haDFKJghOdbJea9z+xHp1RHVg= 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: zicfiss and zicfilp extension gets enabled via b3 and b2 in *envcfg CSR. menvcfg controls enabling for S/HS mode. henvcfg control enabling for VS while senvcfg controls enabling for U/VU mode. zicfilp extension extends *status CSR to hold `expected landing pad` bit. A trap or interrupt can occur between an indirect jmp/call and target instr. `expected landing pad` bit from CPU is recorded into xstatus CSR so that when supervisor performs xret, `expected landing pad` state of CPU can be restored. zicfiss adds one new CSR - CSR_SSP: CSR_SSP contains current shadow stack pointer. Signed-off-by: Deepak Gupta Reviewed-by: Charlie Jenkins --- arch/riscv/include/asm/csr.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 6fed42e37705..2f49b9663640 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -18,6 +18,15 @@ #define SR_MPP _AC(0x00001800, UL) /* Previously Machine */ #define SR_SUM _AC(0x00040000, UL) /* Supervisor User Memory Access */ +/* zicfilp landing pad status bit */ +#define SR_SPELP _AC(0x00800000, UL) +#define SR_MPELP _AC(0x020000000000, UL) +#ifdef CONFIG_RISCV_M_MODE +#define SR_ELP SR_MPELP +#else +#define SR_ELP SR_SPELP +#endif + #define SR_FS _AC(0x00006000, UL) /* Floating-point Status */ #define SR_FS_OFF _AC(0x00000000, UL) #define SR_FS_INITIAL _AC(0x00002000, UL) @@ -212,6 +221,8 @@ #define ENVCFG_PMM_PMLEN_16 (_AC(0x3, ULL) << 32) #define ENVCFG_CBZE (_AC(1, UL) << 7) #define ENVCFG_CBCFE (_AC(1, UL) << 6) +#define ENVCFG_LPE (_AC(1, UL) << 2) +#define ENVCFG_SSE (_AC(1, UL) << 3) #define ENVCFG_CBIE_SHIFT 4 #define ENVCFG_CBIE (_AC(0x3, UL) << ENVCFG_CBIE_SHIFT) #define ENVCFG_CBIE_ILL _AC(0x0, UL) @@ -230,6 +241,11 @@ #define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) #define SMSTATEEN0_SSTATEEN0_SHIFT 63 #define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) +/* + * zicfiss user mode csr + * CSR_SSP holds current shadow stack pointer. + */ +#define CSR_SSP 0x011 /* mseccfg bits */ #define MSECCFG_PMM ENVCFG_PMM From patchwork Wed Feb 5 01:21:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960366 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 87DFFC02193 for ; Wed, 5 Feb 2025 01:22:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3363528000F; Tue, 4 Feb 2025 20:22:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 27135280001; Tue, 4 Feb 2025 20:22:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A0BB28000F; Tue, 4 Feb 2025 20:22:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id DA279280001 for ; Tue, 4 Feb 2025 20:22:06 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 9A11D80461 for ; Wed, 5 Feb 2025 01:22:06 +0000 (UTC) X-FDA: 83084139852.20.8C38A72 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf18.hostedemail.com (Postfix) with ESMTP id B08F81C0009 for ; Wed, 5 Feb 2025 01:22:04 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xgbiPf0O; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.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=1738718524; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=OsAk+70P3VQHc6mNu9pexz2vsvX+dQbi07Rdgg9lnCPo92c6T2190+XGPMTbRhWd7YDv4b r5sKEd9Kd9wsyVifrwkYLJhKZYtT7a89ItTWESGDKZts0WX4QhIs2ntGcNycR+WAe3TkTJ NXYW8I91EtAMTMwx9EYzJ1FRc37X8UM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718524; a=rsa-sha256; cv=none; b=G16NGw5BtFzmSMsDhDX6ESV9enkJEPvlcNOINDH2cJM5rkZlRJRVnLBEZfbE2qg23+xQkq hI1vpR05Y2BWBZOyXy+1E1ayfC5Wd3igwmDsGBgsX7OuvB9gM1RgBY/lkXjySc19osf1/F LjF8s1CerAhLF5ObQmFhfWpUl0SPZig= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xgbiPf0O; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-21f16af1f71so4828585ad.3 for ; Tue, 04 Feb 2025 17:22:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718523; x=1739323323; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=xgbiPf0Oe3ag7kyfUyHzasDJW9iQ+bOp5Wo/WT/nHphuW63FgOMEQqv6uMB6vmXOyX VMUeF2d5L0Mqh5WnCVH7ofj3r14A5UQ09L3xvdlukaa6bowI98u71t8/WdjTxshIE0WQ lyLg97Ic6ppW5WW6CwaRtqPg1//hRzw2tHmj5Y10GFXDvXeLa6PGeNC1KMLKmpj46tho M0z8fsZ6WfugZT6rkwG4AtnSYTSyWxp5i4KyffHyj8E/ON22JxWM+3IJk+ghnSwEtIHu dPr9g0xQsGMh+0h23TCgbglZe26BjyrrUF2OZX8ju9y0BvcOkc33+oZe92NfvBF7KcBK amDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718523; x=1739323323; 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=XFoiG9nO9GzRbM78aaWwJK+Q/U0QRSToN08KNluZphY=; b=VwDlynnen4/v3Pz5GygMh8bkfRmYM3WlEqJLBtp7C//96tAh165cP46MNqFCotXmu+ FH/qP3OhUxZiurtprP43keqQKztu/ZAxaMNR7g4Nmi07tDmwSj+4SLnnMBW37PSeQS8S mHAIusqil6ZjI6RTKOVfV7boJumlYqthQsprv+RcJ5g/6mt15vzZz9+zGUCnOMG9DndA wSqTAzJsNpAsOrcDF8ajkWGtEOIPjgVxoL1162r++scnlIFm7HLAbbFQ5zvZG/KmyhZa 9O1kScQxbCAErBEeLd+w6AxOExxg3hXmhIAYj6Ytobjxyur1KGB6Mp9k2ExehPO+1JBG g7Bw== X-Forwarded-Encrypted: i=1; AJvYcCWzNKOuCB+dKZpId0kjm1RzdJxvlexvm79mFf7CdXHdCtfYNT9Nt0l+z1+IGgpXLz49DKT9hGGPRQ==@kvack.org X-Gm-Message-State: AOJu0YyvzAsy/8N8Nzkp4hyjT17Cs/vemUqBMOwml0Ei7oyj64iCGFET TwxUNawQzlt2mejxSJeYSkH06eVoI5a35CNBGBnRNk26Kr9LN+Ipi9+bwsIe2Zk= X-Gm-Gg: ASbGnctUDdkCXHRD8JCHqRBDCRS4hWSZZIQMHy6Jrdge6VB5cazYUKM9uHzsB69T0ps ReBqxPz74mT3plgvxSMewCsjkx90b4cbsf9V2q1YwnWdy2Q4hlbUYf9GmWAdbC4CFVpMjcnhAoR lqrD0hDHZytqcaGZ6b+MiFoJrkk6MjVncbTZC1lI5YJ2bcXA5SR7TfE3OEM/X9truzb59VHNv5V c3Qr6Krqr/86JEQb/N6x2N9K5OtLm+As4C5ABcngFo5AKNIZCSFrSe/0T/Xq7QXx6Xh+ury/raf Ao/DGUzT9jprom/0wRQfOB4rgg== X-Google-Smtp-Source: AGHT+IEJH+wrDsmQPEIkR5pVBGlKeUP6WNEh0OjFhPnTJqvMzIBJHV63zzIl7KoIxuXF1C9q00ecWw== X-Received: by 2002:a05:6a20:d498:b0:1e1:ca27:89f0 with SMTP id adf61e73a8af0-1ede88d5aa2mr1761718637.37.1738718523627; Tue, 04 Feb 2025 17:22:03 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:03 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:52 -0800 Subject: [PATCH v9 05/26] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-5-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: B08F81C0009 X-Stat-Signature: 3wcri6s6u85m4b1tdxx7593rpsrdd11o X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738718524-2654 X-HE-Meta: U2FsdGVkX18YV8aHHH0goxGeNzrt6lWBanp1NMSD5vOoiGzXU5/PgtA2jPenBhQXNQ4pkPrS4Wy86Se/E7NuJ3zE0G+j/8SvyQeXB3BQW5IO/JhBQZPoRDQoz+QFaj+zrvupcF/UXDTBEGhZCEWyKAti40SS/KBnpqwbsPC/eJUoBDyx2upMtpzsbSeEZG04zX4BEaOcBXNQKX1P775H3MEHMsRSb0KBqp869T5uHsH4TcXk/WZosN7+u7BMe34Nsj0bFt4tWyvQ5JFhE2GYgkr8wB6nNnhDYO+jbcogBTUNsaz/QlPHBbRut7Ya/GFK/Z0LZ+hUlDzJ0/RxgCoM2Rq2R5zThlgRbvMT6neNm3zVYOcADnwGhucMx2I84c32BzgeAkPYFwH5m6u9u7UN42mxRHHrqSOxrQEzLgNS16ZfHY3vMXXUexFIz3OpJVcbV4fV470Lpng2vAA+jRQUQjPwkZwk6TtYGRWOc4DFHTj+C6eDNiMJ3Q4gKJvBpbb2riudel4z1LyBR3ejrXXxUJBLZifBXuChGL6Y8XLGrt9cS/OQpiTz5YxspHG9aJrufFjPPT3JVjTUSoOfqxIK7MR+tx5LOpvSW/oJmlDCcZqA0nWEqImXh59pmXygB/q5+mQQKBge6evh6oZhIG7pyjEt7+OTmTgNFXwHx+CQ4l9K9YkR3/SUtqPhtn4BlZHTvuycVJGz9ic5mu1SVPDJUPRJwJirjAYTCXSOfXEUAfgUPY07NoDi1jm30FPZnBenoQ/38ouhPt8dndCA6mIGvwE2CHsszsfo8qGa0J9MUrSxQZfOIuaVWOvZEJ+c/QZntcJlTDW5Qq64KxODu7s6bQRN7wtlZoBdhpmhWqGgtmYLIOvtULMv85gF9GucsqOx5zJGBxrxsZ0v40lQ0oZ6z7goYI4+JYPPAi9pcCk/n+umixUgXZP2P0sSPcC7LTbey6qH3sMuNtFkkcNMCRq oXJFyw7S xRGowuTGLL7oRNomvdsdy+aDhzDANMc34rH69iRWVHm7dTNvk42lZ0fBSZGUAp36/f/Jrrk3hSeVOqt9sgI71c1CNn/68eM2ejXOIvXkwNeeaRFGtnLNsYAkVaBFg9i9jMDnWslqhzV4vzmuu7dCoHsje76S9dUa7whvtAlGIq3kjtdZBYTJQYB5oai8f0BSsez2vks0U4mcW871YjYZpuTtLkjF+oTKZXmu7uXbBlMXLaUA+0xnvYcXGSNJR7Jymls9gtF8htSLIN6FZgj0BU/SMaYmUISP5/vSA991UB/kIvqWa7CgBT53RMMk1vKskukEFsLxxBewHCPgj7qeZFwracYsz+8dhRq6mz2rZqeLCSRSxro6INk0dI+Sc0+49eJ8JuQeDVEF2VDAuApRWsK1G/5RgFtlSKYi0ZdbLN45LCqiZQ8xs7i7fUECGqe9YlbRy74RDsyspgHDjkDTyLPv5EBn5rZvPncSb0wikOf67L9txtm6um6s/L2ZyUm9cUuuHnZy4W7jxBBiQKeDk0fW4AftoJo5nqGlFlETGBnIVoUU= 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: Carves out space in arch specific thread struct for cfi status and shadow stack in usermode on riscv. This patch does following - defines a new structure cfi_status with status bit for cfi feature - defines shadow stack pointer, base and size in cfi_status structure - defines offsets to new member fields in thread in asm-offsets.c - Saves and restore shadow stack pointer on trap entry (U --> S) and exit (S --> U) Shadow stack save/restore is gated on feature availiblity and implemented using alternative. CSR can be context switched in `switch_to` as well but soon as kernel shadow stack support gets rolled in, shadow stack pointer will need to be switched at trap entry/exit point (much like `sp`). It can be argued that kernel using shadow stack deployment scenario may not be as prevalant as user mode using this feature. But even if there is some minimal deployment of kernel shadow stack, that means that it needs to be supported. And thus save/restore of shadow stack pointer in entry.S instead of in `switch_to.h`. Signed-off-by: Deepak Gupta Reviewed-by: Charlie Jenkins --- arch/riscv/include/asm/processor.h | 1 + arch/riscv/include/asm/thread_info.h | 3 +++ arch/riscv/include/asm/usercfi.h | 24 ++++++++++++++++++++++++ arch/riscv/kernel/asm-offsets.c | 4 ++++ arch/riscv/kernel/entry.S | 26 ++++++++++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index e3aba3336e63..d851bb5c6da0 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -14,6 +14,7 @@ #include #include +#include #define arch_get_mmap_end(addr, len, flags) \ ({ \ diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/thread_info.h index f5916a70879a..a0cfe00c2ca6 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -62,6 +62,9 @@ struct thread_info { long user_sp; /* User stack pointer */ int cpu; unsigned long syscall_work; /* SYSCALL_WORK_ flags */ +#ifdef CONFIG_RISCV_USER_CFI + struct cfi_status user_cfi_state; +#endif #ifdef CONFIG_SHADOW_CALL_STACK void *scs_base; void *scs_sp; diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h new file mode 100644 index 000000000000..5f2027c51917 --- /dev/null +++ b/arch/riscv/include/asm/usercfi.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 + * Copyright (C) 2024 Rivos, Inc. + * Deepak Gupta + */ +#ifndef _ASM_RISCV_USERCFI_H +#define _ASM_RISCV_USERCFI_H + +#ifndef __ASSEMBLY__ +#include + +#ifdef CONFIG_RISCV_USER_CFI +struct cfi_status { + unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 1); + unsigned long user_shdw_stk; /* Current user shadow stack pointer */ + unsigned long shdw_stk_base; /* Base address of shadow stack */ + unsigned long shdw_stk_size; /* size of shadow stack */ +}; + +#endif /* CONFIG_RISCV_USER_CFI */ + +#endif /* __ASSEMBLY__ */ + +#endif /* _ASM_RISCV_USERCFI_H */ diff --git a/arch/riscv/kernel/asm-offsets.c b/arch/riscv/kernel/asm-offsets.c index e89455a6a0e5..0c188aaf3925 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -50,6 +50,10 @@ void asm_offsets(void) #endif OFFSET(TASK_TI_CPU_NUM, task_struct, thread_info.cpu); +#ifdef CONFIG_RISCV_USER_CFI + OFFSET(TASK_TI_CFI_STATUS, task_struct, thread_info.user_cfi_state); + OFFSET(TASK_TI_USER_SSP, task_struct, thread_info.user_cfi_state.user_shdw_stk); +#endif OFFSET(TASK_THREAD_F0, task_struct, thread.fstate.f[0]); OFFSET(TASK_THREAD_F1, task_struct, thread.fstate.f[1]); OFFSET(TASK_THREAD_F2, task_struct, thread.fstate.f[2]); diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 33a5a9f2a0d4..68c99124ea55 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -147,6 +147,20 @@ SYM_CODE_START(handle_exception) REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 + /* + * If previous mode was U, capture shadow stack pointer and save it away + * Zero CSR_SSP at the same time for sanitization. + */ + ALTERNATIVE("nop; nop; nop; nop", + __stringify( \ + andi s2, s1, SR_SPP; \ + bnez s2, skip_ssp_save; \ + csrrw s2, CSR_SSP, x0; \ + REG_S s2, TASK_TI_USER_SSP(tp); \ + skip_ssp_save:), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) csrr s2, CSR_EPC csrr s3, CSR_TVAL csrr s4, CSR_CAUSE @@ -236,6 +250,18 @@ SYM_CODE_START_NOALIGN(ret_from_exception) * structures again. */ csrw CSR_SCRATCH, tp + + /* + * Going back to U mode, restore shadow stack pointer + */ + ALTERNATIVE("nop; nop", + __stringify( \ + REG_L s3, TASK_TI_USER_SSP(tp); \ + csrw CSR_SSP, s3), + 0, + RISCV_ISA_EXT_ZICFISS, + CONFIG_RISCV_USER_CFI) + 1: #ifdef CONFIG_RISCV_ISA_V_PREEMPTIVE move a0, sp From patchwork Wed Feb 5 01:21:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960367 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 85609C02194 for ; Wed, 5 Feb 2025 01:22:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42668280011; Tue, 4 Feb 2025 20:22:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3AB76280001; Tue, 4 Feb 2025 20:22:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AD64280011; Tue, 4 Feb 2025 20:22:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E8035280001 for ; Tue, 4 Feb 2025 20:22:08 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A9C991A0470 for ; Wed, 5 Feb 2025 01:22:08 +0000 (UTC) X-FDA: 83084139936.10.42CF9CA Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf26.hostedemail.com (Postfix) with ESMTP id B68CE140004 for ; Wed, 5 Feb 2025 01:22:06 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="c3Xendk/"; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1738718526; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=WDeAs2QSygMK7IgI6b/jzerI1YSbbF3XGjFNSYBLeNJ6wjEK+sLmn2XqgrNayBotr0cRi9 c8LXEnl0ugtJkxJDYkHeiXAaZ+H7IPIX2vDBJjwkRwY0AuCYYwsvEuIpUrBDvVYFqvjIby XVdXvz+6VBGB/nF5coMVoGo86vzYrX4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="c3Xendk/"; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718526; a=rsa-sha256; cv=none; b=2fw4bRPcduEWVLbeO2JFngv99n/NgJV3oMahW9hTtZOVlfy6SnZcpANg+c8M3P6xX95V9n RpPOxBmOuts2RZBL76ptfrJw8QfQG1MfyBaTUZ99qaxjEVWT1yHske0nG4Nf+suX7/sLm2 f/g3O6w+VrzGQLXLnHPPYiZpo5VS4m4= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-21effc750d2so23874825ad.3 for ; Tue, 04 Feb 2025 17:22:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718525; x=1739323325; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=c3Xendk/N/mQLHMyvVD8wBOAY/Nn5oIvTrqkOVNk2JXBoZwrFZydWTSf0y2qmyJJyH EJnaRfq/9UzX1jQ+jq3rJQDkAm+gcNhdJ1AVfM38NEOnapYKhlSjIh2kNhgYe2NXlQuf ppjFBMgqZh3ZXachEo9tS6oBmzMQ1tTJdL/NsWH3bazxyAeSeTSkzqKWH2svlAJ1te8c 3EunoYRXABrtkvI5NR8zo/0en7PqXFwClIWs2osbPpK5HcznqIEqdThOrb5O8InMja5Z 8tsNspG1gElY5Vf8OkklGMHWXt9kwk3RPFb71G2IJVsWG9r1zAUHeLb4OwmYj1L42CjC vWag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718525; x=1739323325; 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=1e5RgGuqZS+AKw5oTSgp47pWFJ0GDjWFc7jT6Xd5TJc=; b=rtF6HrekaPg9q6lDKIdINTT2uHi6ZAIvJUlhUfJREmzRR8GbsxnKii5+8XJxbtBQv0 NEvN4jY6IVwFadDVRpGemXxAMGBHTipiEpE1suWJl+EfhISVCvBjfGDF/7lDyTXB8GUv m62fOmnJZPy3vu1XjIZRWa8JbfqTLI9vxxFileQ/LFPljb7fHLg0DI4HHpO+V4Wj5XGP pftgJ6js+1jw3yaEF138X/71+qCtLlh/7YL4cQfiZWgbOCdlLb/fUrTo3alFaTU0L+Jz wZvpZV52u0gFjukmHfyBfTY39Tcb4l1cUoas+kYKoGYap6sjLuDaexq7Snkc+AdnKkQy KbvA== X-Forwarded-Encrypted: i=1; AJvYcCUIOxTfnEOs7phxd4JwO/qxWuqSItDHoNOfECybrcIsBM3tozKy311eo4kG9PpvvEoxjHdKdSUsCA==@kvack.org X-Gm-Message-State: AOJu0Ywu/I5JY5f6utufWFYnOiir78988NN2oYBcIdMIm4qsROxz1ORO htiVIMHBEvxs9IFL2FAB9VmFwD6y6qgyJzpE4gwNUfSyU1rL5wX8GHQziKKRKIw= X-Gm-Gg: ASbGnct2m1yg+vItm/NF0gfXXTZC2hcdxVXNTk4qmJlSratksXzLfPRWimUFsXsC4/R 38K7PL0ducHDYREmwRyOOqT9KDs7BGpfeBfc6PJxH04vogvu1gIior9xdysI+nj0p7WTLworcwi l3rgNqqBPUkLPXtnB4mS9HDDxjB3iAgwmypWcRD+s5Tv0fxLbiuKLrovpjuM83/REQn/eUVF9xF Q5S5xIuCdoFyq6qPF5empbF4HS+3xWFWpD42vFBJrTyM9B3cYk0BurxU1wTrCEGIGN/3pPa3PhN djyKCAQdKevayTO/bX2vAcA5Zg== X-Google-Smtp-Source: AGHT+IGmwZmqjzvPRO4j1QnW6c26qtiThBAMPujeU03hhi/wAPDw8k7cHzAb2QmKpofb/oE3lFc7aw== X-Received: by 2002:a05:6a00:e13:b0:725:e37d:cd36 with SMTP id d2e1a72fcca58-730350e4f2amr1787173b3a.2.1738718525565; Tue, 04 Feb 2025 17:22:05 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:05 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:53 -0800 Subject: [PATCH v9 06/26] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-6-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-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: B68CE140004 X-Stat-Signature: 4hyzcg88hwpuy4kh1s4g77e54cftd1i6 X-HE-Tag: 1738718526-315043 X-HE-Meta: U2FsdGVkX1+NlVO3pKO9Y6Rn/3pqhsTR05eQmjoUyR7t4COepCaK7vHajz96oVC3UTPTZkdb/RJVNHNUXF52gpcNxz2hQ/B7O3fPGMRuwFYzHdGi5zw4dxSJ938kB7HDQXbNXkpjlpIDv+Ve1KPChyI1WILMS+ceUo5zFDlBUDH2WlE9466k1WyJII5oQFM0TPF16Ktkn2zw6vWox4HmqK/ulzf8ZxrEVY0ZaLr/d6UVivm4N8/6sbnCbYHtvZp/ekZXS06vv+6RADSK5uoaQtDiY7RBMzKytszIPRSOywRCwnScngPj4gYq5wNtD0Ly5APvKeXWy5wQ3+iPTgrJGJGBBfCBWaRCxodpuGNT2oX+QVXNVlJ1Aj+2jZRkB4ySktberyekB4WYhdtDhjBgz2KGxps9Omm9BZupAk1p4LtgQ7FuvryVQoi/BFCSfDPlDlBrie/NgolU5RqvP+9HuCSINHUcQS8CyFXOlomlKBZNtL80CZc25KqvR4jPb+2MPFdshP8SbbgbpClYaOTSj3tYCRZYJgrBrc1ihLYc8kSuElGrc1hIcea3+fNX4TplRQ3yQQ5gu3G3SCESwbANJPCQb4Lbr07j5/4A8rUWZTnuA1d/W0ytNFu4UUOf1LPApps7ObjXAHdDiJbJIJI1CiIVc8hE1uMfgcmBQHN7UsXMKPhPl7kS1IkdlUGoYpz3zTp9M1byNLYobja163YmpxAyb08CCceuFaaMqRE77CN1fuRxh2GOTD3rq+uBWK5hpntxthgkYGTd4a/K/VLcYsQuX8WoSbdfuOkYQ7AtYZflzwuIXir2QVmX/WI5EZTSKGhcLFm/yjZP625oggEp9RSov31Rc0K2DFImQeTaV5+k/EiKgad6kcnLGoNLbEaXq+b/p0XPlMajKkT5+IZaVze1LgCuSJ29Ga+Pkr96KOb8+2cf3OksYcPnB7oLmhmGhyICdjdjMQAFGqEHwfD d5c3/hrY xsPeMOYUBfNZd8944RY6mm9XAdO+6iYH/hyROqz0V5Wm57mbkOQKwbmmuHzIpiuloF4NabiL6/n+jqBIRut+s8a6OA5oZqYlZWy3O8lroIJCSsVXMoo3NIjsJ1s6glpFiICRYgiUcF9EJBQbmk2rZSqn5tHemB56dnActR82FPXhHruSl5/nv8cv4jTg+bigMhhx8E3/6IL9TVWPaR+aWVZ5B/K0SYVFu3BzTsfPdghqdJK2cn983zL+IgS1aMV3yzODoEjPI4WN1Zy1lH94G94Z2dKpo2glZr1BmwNNxO8XAMW+te1En8eBb15YrG91TRtZDMmkClKo0kaHK0ZPEJAjKzlSRhmiw8S4zq1ezcMPhBH2ULl/uiQRrP6afRQw1PA1r9jDar3kmgbgSZ3OFh1VTf1ByouWTMGQOdZjqXnav10YZ59jMivbcZ/TPdb6iAmatQ7GzUz+g59U9ID3OhvJCWicszMJr/KF33WMuNy+6SiXdY6QBg1YcB3hnBKOUUGW3alibDakPeG8DnQAt5sta4Qdgs7XdpNnFcntW4oQUc4E= 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: `arch_calc_vm_prot_bits` is implemented on risc-v to return VM_READ | VM_WRITE if PROT_WRITE is specified. Similarly `riscv_sys_mmap` is updated to convert all incoming PROT_WRITE to (PROT_WRITE | PROT_READ). This is to make sure that any existing apps using PROT_WRITE still work. Earlier `protection_map[VM_WRITE]` used to pick read-write PTE encodings. Now `protection_map[VM_WRITE]` will always pick PAGE_SHADOWSTACK PTE encodings for shadow stack. Above changes ensure that existing apps continue to work because underneath kernel will be picking `protection_map[VM_WRITE|VM_READ]` PTE encodings. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mman.h | 25 +++++++++++++++++++++++++ arch/riscv/include/asm/pgtable.h | 1 + arch/riscv/kernel/sys_riscv.c | 10 ++++++++++ arch/riscv/mm/init.c | 2 +- 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/mman.h b/arch/riscv/include/asm/mman.h new file mode 100644 index 000000000000..392c9c2d2e78 --- /dev/null +++ b/arch/riscv/include/asm/mman.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MMAN_H__ +#define __ASM_MMAN_H__ + +#include +#include +#include + +static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, + unsigned long pkey __always_unused) +{ + unsigned long ret = 0; + + /* + * If PROT_WRITE was specified, force it to VM_READ | VM_WRITE. + * Only VM_WRITE means shadow stack. + */ + if (prot & PROT_WRITE) + ret = (VM_READ | VM_WRITE); + return ret; +} + +#define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) + +#endif /* ! __ASM_MMAN_H__ */ diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 050fdc49b5ad..8c528cd7347a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -178,6 +178,7 @@ extern struct pt_alloc_ops pt_ops __meminitdata; #define PAGE_READ_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | _PAGE_EXEC) #define PAGE_WRITE_EXEC __pgprot(_PAGE_BASE | _PAGE_READ | \ _PAGE_EXEC | _PAGE_WRITE) +#define PAGE_SHADOWSTACK __pgprot(_PAGE_BASE | _PAGE_WRITE) #define PAGE_COPY PAGE_READ #define PAGE_COPY_EXEC PAGE_READ_EXEC diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index d77afe05578f..43a448bf254b 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -7,6 +7,7 @@ #include #include +#include static long riscv_sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, @@ -16,6 +17,15 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) return -EINVAL; + /* + * If PROT_WRITE is specified then extend that to PROT_READ + * protection_map[VM_WRITE] is now going to select shadow stack encodings. + * So specifying PROT_WRITE actually should select protection_map [VM_WRITE | VM_READ] + * If user wants to create shadow stack then they should use `map_shadow_stack` syscall. + */ + if (unlikely((prot & PROT_WRITE) && !(prot & PROT_READ))) + prot |= PROT_READ; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, offset >> (PAGE_SHIFT - page_shift_offset)); } diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 15b2eda4c364..9d6661638d0b 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -342,7 +342,7 @@ pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); static const pgprot_t protection_map[16] = { [VM_NONE] = PAGE_NONE, [VM_READ] = PAGE_READ, - [VM_WRITE] = PAGE_COPY, + [VM_WRITE] = PAGE_SHADOWSTACK, [VM_WRITE | VM_READ] = PAGE_COPY, [VM_EXEC] = PAGE_EXEC, [VM_EXEC | VM_READ] = PAGE_READ_EXEC, From patchwork Wed Feb 5 01:21:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960368 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 4B7B1C02196 for ; Wed, 5 Feb 2025 01:22:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 38665280012; Tue, 4 Feb 2025 20:22:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 31366280001; Tue, 4 Feb 2025 20:22:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11186280012; Tue, 4 Feb 2025 20:22:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E1C65280001 for ; Tue, 4 Feb 2025 20:22:10 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A84CF160500 for ; Wed, 5 Feb 2025 01:22:10 +0000 (UTC) X-FDA: 83084140020.06.0917044 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf23.hostedemail.com (Postfix) with ESMTP id 80DFD140005 for ; Wed, 5 Feb 2025 01:22:08 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=guuD7xfD; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 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=1738718528; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=cvktw3Fyr7whM2qJyCcqNscyfQ5eSKCsGYzgIr2Cma6et/lFHH4agBM1F3Gyie5QtrKjUT aY1GFKpKUyIg3aykqFBNljCM9Lo1m94u2k9KOcnziWGc2waqR0SQcbbo5AXjfegQ5atjih ZfNoeSEwJkuQW9GWWdBtHsuNlgJ3rNw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718528; a=rsa-sha256; cv=none; b=HnluoCPJykXKJ2pjwQ4kJS9Mse8SDsr1a3Jt38QTxOXpFF+qVx6Psv+rzXVsWgO6gKyHhO zz1/17slWNW8R4NzfegzdYsuRZK9EvcJGgQS986LyVH14pmy1ho7/PUjRzR/l/wykAktlI lwkxyViuOcXzG6ztsYQ/aNbD/Kz9YR4= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=guuD7xfD; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2f9c97af32eso1664744a91.2 for ; Tue, 04 Feb 2025 17:22:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718527; x=1739323327; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=guuD7xfDgG1KlVFpEYjpq9EA0rbI74HlLkOmFCLuuUIvR47SyrujPpjfP4YKrwL1vK BhmXU5U6dSDyIRNeTDZRGW1e552MtHKIYuAEhZMhUMlCjSFr1HyrMafClp6ITy1Zs3GR yCpCCbOcvPiU5N8xiCr4xWDsXSYGPbLkybcyx5DbCT7eqzZKxH28g1+5/HNfTSu8VPAW fhVBfT7R17fZsF8Wq6P0keRKbJU284VpdXJnBSs1w8MLMbmSxqq0PMIz948PKK6+SvVo GnuvwFbdWQ1kRnS8e3iqa3A0CTLAKx4mQwKeYWAJya4yflON0Xekuo+184k/2WtOMyHk DHsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718527; x=1739323327; 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=Bi056oDr44X6mEA5ptOBWamFE29btTVHHp5F60vYQ4s=; b=RU5X+LWugKgiMbNupIw1tWv72+8mSJV5p6OvUGaHLcGkDXv+sC2g7xll+Ki4s9/XKw P457qt2QgWyyxyNwMLbjLVCzmAUlTx6sCdGfk8MacaVp/d4b8dtouz0Y3Qk2EfrFR5Ut fdJqyAZgdT47YayHOP1BjYGlrmNerAnNHPoAeKcIVbcYr5GrO0YPIwcx+ntapbKzExru aqjmJzBq8AHKz4rWr3uxycR1YDTS5JZOTeUi59P5W1c0+A7vQvb5NZMC/iSs9YvyE8Qn sPcG7i61XFjoEDDddfCQglLlZYYcNfnhwEeTSNuk3yB4UOGtn1Ua8WIDkWo5OK4JMlIl sobA== X-Forwarded-Encrypted: i=1; AJvYcCWz4HOgjRoY1DpC/M+Eib77G4Uf9t182s79lnch8vo+lDUxEfEvCReoYL0eOplN5IWibKsKhaOLvg==@kvack.org X-Gm-Message-State: AOJu0Yx+ovuTBhXk0E2WUFIQEhTpsiOqE8xNnQTH3yz9ur+dsYfXOl/I Zu8I9o9o2Xgq+sDfQ3P8q6BzM+9/x+AX9FcaFBTTPvA64Dh9bKh0gTawW/BzR4U= X-Gm-Gg: ASbGnctmQ2BhFDQn3LyQzzWjndO6ews7WYSOWE4mL5/Ap9dCcEM69PS7Dw5a43ntJod XYCNhHhQEIZp3FCbC9ikuW7cjn97StdYQ2zRY0VXGMSeZNlpFDVnNoYE3X9pfOM6yVApjihOvcQ y5QqNB19IWSQ4n3w6WScatF0Vq8J/i8iH2gzQZR4A0R/iv80UMiJ+INdoM+C97bBy+03q9d/C/q tRevRr5L0uYqwF0WBwjtBfxZ8cWdRXbuv8pWfQ06kdDLHgNH2JiY6cGPUqXf2sYv2NcJwamn7nM advExrqd0HWd20H6ztncAE/YUg== X-Google-Smtp-Source: AGHT+IGqNdkqdj5d5A5aA6gKpwq89EtcxR1nZ3Ul1+SB6k4syDnXtWKiLDwMtPZuQ0/gHb49XAPbWg== X-Received: by 2002:a05:6a00:1d88:b0:72f:d7ce:4ff8 with SMTP id d2e1a72fcca58-7303520d315mr1572110b3a.22.1738718527421; Tue, 04 Feb 2025 17:22:07 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:07 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:54 -0800 Subject: [PATCH v9 07/26] riscv mm: manufacture shadow stack pte MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-7-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-Stat-Signature: tcjcq9mpkf8pgckygmno6emonrexkd9o X-Rspam-User: X-Rspamd-Queue-Id: 80DFD140005 X-Rspamd-Server: rspam03 X-HE-Tag: 1738718528-308365 X-HE-Meta: U2FsdGVkX1+pWbFBT6k2cIs7vKx8zpQ/aSBJvASjpIDQPlnCjcPQ+uHUqb7V0+k5DyCsXFIh2rc0kz+K2HuX7mRJbwDSPibIA/1ggoHHFRXq+rcPY5ifZql+clyAf8SS9MWVXdmxNogi2tQNbeeCQdg4GQtO35qfo6P1hKyhZekvPxY+k3yXh6c0T16Zx9zly+zXCuh3rAbxbF2PEmZz9fJubqhI7fFwPKv0mweS+4k9R6maWleFHnhaYaXF2DP6/l9X+zQxLM9TFQR9Sz8BGk/MQ9t/JoyIerbZhyUH0w9/YsxoR83S6u5klhamMGoWWicUdrO2V1ZitAlcrABVlKjVVaOs/jfk3bzFwgMYC1C5o96jOOxx47F9qos9CZCm00WqKsvW/SuyRXgacqbFuKo4mcsZvqniI2wgMTzOJaMYW0CTjnAxZuACu5tJzXx09zd2GbziO/52ZhoTssyiTeWHvNDZertsXfEUJUegtclc/lNCE6oxptnVe7LIP3/xo3IN6HdTJ44v7/uYDxuT+efrFTUvc1cJiXmhLirDarYokvvZZxGENWpaMCBbVdjnNX7RB1bhWyFrzP63LGpLMS/gMxUdlfoQEKVT/NcJB9L1LdNf4JqE71FDXvJ3aSnmWSe5XsomGRt90j3Mr3QK7xkdmWIh7btCGGb3Qa5+r3hRLGGj5Q578zFWkX+4v/8pMXpionbCYYPLEjALbZqGBk+gfX6K5XRrpgoERwbPI8N3xVunPXKycNmn0dtHAK1OoTjxJl3zFNGuR/rLLjqIATXNUAo9/UUJpv/K/Th04qiN46ugqWJBGIJQFB6uhzjxpFtKsnSI0CeXimoo85OXQxXzo5cqhp+iM9zvMH8ZXcdcic7L1gxxUAFDOwmrW44XHXQitqT0PcCarBD8baa3h09ps2R60FVuO5/tetZZOX1FJ05QP0UCnBtOtq5z5p5PkduB6cAXRsLCPDjUaIU DZqsfGGm 219XFLO+993yKumhjmhdhfyyGeu+zKlsMCkWFrNTzarwDNeOM3Jke/G/eDY20M/D6N5IVHgQzmkgb07EN9XQ5CUwJmOp2ryxVzzrAOP7l/4fAAG8rsLLJ236mjeG04g8yC938I8GZb0jwKDTDwtnzUs8HdkPCdQv8SMLeY9qdUUtk9pbYJ++3YqEEGXocj3L24fMRTVA8u2UUEjEBNvucCWIjfzi1kmBlzCBLsqL0MbHWgd3BzK1PDjdaegmPPHOygjOitmbXnjvbtPqRjJPjgEMFRxISn4/9JFUkBKmKwjY4p7vUVLCFwYKRcVjlL0b2jS0pulfgsZBhMWDfX0ccWFTmdvikCHbMHIabNyrcKj2ZkDpcLUoiFc8Uk6E3ked0tzs0C7ZXG+/TkOiaOVGe69eOfYwhjGETtSgPSBfUAwdcg2DEgGOpQuThjLYlQd3kjBKtk/bRXfY2dgM= 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 implements creating shadow stack pte (on riscv). Creating shadow stack PTE on riscv means that clearing RWX and then setting W=1. Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 8c528cd7347a..ede43185ffdf 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -421,6 +421,11 @@ static inline pte_t pte_mkwrite_novma(pte_t pte) return __pte(pte_val(pte) | _PAGE_WRITE); } +static inline pte_t pte_mkwrite_shstk(pte_t pte) +{ + return __pte((pte_val(pte) & ~(_PAGE_LEAF)) | _PAGE_WRITE); +} + /* static inline pte_t pte_mkexec(pte_t pte) */ static inline pte_t pte_mkdirty(pte_t pte) @@ -749,6 +754,11 @@ static inline pmd_t pmd_mkwrite_novma(pmd_t pmd) return pte_pmd(pte_mkwrite_novma(pmd_pte(pmd))); } +static inline pmd_t pmd_mkwrite_shstk(pmd_t pte) +{ + return __pmd((pmd_val(pte) & ~(_PAGE_LEAF)) | _PAGE_WRITE); +} + static inline pmd_t pmd_wrprotect(pmd_t pmd) { return pte_pmd(pte_wrprotect(pmd_pte(pmd))); From patchwork Wed Feb 5 01:21:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960369 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 382AEC02193 for ; Wed, 5 Feb 2025 01:22:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 029F7280013; Tue, 4 Feb 2025 20:22:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EF963280001; Tue, 4 Feb 2025 20:22:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF93D280013; Tue, 4 Feb 2025 20:22:12 -0500 (EST) 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 AFA45280001 for ; Tue, 4 Feb 2025 20:22:12 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 692A147AEB for ; Wed, 5 Feb 2025 01:22:12 +0000 (UTC) X-FDA: 83084140104.24.73C6F96 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf16.hostedemail.com (Postfix) with ESMTP id 78D7018000F for ; Wed, 5 Feb 2025 01:22:10 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hHrhxc2m; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.46 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=1738718530; 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=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=yK9dyzlB2saA59zgEqOtaJPOlgqKu4A9g+p9as2h+DrrdAYhdk8spJwG4p1s/WSb17UTKE wX4vCWdM/JhTvT/gntdi2u5S1WTIQO97v+wSxVCOUACZFkx+6sQn71jY/jGgotICOAgpnd 3yqhz6ulK6DANw58OddN64O9uV4jz5w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718530; a=rsa-sha256; cv=none; b=DuBHoZQcpjdEVn7mmsRtpME2FNjQkUY4P59J5wOiOPn5rpuZ+dO+Hk2QdCXk8VifjP4aAe 0TJwX2b7DGuKrCHTNIw9ujgxl3cpFTqL+o3WDZow1wNGOKFK3Mt69Wsq92htDBAVkds0N8 Wo1ukGAA4j3QRw4Fqu6KfJYF00+blHE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hHrhxc2m; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.46 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2f9d9f14a74so1154086a91.0 for ; Tue, 04 Feb 2025 17:22:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718529; x=1739323329; 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=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=hHrhxc2m+9vp42IFgugJaprnb8yEyRgQtJj834+t/sLUBSaS5rRvl9zMZ9uw5MPaKw mLaWqK49pFAaT/ykws7zpWqZo1So7myl+jD4bCW+PIKEVXiRJ86a2d3mCoDulvGLW8kV HWSxVxrMr6lKAbd2DCLdYcm054b3LyA3d18ST5IpYEh1C7WKZO3yYf7fbpMBKrEzpv9Y 2HiwCFrqgRfBm6nCRMKK42LHeJpl9Czu6n8YNSkQ/88j8DcMUcF5chmPLabUNmwaxtna 4IRXNTi5Ih+t4uyog93zQ2HC9uTkx5OTNZNqxLSosBQHaiA2TspFivFabFkZj3yLtW2N CaZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718529; x=1739323329; 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=WPde6NcIQ47rHbegQG8dPMP+orPth983zEAPX8ktkAY=; b=XecvGQ6LUm1IuqmcRwwK24oNKLlwJhLdHihBu5LxQTOTh7jwNerSXDbNmtXfFqUGT9 kNFUuOEexQZAxuxJNd1QIk9nItNbkGwGIVsnkW8UAxETcefvv2rVx+q2SH2kUn5L4vT/ iWM6YYSUWLiSVbYDKxIk585WCdBmUhA6Pz5XQsd+bx70Does8y0dsTOcv4s6VmbcSyq+ 8EK0hzf0LXRzhtwqKemlLdvvR6VriHNVurB0/hXDhPFWq2Dt8WNtz6/uLSu5fhWgW6sX JV+dw0d+xWYz0CRtYdqVl1kFWU2Fjnk64jRQ9d1JpdUgf2vOLJZGGh1sToOwK4nEpnDu bhUw== X-Forwarded-Encrypted: i=1; AJvYcCVR6HYVj5ntGX2mgaMnhaAtiuOX5rErDfkbNwFtY18V3OUe1xq/Cy7m1beyweVj882mD0X0zvjApg==@kvack.org X-Gm-Message-State: AOJu0YzIK8RB7cn88zgH3pu4rBLRs2jGxuNOKyqYeiRyEUNzzFWsZGN4 aQL78y1zFwYrWZU4Q6WlmeKgp2SQpZ4XpGUPVvS2TprSxfy18KjNgQ1mLR7LLPs= X-Gm-Gg: ASbGnculmFPgGIoagZECjzrKUH4J37hAtUjkmzL1+pEARdBPDxAx3SSn2QGhlbY8++K dDUuA3mCNvggVGPrOuxh5vseUjZbHGy6mmN7fMqsVnPmGY8ifMVQRu0GilSBXLhIyFF6neQsp0J 3A2zTiqPvGGV2AWG0FgI9b2qARp7dxEgd7We31XRIHJhoZiyjrIlj2+gm3OXOB8WpmHIXS5MSjG +bj0NkrKquwb3P3WX2xQfs2rEZEQ+nM4LCFPbwfi1n5X84ZbGMWRG/JKan/rEQM7+6RE2Fiu3rG hx0k/ywQscX4VIVPV0gOUaTv8A== X-Google-Smtp-Source: AGHT+IEPr/jAZdU1BeAv0MTLO4+mRSsOemI+fwwJ0UmsHYAhZKBwL5jRXw2/FSsvJQ9vrjQzGW+zkw== X-Received: by 2002:a05:6a00:35cb:b0:72d:8fa2:9999 with SMTP id d2e1a72fcca58-73035140b35mr1685541b3a.11.1738718529305; Tue, 04 Feb 2025 17:22:09 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:08 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:55 -0800 Subject: [PATCH v9 08/26] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-8-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-Stat-Signature: yg4rroo4x69ymtz44ucfx6my4podkhu4 X-Rspam-User: X-Rspamd-Queue-Id: 78D7018000F X-Rspamd-Server: rspam03 X-HE-Tag: 1738718530-851430 X-HE-Meta: U2FsdGVkX187mamZVupt4+reBEiqz7SAwFGKm8qnjyUf5bSucqK3UVekUJuVB4mysuRbR57d5RpFD4DzZE/ggmpLacBmZmjxuUBiv2tjwQN6+4OlCguK9ea+B6kg1QoIlG7YMhDZTnBd5+i3VxyRMB1eZ+U+SqbNMM+DPimUf63CuvvfdHAsU5NH1eKVHSkeP+P5X3vk7UuiutQ0BI3RUzvy5HHMNkoP0FzRm8QqDiYgLEbM0fKxsm1luZ8CEkHdNvQGk8udbqAbohlDwa2af34O0F3daRjZm90LfXsKUnmNhxMRjL05UcfTeKc7+WlCz+VLs5972kbpCRfOqLd3pIXbooXgsMjsOAUuJ4NCg+JimKtNjoOghsVFgz6RTEXEmVZBDb92EbPPuqh7/m92X5ZJYZKpT/HSDcqL85yCe6c2tLPdCHWBklF0raTlDZJcUpq0LpjXnEsH3RrgzWGcHMXz1TDrQymwEvL0xo4On5qPZ14aX0PV8t3QxCZGx+QXbL5QajAoGoqYPtcBiLhPKLxNX+7i64bwbFQw7xikQ45qyOc8i+aQYm9t/wNAxs7/xkTlpTnKXOvJ7n72nv6GR0QspbFfloWTCC53gfXhJiY9+kBQueF0hJsY8qshHHDvjbMcMAcABB7zrp623AdN8pgWD2Gsoob4reootb7Gfsnfj/mxBkMa5AZkklzXQLRoIwaPvHQ/JDqkYFKEWMrNTCAg+gFuOxmabL0xNqwOupQFuBhJv53tiriq44RmPHJqZFeuqDybSTTT6/6cywcxlT/KLQsE7IoaPEgpWb+kqVCO3AQW5Pr4hG9ARQ31DQ91oX8g+TyVNTbER2C0Wwgdu2gaj5CjUZw/BLgfu0JqI6g43yGR/z8+hwjpvThekDJaVhvRyuimJG1A0Dqbk562WhHkJD6s/nvJmCTM2ANpiL/SpTivJM3ChkZSx2nnAuq77ISJakFu+/j+y0OrXb6 wij6kI8E Ak4hb3UOfAyPWKETDyhjq+i3O508rZD/NJWxBXYoNCuvooIvuk7QOW9vX17MFMswxuKULKOltsvSlkDGkYqSxe4VTUE9rSNyblojSbBNQicShjoV1SIelvTOxKLqwAYAK0gVIqgxYsuL4ZagPcDIhMe/ekzT2YjR7IpmvX27mfgRJe9p1uzSWUXIdj4AgofezIGoiRRezOjo3lUCzaay2tZ0PMbj5iZIqW4vEHlTfmmGsFBzNQuQ1tFpk3IVbBWiN2XSHTmHuG4OOO3V6AFD/aSC3EzFITdXKN8YC921rBeBfp4oy2BvMrSt0sIh2q3lXeXz87sUlphrrU6IjYWwbGU2DFYAZSfSdFV7iMqJwWwrd80PCFtIa9mEfxnP/cBt5OMrcA5ez42Umnzy9YBO80qXLgX9Mqye9Do0KHtS+nySGv0EWPpITZyZC4TDWQQdyebzzrAKnivYgadNbLBfBHKoHSy3LVdtVmDH6WYaAFyJkSw51t2TlmDDPXnRAko7pbwvK 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: pte_mkwrite creates PTEs with WRITE encodings for underlying arch. Underlying arch can have two types of writeable mappings. One that can be written using regular store instructions. Another one that can only be written using specialized store instructions (like shadow stack stores). pte_mkwrite can select write PTE encoding based on VMA range (i.e. VM_SHADOW_STACK) Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 7 +++++++ arch/riscv/mm/pgtable.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ede43185ffdf..ccd2fa34afb8 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -416,6 +416,10 @@ static inline pte_t pte_wrprotect(pte_t pte) /* static inline pte_t pte_mkread(pte_t pte) */ +struct vm_area_struct; +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma); +#define pte_mkwrite pte_mkwrite + static inline pte_t pte_mkwrite_novma(pte_t pte) { return __pte(pte_val(pte) | _PAGE_WRITE); @@ -749,6 +753,9 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd) return pte_pmd(pte_mkyoung(pmd_pte(pmd))); } +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma); +#define pmd_mkwrite pmd_mkwrite + static inline pmd_t pmd_mkwrite_novma(pmd_t pmd) { return pte_pmd(pte_mkwrite_novma(pmd_pte(pmd))); diff --git a/arch/riscv/mm/pgtable.c b/arch/riscv/mm/pgtable.c index 4ae67324f992..be5d38546bb3 100644 --- a/arch/riscv/mm/pgtable.c +++ b/arch/riscv/mm/pgtable.c @@ -155,3 +155,20 @@ pmd_t pmdp_collapse_flush(struct vm_area_struct *vma, return pmd; } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + +pte_t pte_mkwrite(pte_t pte, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pte_mkwrite_shstk(pte); + + return pte_mkwrite_novma(pte); +} + +pmd_t pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma) +{ + if (vma->vm_flags & VM_SHADOW_STACK) + return pmd_mkwrite_shstk(pmd); + + return pmd_mkwrite_novma(pmd); +} + From patchwork Wed Feb 5 01:21:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960370 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 E17FEC02193 for ; Wed, 5 Feb 2025 01:22:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61E17280014; Tue, 4 Feb 2025 20:22:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A700280001; Tue, 4 Feb 2025 20:22:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AA6D280014; Tue, 4 Feb 2025 20:22:16 -0500 (EST) 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 1C996280001 for ; Tue, 4 Feb 2025 20:22:16 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CB54C1C6257 for ; Wed, 5 Feb 2025 01:22:15 +0000 (UTC) X-FDA: 83084140230.04.B384A86 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf19.hostedemail.com (Postfix) with ESMTP id C45901A000C for ; Wed, 5 Feb 2025 01:22:13 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=v5KBGVMA; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 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=1738718533; 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=rjuyUsrRmjsdgE2eHiV1ew63cZ7gXvE8Gyqp5e7FHmI=; b=8Z3rtJRtw3vAtlZyUmKM1TpnbphlHPWyaAh6ZcB2c9GOH9YIz0EOmd5jKNrqGFVtcM+Y9J z37wV5P8LP8/9OtQbYl4k+7Rs2hcxxR/syikTImh7ps6j8nExFO938MeDRUKVde9+bEUuu gHUAujHgzcNq+Yh/y9KO7YcszXe/nTM= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=v5KBGVMA; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718533; a=rsa-sha256; cv=none; b=p1EYfnGXmFZP+JVRy3FyCMeDcpDCoXqMHwcPKDPra9nENILhPNBJz2M0U0amUM88ONVSon B2gN0blL49+//8TljmETsDYbzlrfmt4JPDa9Vs/dd2JU1eauiYq2u+ClpMUgwU5RwxmuBi EFWBAqH4IMHyIvHKMQRnucohO0Ok3UU= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-21f0bc811dbso5060885ad.1 for ; Tue, 04 Feb 2025 17:22:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718533; x=1739323333; 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=rjuyUsrRmjsdgE2eHiV1ew63cZ7gXvE8Gyqp5e7FHmI=; b=v5KBGVMAq+6c06WSljXHEBijtMu38bzc0Of8HRJek4u4WdxF1Bo/er70UAK16JhY1C b91fSBC0HXuD639ZjNi+BMVlEX+uCSHmG0E/a+xGq80SpuE5px892DsI+Uu2pSz53jB9 er515QlAwL2Hy99DAkQtD8Z8je10niEaWVctYaWxPY4ckdxs5C1wa8YNpe2LQMgVDnE5 csqi2sOKOXj69LfARExlsuqCSnKniteDVkrnOtLIh1NctcgJBE3ENNqQSsXP8jXW1UA4 l45ALeuGaSzsxu10PowEo+qsbTbsP2lYMXwJNjCaRn0qHzxdAFP6faYe8DBOjQ9AGyHf NpHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718533; x=1739323333; 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=rjuyUsrRmjsdgE2eHiV1ew63cZ7gXvE8Gyqp5e7FHmI=; b=KQMpE1iXytg96Q7bIe6/ys5WH/M7NIT5/uV9or3RDrt+pIDgJv3OpPFoS7lPzgDeG9 mHr10CH493hGjlalW/IGoL/JNNMmjzfN21BtIh/xUJ8Pr1brTCnZNqHSVvzcgiaceNBG akRgTnJ/pb+IDhOMAPpu9PDxnYC4gwFZIJ/GAjXUI4BEFsoD4QpjoI4Hlp77BUDDHPQT b+CsyN8LnyPaCWrkvJQmwwwBsEB0YGVgXw89LseVFdz5IRm3IT8CBVC9Ec5ZDvTwYNCV bw4ALV8/96Z0FGuzWVhPU7vOV+ohv8ZfC1jN9DtkMFmatOHmae/KJuJ7ijyY4A8E20ww y9FQ== X-Forwarded-Encrypted: i=1; AJvYcCX3DnDIVR6Wsp3I9RLoYO3SMU35QU2WRx/ixOyNf87AovXZwDwrxQo5JW5MpK8fYCEjzSrioJDQ0Q==@kvack.org X-Gm-Message-State: AOJu0YwHzXO47bNqDlDHuHTl9aCAhsRvhN10JWNvX4DBzEoJuCBZFTbI S8u0F2QLl6JYGBzQ8h6HPecnhtLH8WtTOfL5tTyTTljJ+2RelL8ugmiApMB12kk= X-Gm-Gg: ASbGncvK46RK/hbzB7sMARK300WiPyTkK3342h8LXOf4ldRDRaRhIut0qwx3K2t0V1G +FtCGD1LyY37IoGfO9pZckLIrh4V3YssBxTiSrZBaz2yxtVFdpNeNkNx4KyaacET4ohv+kXoEq+ +LvrhkuTkoUpsMUTt5tXxoEE+ciIyHAg17NrICWa+ehbl0GVo/FoWaMyLH8e1I5x7vz+ak1pTL7 Oi2gWX1T0ELUSxrcT8XU5UPs6YyICB7lwkY07Pg2TwfpN04L5vASY5dQQeJwhJ+DSM1MVst2VKf nYJRWbC6dmuqrdZXCbhomoHZAQ== X-Google-Smtp-Source: AGHT+IHlwnAptZSky9Y1DYo277tRu5dBk5BHHEzzWIoM+u4E8FH3BeXq2ANIOmZF+k6xGQHG5TCG8g== X-Received: by 2002:a05:6a00:2306:b0:725:4915:c10 with SMTP id d2e1a72fcca58-73027296652mr8559134b3a.10.1738718531190; Tue, 04 Feb 2025 17:22:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:10 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:56 -0800 Subject: [PATCH v9 09/26] riscv mmu: write protect and shadow stack MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-9-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-Server: rspam05 X-Rspamd-Queue-Id: C45901A000C X-Stat-Signature: xhgj6o1567m56nr1h3f7893at3opmtwu X-Rspam-User: X-HE-Tag: 1738718533-602248 X-HE-Meta: U2FsdGVkX1+Xhof7nZ7ktWcc0XTLHFCjxz5aBGnz63enBtYjg8u2XypYNo+JUtRSxDKSYGYegalWqteY3v4lFKn9WESwZ9gmmluBCZhFa2Dt9qpUe8o8hWENnLhEs/Bg4qqa1DT1aFje1Mp6vIsMq4JMWvSXvbzwpQfl1gxiDcnW1/sB7Ko6ffL/EEinZ3ezJ9gHkdBKxPNwjhJGZ2PXx+bnipHj//uZb6K+kvoOI/4LGvg9JwC0UpU8fNYwhu/0mjfvPIpPk5zHWS53oeGElfAKa0xXGXyXeUJpIBVeo+Ei7ijH07u6b2zN2pq7g3acvzVnbtL7xBCfzd/mDl2h1OkTvE838HPD16wdstUmUcN5kkqMG0nhXMoXWLsgoxpXslDEO9QiFip6FSKgYh8808FTN5r3QdmhnFW7YL6keMHRLMy6JLDyHk/S3kloKTuTXkxlzWhepXHbfzS3IlaFIbw3tWhbnvhwCoKgHoRGbcm2cbcZwjr/FJwcclaQwbrmJB0GxLPI1nlB5z3XXzBQgBnaboPabi0mqLhISG8u0LFm2+oKvGN04DreMkKp9sHg6QD2/krNazNS05DTFO7K1ZBqm0vFCGPJUe2VukMo/OjL+Pb1wUwmZHth1kZe8DPBAvTYaEOkfhWymGQ8u7rZHXnBr2V8ivkJ+BmkYUkg43UIt1FVFJLFPgXivblIENwR0Gy/0LSxA2JtOOl9iQsOpJ31MLjWP3BLNuyQRs/5kLhWwMmBDmJNlWddqg4R1Kb+7FAUxcoU/H74ZEMxst/xq+TU19qVvsxWXurr8BHP6rLhBo0iMRdtPD6JLkjHrDFiAyQ9cLqoAEEvdI8S3OqY+J7Bylp6xjnQ+caDUOV6fRwoay9jHSSI9pPgG9sqf3m6qyk3cshWQ0i+SqCgp7Ygg4MgjmSbcuOvgRlUZLiXRayoO2VYBHL6yMMoutNPjoCr5UEmirE7eky2Vdw4sXn J5syD71V /zSA9lU9ILJpG0bTvhEt25sTlIW0e2GyvKL3gwQFExUd1c/YyStSst4C56fhk0PdgcQaXgxE7HvEgExCSwIaw/AdTd1DdFQszbTERmgptOcuy5LhI9H4WCR8t66mlUsJ/MzCb2qbZVCXWG/3mxCvd3cqQk5iNwL8pTSpf96LHVsplx7rJrg72h05I2S7WUyAy/c37Bqfq8Q8UxG/tycc3KmjTyO6GIjWlTDayC/2x7dZ/Nbqm7PtKaa4Lyc7sOIhuazlP8IAUHn4ukNNrRBsMqxhAXUNo/amPwm2jaZpjB2RSISHtBRQ1Lznwhrdch8TWISsakKdkTxolQAtYsehXhg/tNZet0gsOiQMM7wte2zpaOswkPAmVNOjFKMBr6zTOuYBg9bm4g2EcQISMWwdkvlNksiuHUXXF59cQU/m6Idc12iQi2NlDVN8lLsaxK6hGr6pivXPTJFuLxHQ= 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: `fork` implements copy on write (COW) by making pages readonly in child and parent both. ptep_set_wrprotect and pte_wrprotect clears _PAGE_WRITE in PTE. Assumption is that page is readable and on fault copy on write happens. To implement COW on shadow stack pages, clearing up W bit makes them XWR = 000. This will result in wrong PTE setting which says no perms but V=1 and PFN field pointing to final page. Instead desired behavior is to turn it into a readable page, take an access (load/store) fault on sspush/sspop (shadow stack) and then perform COW on such pages. This way regular reads would still be allowed and not lead to COW maintaining current behavior of COW on non-shadow stack but writeable memory. On the other hand it doesn't interfere with existing COW for read-write memory. Assumption is always that _PAGE_READ must have been set and thus setting _PAGE_READ is harmless. Signed-off-by: Deepak Gupta Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index ccd2fa34afb8..54707686f042 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -411,7 +411,7 @@ static inline int pte_devmap(pte_t pte) static inline pte_t pte_wrprotect(pte_t pte) { - return __pte(pte_val(pte) & ~(_PAGE_WRITE)); + return __pte((pte_val(pte) & ~(_PAGE_WRITE)) | (_PAGE_READ)); } /* static inline pte_t pte_mkread(pte_t pte) */ @@ -612,7 +612,15 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long address, pte_t *ptep) { - atomic_long_and(~(unsigned long)_PAGE_WRITE, (atomic_long_t *)ptep); + pte_t read_pte = READ_ONCE(*ptep); + /* + * ptep_set_wrprotect can be called for shadow stack ranges too. + * shadow stack memory is XWR = 010 and thus clearing _PAGE_WRITE will lead to + * encoding 000b which is wrong encoding with V = 1. This should lead to page fault + * but we dont want this wrong configuration to be set in page tables. + */ + atomic_long_set((atomic_long_t *)ptep, + ((pte_val(read_pte) & ~(unsigned long)_PAGE_WRITE) | _PAGE_READ)); } #define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH From patchwork Wed Feb 5 01:21:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960371 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 3D912C02194 for ; Wed, 5 Feb 2025 01:22:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CAF1C280001; Tue, 4 Feb 2025 20:22:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C3963280015; Tue, 4 Feb 2025 20:22:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A86AC280001; Tue, 4 Feb 2025 20:22:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8064E280015 for ; Tue, 4 Feb 2025 20:22:16 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 374C647ADE for ; Wed, 5 Feb 2025 01:22:16 +0000 (UTC) X-FDA: 83084140272.13.765AEA4 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf16.hostedemail.com (Postfix) with ESMTP id 4AB32180003 for ; Wed, 5 Feb 2025 01:22:14 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=dqPGQEWr; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 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=1738718534; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=XV8xTcsVcqAMqYxRNMJuNznj33Rzq/m113i90mNzXUIyirWQiL+C7H93uB/dEaOdR8SgYk 07BIj4hd2ETHEi2FkA0wH3XZwMRelHX2Z61AN3kwnoKcHo/yb0jZQTIHu7psq6L6iLCukB g6HFLPGPEoSZSDcLpNGvZwFIvRnLOng= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=dqPGQEWr; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718534; a=rsa-sha256; cv=none; b=nGCU+oWC1IGorTd/G34YrZAqRqZsAvmkVhREhabY4QHLVYp+cRH8Yixd7Vp4qONfDuHTum L5JLGSla5jBuNQdRtY/Ci8iRHr/OD4mC70UgpKVth8yqL4YpH3Fzd4gZpxybK2rezwei03 rmou6LIJTRc+ckrRylcUq7200xembkQ= Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2f9c97af32eso1664822a91.2 for ; Tue, 04 Feb 2025 17:22:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718533; x=1739323333; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=dqPGQEWrcOnRXGhSDnKrrEoINATeZ8zMNZRDSj3iK9473YgGRnPO2E4Vzq9lXwshvI gqxdyNkakLM6rwFNZpaojIKqv2Nf2UeF6KEkWqdrBo8+KONSq172TcAXqYWYY4Z+ugpu hbQgcrZTsHaIhkVYVyd+Z32B6fz29WqMbZUOrfVaz1GJNIzDNCVXaPmrzwa94IdQ0NKR 8nXUDkOO/Pzwkifb/N/XTk+EgHQpfT1VHYGv0ljYEeKXJB/gFf5R+JQfi6imZotrpD4D PxsrzEw1GJJQ5hc34WNSGNiqWunKQtnO3nSaLKEdGTPTVIvaTtXTtT/LA0tPLYm1ORrY fLWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718533; x=1739323333; 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=hK7DlmuIRYzIsuvvXHgsbKnv3WN7JKJpEt1D7vAnJaQ=; b=rjxbRWO/WaRJMeTbKyC8wlOw5uXVg/YtSIxnhtN/A79Rb8MpS+OSORA0/vjC8E2la/ ldCKjZHNCcUzSjgDEZYkPI4/R2yoF/zygHZNnodE1Xm43xHBwe8AfCqEzpcIJqOgpmZP ueihN4pVQej2VEZjmspyZPPhlkFkdRL6L6oVi5BhmlFWQWgwyz6HDFNZVCMz4C+BC4f4 tS8VrhyhpRLjo+29LEDIuF6x8qLQRZF2y/l7YLL7nF3lvjtV/lnR7Gnt3z8YQnG/bRtw +Vh0BOHtZWO9inUZu2tNR2Bt7HEmwOVJPMQH1ihOA3WQ1ORYI+fNlMcVMW9uN5KKFdu1 NBVg== X-Forwarded-Encrypted: i=1; AJvYcCUDQBadgdqBknM5UdLi3QzRDrnhPfhA8/q7MFTZpRA4HfIpW4oFIB312dKHJyQF7JmUhIJTgOu8Ng==@kvack.org X-Gm-Message-State: AOJu0YyX8fRNczAbUPjbquO0/peRyiYf8e7OPhiSQO2iJtOZpHnSN3SC THpq6zcOGFIrpjHWUSyaYZ0s3DYt1+b1Wor/NNq3vmPyUeePRFGfOLYl8tme7a4= X-Gm-Gg: ASbGncuV1s7RUQxjX4HNJJ5Ok8Bye6fnjPav1llAo28JGfvWhyaxYOVJxfSrR0mFsmT ebAfW2mF5GK1OS0bwU5SZjcKsVQZ7M7bYqGAQvCevqtM5GNhlUWLSx3tcyBrGZ8IL9aL7oYaak9 bRMoAiiu2YDRLq5kVTwaYaiZ52mVhpnT0k8n7ZPMZ31HZ9sDGqa2/aKtAxY8WECuLGCzLUAbCvR axO5DKJgi9piqcVHD4ZcJ2AfqUmsobTu0uj3etqDuTiUlvzB8G5KxSIwRaEVOalqiDYkoBbLen0 q05qDOar5a6qm85HIsj8QiVdzg== X-Google-Smtp-Source: AGHT+IHSDstT0FGTL1rKn5OYVTictI2F7hNGUqzMma/U3VqWcjoJawW9HqWn0ZJ0B/nhVBR5FKHupQ== X-Received: by 2002:a05:6a00:1d88:b0:72f:d7ce:4ff8 with SMTP id d2e1a72fcca58-7303520d315mr1572427b3a.22.1738718533123; Tue, 04 Feb 2025 17:22:13 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:12 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:57 -0800 Subject: [PATCH v9 10/26] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-10-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-Server: rspam07 X-Rspamd-Queue-Id: 4AB32180003 X-Stat-Signature: 5q9zt58p81umycxd13mnpcw5tt6ywcxa X-Rspam-User: X-HE-Tag: 1738718534-714574 X-HE-Meta: U2FsdGVkX1/UbTnruHy1TA/vXadub2aGxCBLlqbgdqeFXChopZ17Emj0Ff9bd15sleua2fYifCg3IjcoyVYpEhoEfS5ME3WpV95CklhBapSTgOvHYZdo/eZsVZMZbTBWcC0LdW9+p6hY7Sf/TSXZuhfsmOlyuEZ2gjlSkEY06GVrO8nK/v3McOZK9C99GOml7y6pvnvsgvgQlHyI4dC+rdCBY8yK1z2BDVofFW+czeHImwGU/0HPrxvmQFoowI3axrYxVic2F154WFMPK+DSDtEy9QsXyLwusEdNggOGAFO+592Ts226R+QvVwwVduVDUW7/bSobkk0pOEXPq+1tkGRZcgib1bkTWa3DCSqLDzWB3+s6n2XnTQtTqhsaefv9eNdowek6nW5hiqP48Bcx4DisQxS1q19qgwNKJ22j+4NlXVGEu1yNkgYe3dEKHRnBBYP1RhYGKhef8rncNLqkvTk+qv5F2s2lbrAqaMBXPzKVQ6Ag4h5asO5QNhn159U03o9y3r3+Z3p2Kfe8xGKxR1yMDiSvHwFzqd7VN7nwqIU8SSVDxgxN8Yjy5GTI8kw/ohpRRwFUYo1WK+6J9i3Xu4F809dheAnuqOnvsz+uUerVU0FrpopM8/TM/lV9EdM82EiQbSEwsuti6HBBMPeCZgK5nMQV7cN2VAlHh31fw414JPMocEn8a/UyGkT4/SCOlSdpmrb6h69VQdsWduUTBd9GzLENWU+89zcG7v5yf9iRCEjh3ReMUnyI5EqGBPd0dzr0hOglh3Kuf3FVQiswsJGOG/rcgucHLTbvIOo6ed4cz3ckzPykkrHdT6zbeytL2s85l7lcxnvzNa9Rlafei5FNXihbIosTWGB0VK3daa7rnVdLg1YRYKgT+/Npcxt0p0i4jKA2RycDbNGr9koQGKTozD2TuxkEg6EfHC2RRAnIbhE7sRIiNwzpCyYXBwcAxvLrNS6Ypa8uXO1Q3bj DUrtoLHH hKJvaFOR913gV4H89KBoyNP2ca2FuyUrW6SIgGEV5H7MtDoFTDiE6knYDXVtVqzCegpumoh9O9LCsO4JjxmqdaBJMzCdieZI4nlk5a3J1t7bWGrChgiJGOmXevYObSejaXpkibCesy5l/OzwytuGT1jNrgLFYz1q6srG7ntrRJpPYSpMm+p3shKSJDRV7hKpGkysHv/ha/Bi2EzvEu9typVjdN1WkxLFggjAfnjFwBEDQCUwMDbcdTRMued0EJUD6JzKvm5aL+yVWRz4krkbTNvYkgvViG/ZCnpEFRs9evAlJzWqVDITbLuS8+NS82k+qd5pmHJxYZC1FX8+Ff5gEDrnGteGE0TG1gVcTDlhbtM0ryELmk9EfpChQr40vystGuZ0Pv2ondTVDgywgdLd5o9h8Ph3jhYW6GNyVU10CYLGyUUj/Aq+YEPypRZwTYkKIAFhXJGG9gJcmgoR6gTwk+WP0ZSXKE7T+SNsWS7jLUw+muuLKK1D9KamTAQ9uWEAPUePz 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: As discussed extensively in the changelog for the addition of this syscall on x86 ("x86/shstk: Introduce map_shadow_stack syscall") the existing mmap() and madvise() syscalls do not map entirely well onto the security requirements for shadow stack memory since they lead to windows where memory is allocated but not yet protected or stacks which are not properly and safely initialised. Instead a new syscall map_shadow_stack() has been defined which allocates and initialises a shadow stack page. This patch implements this syscall for riscv. riscv doesn't require token to be setup by kernel because user mode can do that by itself. However to provide compatibility and portability with other architectues, user mode can specify token set flag. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/usercfi.c | 144 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 8d186bfced45..3a861d320654 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -125,3 +125,4 @@ obj-$(CONFIG_ACPI) += acpi.o obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o obj-$(CONFIG_GENERIC_CPU_VULNERABILITIES) += bugs.o +obj-$(CONFIG_RISCV_USER_CFI) += usercfi.o diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c new file mode 100644 index 000000000000..24022809a7b5 --- /dev/null +++ b/arch/riscv/kernel/usercfi.c @@ -0,0 +1,144 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024 Rivos, Inc. + * Deepak Gupta + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define SHSTK_ENTRY_SIZE sizeof(void *) + +/* + * Writes on shadow stack can either be `sspush` or `ssamoswap`. `sspush` can happen + * implicitly on current shadow stack pointed to by CSR_SSP. `ssamoswap` takes pointer to + * shadow stack. To keep it simple, we plan to use `ssamoswap` to perform writes on shadow + * stack. + */ +static noinline unsigned long amo_user_shstk(unsigned long *addr, unsigned long val) +{ + /* + * Never expect -1 on shadow stack. Expect return addresses and zero + */ + unsigned long swap = -1; + + __enable_user_access(); + asm goto( + ".option push\n" + ".option arch, +zicfiss\n" + "1: ssamoswap.d %[swap], %[val], %[addr]\n" + _ASM_EXTABLE(1b, %l[fault]) + RISCV_ACQUIRE_BARRIER + ".option pop\n" + : [swap] "=r" (swap), [addr] "+A" (*addr) + : [val] "r" (val) + : "memory" + : fault + ); + __disable_user_access(); + return swap; +fault: + __disable_user_access(); + return -1; +} + +/* + * Create a restore token on the shadow stack. A token is always XLEN wide + * and aligned to XLEN. + */ +static int create_rstor_token(unsigned long ssp, unsigned long *token_addr) +{ + unsigned long addr; + + /* Token must be aligned */ + if (!IS_ALIGNED(ssp, SHSTK_ENTRY_SIZE)) + return -EINVAL; + + /* On RISC-V we're constructing token to be function of address itself */ + addr = ssp - SHSTK_ENTRY_SIZE; + + if (amo_user_shstk((unsigned long __user *)addr, (unsigned long)ssp) == -1) + return -EFAULT; + + if (token_addr) + *token_addr = addr; + + return 0; +} + +static unsigned long allocate_shadow_stack(unsigned long addr, unsigned long size, + unsigned long token_offset, bool set_tok) +{ + int flags = MAP_ANONYMOUS | MAP_PRIVATE; + struct mm_struct *mm = current->mm; + unsigned long populate, tok_loc = 0; + + if (addr) + flags |= MAP_FIXED_NOREPLACE; + + mmap_write_lock(mm); + addr = do_mmap(NULL, addr, size, PROT_READ, flags, + VM_SHADOW_STACK | VM_WRITE, 0, &populate, NULL); + mmap_write_unlock(mm); + + if (!set_tok || IS_ERR_VALUE(addr)) + goto out; + + if (create_rstor_token(addr + token_offset, &tok_loc)) { + vm_munmap(addr, size); + return -EINVAL; + } + + addr = tok_loc; + +out: + return addr; +} + +SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size, unsigned int, flags) +{ + bool set_tok = flags & SHADOW_STACK_SET_TOKEN; + unsigned long aligned_size = 0; + + if (!cpu_supports_shadow_stack()) + return -EOPNOTSUPP; + + /* Anything other than set token should result in invalid param */ + if (flags & ~SHADOW_STACK_SET_TOKEN) + return -EINVAL; + + /* + * Unlike other architectures, on RISC-V, SSP pointer is held in CSR_SSP and is available + * CSR in all modes. CSR accesses are performed using 12bit index programmed in instruction + * itself. This provides static property on register programming and writes to CSR can't + * be unintentional from programmer's perspective. As long as programmer has guarded areas + * which perform writes to CSR_SSP properly, shadow stack pivoting is not possible. Since + * CSR_SSP is writeable by user mode, it itself can setup a shadow stack token subsequent + * to allocation. Although in order to provide portablity with other architecture (because + * `map_shadow_stack` is arch agnostic syscall), RISC-V will follow expectation of a token + * flag in flags and if provided in flags, setup a token at the base. + */ + + /* If there isn't space for a token */ + if (set_tok && size < SHSTK_ENTRY_SIZE) + return -ENOSPC; + + if (addr && (addr & (PAGE_SIZE - 1))) + return -EINVAL; + + aligned_size = PAGE_ALIGN(size); + if (aligned_size < size) + return -EOVERFLOW; + + return allocate_shadow_stack(addr, aligned_size, size, set_tok); +} From patchwork Wed Feb 5 01:21:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960372 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 3F23CC02193 for ; Wed, 5 Feb 2025 01:22:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D49F1280017; Tue, 4 Feb 2025 20:22:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CD616280016; Tue, 4 Feb 2025 20:22:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAEFE280017; Tue, 4 Feb 2025 20:22:18 -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 89A1F280016 for ; Tue, 4 Feb 2025 20:22:18 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3ED518047B for ; Wed, 5 Feb 2025 01:22:18 +0000 (UTC) X-FDA: 83084140356.22.6B0ADA2 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf24.hostedemail.com (Postfix) with ESMTP id 57BE6180005 for ; Wed, 5 Feb 2025 01:22:16 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=R20w4NQV; spf=pass (imf24.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=1738718536; 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=42Qh4XiAuZulv75xzl4kByDL6UOmUjop2oq2YsBLVIA=; b=Tvfb6vcrRnDXkxyuuPL9Jpm6GmhvVhFaZFq4/+AbPqScCpDpGWQtWazjEySEHNJaNe/ypV 5DUL8Un+CciLulIdlMuL9k14xwEEEQKL35HL6OqGznHnPQ5ySUnyZcjjNyq1VudASzfkRK rehm9edidHvPpeHp1ECNeFBu2+hSkTQ= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=R20w4NQV; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718536; a=rsa-sha256; cv=none; b=vDl0l6md4orOuSAW/oRnXg2D4t7u7nh8gDTU8GttZ62B69sR5Wf0JJIBMXRB/5b6hwv6qc vWu+8iehg+wC42SylNFXUlYzLiGHx8VxnAR+H8/gZyY6feNdJReGpMbLz0xaaDA2CA4ioL iJpGAfMQuToCTnS6Kq0UoXU3AKLbuBo= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21f0bc811dbso5061395ad.1 for ; Tue, 04 Feb 2025 17:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718535; x=1739323335; 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=42Qh4XiAuZulv75xzl4kByDL6UOmUjop2oq2YsBLVIA=; b=R20w4NQVfYKgQMAN6ESbwV7ssG6xUOv1UuVunNun41ZOEtL/l1kn33gxFwjJSjRGQw Acmya/6tvDqVfZe8SnaL750NKEhiUA30aKf5ldaaleLOZ6RrNsObuiFr37Wx1OZTjJxm 14Sh0r6Pp4osFBGq5+4pcOQYZcWlGbbiAdcJHa45ksF2ry7AIZT18Ynk3WXaGmTKQiNg depgadzU0fzCaN1+v6/A2npxtOoPq2hujUFKjAEG53aNjtHlBnsoDXUMLzE/GMV14oIB IgxnInTHGU7+ZrYGzRsAVGY4EwX/qGqNvu3HqAB11taxNrwkZs7hHkHmnOOcGdrmpxAj i5BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718535; x=1739323335; 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=42Qh4XiAuZulv75xzl4kByDL6UOmUjop2oq2YsBLVIA=; b=ry+/8gcw1Eu9D1BexXzXwV5+KU85dEEW7+6KlytN90yCAY5xGY2sIb4+Dc0W00AfEP oOcDSRCxcJ2ZQfbbWSxaUmkweD1SHlEJm8228pke4yQo9zoBse4iW8TziORswIhPqdU9 7JVs5eVoTWL4SX+hEudx5W+E3N3Vw4ru8GP36xqiAwWtle3S43ZiZw7CllH7FRJQh6Pg obodDNwZYBclH+P+54q2I4MPD0QkgLHIlS3ErP5oKR2yD7+xKVwH3QWqNNy8Tmy+frBh BMWJmgH2GGoijvYIM+4qTm76RAUUVi20QzJr9zhzbxl4S2Vpr0sM2kvt1DkbILUqouEJ OZdg== X-Forwarded-Encrypted: i=1; AJvYcCX3qYGLz+hoVXoKmZcA3MhJI152ueIM8YRbWiIJzjmS0zuQOkO43d3+Q+r5SOF5h98j+d0h5iMtVg==@kvack.org X-Gm-Message-State: AOJu0YxEbjuqSyqV3zuUWKiE/NTTX9b4KSx9fN5h99n+FVwfQ1WCpga8 WUvELDEijY/8yyWu79WTzUstPuTgS+j2/MVvY59WOPXrDAd0WA9I8H8kd9/l4/Q= X-Gm-Gg: ASbGnctDZgUP0k1db3x1on8rluIQkgc6Q796gPnHC8D1fUThIc2eMS6V27zE9r0cnEu Sc0utZ465gkMXoZ1uJX2ijnjqFOGScKSFDJPHTRK4I7zKfJs6955XG/rsIvctGIwkul98MlkKi/ qv1iIhONe7jxzzkBHL4aNVNX/GLlCWkNO1WXxh8w2/MLmHbipxy340GtP/yhe/JCve3zdCv9+G6 xYyTUPs1BCWAG4Tdg+HyS4IlwomVz76mExKroQ+HZ6iyqBFt4txnwLPp+0BzJzkFhkqoRY7YrY6 T/1xM3FM+qYGW8D6qEfOZ/UxWA== X-Google-Smtp-Source: AGHT+IH/Psd/onCatzWOL9h1hC6OuXGTzue1ff8vsdlioogCR33P6WJDwTS7Y6T23ip1mN212dv4pg== X-Received: by 2002:a05:6a00:179c:b0:725:e386:3c5b with SMTP id d2e1a72fcca58-730271ffbd9mr10428644b3a.5.1738718535041; Tue, 04 Feb 2025 17:22:15 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:14 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:58 -0800 Subject: [PATCH v9 11/26] riscv/shstk: If needed allocate a new shadow stack on clone MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-11-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: 57BE6180005 X-Stat-Signature: 9bfct1mku1nt1s76qmfsextzmtwsdato X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1738718536-340630 X-HE-Meta: U2FsdGVkX19z1Lga84xvXj4eY480heDL2mt4HB1hCnzc4Piu8fHQt2MG+B7gdSYwZXDMI1xkgGuOwB0SEoStJswSHwBvjaMLkAqG4dQj8jHimYyFECOq9Cq45+cUkfqEaue49sERR+l974VYY5YHmxeGfnr4r9YACFXeWfDqN49dXawk7rdln3k2gqKkI4W85vrptDNvDWbNZc5t8IgVkXpuBC7G3INTGz2IpsHYQAahSH04tlaFjeLSuhXppZ+eP+8duNw3aYTyDfF/fZcOFRLmCCvR3xPzJ9MN96wypr0osn6G3gdB7t9bf934yM9ZIwMLGUhiNfHVbXsECW76lzzQtJweLHsXvcDTOAlj5/jC3lobKo3xCgWBOJTopM4ZTmNZK4frLsiyDMQahazBeK9hih2zlHZpkxvAGIeIBOWedErMLxLZUYkBOsHNrGIJOjmaqXwe7/9xEba1AxmlfmfNoXAcW6MQdb81hzuRj3KMy8RdGJMlGlWxmSxkt9SNhjsRjSsw3ebydwV3AKy9M/pXwAxdIhPMuHnl5Bvqi3UeYY+YZQUVtDTMkYmAugOkZ9YUx0Re/aic2y6etUbHsBpvidM5d+RMhItMI0e8lMIbcQgeqEDYVRtkS9pcYwnikEyZncyvFKH+ddg2YcMOpIMXACmz1pcOApCpGGLTdKElvl2N1l7RBWvpwPB5yFXSBsLDB6lQpplyi+LXQVEbTm443kQS1BWBFJJ9snGuU27uo4hj0d1nAb82hzP0D89Hel0f/Bo/tEKzjh24yvrqlTicPoIOQQI7wahhPfrCIa2a4g9mQd96CNf/p2Uo3sjmpRL6xwwvD9Lqu8yJHNh1+11v423F3PamtvVUdH1vUXW6zRB/VRhE6yj5S9kZtwQhz3ZzswtgYSNJqmUd+d+rwNmvUs0PZGu4rHeRoM3Q+ha07l3600+iySZFtJReTK3b6X+wmkp85dcAF2jSfgm 05AC0BH6 cMp0+FqapJVsajbUpXQZPtvO8WYXb6TEItw4Lbzvz6KLBMi7mp5CIEaCbu8f/F3W+tOBropcosp5fxmOAz/manrXECTxjsqy/PLh3h4kXyc1w9Bg98Gol1Fd2yLKK7ukbwVLC+pf/OGrLRaTLHo9x1luhu1BMbRBx1PE9+fTeUsfQHma9S49LSMQErZPl2bI89WJqlfyZ2BBIx2F0EdP9E3dD03DXNI7Nt4mbURwct990zhXlmYSW76uz+T7iKpm0ckHCYMiNO10zHgqALyrDOdanpN4SFVoDONHQqMI6kSeTKNIf8HgYodu5LDqP9/5smAextVddyaRErLracmQe9YNY8wKnBad/wnAGH/QqiCf6wpByRHghBkBDlfJI2CRI1MDjSBTycy3Nh5o5CY0loSwrhS6OeiMIinlaZUMuHrDsI0LfQdtYtmkqhTrLCRoEZdS9m41Mj47vNl4= 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: Userspace specifies CLONE_VM to share address space and spawn new thread. `clone` allow userspace to specify a new stack for new thread. However there is no way to specify new shadow stack base address without changing API. This patch allocates a new shadow stack whenever CLONE_VM is given. In case of CLONE_VFORK, parent is suspended until child finishes and thus can child use parent shadow stack. In case of !CLONE_VM, COW kicks in because entire address space is copied from parent to child. `clone3` is extensible and can provide mechanisms using which shadow stack as an input parameter can be provided. This is not settled yet and being extensively discussed on mailing list. Once that's settled, this commit will adapt to that. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/mmu_context.h | 7 ++ arch/riscv/include/asm/usercfi.h | 25 ++++++++ arch/riscv/kernel/process.c | 9 +++ arch/riscv/kernel/usercfi.c | 120 +++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+) diff --git a/arch/riscv/include/asm/mmu_context.h b/arch/riscv/include/asm/mmu_context.h index 8c4bc49a3a0f..dbf27a78df6c 100644 --- a/arch/riscv/include/asm/mmu_context.h +++ b/arch/riscv/include/asm/mmu_context.h @@ -48,6 +48,13 @@ static inline unsigned long mm_untag_mask(struct mm_struct *mm) } #endif +#define deactivate_mm deactivate_mm +static inline void deactivate_mm(struct task_struct *tsk, + struct mm_struct *mm) +{ + shstk_release(tsk); +} + #include #endif /* _ASM_RISCV_MMU_CONTEXT_H */ diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index 5f2027c51917..82d28ac98d76 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -8,6 +8,9 @@ #ifndef __ASSEMBLY__ #include +struct task_struct; +struct kernel_clone_args; + #ifdef CONFIG_RISCV_USER_CFI struct cfi_status { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ @@ -17,6 +20,28 @@ struct cfi_status { unsigned long shdw_stk_size; /* size of shadow stack */ }; +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args); +void shstk_release(struct task_struct *tsk); +void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size); +unsigned long get_shstk_base(struct task_struct *task, unsigned long *size); +void set_active_shstk(struct task_struct *task, unsigned long shstk_addr); +bool is_shstk_enabled(struct task_struct *task); + +#else + +#define shstk_alloc_thread_stack(tsk, args) 0 + +#define shstk_release(tsk) + +#define get_shstk_base(task, size) 0UL + +#define set_shstk_base(task, shstk_addr, size) + +#define set_active_shstk(task, shstk_addr) + +#define is_shstk_enabled(task) false + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 7c244de77180..99acb6342a37 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -29,6 +29,7 @@ #include #include #include +#include #if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK) #include @@ -211,6 +212,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) unsigned long clone_flags = args->flags; unsigned long usp = args->stack; unsigned long tls = args->tls; + unsigned long ssp = 0; struct pt_regs *childregs = task_pt_regs(p); /* Ensure all threads in this mm have the same pointer masking mode. */ @@ -229,11 +231,18 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) p->thread.s[0] = (unsigned long)args->fn; p->thread.s[1] = (unsigned long)args->fn_arg; } else { + /* allocate new shadow stack if needed. In case of CLONE_VM we have to */ + ssp = shstk_alloc_thread_stack(p, args); + if (IS_ERR_VALUE(ssp)) + return PTR_ERR((void *)ssp); + *childregs = *(current_pt_regs()); /* Turn off status.VS */ riscv_v_vstate_off(childregs); if (usp) /* User fork */ childregs->sp = usp; + /* if needed, set new ssp */ + ssp ? set_active_shstk(p, ssp) : 0; if (clone_flags & CLONE_SETTLS) childregs->tp = tls; childregs->a0 = 0; /* Return value of fork() */ diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 24022809a7b5..73cf87dab186 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -19,6 +19,41 @@ #define SHSTK_ENTRY_SIZE sizeof(void *) +bool is_shstk_enabled(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ubcfi_en ? true : false; +} + +void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size) +{ + task->thread_info.user_cfi_state.shdw_stk_base = shstk_addr; + task->thread_info.user_cfi_state.shdw_stk_size = size; +} + +unsigned long get_shstk_base(struct task_struct *task, unsigned long *size) +{ + if (size) + *size = task->thread_info.user_cfi_state.shdw_stk_size; + return task->thread_info.user_cfi_state.shdw_stk_base; +} + +void set_active_shstk(struct task_struct *task, unsigned long shstk_addr) +{ + task->thread_info.user_cfi_state.user_shdw_stk = shstk_addr; +} + +/* + * If size is 0, then to be compatible with regular stack we want it to be as big as + * regular stack. Else PAGE_ALIGN it and return back + */ +static unsigned long calc_shstk_size(unsigned long size) +{ + if (size) + return PAGE_ALIGN(size); + + return PAGE_ALIGN(min_t(unsigned long long, rlimit(RLIMIT_STACK), SZ_4G)); +} + /* * Writes on shadow stack can either be `sspush` or `ssamoswap`. `sspush` can happen * implicitly on current shadow stack pointed to by CSR_SSP. `ssamoswap` takes pointer to @@ -142,3 +177,88 @@ SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size, unsi return allocate_shadow_stack(addr, aligned_size, size, set_tok); } + +/* + * This gets called during clone/clone3/fork. And is needed to allocate a shadow stack for + * cases where CLONE_VM is specified and thus a different stack is specified by user. We + * thus need a separate shadow stack too. How does separate shadow stack is specified by + * user is still being debated. Once that's settled, remove this part of the comment. + * This function simply returns 0 if shadow stack are not supported or if separate shadow + * stack allocation is not needed (like in case of !CLONE_VM) + */ +unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, + const struct kernel_clone_args *args) +{ + unsigned long addr, size; + + /* If shadow stack is not supported, return 0 */ + if (!cpu_supports_shadow_stack()) + return 0; + + /* + * If shadow stack is not enabled on the new thread, skip any + * switch to a new shadow stack. + */ + if (!is_shstk_enabled(tsk)) + return 0; + + /* + * For CLONE_VFORK the child will share the parents shadow stack. + * Set base = 0 and size = 0, this is special means to track this state + * so the freeing logic run for child knows to leave it alone. + */ + if (args->flags & CLONE_VFORK) { + set_shstk_base(tsk, 0, 0); + return 0; + } + + /* + * For !CLONE_VM the child will use a copy of the parents shadow + * stack. + */ + if (!(args->flags & CLONE_VM)) + return 0; + + /* + * reaching here means, CLONE_VM was specified and thus a separate shadow + * stack is needed for new cloned thread. Note: below allocation is happening + * using current mm. + */ + size = calc_shstk_size(args->stack_size); + addr = allocate_shadow_stack(0, size, 0, false); + if (IS_ERR_VALUE(addr)) + return addr; + + set_shstk_base(tsk, addr, size); + + return addr + size; +} + +void shstk_release(struct task_struct *tsk) +{ + unsigned long base = 0, size = 0; + /* If shadow stack is not supported or not enabled, nothing to release */ + if (!cpu_supports_shadow_stack() || !is_shstk_enabled(tsk)) + return; + + /* + * When fork() with CLONE_VM fails, the child (tsk) already has a + * shadow stack allocated, and exit_thread() calls this function to + * free it. In this case the parent (current) and the child share + * the same mm struct. Move forward only when they're same. + */ + if (!tsk->mm || tsk->mm != current->mm) + return; + + /* + * We know shadow stack is enabled but if base is NULL, then + * this task is not managing its own shadow stack (CLONE_VFORK). So + * skip freeing it. + */ + base = get_shstk_base(tsk, &size); + if (!base) + return; + + vm_munmap(base, size); + set_shstk_base(tsk, 0, 0); +} From patchwork Wed Feb 5 01:21:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960373 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 63560C02196 for ; Wed, 5 Feb 2025 01:22:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 161E1280018; Tue, 4 Feb 2025 20:22:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C491280016; Tue, 4 Feb 2025 20:22:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5841280018; Tue, 4 Feb 2025 20:22:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C1FF7280016 for ; Tue, 4 Feb 2025 20:22:20 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 2098880482 for ; Wed, 5 Feb 2025 01:22:20 +0000 (UTC) X-FDA: 83084140440.03.9381DE2 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf08.hostedemail.com (Postfix) with ESMTP id 2AB89160006 for ; Wed, 5 Feb 2025 01:22:17 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jFyh5hUf; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 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=1738718538; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=fwz7caUnw9PDcW/pbLX+2Com4kfXW/6HNSBid4S4qenSJ8Lq2cavC6B8r7OCcMNgtpHzuI t7FhdLHWetdU0RuCl9XjsNTWy8mv/eTGIiTEBbmDyC+sJMvdeQIVhA3oRUUefU1LoAAOeU XdTz8QY4NLJxBTQmx0UcMJF/yMhCxZE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718538; a=rsa-sha256; cv=none; b=vnpFy5+hjCYWFSl+BRHz9KVfAOdNwkULNod7gBxvJ9pf3th97NeNx0KkifsY0/U4s3IuoP qVEEq1GR5DohDT5St78sM68uFc4rXqhbT3NkBb/A6UCpjXXZxtpDunWqRppOTs7pvb8W8w +sjt58pZdWmwZq3IvqrsLXmj1VVSqZ0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jFyh5hUf; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2f9da2a7004so883078a91.0 for ; Tue, 04 Feb 2025 17:22:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718537; x=1739323337; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=jFyh5hUfO/ozAJIGz/chPAPjtQc39UcLW6WiIYfWPr7+KQoj3kslSm6WxCMpanotHt yRnwLEpTxrXiclgEAn0s04OB6ZkSJ7ZyHYLnr04we9bYiqnLNoO86wjSfiBaGOy4zyVP t1jIiD4pmPxS9HaxH9iebCXegg58ljysaEL8QP1YWg8oip8DqXi3a4O1MZoPOMkIdqWn rvXP5rJtib7HnHAr9GMaTGSNYhpwsn+zb1FNrfkqtp9fT3l2ZptWgQhx9ODycW37PH/x oKvZO9sLZLlSJYqUwVldIqGhRTNIbwr+1U5VMq4SAxBhbL3DjnFJ6HGIJY5ZEmcK4hdd UK1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718537; x=1739323337; 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=Zfw9OtoVzzM7Z5oL2c+Ej/yDm51xyr1WNtqXJN3fx8s=; b=tKdbjPwkP7xB6j9hsuV8DP6N8ZzKjb6V3vUMFtcBlJeEFdk5nXWkRiU7xFJoho73Cq 5HwGAxFrcQXqfFHUA1WV5h2pL5qtCVGs4L+XQiZK8C16VY/GF2unfOXCvA0fW9vCqrN8 ga37lsKXBbAcm+kKi6ji/s6CssFfuEGV+taYqNHmNGJuAgdWffcgILkf9EEJPHg4TSGm aYbLa+tsa8wcpNte3LFhI3MgA7L5pg+cSiuLJPJfIliY6V8DOEEcFKQYFWzvk8QHvOBt sJ4PLYIHAYxoFJZtSa1igV/ZUVO0pBsDIHnnNqcClvaGKGhd2L3cml1UHS5h6hSFI/Yw PJnw== X-Forwarded-Encrypted: i=1; AJvYcCWAqflEhXm8QK0CcUFxUMpp1IjDTnzVPGVfK9oIaQ7vw/3ZUcHLiqfy5Mbn5xLsOaDY9WEUkWDs9A==@kvack.org X-Gm-Message-State: AOJu0YzUsfFz5ijH2VHQbYuT4UuKPhVH0iylgjG0TxbUjJr9PbNjtAeh XjMzYPH7BUTFBYM/5u9WHhzM0ALtVg6T8RtYX6bcMBq69ViIxyfMq3bE0W8SJ7I= X-Gm-Gg: ASbGncuRyUtswFmsi+HM4mjt+ZZ3rifrPsD69volvcMWqvA7T0VCYBBNzlZNb5UETua RUJMy1ECvSMT4IqgSr22YYT3mYXiNblxQGyjlLrSFGZyUXckmI8qvPRqeFhrgA5xhlcjjfFJtsc wIDcfAHNJHHe7qRFmcKQxXIWRyhd4NHrq00PM37aoBPhUuMguUGNQrYQ+iX31uOVh1So891W+if KnsDS3BrkVQsoKnbuv0kKIgFTxoVM99oYzMTr+FuBCYGn/Z4JKyhnZXqSlIV0LQUzqfjHw+3i/f optVUVDMvGN1t0SLULWTsx8igQ== X-Google-Smtp-Source: AGHT+IEV2JRI/u7jJ+DMFTPXNcstQgsHVFgvv9cPCm1RBElDa+SvGAhtxoxPORcsFm2xZuy3PMKfmQ== X-Received: by 2002:a05:6a00:3991:b0:728:e2cc:bfd6 with SMTP id d2e1a72fcca58-730351dd5d3mr1505033b3a.18.1738718536922; Tue, 04 Feb 2025 17:22:16 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:16 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:21:59 -0800 Subject: [PATCH v9 12/26] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-12-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-Stat-Signature: pupzjn1bjahbg7k51twbpxc85g9dt84w X-Rspam-User: X-Rspamd-Queue-Id: 2AB89160006 X-Rspamd-Server: rspam03 X-HE-Tag: 1738718537-244893 X-HE-Meta: U2FsdGVkX18Sh8tl2q7V5DXDImsAtx7Xf712QXgL8o380hI+86WbAyPDsYVeOheWZyw6ymtuNc8aOpCYsgKQg+0zpzPAl3RVEYOGr2vACGx0DlB5ep1NjZ9QvgTyzh64Ap0WyMHm7y4zRfotrzPdnYgDEiMElo/osrM/BWxkgz6Kz9NYoD2PFgExTAjExaoHcxLej35n+KAM8kRFim4fcBx5RvgExd+CfDa4V4wK5bMvQfvMQIZNPefuYZbsjxg76jVUGiV4Uvj4x1BhpVv6+orUE1GL+xB/wCs2MJ6emp2UPbKoxELUX/XR4+g9YdVqJo/uSeqF6F4p0kLe6P8sL01rTJUFNSKrjFIrSaXlR108aeWFOK/RZxbM6ikjvwStZd5kSOa4zc13cDoJrBMP+P2W4l7dmsxLG231rSjEXM0DiMMBZXvzujb9C0PMpQVS8B5VsYE9GYXXrR+lCbpAmyMdR0JvjNa0L9icOGXh1JylR3ueVUzc4Rb5XEJcQTxoUATlyWQSXfhC2ydoVWnQ0K6YNvFP5YcY1BVI8DE094IDu1IACkAzyzOgF6kvDhIumeSag4yfJCtFh6fEthG0S/yYwr0k1B/MISwSfz9PIFs4ednDmLUTrDTJwf5pz5zapYlJXyFywaO1+9BwQLfDzMzEO5SUbj4uVxXM1j2GB2FwTfCyVmQOZKX4JIJXkaoR7TW/AD3iCT9sNSP5xxBeY+s5MVr4ZzcGaOABBY553/VKmSfmdsd4E7mY07PBD/FovUebfqgWC3qle2baEUewd+m46P8jX6aIN1dH3WuvrhWZkEE0u09iCzTuRg3Dan6UTaev8JCICuZ+CxNdjClobbzjrX6TKLzMidA5Lzp/614C39bhXEOJGcPrJeeRvhcj1Hf+wo4C+acEH0iD+FcBNCIQhLy0jXSgXo2JTFPvwrspNYCt3CXEOfYNQJh9xCgjlQt6BYGLajwfSAysy/z 9U5pTxbv Couth/A0Jz/F3YCMv8biklbeZP0n4rHjL2A0c4dDTs1EQNk/zfrZtzKFugIRJNrO8dKEHQc97wHVIgnXXLsqvDxEYjm24/arjhWat7C8U5TrnI1cE7Wv/jCFCWwT+mU7lmDpLjsG4WSrdQlTv/fKtgDfAEeAwN3GethPr7cBHKU+e0T13pCofODYUA9szyM2Vqy42g3bCou1Mg2p6uCPYT3ex8XmFtzI0lhU1SLlVRZjOJS6BKB76kBb/vD58d0ZwL+tOMLdKwWmDXTrQWl3Z03kSXfbuJToaBSx1cRVHfMtTiOKD3AGGMD5nnhDZQ+nw8yNYNfe7D81NDLk18RpO4I5WtTG8BnQnINSua1jU82N1qYCGtnmT949foUk80OKVLqpBgZaixdN9eAAvwsAOlghjqvaEcBXncNKOTYj8g9r1y8xwqoN82Sb25L8GiF+E8m7UCbgDv2FX/CYj4HLLSW78rw== 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: Implement architecture agnostic prctls() interface for setting and getting shadow stack status. prctls implemented are PR_GET_SHADOW_STACK_STATUS, PR_SET_SHADOW_STACK_STATUS and PR_LOCK_SHADOW_STACK_STATUS. As part of PR_SET_SHADOW_STACK_STATUS/PR_GET_SHADOW_STACK_STATUS, only PR_SHADOW_STACK_ENABLE is implemented because RISCV allows each mode to write to their own shadow stack using `sspush` or `ssamoswap`. PR_LOCK_SHADOW_STACK_STATUS locks current configuration of shadow stack enabling. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 18 ++++++- arch/riscv/kernel/process.c | 8 +++ arch/riscv/kernel/usercfi.c | 107 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index 82d28ac98d76..c4dcd256f19a 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -7,6 +7,7 @@ #ifndef __ASSEMBLY__ #include +#include struct task_struct; struct kernel_clone_args; @@ -14,7 +15,8 @@ struct kernel_clone_args; #ifdef CONFIG_RISCV_USER_CFI struct cfi_status { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ - unsigned long rsvd : ((sizeof(unsigned long) * 8) - 1); + unsigned long ubcfi_locked : 1; + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 2); unsigned long user_shdw_stk; /* Current user shadow stack pointer */ unsigned long shdw_stk_base; /* Base address of shadow stack */ unsigned long shdw_stk_size; /* size of shadow stack */ @@ -27,6 +29,12 @@ void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned unsigned long get_shstk_base(struct task_struct *task, unsigned long *size); void set_active_shstk(struct task_struct *task, unsigned long shstk_addr); bool is_shstk_enabled(struct task_struct *task); +bool is_shstk_locked(struct task_struct *task); +bool is_shstk_allocated(struct task_struct *task); +void set_shstk_lock(struct task_struct *task); +void set_shstk_status(struct task_struct *task, bool enable); + +#define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) #else @@ -42,6 +50,14 @@ bool is_shstk_enabled(struct task_struct *task); #define is_shstk_enabled(task) false +#define is_shstk_locked(task) false + +#define is_shstk_allocated(task) false + +#define set_shstk_lock(task) + +#define set_shstk_status(task, enable) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 99acb6342a37..cd11667593fe 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -153,6 +153,14 @@ void start_thread(struct pt_regs *regs, unsigned long pc, regs->epc = pc; regs->sp = sp; + /* + * clear shadow stack state on exec. + * libc will set it later via prctl. + */ + set_shstk_status(current, false); + set_shstk_base(current, 0, 0); + set_active_shstk(current, 0); + #ifdef CONFIG_64BIT regs->status &= ~SR_UXL; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 73cf87dab186..37d6fb8144e7 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -24,6 +24,16 @@ bool is_shstk_enabled(struct task_struct *task) return task->thread_info.user_cfi_state.ubcfi_en ? true : false; } +bool is_shstk_allocated(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.shdw_stk_base ? true : false; +} + +bool is_shstk_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ubcfi_locked ? true : false; +} + void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned long size) { task->thread_info.user_cfi_state.shdw_stk_base = shstk_addr; @@ -42,6 +52,23 @@ void set_active_shstk(struct task_struct *task, unsigned long shstk_addr) task->thread_info.user_cfi_state.user_shdw_stk = shstk_addr; } +void set_shstk_status(struct task_struct *task, bool enable) +{ + task->thread_info.user_cfi_state.ubcfi_en = enable ? 1 : 0; + + if (enable) + task->thread.envcfg |= ENVCFG_SSE; + else + task->thread.envcfg &= ~ENVCFG_SSE; + + csr_write(CSR_ENVCFG, task->thread.envcfg); +} + +void set_shstk_lock(struct task_struct *task) +{ + task->thread_info.user_cfi_state.ubcfi_locked = 1; +} + /* * If size is 0, then to be compatible with regular stack we want it to be as big as * regular stack. Else PAGE_ALIGN it and return back @@ -262,3 +289,83 @@ void shstk_release(struct task_struct *tsk) vm_munmap(base, size); set_shstk_base(tsk, 0, 0); } + +int arch_get_shadow_stack_status(struct task_struct *t, unsigned long __user *status) +{ + unsigned long bcfi_status = 0; + + if (!cpu_supports_shadow_stack()) + return -EINVAL; + + /* this means shadow stack is enabled on the task */ + bcfi_status |= (is_shstk_enabled(t) ? PR_SHADOW_STACK_ENABLE : 0); + + return copy_to_user(status, &bcfi_status, sizeof(bcfi_status)) ? -EFAULT : 0; +} + +int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status) +{ + unsigned long size = 0, addr = 0; + bool enable_shstk = false; + + if (!cpu_supports_shadow_stack()) + return -EINVAL; + + /* Reject unknown flags */ + if (status & ~PR_SHADOW_STACK_SUPPORTED_STATUS_MASK) + return -EINVAL; + + /* bcfi status is locked and further can't be modified by user */ + if (is_shstk_locked(t)) + return -EINVAL; + + enable_shstk = status & PR_SHADOW_STACK_ENABLE; + /* Request is to enable shadow stack and shadow stack is not enabled already */ + if (enable_shstk && !is_shstk_enabled(t)) { + /* shadow stack was allocated and enable request again + * no need to support such usecase and return EINVAL. + */ + if (is_shstk_allocated(t)) + return -EINVAL; + + size = calc_shstk_size(0); + addr = allocate_shadow_stack(0, size, 0, false); + if (IS_ERR_VALUE(addr)) + return -ENOMEM; + set_shstk_base(t, addr, size); + set_active_shstk(t, addr + size); + } + + /* + * If a request to disable shadow stack happens, let's go ahead and release it + * Although, if CLONE_VFORKed child did this, then in that case we will end up + * not releasing the shadow stack (because it might be needed in parent). Although + * we will disable it for VFORKed child. And if VFORKed child tries to enable again + * then in that case, it'll get entirely new shadow stack because following condition + * are true + * - shadow stack was not enabled for vforked child + * - shadow stack base was anyways pointing to 0 + * This shouldn't be a big issue because we want parent to have availability of shadow + * stack whenever VFORKed child releases resources via exit or exec but at the same + * time we want VFORKed child to break away and establish new shadow stack if it desires + * + */ + if (!enable_shstk) + shstk_release(t); + + set_shstk_status(t, enable_shstk); + return 0; +} + +int arch_lock_shadow_stack_status(struct task_struct *task, + unsigned long arg) +{ + /* If shtstk not supported or not enabled on task, nothing to lock here */ + if (!cpu_supports_shadow_stack() || + !is_shstk_enabled(task) || arg != 0) + return -EINVAL; + + set_shstk_lock(task); + + return 0; +} From patchwork Wed Feb 5 01:22:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960374 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 294F2C02193 for ; Wed, 5 Feb 2025 01:22:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB427280019; Tue, 4 Feb 2025 20:22:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A3956280016; Tue, 4 Feb 2025 20:22:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81672280019; Tue, 4 Feb 2025 20:22:22 -0500 (EST) 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 5CD9D280016 for ; Tue, 4 Feb 2025 20:22:22 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1219B1605A9 for ; Wed, 5 Feb 2025 01:22:22 +0000 (UTC) X-FDA: 83084140524.26.ABB8B69 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf30.hostedemail.com (Postfix) with ESMTP id EB4698000B for ; Wed, 5 Feb 2025 01:22:19 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=D654WiHo; dmarc=none; spf=pass (imf30.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718540; a=rsa-sha256; cv=none; b=uH7CPTYbLgxwjYqQ7H+4zm2Tgk2RW7znYqR7qZ6bMqV5URUe56tQpEGfS+jkZ8wQVx5Dgg uM9PNPIeMD5zmw+je9sWw1luOqES2q3XVjLUAraFyvEarlysUbQRPRgfIGeJ0hhVUc4Udi UwKl9tZiaTeNNgPNUs/LpH1encj/O8w= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=D654WiHo; dmarc=none; spf=pass (imf30.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738718540; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=QENQZmh4lxE2reEbTsOx4ZwimuJysJgcILrp4FFHskRnzeHGFDfb6TGRo95nZ7r1LEjN/I ErUVOdVYJajWmoMFvymap32cmYehAB76ToxgMBjvEOJy8G0u3+kmfnCV7zny06AhAbDP3l 1j24ib+uxvcgX6QVOJCaSSLijf9ejcU= Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2f9cb23d22cso1694885a91.1 for ; Tue, 04 Feb 2025 17:22:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718539; x=1739323339; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=D654WiHolK5rp5cu/+19v0Q8LqsBTX15+MjT64hjpOUpFg73yKZ60wX/q5rHif2SsL O29Y9OAmcjlXeVOV+3wB8L62chWArPIWWt3Hb6klXC4YACKlqgJFZ00+55ZIgK7vUB0Z ME0TwEOXqfus0BaiStEJ8ThKO9HE9SSQtveBIFZvHPlM4sWvmORkx6lBws+7kYLovqWQ iEq1vghTFb2SG6eIDCgUayw+N7GOBCRR+C1IP3bJ35fV8nrPcZgLrRVzW6SY+LOYiOyb kKD27j0gTH6JsinoYnsqILq1KQnh86D1ge99pjxlrkIMaMbzdH9UgqG4g5XUAEQGNYZg I9Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718539; x=1739323339; 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=n4wOXS0/20DvZRxruHD7mFnd6lRzln/dV2wTFJ6STYc=; b=XS6ZLxsBXlknCCQCNcFWc6WwTC4/4nBtrHZoJi02ZVW3DIlEVbww7y6he5/TaE0nhW y87fMFquhqQ7V3f/6RDY0i2nosg5QSSv9L2h2Vhyyk46u6c0SuRetsOnPY793fMcc8m6 YNhgqM7nKnghEFZaMaXkXV0cmzMXZlNyCnuoAAXlSxcXBJ2R+u2ZfANer+sYKBh+u8q9 a6RibLNmy6cPVoTVeeAcX+daOqvvaI6ajen+ZhwXXcILS89fzflPez2o4fiPJYm7Fn6y IKD0FymWPikQn7BC4aR//zXOI0M2RrpcAsds1A4e4zb2N53Ei+xk1L+0soemIDfIHj+c SqbA== X-Forwarded-Encrypted: i=1; AJvYcCVc4y/tk+OrMWjLYeHjWRP+kQy8KwpqQSCVT0WrVDy7Lnq4PFbDEU+p9kRuVX+VrG7fTYNwNMsXyQ==@kvack.org X-Gm-Message-State: AOJu0Yyth7hmx2KCDsEWLCh8XZjFgQ9Vt4Hgdl+Gxu4VpccMgs8h0bZt PIdvQhn0AukzOv7QY23jaumhsnndlx6hMskCgEylNjPX7iOCF1eglbX4TagpM6w= X-Gm-Gg: ASbGncsJBXdlE2qr32ssSYZLBbfsthY5LioXTtkMPIMvUZyZXkxDYD3ihrCym5rJNdn 0e/z0qk9118dqEeLb705SIr9cyUJsrmdYeJo9e8RpezpKikpaM9L0ifiQSsjBIpBTTL9p+owrvs 3r7tp06uuq1dy4NLn3TdPNcVV9yZJb4IfH1tUIYl8ap7z2k30bhBpenRET7HE1grL1STi70hJ70 Rsktj2nxkewwop4CbRyGSbiJQmyNpinyjPpodprNUuUyZttheEIR+6PCzq3ZeLJmBNSGneNIYP+ Pg+ZGq0ClIElsvhwdpjqcGuJvw== X-Google-Smtp-Source: AGHT+IEkMV3NZQlTfgqHebic0yhy4xKkC1OVABBD14xN7hIjWbNvTWOJifhfgskqBrlP8VDgH29eiw== X-Received: by 2002:a05:6a00:2886:b0:729:1b8f:9645 with SMTP id d2e1a72fcca58-7303521c6d7mr1821327b3a.24.1738718538832; Tue, 04 Feb 2025 17:22:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:18 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:00 -0800 Subject: [PATCH v9 13/26] prctl: arch-agnostic prctl for indirect branch tracking MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-13-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-Rspam-User: X-Rspamd-Queue-Id: EB4698000B X-Rspamd-Server: rspam10 X-Stat-Signature: m9i3x7hesgogwd5ns1sr1ebp9ydax73g X-HE-Tag: 1738718539-927168 X-HE-Meta: U2FsdGVkX19W9OapzOD4zPGBk0ipnXMDUpmurxqrewzSPfghtXbHBEDa6vGcDIQ77TRt3VhH2aOeRnq1uBZWtmAyiCObZOAKtxiukylnwy4UDBspCut4pk341ca0jRVjU/FqVTqCEdwPiHBHDWD3LIpOLD3MNUNjdOmkC3cdmKqeAo44/OmCbsD7SnmPRX95Acv2sE+X6CS8mso04RfBlRuWK7C22u8gwxiwysbHwmX2WUut5ziCeXYDDJSl+d4Tlyj0P3A/0LxmaKQn+tSLljLdcqwzyemZ/WHdGY+OGwM1mp6qfzDmr9lx0RKx/i+UetXcP4xPCkyWmypQf1BKvrCho+8634PbkG4XW/yhGgZEg/EE7T7BfMHOyRqWqavg1guMJfdtHRd4dYOkYmfuVvBUz7VWQmRsJ20pbhcyeWZSyVH/VEBTZGnClG+1C+SjBwUESthRikmmgAU/7qZnsPcBSKpJeeAmI4FkbBT/eXyPjeAI3FHR+kEuwOfJNOXb52KGxkkXmk8IrBNd1yyz0Hmpp2iG53D/rvmmSnuQI4D5IlGltMZ/cq6URTVu0YEM1wDhzisokzxUJoOhbVfcprUJO4QBqJ1v9b72RsgKKjFoZK3FrKVbliF8zmxxWUGTXYy2ozMDJO9oRM2yi10sg+W+v+hiHlkRWM5NRBnNyafrz6x2gXAH1aNiV5oQ6mTOGUsolYHU1W0z2NZPiICR4km85kkrpvFfdUAooBxcXt01gcokpeIfhdhZOa32rikbfTkxqsQmtzLCDna1zdhM7sCKOL0QCLSC8A0oPjOuYxmKcZY0rS9NnXPFivdvBH8EB2Z/mJ75CeKljMObZaTgMgpGUqY2GW1CFpCbeabDU3ApKLiPEgOJphqZCnQNF+bWHfzlFM05bDRKJxvSrXc/SS24yUKXSCQTxiVI5Jkzz52gRipnfWX/QCYEiveXVvIO2AMeeCt72ghwr+l2WYW oQqCHbhf 1VBLgxji9c1yW/h1Wk4NXbPv8ZeQ/7SLs4UBtvqry1h9RMN8A3MBt4Sbx26G6n6LAX9XnE+RoFOzEEin/lA/WeZOjyb90gIgzwO7V65BRe07jLSA73FHNXNrZc9fDmCWywtPn82yqOTNMCDhnEYUmA7JItsvDJyQdhVzvLQsBhGApWZ8BXznR5aSy0PWTKX0GJHAPLOM/OrXKjvK+amIIkVeNfW07EPyiJmSf0dqqVF7HCKG4n2J67KuUiTYx/AftaxPTEbVEi+DavDDVea+BCpFaby4AU8da3XE37i8nOmaZqpHyWCnODwb8MNHvqu0ugFh3fO3llwXvvK3AuqT8kxmIo6figfThDEJj7EW/dX/dY8KcYXu/7qmqsNG4Q34smi9VQpb1eLRxTB1j2ETshzjk9xEcl38sejvzKlMPUJUhO0icLBaZA5aKBNi5O+S0k5D0UmAvHXsExogLN+VVfnt8ILx5zjMmWbNuanXJBjKRLyQ= 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: Three architectures (x86, aarch64, riscv) have support for indirect branch tracking feature in a very similar fashion. On a very high level, indirect branch tracking is a CPU feature where CPU tracks branches which uses memory operand to perform control transfer in program. As part of this tracking on indirect branches, CPU goes in a state where it expects a landing pad instr on target and if not found then CPU raises some fault (architecture dependent) x86 landing pad instr - `ENDBRANCH` aarch64 landing pad instr - `BTI` riscv landing instr - `lpad` Given that three major arches have support for indirect branch tracking, This patch makes `prctl` for indirect branch tracking arch agnostic. To allow userspace to enable this feature for itself, following prtcls are defined: - PR_GET_INDIR_BR_LP_STATUS: Gets current configured status for indirect branch tracking. - PR_SET_INDIR_BR_LP_STATUS: Sets a configuration for indirect branch tracking. Following status options are allowed - PR_INDIR_BR_LP_ENABLE: Enables indirect branch tracking on user thread. - PR_INDIR_BR_LP_DISABLE; Disables indirect branch tracking on user thread. - PR_LOCK_INDIR_BR_LP_STATUS: Locks configured status for indirect branch tracking for user thread. Signed-off-by: Deepak Gupta Reviewed-by: Mark Brown --- arch/riscv/include/asm/usercfi.h | 16 ++++++++- arch/riscv/kernel/entry.S | 2 +- arch/riscv/kernel/process.c | 5 +++ arch/riscv/kernel/usercfi.c | 76 ++++++++++++++++++++++++++++++++++++++++ include/linux/cpu.h | 4 +++ include/uapi/linux/prctl.h | 27 ++++++++++++++ kernel/sys.c | 30 ++++++++++++++++ 7 files changed, 158 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index c4dcd256f19a..a8cec7c14d1d 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -16,7 +16,9 @@ struct kernel_clone_args; struct cfi_status { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ unsigned long ubcfi_locked : 1; - unsigned long rsvd : ((sizeof(unsigned long) * 8) - 2); + unsigned long ufcfi_en : 1; /* Enable for forward cfi. Note that ELP goes in sstatus */ + unsigned long ufcfi_locked : 1; + unsigned long rsvd : ((sizeof(unsigned long) * 8) - 4); unsigned long user_shdw_stk; /* Current user shadow stack pointer */ unsigned long shdw_stk_base; /* Base address of shadow stack */ unsigned long shdw_stk_size; /* size of shadow stack */ @@ -33,6 +35,10 @@ bool is_shstk_locked(struct task_struct *task); bool is_shstk_allocated(struct task_struct *task); void set_shstk_lock(struct task_struct *task); void set_shstk_status(struct task_struct *task, bool enable); +bool is_indir_lp_enabled(struct task_struct *task); +bool is_indir_lp_locked(struct task_struct *task); +void set_indir_lp_status(struct task_struct *task, bool enable); +void set_indir_lp_lock(struct task_struct *task); #define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) @@ -58,6 +64,14 @@ void set_shstk_status(struct task_struct *task, bool enable); #define set_shstk_status(task, enable) +#define is_indir_lp_enabled(task) false + +#define is_indir_lp_locked(task) false + +#define set_indir_lp_status(task, enable) + +#define set_indir_lp_lock(task) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 68c99124ea55..00494b54ff4a 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -143,7 +143,7 @@ SYM_CODE_START(handle_exception) * Disable the FPU/Vector to detect illegal usage of floating point * or vector in kernel space. */ - li t0, SR_SUM | SR_FS_VS + li t0, SR_SUM | SR_FS_VS | SR_ELP REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index cd11667593fe..4587201dd81d 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -160,6 +160,11 @@ void start_thread(struct pt_regs *regs, unsigned long pc, set_shstk_status(current, false); set_shstk_base(current, 0, 0); set_active_shstk(current, 0); + /* + * disable indirect branch tracking on exec. + * libc will enable it later via prctl. + */ + set_indir_lp_status(current, false); #ifdef CONFIG_64BIT regs->status &= ~SR_UXL; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 37d6fb8144e7..3a66f149a4ef 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -69,6 +69,32 @@ void set_shstk_lock(struct task_struct *task) task->thread_info.user_cfi_state.ubcfi_locked = 1; } +bool is_indir_lp_enabled(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_en ? true : false; +} + +bool is_indir_lp_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_locked ? true : false; +} + +void set_indir_lp_status(struct task_struct *task, bool enable) +{ + task->thread_info.user_cfi_state.ufcfi_en = enable ? 1 : 0; + + if (enable) + task->thread.envcfg |= ENVCFG_LPE; + else + task->thread.envcfg &= ~ENVCFG_LPE; + + csr_write(CSR_ENVCFG, task->thread.envcfg); +} + +void set_indir_lp_lock(struct task_struct *task) +{ + task->thread_info.user_cfi_state.ufcfi_locked = 1; +} /* * If size is 0, then to be compatible with regular stack we want it to be as big as * regular stack. Else PAGE_ALIGN it and return back @@ -369,3 +395,53 @@ int arch_lock_shadow_stack_status(struct task_struct *task, return 0; } + +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status) +{ + unsigned long fcfi_status = 0; + + if (!cpu_supports_indirect_br_lp_instr()) + return -EINVAL; + + /* indirect branch tracking is enabled on the task or not */ + fcfi_status |= (is_indir_lp_enabled(t) ? PR_INDIR_BR_LP_ENABLE : 0); + + return copy_to_user(status, &fcfi_status, sizeof(fcfi_status)) ? -EFAULT : 0; +} + +int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + bool enable_indir_lp = false; + + if (!cpu_supports_indirect_br_lp_instr()) + return -EINVAL; + + /* indirect branch tracking is locked and further can't be modified by user */ + if (is_indir_lp_locked(t)) + return -EINVAL; + + /* Reject unknown flags */ + if (status & ~PR_INDIR_BR_LP_ENABLE) + return -EINVAL; + + enable_indir_lp = (status & PR_INDIR_BR_LP_ENABLE) ? true : false; + set_indir_lp_status(t, enable_indir_lp); + + return 0; +} + +int arch_lock_indir_br_lp_status(struct task_struct *task, + unsigned long arg) +{ + /* + * If indirect branch tracking is not supported or not enabled on task, + * nothing to lock here + */ + if (!cpu_supports_indirect_br_lp_instr() || + !is_indir_lp_enabled(task) || arg != 0) + return -EINVAL; + + set_indir_lp_lock(task); + + return 0; +} diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 6a0a8f1c7c90..fb0c394430c6 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -204,4 +204,8 @@ static inline bool cpu_mitigations_auto_nosmt(void) } #endif +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status); +int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status); +int arch_lock_indir_br_lp_status(struct task_struct *t, unsigned long status); + #endif /* _LINUX_CPU_H_ */ diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h index 5c6080680cb2..6cd90460cbad 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -353,4 +353,31 @@ struct prctl_mm_map { */ #define PR_LOCK_SHADOW_STACK_STATUS 76 +/* + * Get the current indirect branch tracking configuration for the current + * thread, this will be the value configured via PR_SET_INDIR_BR_LP_STATUS. + */ +#define PR_GET_INDIR_BR_LP_STATUS 77 + +/* + * Set the indirect branch tracking configuration. PR_INDIR_BR_LP_ENABLE will + * enable cpu feature for user thread, to track all indirect branches and ensure + * they land on arch defined landing pad instruction. + * x86 - If enabled, an indirect branch must land on `ENDBRANCH` instruction. + * arch64 - If enabled, an indirect branch must land on `BTI` instruction. + * riscv - If enabled, an indirect branch must land on `lpad` instruction. + * PR_INDIR_BR_LP_DISABLE will disable feature for user thread and indirect + * branches will no more be tracked by cpu to land on arch defined landing pad + * instruction. + */ +#define PR_SET_INDIR_BR_LP_STATUS 78 +# define PR_INDIR_BR_LP_ENABLE (1UL << 0) + +/* + * Prevent further changes to the specified indirect branch tracking + * configuration. All bits may be locked via this call, including + * undefined bits. + */ +#define PR_LOCK_INDIR_BR_LP_STATUS 79 + #endif /* _LINUX_PRCTL_H */ diff --git a/kernel/sys.c b/kernel/sys.c index cb366ff8703a..f347f3518d0b 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2336,6 +2336,21 @@ int __weak arch_lock_shadow_stack_status(struct task_struct *t, unsigned long st return -EINVAL; } +int __weak arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status) +{ + return -EINVAL; +} + +int __weak arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + return -EINVAL; +} + +int __weak arch_lock_indir_br_lp_status(struct task_struct *t, unsigned long status) +{ + return -EINVAL; +} + #define PR_IO_FLUSHER (PF_MEMALLOC_NOIO | PF_LOCAL_THROTTLE) #ifdef CONFIG_ANON_VMA_NAME @@ -2811,6 +2826,21 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, return -EINVAL; error = arch_lock_shadow_stack_status(me, arg2); break; + case PR_GET_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_get_indir_br_lp_status(me, (unsigned long __user *)arg2); + break; + case PR_SET_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_set_indir_br_lp_status(me, arg2); + break; + case PR_LOCK_INDIR_BR_LP_STATUS: + if (arg3 || arg4 || arg5) + return -EINVAL; + error = arch_lock_indir_br_lp_status(me, arg2); + break; default: trace_task_prctl_unknown(option, arg2, arg3, arg4, arg5); error = -EINVAL; From patchwork Wed Feb 5 01:22:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960375 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 C5651C02194 for ; Wed, 5 Feb 2025 01:22:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6922D28001A; Tue, 4 Feb 2025 20:22:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 61A32280016; Tue, 4 Feb 2025 20:22:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4455828001A; Tue, 4 Feb 2025 20:22:24 -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 21C65280016 for ; Tue, 4 Feb 2025 20:22:24 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CB89947A4E for ; Wed, 5 Feb 2025 01:22:23 +0000 (UTC) X-FDA: 83084140566.09.03A599F Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf26.hostedemail.com (Postfix) with ESMTP id DCD69140006 for ; Wed, 5 Feb 2025 01:22:21 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KQt97o0V; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 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=1738718541; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=zdnDBLtl5aaL8nG2dAbftlNYY7RRlcZhkDsDiygXKscud3w6BiotD1Fd6WQFrBsB3iTaM1 6SGE5ihHZ0VQTBXElA7ai5BcW2CCsnp3a8+K+E4B8iqSCRO2bOtCrTPv4Rt9yKtQjfgxt/ ek/qrINpetmLrJ6o39INXUuMAAoWNeE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718541; a=rsa-sha256; cv=none; b=Yu8V9ACgFglMWcrLKeTX/eVjQoB7sE3JllA2aGY3u9ZJqtGVGGbIu+Oj6pjExi/pDI4Wj3 XFfGKeIurTq8HfCQ+Brma53pLv4GTUbVmPqXpPHdOz+c49r8+nWSckpv+kETp8HB4wS5Cv x5dbgDkWuz8ceP861sJYjHsSCEW1FCo= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KQt97o0V; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2f9da2a7004so883208a91.0 for ; Tue, 04 Feb 2025 17:22:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718541; x=1739323341; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=KQt97o0VGsBMdMaojwGKnlWvIsBTJxDGCmV2IxVAfwSofBi6fkWfjVKBLXQS1NiOb7 XGsAoE6mNYYDGQje9tBllyKKGizbb0PR/y4+zdA63L4Ct48pBf7PlHt04TIZhcENauSW VjQpqAfUx3MTASwoyBjh1V/MyM5fKs6Z5+YuGiukicDU+Rr91/sCCGwwbNpc5mj/oxiZ GzYJEh7SpGc5GbtSrbSKlsRjluQkdQXg3TiXbhLA/o5S1tQ1HFfoYo/FzF3ZfElDZxtd XE8TavGhzU2CKhpPCdeJ/1ZRsuY+Jssc23svd1tmGWsHpkt45soNovkdqKeKWX9rED9j eTxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718541; x=1739323341; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=GkvjVvkK4nWZqhJlleAyLEDMzC2/ZkNNgrafDN8plIpzq16ATjGMQGzP1RlsmGnzTa dEouGqaVsTZFt4qbklEB0kireALWU9yi9jBcUD2yiFoXGv247WHkWf6GQIRSd0nNBG4G Peh1XYRSJi0mZPRWMxTj8EYbTM/GuVs8Hp3wUxp4v1UEtYtMLGr35NhWOJSW5uU/1Zdh t15ILEi6oHk6Rk/SfrOIxhkO/TO2pgKUkebsw+9nHDiyXvM9l8wjvd4fq3Bjsu9TPsxO EOHwYwTLTB+fbykBOmHGa4Y5Eu1CtOZWGQKxxr9bNL1o+C5CBmJsE39l6xX2446JL1QV bYgw== X-Forwarded-Encrypted: i=1; AJvYcCWbEcETgRQBael593R8f97pzrETKUPmeQ5rmftgldba4s3NykrlCRpHy9bar+Ofqk+DknZv331tWg==@kvack.org X-Gm-Message-State: AOJu0Yzp7N/CY648jJZmPgr1ONX7jpl1XxLF7YrRedpoelHfmqdHPCQM TSVSToZvZMNyYLjJn/fekiJWGiqNi036M4ystxkRIzV5lj2s6JMPHhZIIibuR6k= X-Gm-Gg: ASbGncsA+BNGD1gTuRVmUgovQwYc9QDZPWHnCRXtjEVWOP61V+j76WwPBqZWwmJGdDX mnrzhwxT891jT3FIMY57y95WnBOMVl7gTebeO1ihxIw0WHZ2Qck0ARm2rY0SQdOv0/B7aRtEKVF DLT0tSGk+NLYlWO/rHGbAVwmffgaIlQR1KgwllQ5UhVYno6U2wWDEITwaxNslOEu3m/2F9+8i3k 1SU3iDvBIkkGs5PdqLMGMGug7LRslV+R/uNeGkt9BN1b3WELa8/nJv6dCAJi4PxYhCoEK4AHoMX TsIzFcDt5ZBgdqUOUxKycYXtLg== X-Google-Smtp-Source: AGHT+IFplfoY4kwYRUYkUapPyLUTmtCYI1kOBemc2Fu2DroKYmpICeBEsM6C9QAH02Mf3MaRp7pG+A== X-Received: by 2002:a05:6a00:3cc1:b0:72d:4d77:ccc with SMTP id d2e1a72fcca58-7303511ae5cmr1489432b3a.6.1738718540683; Tue, 04 Feb 2025 17:22:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:20 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:01 -0800 Subject: [PATCH v9 14/26] riscv/traps: Introduce software check exception MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-14-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: DCD69140006 X-Stat-Signature: kozwixbsnim8qj63u1adr86of9mhsdzq X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738718541-184794 X-HE-Meta: U2FsdGVkX18FEpHq3LCvq0XuhAB9iuIKQFnwRI3QqAorzTD5xZIAh0cIjBSfi9ma8u5WlCSZpKYMF0xGJ7YlR6J7a1TexJ2PdRNn8/pBrnUj7JiB3OEQtLXPPxDoJvCu4O9jV1IW4FaBc8lUHFNabRRzJS2mwCN34JmfYA+LdZ678uCltdZRBZWiIxzE5ZFcRnJj/2QtgSAuuRW/mmr4ekp6qnRvkryM62FR0IswhsMLCsCKCJlxx1xv0kAoNRsHkKwIa2+Q/sQKY3sQvFEW4eyBAz32r7AupFv0MXJC/GkpmECBs9uhZXljKUPcT5mOp+WbdZYp/FRqyZiVe5V7JH/acUO3caUK4l0GnHxUHeZqvVZSBzBAKo6JFbcTIubCFo5kYNCatLokhgpX25JQ8qKo75kzA4leit1cfYGJ46o2rSeUYLtshKx3V2oE4qqQlxLwpX5N/E2w2YUurgdcgNm7xjnhwrfckIrgomBbgLiYGNlpvHzYiP0c7CC3zBJZEBdEPJpkteCsbU2lmH9gQGKxFJu2+7JFFxvzFbGvoygW0JpBw+oLcIypvfes28yW2QKBCbN12lUy1Uh8hXxR+hfz/3Jrmz+xssGPAen3NQZdh15h54tKI7983n631yS7SqWcBjZeoGVxponPwvF4fDElARETag3YDYEE3EswFfjznlNsOnSfQNFOJ8x4po8t+xmakV4wNSBTum1uhyrghwiXRaJU+k29dsF10z9NUzOkca+NDT7ZQ/xuR5neNlFYMm1dsLq945YO0v0aPcH6GMP194yXdDpfqo2vpG41pp0lt55xPbvLyg22VGjVmg8BRdsxotd219JcVgz3mmo35DHRBtCWjZ+52YEqKHRjK5XWAFG5ePgWIYTCF1X6zji6HhPyjhnZoUbk+ZmXs8PCJWdow+NMcf8YQPzyMpMMmXyCR5DAYTd/UT6h7aNyNAdzklFbvBxVgjKcmJG2pUn p8UwSQ9T X9eYyjSWaoRtqTGQK6DfcDd99yE38HSxPtmImWbsVuz6lVtfh6DfJPRGuhbA2QGI6oGUpp39eYzFSGN4AnLU2bVpf6kV0XSUf+U6xiZXIRb6i8JzNyoc5D21sKX3Nh7j4O9ym3Ux7qrV5GpJYywcyNKF1fMiOO8ySZUccbzTMig0bV4z5CQYr/x1cawhwn5ZlaUSdPHt2W1FOgXYblCtDFsJAH0SBmjr3vwXLq34cY07T5GarVNqUtJBp4flql/34lXw0fgA7KGs4IuzFYEtNNw2dounpvMhc0KgtB8bCyyr/hj72xkASMjcDGKK8YgBaowKbgzc4ildGjAftrTuLMYBAmnc/F4c+1rB6DBZhwAwbEucW9SvUys6TvbMkCxRAVF/AwuOo8FUwDtsQ8Rub0W+8aZXeyUv8PxRWpJzRVYw5iw8EDZgXFB4g8YEOmXZ5Aqw01hWNrfc+zYAVGOac1vgxFg== 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: zicfiss / zicfilp introduces a new exception to priv isa `software check exception` with cause code = 18. This patch implements software check exception. Additionally it implements a cfi violation handler which checks for code in xtval. If xtval=2, it means that sw check exception happened because of an indirect branch not landing on 4 byte aligned PC or not landing on `lpad` instruction or label value embedded in `lpad` not matching label value setup in `x7`. If xtval=3, it means that sw check exception happened because of mismatch between link register (x1 or x5) and top of shadow stack (on execution of `sspopchk`). In case of cfi violation, SIGSEGV is raised with code=SEGV_CPERR. SEGV_CPERR was introduced by x86 shadow stack patches. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/asm-prototypes.h | 1 + arch/riscv/include/asm/entry-common.h | 2 ++ arch/riscv/kernel/entry.S | 3 +++ arch/riscv/kernel/traps.c | 43 +++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h index cd627ec289f1..5a27cefd7805 100644 --- a/arch/riscv/include/asm/asm-prototypes.h +++ b/arch/riscv/include/asm/asm-prototypes.h @@ -51,6 +51,7 @@ DECLARE_DO_ERROR_INFO(do_trap_ecall_u); DECLARE_DO_ERROR_INFO(do_trap_ecall_s); DECLARE_DO_ERROR_INFO(do_trap_ecall_m); DECLARE_DO_ERROR_INFO(do_trap_break); +DECLARE_DO_ERROR_INFO(do_trap_software_check); asmlinkage void handle_bad_stack(struct pt_regs *regs); asmlinkage void do_page_fault(struct pt_regs *regs); diff --git a/arch/riscv/include/asm/entry-common.h b/arch/riscv/include/asm/entry-common.h index b28ccc6cdeea..34ed149af5d1 100644 --- a/arch/riscv/include/asm/entry-common.h +++ b/arch/riscv/include/asm/entry-common.h @@ -40,4 +40,6 @@ static inline int handle_misaligned_store(struct pt_regs *regs) } #endif +bool handle_user_cfi_violation(struct pt_regs *regs); + #endif /* _ASM_RISCV_ENTRY_COMMON_H */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 00494b54ff4a..9c00cac3f6f2 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -472,6 +472,9 @@ SYM_DATA_START_LOCAL(excp_vect_table) RISCV_PTR do_page_fault /* load page fault */ RISCV_PTR do_trap_unknown RISCV_PTR do_page_fault /* store page fault */ + RISCV_PTR do_trap_unknown /* cause=16 */ + RISCV_PTR do_trap_unknown /* cause=17 */ + RISCV_PTR do_trap_software_check /* cause=18 is sw check exception */ SYM_DATA_END_LABEL(excp_vect_table, SYM_L_LOCAL, excp_vect_table_end) #ifndef CONFIG_MMU diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 8ff8e8b36524..3f7709f4595a 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -354,6 +354,49 @@ void do_trap_ecall_u(struct pt_regs *regs) } +#define CFI_TVAL_FCFI_CODE 2 +#define CFI_TVAL_BCFI_CODE 3 +/* handle cfi violations */ +bool handle_user_cfi_violation(struct pt_regs *regs) +{ + bool ret = false; + unsigned long tval = csr_read(CSR_TVAL); + + if ((tval == CFI_TVAL_FCFI_CODE && cpu_supports_indirect_br_lp_instr()) || + (tval == CFI_TVAL_BCFI_CODE && cpu_supports_shadow_stack())) { + do_trap_error(regs, SIGSEGV, SEGV_CPERR, regs->epc, + "Oops - control flow violation"); + ret = true; + } + + return ret; +} + +/* + * software check exception is defined with risc-v cfi spec. Software check + * exception is raised when:- + * a) An indirect branch doesn't land on 4 byte aligned PC or `lpad` + * instruction or `label` value programmed in `lpad` instr doesn't + * match with value setup in `x7`. reported code in `xtval` is 2. + * b) `sspopchk` instruction finds a mismatch between top of shadow stack (ssp) + * and x1/x5. reported code in `xtval` is 3. + */ +asmlinkage __visible __trap_section void do_trap_software_check(struct pt_regs *regs) +{ + if (user_mode(regs)) { + irqentry_enter_from_user_mode(regs); + + /* not a cfi violation, then merge into flow of unknown trap handler */ + if (!handle_user_cfi_violation(regs)) + do_trap_unknown(regs); + + irqentry_exit_to_user_mode(regs); + } else { + /* sw check exception coming from kernel is a bug in kernel */ + die(regs, "Kernel BUG"); + } +} + #ifdef CONFIG_MMU asmlinkage __visible noinstr void do_page_fault(struct pt_regs *regs) { From patchwork Wed Feb 5 01:22:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960376 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 76D38C02193 for ; Wed, 5 Feb 2025 01:22:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29AD328001B; Tue, 4 Feb 2025 20:22:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 222B5280016; Tue, 4 Feb 2025 20:22:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 001BC28001B; Tue, 4 Feb 2025 20:22:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id D364D280016 for ; Tue, 4 Feb 2025 20:22:25 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9BBE0B081A for ; Wed, 5 Feb 2025 01:22:25 +0000 (UTC) X-FDA: 83084140650.12.00A8143 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf11.hostedemail.com (Postfix) with ESMTP id AA74C40008 for ; Wed, 5 Feb 2025 01:22:23 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=CSxLN+QZ; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.52 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=1738718543; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=s4a4iCR11C3zMGjHst2+0HH0/G2/gzAuktcP+r9rICaT+414/f3vPrwRo0+WbD/03D4Wzh lLI256qudqx4TUFj1MxncQjbsEuyOp3lxWIIsywt0osBPUjjTmO9wOAmpnr4PMD/JFredQ wJDrRsvmWxOEC0s10fH/6/CHX9XhQ/4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=CSxLN+QZ; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718543; a=rsa-sha256; cv=none; b=dOIHbQaqYRKhtXJh+KuKwfsez6Nq8JNXGyyoRZrvbLMlNm5HP0/sJoTnLqRhykF6Bl2Im2 g/iH6MIBCCr2PgrF6cC038cWvFuw9Mljll1mN/zDp0oHwCQP5+EEEDB2SpGS5NiFi2xOVd Uq1bf79pwjUABH87cU7bNYwM4sQqiBE= Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2ef87d24c2dso8264382a91.1 for ; Tue, 04 Feb 2025 17:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718542; x=1739323342; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=CSxLN+QZy/vSz9daHREwzhgJgKvtMv8WiwXeCGDCfscMQxc//IvuuV+ZHMnBxHTR6E L+GLVbFgNP9VVcsK0G+oL4UOb8kQE8/KvtkvLF75WDpxs6Q1NT0EVIa2MNnxMy5xW1aF 3V+QXYEGHHtBvo8bWvtnqzcoZgz6LIdDHR2d+6Zr8Tv+3Lp0gWSF/Ybm7oaxIIQw8QSZ sCnHmsj0CNYRS0f24tLdp+CkEnEtDTVKdcYKBVqHA8eWPVLL7o1qn+rr4hkEsDRflaEj 1NUD38JSCpr07+cWxd5Zvq9vogt9k2yveeJnJPOvGWPd/8lbQTWyW9dS+Ai9nJRbHdmu QQLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718542; x=1739323342; 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=N78rd5bu5L3Nb7UCylb6NhXzPkib+ej1wIZfC16ALRg=; b=kAHAT09Pund/06MQYSieaalhZDgFr9+Fn91RsuNM9QdBJrGl95PkjHDNmj3Y9fAlbr v+EPAnHaMZPOEqOfKjYevp3G2g4zRpnaJKHS67/d8XUwzg95rYUif2SpvTOTsV9AKJBF JpAwOcrJftMLiRoKL2HYuOOnygQbggTHHqUvte9eUDGRO2KeHrskPMXn6oVQagE1iNrh qhdMDSc7DZvfSvEQzoavRFsMiqBm/uGrCEE5p+1R8TNaHmCRhCM+jjcpnnBtlg0oeAP/ DpAdP48LTrvnfVuo0M6e9HDKfw+JliQEl+AB2kUD7BhrGcdPF4zD5YuinKBIg2e/yTcE zyzw== X-Forwarded-Encrypted: i=1; AJvYcCV/R4u6ubSHrPw6XwglYTbu8AvP1+3FkMTav5OeYhNM12g68krG9776+vV7PgkdBYikTmT2PgM0rw==@kvack.org X-Gm-Message-State: AOJu0Yxr19D7/sgUO4ZSjP3oOUfkCxvZbh8IMQrMgSE/b9TQspVLAjZb pfeTzFo/Opi3EW8xwmSg37+bP8dp+R0P0NetEdP6f+qpSDMKxwA9u9JTl2/xFyY= X-Gm-Gg: ASbGncteI3884VdU4KLq1Fasn3Zips6FDuV7OkIXq6dnUjWsPo8DPoJD+nuP2lnvph/ xt6jqDVBNPfFPHcax57HWReAR9TG/kOPA2EhQ0iY9btkt1yHNC7489c/kvElGIT51wx02iR3aj3 g4pNKAj6zDctOnIEKYwnMVJrnpPzlULzaB09tHZMLudjuSSERRTSVT35M3N0uOVYqmtnGilNE4k an7pHYr9ZXwta9/vlrvMOg2QW8nvi3rOcIhUUsw++WHcWtlXY0tAXJzzdxiKEOJubFEmt0kOp9/ rktuPzfAT07lFi0UC2GyilBSNA== X-Google-Smtp-Source: AGHT+IFP/nZiHgN8IdOqdmoR6h7NcsY1CSiQrUwXf/VaRJ07hdJ31km67MYlbRhpJdCkwehTOyokKQ== X-Received: by 2002:a05:6a00:3a1d:b0:725:f1b1:cb9f with SMTP id d2e1a72fcca58-7303520e7f3mr1721528b3a.20.1738718542562; Tue, 04 Feb 2025 17:22:22 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:22 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:02 -0800 Subject: [PATCH v9 15/26] riscv: signal: abstract header saving for setup_sigcontext MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-15-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 X-Mailer: b4 0.14.0 X-Rspamd-Queue-Id: AA74C40008 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 9ma4cb5f9pkfysoupshb93rac95yahy5 X-HE-Tag: 1738718543-63724 X-HE-Meta: U2FsdGVkX19eQ4j1YaPDQI1qEG/Jepf/HD38DLd3sJkjiCTdweTjK5nsFhIhCokhCWtnBCqEsIN/2STH/6xJw88PxdKOTIfjx+ddliK+B6Aiw3+BtBf9LpexRl3hh9bEY+PgHghg30NdExIz5WPUpWDkV+FnnNuOAcZwBmzan3nOHPgMgmB5N3ADWT0zJ2LCbdOj/frGd4EexnM5NpKgpETTwkTVzzanxKgtowLumjsqLQEmGjNfWZJXQAWplvgOMwrQ2Y0kU5gtBXFOehBBtMAqu34p1Xa1c0aGIBqK0xj1G7YZ6xFYqBRyKrXtSmwr80S4ybWYsEhnKYchx8Lx3a/2N8eYsFo1m7/Pjv/NYo+d7LLvrGgwE5sQkyGm9JX1PlpPJT9MdSbqu6yXc0o5NOSd4iz0kcebGCXfUUMBxks6CO0wL12dbalsHlfYImgjMXlH488pqyKFYMYNFK6Tqq9UTA0zrLs8bRmmL4B+taoCCXRD3IlHAFcId1U9tkwqQYMc7rJJNOPyZ0wfBaAafIwujLqopOLBRpxwH9EzRnUme+7Rgzo2tKycwi75eHPGeUlXMhh/eKOkynUqkaVxGC9/uRFyYbS3CylPPbkUjlJtsD9dCRfwkEkUZJbkZop3tUcF30J/80K9CfUR1vjI9YGefUy0nD+0Hy7B74pQ2rPNyO0ExpgTUuPuOTx+9AE+UwbOG39fqUfhcsLBmCxnL9Dz6YUua0yyarhMcdh6uNNNmhFvNZprc0POVMhWdvUIIMfB8CHbha5vQD319ykVLLsdr+P/M6qH04a80pwYN9k8yHxSLyps25XQ96HJxYUDhl1G/frPTMd3PPRjlE9xBeLeTS+m5qlozOEO8go8FYxAs4YneCjP4KFiumMl+XPDauujBXvHdorTLQPoTevykeDiA8IWJZLii6uGEbqt6vMePBMcS7VLsP1linRVoLg06cqrZ0b1zLuILA3xmak BCSxM6N1 jWMYjId+ynUTueF5sNEzKuod7AoucBYW9BJhE5+pWEByXVCBbVfLRXORXLq45MlaBQ7BbnZ8PR2di76a+K15RnS+NExL534MnD7wHPve/LmyOOmtMmErJnSu8qbplkMpxHdUBm87wNeKOwImcTSbMra8qUJG6zd/kJTtflURpANRrlvLoFOcvSHzgCkZjWvBgQg4Mp0WLrVyEppZK5xMQgU1uM2kI6Sk9qhgXww1rUfWVZ9kD0HQo2M4kwEvgtb7vuNm1Y6TLg6BTBz8Nx75J0sP8/aTzgD5n+wJ5P2NNEXmNJRnSUZWHdesuWv/LC9CofdmnV7AaI2y/qdKeDMzHymMKwSf3oDcZTMLCMIWG2X8vLJDJ7oD0y2RfqqkUDOKpliYwc5o4l9h/GF+rCNtNfM7T2YNf/fg9QW7Na740MesQICkifR3pVZB0HEi5rGYrrouBXtjyvXYwUlh6VmjZKDpSfqItMvsrVh5u 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: From: Andy Chiu The function save_v_state() served two purposes. First, it saved extension context into the signal stack. Then, it constructed the extension header if there was no fault. The second part is independent of the extension itself. As a result, we can pull that part out, so future extensions may reuse it. This patch adds arch_ext_list and makes setup_sigcontext() go through all possible extensions' save() callback. The callback returns a positive value indicating the size of the successfully saved extension. Then the kernel proceeds to construct the header for that extension. The kernel skips an extension if it does not exist, or if the saving fails for some reasons. The error code is propagated out on the later case. This patch does not introduce any functional changes. Signed-off-by: Andy Chiu --- arch/riscv/include/asm/vector.h | 3 ++ arch/riscv/kernel/signal.c | 62 +++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/arch/riscv/include/asm/vector.h b/arch/riscv/include/asm/vector.h index e8a83f55be2b..05390538ea8a 100644 --- a/arch/riscv/include/asm/vector.h +++ b/arch/riscv/include/asm/vector.h @@ -407,6 +407,9 @@ static inline bool riscv_v_vstate_ctrl_user_allowed(void) { return false; } #define riscv_v_thread_free(tsk) do {} while (0) #define riscv_v_setup_ctx_cache() do {} while (0) #define riscv_v_thread_alloc(tsk) do {} while (0) +#define get_cpu_vector_context() do {} while (0) +#define put_cpu_vector_context() do {} while (0) +#define riscv_v_vstate_set_restore(task, regs) do {} while (0) #endif /* CONFIG_RISCV_ISA_V */ diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 94e905eea1de..80c70dccf09f 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -68,18 +68,19 @@ static long save_fp_state(struct pt_regs *regs, #define restore_fp_state(task, regs) (0) #endif -#ifdef CONFIG_RISCV_ISA_V - -static long save_v_state(struct pt_regs *regs, void __user **sc_vec) +static long save_v_state(struct pt_regs *regs, void __user *sc_vec) { - struct __riscv_ctx_hdr __user *hdr; struct __sc_riscv_v_state __user *state; void __user *datap; long err; - hdr = *sc_vec; - /* Place state to the user's signal context space after the hdr */ - state = (struct __sc_riscv_v_state __user *)(hdr + 1); + if (!IS_ENABLED(CONFIG_RISCV_ISA_V) || + !((has_vector() || has_xtheadvector()) && + riscv_v_vstate_query(regs))) + return 0; + + /* Place state to the user's signal context spac */ + state = (struct __sc_riscv_v_state __user *)sc_vec; /* Point datap right after the end of __sc_riscv_v_state */ datap = state + 1; @@ -97,15 +98,11 @@ static long save_v_state(struct pt_regs *regs, void __user **sc_vec) err |= __put_user((__force void *)datap, &state->v_state.datap); /* Copy the whole vector content to user space datap. */ err |= __copy_to_user(datap, current->thread.vstate.datap, riscv_v_vsize); - /* Copy magic to the user space after saving all vector conetext */ - err |= __put_user(RISCV_V_MAGIC, &hdr->magic); - err |= __put_user(riscv_v_sc_size, &hdr->size); if (unlikely(err)) - return err; + return -EFAULT; - /* Only progress the sv_vec if everything has done successfully */ - *sc_vec += riscv_v_sc_size; - return 0; + /* Only return the size if everything has done successfully */ + return riscv_v_sc_size; } /* @@ -142,10 +139,20 @@ static long __restore_v_state(struct pt_regs *regs, void __user *sc_vec) */ return copy_from_user(current->thread.vstate.datap, datap, riscv_v_vsize); } -#else -#define save_v_state(task, regs) (0) -#define __restore_v_state(task, regs) (0) -#endif + +struct arch_ext_priv { + __u32 magic; + long (*save)(struct pt_regs *regs, void __user *sc_vec); +}; + +struct arch_ext_priv arch_ext_list[] = { + { + .magic = RISCV_V_MAGIC, + .save = &save_v_state, + }, +}; + +const size_t nr_arch_exts = ARRAY_SIZE(arch_ext_list); static long restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) @@ -276,7 +283,8 @@ static long setup_sigcontext(struct rt_sigframe __user *frame, { struct sigcontext __user *sc = &frame->uc.uc_mcontext; struct __riscv_ctx_hdr __user *sc_ext_ptr = &sc->sc_extdesc.hdr; - long err; + struct arch_ext_priv *arch_ext; + long err, i, ext_size; /* sc_regs is structured the same as the start of pt_regs */ err = __copy_to_user(&sc->sc_regs, regs, sizeof(sc->sc_regs)); @@ -284,8 +292,20 @@ static long setup_sigcontext(struct rt_sigframe __user *frame, if (has_fpu()) err |= save_fp_state(regs, &sc->sc_fpregs); /* Save the vector state. */ - if ((has_vector() || has_xtheadvector()) && riscv_v_vstate_query(regs)) - err |= save_v_state(regs, (void __user **)&sc_ext_ptr); + for (i = 0; i < nr_arch_exts; i++) { + arch_ext = &arch_ext_list[i]; + if (!arch_ext->save) + continue; + + ext_size = arch_ext->save(regs, sc_ext_ptr + 1); + if (ext_size <= 0) { + err |= ext_size; + } else { + err |= __put_user(arch_ext->magic, &sc_ext_ptr->magic); + err |= __put_user(ext_size, &sc_ext_ptr->size); + sc_ext_ptr = (void *)sc_ext_ptr + ext_size; + } + } /* Write zero to fp-reserved space and check it on restore_sigcontext */ err |= __put_user(0, &sc->sc_extdesc.reserved); /* And put END __riscv_ctx_hdr at the end. */ From patchwork Wed Feb 5 01:22:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960377 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 0F687C02194 for ; Wed, 5 Feb 2025 01:22:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4499928001C; Tue, 4 Feb 2025 20:22:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D245280016; Tue, 4 Feb 2025 20:22:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1D63928001C; Tue, 4 Feb 2025 20:22:28 -0500 (EST) 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 E4B98280016 for ; Tue, 4 Feb 2025 20:22:27 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A4D0780461 for ; Wed, 5 Feb 2025 01:22:27 +0000 (UTC) X-FDA: 83084140734.27.01CA825 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf09.hostedemail.com (Postfix) with ESMTP id B5E05140002 for ; Wed, 5 Feb 2025 01:22:25 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eM81gcRf; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 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=1738718545; 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=FZizf8oZeAex4CEwHeMnGWZudkjFQvNzoIsL7CfIy1g=; b=QQqO05NoTOFsIpFJ8S6yt6yYsIV/pCDRp7sv1YeSGyZ9Y9KSURXt5Z6IUHw2HbiCp/xwf7 tZEDLQd47s2Hb/72XczfWMvb+UcYYWymL5lc0Bf3d6LpWUQlJ7Fnlc8Y1AiQy49HRVyfGe 1kJlLgYtJT7Fyd0tZGEtRUmmF/uK+8g= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=eM81gcRf; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718545; a=rsa-sha256; cv=none; b=IYHzqYapm3uHdsMoEchwjQdDPTAwptlD+PG52eFrEe+YhvjI74smIUCM98UgX/4NxotgcZ Gr03xLhaf7/yccM1/Pv+G4FY0ongde2STxG9CTGGMZPVBi9AQsN68HbmmR8+pBnG7vKF44 Wjge8HYpQsBsYCFNqXFOcy+fIyEYDkU= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21ddab8800bso88859505ad.3 for ; Tue, 04 Feb 2025 17:22:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718544; x=1739323344; 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=FZizf8oZeAex4CEwHeMnGWZudkjFQvNzoIsL7CfIy1g=; b=eM81gcRfSF1F6Y2+kMsFRVa/bfq0QRnzhXg/q8QXan4AH48lipp/bUDrlNyzRUTDA/ QgH8f4MoD0LuwJDpq98bmPizOFNc8pFGwmVJS62u5JxKqHuyLElKVBagcavvqsYP3R9S BIJ+F55h4OTDR8cj4LZ3NueE9GUe9Jl1wzuzSisQm9dCZQQJJ9sOL53v7yludS3iS3HD b+R6zsg1xPfE9yJK8eGjDlOlR/gbnW8VjRI1QYyspJr+bDWe+lq7/BOdKJAgxAukrQ7T tc1AQBd1bpNtcrrtENVyoAfj3RQ02yFoC4s/XAtWkVBcYXrQANuCe6bVI0f4/JbUqH8M 32Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718544; x=1739323344; 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=FZizf8oZeAex4CEwHeMnGWZudkjFQvNzoIsL7CfIy1g=; b=NfYoTRiy3sicxs4DNQeNDMj3vDCnzhfCJdIOWSfvcOrWtiIY25V/RJU5aK5Ya90VUQ l9lzBdf98jogxwXNj4pMf26f3OR5NbWniy6Pucut8WMaDoMyYrTunqMyTihx1ac7SJjs 8gK8DjStNMorp4dYPoXPXe9+XjDuu6UNLv2ZQer1NNn50w6M1bMiI9Fa5roccEzrSF4B NbeoUiHHVdnKeBV9Vbd3k/XuNFJOfNildBUf8C7zf7PBJ2z2BSFv1bxxQaq6zNIZiSKi xRkcW2IYAGeasTz68ku6n3Nu2U2g+4g1Iz+Zdjhh1AZu6xTn5XtnR+rbkoN1yMSp7dDW UGiA== X-Forwarded-Encrypted: i=1; AJvYcCU96Z0f5wwvZqVKGW7v8R67mvnaDYJEd0LfsaAXo31zAu0ZDHzwltBTFUCaxYWFc35+y/DOW102rQ==@kvack.org X-Gm-Message-State: AOJu0Yx71IuQIzqiTDddvR+YxtqBKK51b/EZRpb6cYnVv9AI/Vd29/f9 xAIKxy9u93AyECa9KpbS70in+yUqwOSdjWFGF9seySWH14rHg05nXFExAW62FQ8= X-Gm-Gg: ASbGncugQw0V2wDMoxuu3iS+0h6UvhiPvT203E5XTZ2+jnklwBxugkDaf47+KYFMYAM Xw0IRpE4pbJkAKbmnAShtsh0UjnLMekLNftLyesUo0arrAWjd8BTF9/LLLxAftcTl1qZPOrq6QF Rcfm84RqzNGqL9xnuxPvg97SOXb497+X2Tk09msVO3ythgSbPiHD64emPI5m6NRUj8FO980vmTX eIHhlrtbsCKrMcxtziwo+nEhu5XQy0+9LTfROJ8CS9sYIorg+VoZAtAnmFBf/LlZiGcG47dA18V n+s+gPn50zyKqofIPhXwGSgcwQ== X-Google-Smtp-Source: AGHT+IEqJS41+LJt7inAR5iPhE1y82el2DHhoGjAbkJX4IwMn8QFNmHGfzX0UCg4AcbCiAYuTtk5yw== X-Received: by 2002:a05:6a21:350d:b0:1ed:8cd8:77fb with SMTP id adf61e73a8af0-1ede8836074mr1402463637.16.1738718544490; Tue, 04 Feb 2025 17:22:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:24 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:03 -0800 Subject: [PATCH v9 16/26] riscv/signal: save and restore of shadow stack for signal MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-16-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 , Andy Chiu X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B5E05140002 X-Stat-Signature: tj8c4emskspngky9wqcwzfeq9kibnfeo X-Rspam-User: X-HE-Tag: 1738718545-300629 X-HE-Meta: U2FsdGVkX185CSVANHTLAgF6o3A8jyO7Zxlm6O+jTaVOSxWzioBdD29FbI7FDS9hSTqQzjMHJDEhELHvhvXE6AdaW6p0iQLIpp6Qs38C2Q74Gj3CQF+X+QKUPBvSbkIVX7Jc/HnfMxGIVZBd2siW21ZmhoOYq301nXipIJ2o/wK4aIr2DVREUoD2plhiNT7uXVjADkMCh1TCz17thwa9gI2R/T8dAs/sK4VeJct4u1Jqi03tFLOSzLoXC5aUXgWELH+Yg7RLjHt0kq38ltVQZsxv6QPdokLxkHRW4EHbGRgkldF4D1qJtLPrQoNa6pHIFOuCCEm51XYS+bZzRgM3OUnCy+zHE77ky30PmRxN3JPUiOipEs3j12CToHx3k+9x2dwWUH37xkjOUsGfLLbxdbcA3czmruaGDkHqfFLNugcloL/B/nsBqO0utfeA10CPUP9tHgDKsJFoGBJ9SPQ9vA9Ahxp4CqTgqNCxyqV1n6v5Q0t9eCSpOs6+FbFmGKsZ1Rmm2NTQZQKMPQnor9P16cOdvlAjo7PpHEdGCUUocd161wXfRXIhjJg/WrsiDzlKh30kQD1bIUOJ35u0ZK8LR/yfEEotK12KYPESa8FYI1+r5jxvKq0Pt6e7JuGi6xojQpPmqfx9ygsDUU5aWXPkTOtyLj87hAhHJD0H8rWzRxFwu/TwCXXR46K1DHfXK+SGn1WHSepCFbgPXeeUH8sKvBJj5NE0QLhikahzMUU6+y+NUjhWfI2/M0VaDE74hTcps8G5WLqL9hWkgPl/cj51xwX10/Dl29XAQtsxf4Ta42gmd6+T5ZtDBoTZd70N9FsB25VPRyCK32+Mv+xNPCUF52HxMAvtGsFSGJjkZHQ8iUzWoXRA1L1gqIlkmoULhWX4sEhgo4zNSBfBj0Zh84Vgq7ivd4WV6H/yTuw1sC+u/JdfLnch4xPNxSgyusV7uQZb9LbsDcmnHgZH4MFmI8V LR2vPhLH 8E5v2fbtjpEWXPxkHu+hs3e8nGQW1DvVG3KRZNnFIu7Ov5diE6+jT3y3QnV/A8oi1Q7JyWPnfJ+SRR7Kh9fxk97Rss1LwuY52eaUd8HLn0WRInKUiIsL5HlWbtCnfIB9I/qvg235nh1ddlo1R2FqaqveGV7ZFgUHaVMc6Gb8pm2vbAWWYoYZa/cXO2Z30Yb1VU62srFWceJ32Cdl7vrTRnKxPWgIZl3n16oyDZ7EN8/DOMs56jMe+9RzH/1WyFrrYIiy+uxYsUxEP7B+xnnwZSHCP2lLK9uH3vs3P6Na/VwgkbQHR1zHNhhTDM8p8PtlpREzTWDiFD0iUdbyZjVI51cA2TUOWk92hhnwTlRKFdWX+h1n3FHPrEdmovGn0ePbV0ybHTGOFdjsow4xxkAlFGGOCBSMLhfqKCuol575i57Uf8MZrBpiXHTrlPshAN0oqGZJfp2e1gbQqLBaAwkUOltZ3Pcc8dbkgsH+zNjwAIi1M601osYFEuPgDrWXVTae6UDe7JTbHOIqW+dE= 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: Save shadow stack pointer in sigcontext structure while delivering signal. Restore shadow stack pointer from sigcontext on sigreturn. As part of save operation, kernel uses `ssamoswap` to save snapshot of current shadow stack on shadow stack itself (can be called as a save token). During restore on sigreturn, kernel retrieves token from top of shadow stack and validates it. This allows that user mode can't arbitrary pivot to any shadow stack address without having a token and thus provide strong security assurance between signaly delivery and sigreturn window. Use ABI compatible way of saving/restoring shadow stack pointer into signal stack. This follows what Vector extension, where extra registers are placed in a form of extension header + extension body in the stack. The extension header indicates the size of the extra architectural states plus the size of header itself, and a magic identifier of the extension. Then, the extensions body contains the new architectural states in the form defined by uapi. Signed-off-by: Andy Chiu Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 10 ++++ arch/riscv/include/uapi/asm/ptrace.h | 4 ++ arch/riscv/include/uapi/asm/sigcontext.h | 1 + arch/riscv/kernel/signal.c | 80 ++++++++++++++++++++++++++++++++ arch/riscv/kernel/usercfi.c | 56 ++++++++++++++++++++++ 5 files changed, 151 insertions(+) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index a8cec7c14d1d..361f59edbdef 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -8,6 +8,7 @@ #ifndef __ASSEMBLY__ #include #include +#include struct task_struct; struct kernel_clone_args; @@ -35,6 +36,9 @@ bool is_shstk_locked(struct task_struct *task); bool is_shstk_allocated(struct task_struct *task); void set_shstk_lock(struct task_struct *task); void set_shstk_status(struct task_struct *task, bool enable); +unsigned long get_active_shstk(struct task_struct *task); +int restore_user_shstk(struct task_struct *tsk, unsigned long shstk_ptr); +int save_user_shstk(struct task_struct *tsk, unsigned long *saved_shstk_ptr); bool is_indir_lp_enabled(struct task_struct *task); bool is_indir_lp_locked(struct task_struct *task); void set_indir_lp_status(struct task_struct *task, bool enable); @@ -72,6 +76,12 @@ void set_indir_lp_lock(struct task_struct *task); #define set_indir_lp_lock(task) +#define restore_user_shstk(tsk, shstk_ptr) -EINVAL + +#define save_user_shstk(tsk, saved_shstk_ptr) -EINVAL + +#define get_active_shstk(task) 0UL + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index a38268b19c3d..659ea3af5680 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -127,6 +127,10 @@ struct __riscv_v_regset_state { */ #define RISCV_MAX_VLENB (8192) +struct __sc_riscv_cfi_state { + unsigned long ss_ptr; /* shadow stack pointer */ +}; + #endif /* __ASSEMBLY__ */ #endif /* _UAPI_ASM_RISCV_PTRACE_H */ diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h index cd4f175dc837..f37e4beffe03 100644 --- a/arch/riscv/include/uapi/asm/sigcontext.h +++ b/arch/riscv/include/uapi/asm/sigcontext.h @@ -10,6 +10,7 @@ /* The Magic number for signal context frame header. */ #define RISCV_V_MAGIC 0x53465457 +#define RISCV_ZICFISS_MAGIC 0x9487 #define END_MAGIC 0x0 /* The size of END signal context header. */ diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 80c70dccf09f..a7472a6fcdca 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -22,11 +22,13 @@ #include #include #include +#include unsigned long signal_minsigstksz __ro_after_init; extern u32 __user_rt_sigreturn[2]; static size_t riscv_v_sc_size __ro_after_init; +static size_t riscv_zicfiss_sc_size __ro_after_init; #define DEBUG_SIG 0 @@ -140,6 +142,62 @@ static long __restore_v_state(struct pt_regs *regs, void __user *sc_vec) return copy_from_user(current->thread.vstate.datap, datap, riscv_v_vsize); } +static long save_cfiss_state(struct pt_regs *regs, void __user *sc_cfi) +{ + struct __sc_riscv_cfi_state __user *state = sc_cfi; + unsigned long ss_ptr = 0; + long err = 0; + + if (!IS_ENABLED(CONFIG_RISCV_USER_CFI) || !is_shstk_enabled(current)) + return 0; + + /* + * Save a pointer to shadow stack itself on shadow stack as a form of token. + * A token on shadow gives following properties + * - Safe save and restore for shadow stack switching. Any save of shadow stack + * must have had saved a token on shadow stack. Similarly any restore of shadow + * stack must check the token before restore. Since writing to shadow stack with + * address of shadow stack itself is not easily allowed. A restore without a save + * is quite difficult for an attacker to perform. + * - A natural break. A token in shadow stack provides a natural break in shadow stack + * So a single linear range can be bucketed into different shadow stack segments. Any + * sspopchk will detect the condition and fault to kernel as sw check exception. + */ + err |= save_user_shstk(current, &ss_ptr); + err |= __put_user(ss_ptr, &state->ss_ptr); + if (unlikely(err)) + return -EFAULT; + + return riscv_zicfiss_sc_size; +} + +static long __restore_cfiss_state(struct pt_regs *regs, void __user *sc_cfi) +{ + struct __sc_riscv_cfi_state __user *state = sc_cfi; + unsigned long ss_ptr = 0; + long err; + + /* + * Restore shadow stack as a form of token stored on shadow stack itself as a safe + * way to restore. + * A token on shadow gives following properties + * - Safe save and restore for shadow stack switching. Any save of shadow stack + * must have had saved a token on shadow stack. Similarly any restore of shadow + * stack must check the token before restore. Since writing to shadow stack with + * address of shadow stack itself is not easily allowed. A restore without a save + * is quite difficult for an attacker to perform. + * - A natural break. A token in shadow stack provides a natural break in shadow stack + * So a single linear range can be bucketed into different shadow stack segments. + * sspopchk will detect the condition and fault to kernel as sw check exception. + */ + err = __copy_from_user(&ss_ptr, &state->ss_ptr, sizeof(unsigned long)); + + if (unlikely(err)) + return err; + + return restore_user_shstk(current, ss_ptr); +} + struct arch_ext_priv { __u32 magic; long (*save)(struct pt_regs *regs, void __user *sc_vec); @@ -150,6 +208,10 @@ struct arch_ext_priv arch_ext_list[] = { .magic = RISCV_V_MAGIC, .save = &save_v_state, }, + { + .magic = RISCV_ZICFISS_MAGIC, + .save = &save_cfiss_state, + }, }; const size_t nr_arch_exts = ARRAY_SIZE(arch_ext_list); @@ -202,6 +264,12 @@ static long restore_sigcontext(struct pt_regs *regs, err = __restore_v_state(regs, sc_ext_ptr); break; + case RISCV_ZICFISS_MAGIC: + if (!is_shstk_enabled(current) || size != riscv_zicfiss_sc_size) + return -EINVAL; + + err = __restore_cfiss_state(regs, sc_ext_ptr); + break; default: return -EINVAL; } @@ -222,6 +290,10 @@ static size_t get_rt_frame_size(bool cal_all) if (cal_all || riscv_v_vstate_query(task_pt_regs(current))) total_context_size += riscv_v_sc_size; } + + if (is_shstk_enabled(current)) + total_context_size += riscv_zicfiss_sc_size; + /* * Preserved a __riscv_ctx_hdr for END signal context header if an * extension uses __riscv_extra_ext_header @@ -365,6 +437,11 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, #ifdef CONFIG_MMU regs->ra = (unsigned long)VDSO_SYMBOL( current->mm->context.vdso, rt_sigreturn); + + /* if bcfi is enabled x1 (ra) and x5 (t0) must match. not sure if we need this? */ + if (is_shstk_enabled(current)) + regs->t0 = regs->ra; + #else /* * For the nommu case we don't have a VDSO. Instead we push two @@ -493,6 +570,9 @@ void __init init_rt_signal_env(void) { riscv_v_sc_size = sizeof(struct __riscv_ctx_hdr) + sizeof(struct __sc_riscv_v_state) + riscv_v_vsize; + + riscv_zicfiss_sc_size = sizeof(struct __riscv_ctx_hdr) + + sizeof(struct __sc_riscv_cfi_state); /* * Determine the stack space required for guaranteed signal delivery. * The signal_minsigstksz will be populated into the AT_MINSIGSTKSZ entry diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 3a66f149a4ef..6e561256bfaf 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -52,6 +52,11 @@ void set_active_shstk(struct task_struct *task, unsigned long shstk_addr) task->thread_info.user_cfi_state.user_shdw_stk = shstk_addr; } +unsigned long get_active_shstk(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.user_shdw_stk; +} + void set_shstk_status(struct task_struct *task, bool enable) { task->thread_info.user_cfi_state.ubcfi_en = enable ? 1 : 0; @@ -164,6 +169,57 @@ static int create_rstor_token(unsigned long ssp, unsigned long *token_addr) return 0; } +/* + * Save user shadow stack pointer on shadow stack itself and return pointer to saved location + * returns -EFAULT if operation was unsuccessful + */ +int save_user_shstk(struct task_struct *tsk, unsigned long *saved_shstk_ptr) +{ + unsigned long ss_ptr = 0; + unsigned long token_loc = 0; + int ret = 0; + + if (saved_shstk_ptr == NULL) + return -EINVAL; + + ss_ptr = get_active_shstk(tsk); + ret = create_rstor_token(ss_ptr, &token_loc); + + if (!ret) { + *saved_shstk_ptr = token_loc; + set_active_shstk(tsk, token_loc); + } + + return ret; +} + +/* + * Restores user shadow stack pointer from token on shadow stack for task `tsk` + * returns -EFAULT if operation was unsuccessful + */ +int restore_user_shstk(struct task_struct *tsk, unsigned long shstk_ptr) +{ + unsigned long token = 0; + + token = amo_user_shstk((unsigned long __user *)shstk_ptr, 0); + + if (token == -1) + return -EFAULT; + + /* invalid token, return EINVAL */ + if ((token - shstk_ptr) != SHSTK_ENTRY_SIZE) { + pr_info_ratelimited( + "%s[%d]: bad restore token in %s: pc=%p sp=%p, token=%p, shstk_ptr=%p\n", + tsk->comm, task_pid_nr(tsk), __func__, (void *)(task_pt_regs(tsk)->epc), + (void *)(task_pt_regs(tsk)->sp), (void *)token, (void *)shstk_ptr); + return -EINVAL; + } + + /* all checks passed, set active shstk and return success */ + set_active_shstk(tsk, token); + return 0; +} + static unsigned long allocate_shadow_stack(unsigned long addr, unsigned long size, unsigned long token_offset, bool set_tok) { From patchwork Wed Feb 5 01:22:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960378 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 D0F55C02193 for ; Wed, 5 Feb 2025 01:22:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 079E028001D; Tue, 4 Feb 2025 20:22:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 00052280016; Tue, 4 Feb 2025 20:22:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D46E628001D; Tue, 4 Feb 2025 20:22:29 -0500 (EST) 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 B2D0D280016 for ; Tue, 4 Feb 2025 20:22:29 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 689271C77C0 for ; Wed, 5 Feb 2025 01:22:29 +0000 (UTC) X-FDA: 83084140818.22.A33721B Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf21.hostedemail.com (Postfix) with ESMTP id 80C731C0009 for ; Wed, 5 Feb 2025 01:22:27 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=oW+crira; dmarc=none; spf=pass (imf21.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718547; a=rsa-sha256; cv=none; b=Hf/PH5llsBGj7aeSgmkQ3+a+FYFcO62Aj1Vxc2n79dDeP33R1dH7WuNnJ47d07wMXSsCdF a88q0Gi4AVO1I7n/H49VM2gAtSJnAoIE4xqc/BAU4v7DwO31wgXBqoacbZ+WE/p6DbGMDL QJdKvps9FZC4pFjbxlIaFX6MJyxU5r8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=oW+crira; dmarc=none; spf=pass (imf21.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738718547; 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=hU6IAlGSwKWKw5iWDrFBqBdwaJZ69/+Cs7+/DXu3do8=; b=BsW/7fRcRQSBV0sRKr/wpuKel+2W2VwGiS4tuChVFvv/eCTr7KhZlfi/+Q/5eVoCM951Z0 tphv5evA8UVVQUqcK6GxP1KsIIRx0SV3uNoiuFU4R14zQGXX+p9XGMO5IRotQmqDeFUwDD nM91pVMx29bC8hz4TNtSbEaOctTEw4s= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21628b3fe7dso116074305ad.3 for ; Tue, 04 Feb 2025 17:22:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718546; x=1739323346; 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=hU6IAlGSwKWKw5iWDrFBqBdwaJZ69/+Cs7+/DXu3do8=; b=oW+criraKpLJmUcVD6An9rMwOsiaDZ1oG0rCWiB4wMnbTSRN6AzetiG197319DnoLg nWfXxdpa6dFNUeXHam53HfgofMtrXTbmCc0sSxdldmyEURrg1ic7yssP9zcGIydFuGLT q2fJc3oIXUDpUu/MQQYvCNVCsTbp9r/aai2HnRYc91wodM7E4dRmkNfT+JGfxWjo5dz7 NiPWcoqTK/xpCYwe2zmpYNkZSW+OS+tqGH12OIMgJzogX0tHWLB5ueKqO4qRIYpZ0uQQ WsRok2qjuCDbC0JpnNbOseC+gvFhKqljP7j5WvulRU0jX5lj1y4bMyWWV9Qy65gh08Zi M2dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718546; x=1739323346; 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=hU6IAlGSwKWKw5iWDrFBqBdwaJZ69/+Cs7+/DXu3do8=; b=SbHexgdyQv51FZU6dN7b9SzTxqWm9F2QtZA2v58FIJZcTNPrsVqKuo4yqr4kpVMvwN ag82kP/NoseRf7idAe+BdY9/aQs6yldc3LtlUU9tgETfUpAaZ6HM7eTCBWxV2JrqRRnf IXNPTMjBz3gzNd3AFrcxpBbMwbsiDpTd8lnClDXPAFmZO+ILivbsLr6g6yFSMGka3oDj e3olc8nFevCMkPJz9BzfFTw8BBjH3iClZcngFsQ+Lzes5vohF4iIPTG6TTs3fY0fGPZp 2FCcHErcoRSbxXazNr+qNT+MmRL48BuYDax5FJNTxTA0tgoYcrjh4SVXHLFBxPmSPqYB 4wxQ== X-Forwarded-Encrypted: i=1; AJvYcCX7e6o+v7laAKvio73HAK8hG/HgEC+a2zUL7tbTHqnFjlJWNnGuF0i/aS6qrE55dSC9pZkJVCHWnw==@kvack.org X-Gm-Message-State: AOJu0YwUWuC74JgiH+ZpGUYXjQq7wK08DSgSdGa7RAvlQUuqn32lGavk D8xjpdyeVSLOxi+HPziy4JQ09BYBUnFw4pRtZvHIpEGUW+PIQCbOzZUUOt463Ss= X-Gm-Gg: ASbGncsqsikWot0vcUxxZmydhoD7RhcEibrrn377At2Uz/YpSvrH/29gttvAR5DcXcV JSz/9SqrdRbNIPHl0sT8nZSBSvpfEkcAD+K2vYA7xEM8eszS/2FvyMkuH9/2hPCqn5RPGgJF1nZ YJu6BgE9n4phdc2z+ny5Wes14amkdgs/sdQNMp00q1pUm2Wj+gUaYqScTcC3hVK8JZkbhU/lNIj FUtDdh4JUXBqe2lPEsBHu/V8A5HMQwpz0UOoRh65hhA6vW7IJFBDK+PHiUzHM4gx/b6OemvxVIi RYoTulVqLxLU32XCrkQp7ggc5A== X-Google-Smtp-Source: AGHT+IGWWoW/7lRLh8J45NtMl4EugfElwrrMWaqnc/KSZ7FxaiKV7MT8r9isBGhbF0Mg00kAPNlQiw== X-Received: by 2002:a05:6a20:ce45:b0:1e1:a75a:c452 with SMTP id adf61e73a8af0-1ede8844f5emr1528777637.19.1738718546388; Tue, 04 Feb 2025 17:22:26 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:26 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:04 -0800 Subject: [PATCH v9 17/26] riscv/kernel: update __show_regs to print shadow stack register MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-17-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-Server: rspam04 X-Rspamd-Queue-Id: 80C731C0009 X-Stat-Signature: hepwbho8i1gacno4rpcbhcq6bj9wu8b9 X-Rspam-User: X-HE-Tag: 1738718547-96131 X-HE-Meta: U2FsdGVkX19G4fisYppI7+U1O3I7ljtstrXQXvgmVThnHTei7NoansPq7AyI3EEVrg9UwMqY3uG+IxS+22gUGdokuZewNwycR5FuAf0yeeCNCWb0uHdEJruMcLRjdlR1TATM4U/jHWBruN3W+lgBieZJZ8tvFtIOJocK8COglRpSZGz7AjWTIdUlQmY6JmT+DLb/MTobZ5GLffp/+y1UhdMoZhBBLxE5Io2nQe1STN7KBmNvJW+KkrmkBAV/KI9AhuB4u5mUJda1Vq/K/EUANQzKT70ePtM9c8frGlAse2kYeLQCgbgN0TUEdVmeuf/lAWqYuSr8vt49+KQs0KsYgmq5GeY92knQjhxGabSI9fyyln2dO9HnvrZVsLeULiqtoWb1KYuyjzGJjqhnKw4rbaaqFnzRGk2Czya08Fh+vcPfx4TPO8FV+jPYWWRQ1qyayXRxcFEJhu0l8bLGAFgfyFpSjpZbi1ccZFxcFJaN4gvPf/ImfzwFWcGGFVxFZvQEsG8osQ87BUGVsfUix/pE07Hz8ll744jm82GY8YJdqXwi2oXBrO+1k81RNFIBGq0yfji/DeJvYmb+fj6td+fXF7HT4/OReXAx4dfJqLBsWPQKqOoxfXED4kDKXpUC4EYI8mX9FmCwGzcJBZtaFqn8k8ZRsrFA9HwZ7Z0nhmb1lU2yXcpUgsJJtJUuIAot1RyDIyF1ps87P/N001D1ywRZkD/yohEzNQWSTBv63uGQu4KLz636b3MJyBIvWCQKDqTvdCqdC8XMsQwYFguane/ZmIAVk5ghZ//dFF0aNUmQt2ClnVgy0v3BmX64qwcSgGAYLegb6KcLT3bdh772axhISFRdVu7MpWjqINoCfTIolXNeLnIMfsHftSUCmdylI5vZKtMNrELbM2vOIHQVb3218xImlzMfHaoijVk5OvdeLmkDyaZ+WHXvAvCq/GB5NteabBT+6wiB88RRj55MiYk cLkFiQQF yYe2wZGEhT1DL+5nYD+xxkc7FJgILDfvuE5Hs/X3hoflMGN5XZH8q9JTPg1xygxm5iaB6f69J1auZ5WUgCnOYdr/4fkve2iCD+fEDHSGgsE99B+ZrM1/OOToOcikT2A0tB7bKBDDCNpUTaFyHOVRYtKacM2v/zAKAxSLusMBxitrSmJLxEmjCCbBNFUZV+vUFLeRPcm6LAyYwQEmKl0/jlk5gvrbOscTwyn8AG58NCAmk53tD+t8sDjwxyripKZ2T7OKtpsSVKm3qCWSArw3PBczY9Q0ybX0tcp6oOdSv1gWB98S2jdvAQO4hCVELrSqadAJ07lWLeph1f3Vj5QrHfrGyi33onzzWY5oRIGb/Ucn0ZA0OtWkfsy5EBKoyOvsrVeA+k1y4wyiR7dVTVtoJawITrfxLDAQaobEsFFdsSdai26HOHqxf+aPfWtguoQIfJ0O9JJs9gK9ilnFZbKVhSiESK3UeKoWAm/dEgVL4+szSbtgnf+Tc5Dn0dZFtE6vdnoji 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: Updating __show_regs to print captured shadow stack pointer as well. On tasks where shadow stack is disabled, it'll simply print 0. Signed-off-by: Deepak Gupta Reviewed-by: Alexandre Ghiti --- arch/riscv/kernel/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 4587201dd81d..6bb53ce72ed5 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -90,8 +90,8 @@ void __show_regs(struct pt_regs *regs) regs->s8, regs->s9, regs->s10); pr_cont(" s11: " REG_FMT " t3 : " REG_FMT " t4 : " REG_FMT "\n", regs->s11, regs->t3, regs->t4); - pr_cont(" t5 : " REG_FMT " t6 : " REG_FMT "\n", - regs->t5, regs->t6); + pr_cont(" t5 : " REG_FMT " t6 : " REG_FMT " ssp : " REG_FMT "\n", + regs->t5, regs->t6, get_active_shstk(current)); pr_cont("status: " REG_FMT " badaddr: " REG_FMT " cause: " REG_FMT "\n", regs->status, regs->badaddr, regs->cause); From patchwork Wed Feb 5 01:22:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960379 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 5E0A2C02199 for ; Wed, 5 Feb 2025 01:22:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 114F428001E; Tue, 4 Feb 2025 20:22:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C819280016; Tue, 4 Feb 2025 20:22:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E59ED28001E; Tue, 4 Feb 2025 20:22:31 -0500 (EST) 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 BBFB2280016 for ; Tue, 4 Feb 2025 20:22:31 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 77B45B08AD for ; Wed, 5 Feb 2025 01:22:31 +0000 (UTC) X-FDA: 83084140902.14.47459B1 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf18.hostedemail.com (Postfix) with ESMTP id 86DD51C0007 for ; Wed, 5 Feb 2025 01:22:29 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hMTVxx1k; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 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=1738718549; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=XJVEYohRaxfOeSf3pAnW48dx9S9Hkj+LEbU+4gT5oKiMhbt9p0+knH2cMPBWBKeqptGKTV l8CJW9/B2qkbzQeNB59Np9FPaBvRh6B2ncvghTLjJcwVteB8qHvEqtyzcPoaU5JsYcQaT6 swoL9cLQlGpGVZYkw2izQFRSpbJVoJM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718549; a=rsa-sha256; cv=none; b=M17zz/RN63QpUzkACInXOPzOdLdVHR4xCOkmiZV/TX+raVn6L+uGEFnf3dEv2fuiRZRrBr SjzOGo2oYQ6E69vJnr3a40rW0rX07I3Q1XktH23ahy4YLYfMexu3bDwXiS7jFu+EAKBrHB goyItlyk5nZMrp6j3yrdgNb7qGlVe1E= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hMTVxx1k; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f9ba87f5d4so2285782a91.3 for ; Tue, 04 Feb 2025 17:22:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718548; x=1739323348; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=hMTVxx1kiRuMDmvk03N4z9heOtB1Ji+fzZ5Adk9ThLXKhdO2o08hjIbOVILQvBHFON i7BTrtzYxk8l/MKXHdUtZYcwsBaUNgmL5k4ntcdEPCEIF13cilR53Bias9f/Z/F9ZjVm glCZiXEFNkAIVYIuLvS1w8I92b1g6tZHM6dBBxbGr98oP5nrXP3x/4IzjbewmUBuB59o uqEm62GJsm+y4Sv0EAsEgu04lL+98FzScq7NvToo8CAYacPfJn4LoFeLu/K4+6If78wO RW3qXzNTkZC9FA2WcTwbN5p4haZAGDDpiOPv3laDeHy2z03sSHBw3F7h014S4e5scvD5 BwOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718548; x=1739323348; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=ffy/DiCKwhtWNf5sDsKLEsdaAe8bC70jCdfexbH1WmCijfdKTQTu3pJtDQO2rsLo3Z 975GOYB4V1JWqqudsKJTA6/SQaE6/BUZsw1LmNGDdisFXFbHqrU2PMkmoGTMsVeCEgyt hHmuwSkLTTOcPJ4OY3Jsa02iGwwpqkCjKAwj5Fcq/O46o3dUXQHBHq+LcHcFU12Gy+2Y aWyNA+UbQk95dvlmlCeZZQSoYnodrCgW6c1B1mTs9G4DtbZmujuQq/p/KQsYeLKw/gdC Mexgdmj1jRTSToAhknNTpHkyE1a+1Odzqv/rUzBhEzbjbF1USnyvkmv/DljECkXTwEKl SWjw== X-Forwarded-Encrypted: i=1; AJvYcCVp03LQklW5VgZHmG0vJYOe44AyAxxdkxHm8dCi7U0pWtGP1AZPFjn7T8PUgmBcThQiCPZL6mnRXA==@kvack.org X-Gm-Message-State: AOJu0Yxax6kt3h2MYGu2Oee/wpSa2CQZJWl7j1p1Mxy32SAe/O9rxfo+ q6yGHQw5cVN3T9RN1OM0gkCCJF5SqCZvwRS0xYLByUItFbWEgdIOErDBTGvJ7do= X-Gm-Gg: ASbGncsohEaFBWOD1Zq1DzaJnvSfyFr4K/zHUXiKH86X6JUWuGNgyiRI5QQACQmopqv oEcJJ5/NDZFAgTAJWshaWnvEjcDod/TFzehh1A9FRzGrm7xU46c6/WihxuVYEtnbt3YOD3osvDd 1sSq7CB6+9VVpFtsEl7yG1M9vpieQoye+OiUpKJtwfEGcPgO1820D1+9QJfliyn9M7OcahJh57j PYjqMIg2+Dxb1qwivRScAJ/xz5J9oD8t5RwJxoG+v9U2vXllG31QsE1Vf1TOhWL3WBlYCTPVdUf 0+W2xK5oJvhp0Lejfx/sBBPPNQ== X-Google-Smtp-Source: AGHT+IHWbQfADLd+Ob8Vnh0rOA4NZ0z4/6KaV7B9hVIajt+57sgLHfd+vtzkYcT3cxRQ/UAnvuEoKw== X-Received: by 2002:a05:6a00:2886:b0:728:b601:86ee with SMTP id d2e1a72fcca58-730351ec0acmr1566871b3a.16.1738718548311; Tue, 04 Feb 2025 17:22:28 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:27 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:05 -0800 Subject: [PATCH v9 18/26] riscv/ptrace: riscv cfi status and state via ptrace and in core files MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-18-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-Stat-Signature: dbc7wxp78k38hraxtw57q1hr5e7m5jkn X-Rspam-User: X-Rspamd-Queue-Id: 86DD51C0007 X-Rspamd-Server: rspam03 X-HE-Tag: 1738718549-289643 X-HE-Meta: U2FsdGVkX19zK+pAJ1twwzx7q3drLHo2+uOvh6Afud+KVamSiiec1djl8qQs58Uhjy8l1R/Bzy1/6Xtq+oxS7LxJDKX96bN7Q/XC5U5V7QJUagYdBQ3/GH1wZzCqiLq8tl0Q3iEVoo+nfftZgPXL2melh2pfyLzf2IGIzF6X+/VeZSc+WZL8dck/sT/4xpU8UrhvKw6hFTKilhy7r/NrN/VFG1HdA1ijw+501+8BLEYQXJhZHE2IrWN9sJoYPkJrkISfrtCN5vWlHCb9GL06OibkPUYn7y2bu2mBjNVDc3BNORW4CeI3QeZ1QiI6taiPfV2u54HLmNgPEoK9bnM8b0vW7cYBQcB6I92k7LP6l5OKBaPX5vdu7ymdde9YkGsz2ajuEaG82tL1B/fTRbbXzDgblai4BexJvioCaHd3qtXbhyXPJ6FqWp26Yj7VoomJ5pkBZb+B01PaTtsi7EJ+s+hIrXS15JwAAbB974wHY6DT8EhW4DRY/47MtHUUulzjUOCc5rf0TsXoDnMx7NnXsUmRmWF8IluCqoTmqq4i5bu4xQKNhFe1ptll9pObQ8i6O3iwYutCJdjlLuVbQgYQ69xa9Q7BFq9DD0OCHQim8KG5wL5oIzUeI5I4c52oNK+ckSfBWfUZUNHRSiW+OdhWXlgLPh0BUKGfIDxegmOym4VSm5K4GzyozsilUHJPip92Bz9njMREiciTyt+Yj90LA/NLTKfTdN4B0dJAeQ9446gTAY3Gd/fxM4J4Xiv4b5RvmvmxL7794kYleouUMvapjK30x74fxc7Uf/8vj5PVZ+Nc5ZGkvQadQ3vlYgwvpiPiU78k4jN3cqQfFU2a5J4qXtjTl/llM5m0FxRyWjfMgk8EEPeVGBaVDF8dwDvhp3gpDsi9med5ZV0AnCIqem+XwBKU33TVseVfVKa5sDxTRh8oAdnG3QtJDQTBgio/HdImVYHpZWwRU77mOhhlxrf jRHDSMsZ 2sCNCD0K1xvZo+2HOlHjYKi63lQI4NPOQSp/kqy2rEgmZwwkqKMrxDeRqAR7voZupElPfnCXHHIHZOT3yIUKG2V3qBfHOVndHRgiCntb8HurO4LHYXmvVH/7X59FFIobDgKpi4MmCNVHR3gX/l2Kh6cw/vcRP4X6Qk+z0yUkUrstMFmFNACJ9qZwCsVYQrhkOXT25UqKjr2wc+xQ1eKzsPqNCXKbnmeFxx60v3ZbVfkZlzGzjfsjbLQpkbhQcB4l90LPvShN6/E9PZFFnJwuALEakwN0DRS9jfQLt8qxi5BjhD86xk6GYDwZUXY4vr7ilv5o8CHRHfil4/yjQwVJGndVKBzzBhwrSDcEV2DYka1qRJ0g1RmQVk2DnU5Q0oyXYbP6uv/r0gXGdZqB5lTRyuOqztIlVLIgdmntPrsWSVEJKnTF05n1bm1ERxgVAmuZRHxiP/B4ae1xXHxnom5Gpsa6cFQ== 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: Expose a new register type NT_RISCV_USER_CFI for risc-v cfi status and state. Intentionally both landing pad and shadow stack status and state are rolled into cfi state. Creating two different NT_RISCV_USER_XXX would not be useful and wastage of a note type. Enabling or disabling of feature is not allowed via ptrace set interface. However setting `elp` state or setting shadow stack pointer are allowed via ptrace set interface. It is expected `gdb` might have use to fixup `elp` state or `shadow stack` pointer. Signed-off-by: Deepak Gupta --- arch/riscv/include/uapi/asm/ptrace.h | 18 ++++++++ arch/riscv/kernel/ptrace.c | 83 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 1 + 3 files changed, 102 insertions(+) diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 659ea3af5680..e6571fba8a8a 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -131,6 +131,24 @@ struct __sc_riscv_cfi_state { unsigned long ss_ptr; /* shadow stack pointer */ }; +struct __cfi_status { + /* indirect branch tracking state */ + __u64 lp_en : 1; + __u64 lp_lock : 1; + __u64 elp_state : 1; + + /* shadow stack status */ + __u64 shstk_en : 1; + __u64 shstk_lock : 1; + + __u64 rsvd : sizeof(__u64) - 5; +}; + +struct user_cfi_state { + struct __cfi_status cfi_status; + __u64 shstk_ptr; +}; + #endif /* __ASSEMBLY__ */ #endif /* _UAPI_ASM_RISCV_PTRACE_H */ diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index ea67e9fb7a58..df8b7c6ab671 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -19,6 +19,7 @@ #include #include #include +#include enum riscv_regset { REGSET_X, @@ -31,6 +32,9 @@ enum riscv_regset { #ifdef CONFIG_RISCV_ISA_SUPM REGSET_TAGGED_ADDR_CTRL, #endif +#ifdef CONFIG_RISCV_USER_CFI + REGSET_CFI, +#endif }; static int riscv_gpr_get(struct task_struct *target, @@ -184,6 +188,75 @@ static int tagged_addr_ctrl_set(struct task_struct *target, } #endif +#ifdef CONFIG_RISCV_USER_CFI +static int riscv_cfi_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + struct user_cfi_state user_cfi; + struct pt_regs *regs; + + regs = task_pt_regs(target); + + user_cfi.cfi_status.lp_en = is_indir_lp_enabled(target); + user_cfi.cfi_status.lp_lock = is_indir_lp_locked(target); + user_cfi.cfi_status.elp_state = (regs->status & SR_ELP); + + user_cfi.cfi_status.shstk_en = is_shstk_enabled(target); + user_cfi.cfi_status.shstk_lock = is_shstk_locked(target); + user_cfi.shstk_ptr = get_active_shstk(target); + + return membuf_write(&to, &user_cfi, sizeof(user_cfi)); +} + +/* + * Does it make sense to allowing enable / disable of cfi via ptrace? + * Not allowing enable / disable / locking control via ptrace for now. + * Setting shadow stack pointer is allowed. GDB might use it to unwind or + * some other fixup. Similarly gdb might want to suppress elp and may want + * to reset elp state. + */ +static int riscv_cfi_set(struct task_struct *target, + const struct user_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) +{ + int ret; + struct user_cfi_state user_cfi; + struct pt_regs *regs; + + regs = task_pt_regs(target); + + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &user_cfi, 0, -1); + if (ret) + return ret; + + /* + * Not allowing enabling or locking shadow stack or landing pad + * There is no disabling of shadow stack or landing pad via ptrace + * rsvd field should be set to zero so that if those fields are needed in future + */ + if (user_cfi.cfi_status.lp_en || user_cfi.cfi_status.lp_lock || + user_cfi.cfi_status.shstk_en || user_cfi.cfi_status.shstk_lock || + !user_cfi.cfi_status.rsvd) + return -EINVAL; + + /* If lpad is enabled on target and ptrace requests to set / clear elp, do that */ + if (is_indir_lp_enabled(target)) { + if (user_cfi.cfi_status.elp_state) /* set elp state */ + regs->status |= SR_ELP; + else + regs->status &= ~SR_ELP; /* clear elp state */ + } + + /* If shadow stack enabled on target, set new shadow stack pointer */ + if (is_shstk_enabled(target)) + set_active_shstk(target, user_cfi.shstk_ptr); + + return 0; +} +#endif + static const struct user_regset riscv_user_regset[] = { [REGSET_X] = { .core_note_type = NT_PRSTATUS, @@ -224,6 +297,16 @@ static const struct user_regset riscv_user_regset[] = { .set = tagged_addr_ctrl_set, }, #endif +#ifdef CONFIG_RISCV_USER_CFI + [REGSET_CFI] = { + .core_note_type = NT_RISCV_USER_CFI, + .align = sizeof(__u64), + .n = sizeof(struct user_cfi_state) / sizeof(__u64), + .size = sizeof(__u64), + .regset_get = riscv_cfi_get, + .set = riscv_cfi_set, + }, +#endif }; static const struct user_regset_view riscv_user_native_view = { diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index b44069d29cec..b9daed4ab780 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -452,6 +452,7 @@ typedef struct elf64_shdr { #define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NT_RISCV_USER_CFI 0x903 /* RISC-V shadow stack state */ #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */ #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */ From patchwork Wed Feb 5 01:22:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960380 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 16B9AC02194 for ; Wed, 5 Feb 2025 01:22:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED487280020; Tue, 4 Feb 2025 20:22:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E8027280016; Tue, 4 Feb 2025 20:22:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5DF6280020; Tue, 4 Feb 2025 20:22:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A1DD2280016 for ; Tue, 4 Feb 2025 20:22:33 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 671AAA03E2 for ; Wed, 5 Feb 2025 01:22:33 +0000 (UTC) X-FDA: 83084140986.17.1E26A9D Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by imf01.hostedemail.com (Postfix) with ESMTP id 74ACD40012 for ; Wed, 5 Feb 2025 01:22:31 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lavsljru; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.41 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=1738718551; 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=BEoq6zqSeLFMaXOoiuM7yp6ZSaKHVlNR4X3PvApIHRU=; b=75kgMpm1oCQhgICo7lWUc/yfu2wCnCqXSXFq9HuJWJ5BFPwqv9XBk2yzVyR+6QHxm5vOB3 EXIsgipzqUHe5sVYzsGCmSVz79MIbvmDSdPAGhf//qkTkPCiGQFe/vDuUQX/CBb5CD/wSy VZd5j+DXMOvm3Itxdm4sRv7fYr43txE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718551; a=rsa-sha256; cv=none; b=ZLd2IHrxPwQ6HzELuBGPC9XxbgbEy10sBOUKxhnWGtGhr9JnO9GcPbsRLImvVQ9UPpdfg9 C5js+MfUVap88ONhVBYz6tCGWt3WOIvbBt0v2T4A1sshHZpoZr/yHd4FpR2haKp5/0HXWX mHGvic8DSjafPcqzkUo1Gal1L6EZPMI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lavsljru; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.41 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2ee50ffcf14so581980a91.0 for ; Tue, 04 Feb 2025 17:22:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718550; x=1739323350; 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=BEoq6zqSeLFMaXOoiuM7yp6ZSaKHVlNR4X3PvApIHRU=; b=lavsljruNpf0OB6sPLIEUeROdoiVQZPD+ohpW80nmIoqPmP0R8mU+ig7YcfWwTrUqH 51GDrI8UETItqpbuvlEr6j4tBV+rMPAgHJOmtempth739R2Sii5Y8KuyjaiDL9J0iKV/ rJTDbCG7aPSnRtnm07SaBfU6+/ZvCjQRAygJRa+TxWd/gY2Jlv0n0S0jaaBKHyUbl619 PzQCU3v311gxza/ZgtlFu3JppV7cIY7QHYVdGdFjXE7b4H7E9IHe7UDvnw+DRg8KoGFe yw1eMyBgMgJTVVE6Ai0IhwSN7wYIPV7bMm77zS4BECvmqe9ImBv98tadfzdXC4HgwUbq QGgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718550; x=1739323350; 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=BEoq6zqSeLFMaXOoiuM7yp6ZSaKHVlNR4X3PvApIHRU=; b=T4U+aMiOn3JuQxzMN8VT2td4LYkAyq74WX74sydtgUrNRESRevol3wmoV4KOY5BLEo nbfeFtSjlXNLVIVKV/Efu6Y7WQSDxZuUi47zCpX/xuyibC2j3l5al6c+Zbtsd9UVMdzm kR9xGnSGVjUdH4TsytH82U0sMb4btIPp1qniATWy6111lKlW/u2Yd+Fb+0Xb7zC0NZ1f 3vhvSRMBwUdC3UiO0v11z/alBmxsloeLyrjiRjbQ9HkftCbbDsW2uO93q7eZ7SO+OA6i K2xNrXCgZSHVG84XkSLeFrH2rpcn6s6hxV6JleBQY2GpT2gfGeLst533ON1eh5sCRr9Y q6Ng== X-Forwarded-Encrypted: i=1; AJvYcCXg+Bd59eCqNj1zZyDJ1354KMoL/8MF7WUyfvxipva9kZF9GjFa3I/CRgCCAZeAATny/N7iEcptIg==@kvack.org X-Gm-Message-State: AOJu0YxQz6qN6m/N6m/UtZt0CTs2+41znWmuioJqGe09DCvWMX17SaMm FKqEQkDvcORcbag0VasRrgiiw24LpquyoS4mFTzEDWaZU/p2odzrNLl94WFlLd0= X-Gm-Gg: ASbGncs3PjD/PVLzo1avmwXHgGtqE1d6LjZuRj3ABHP6Wf+yt43pSsG8PYMzMSqRNlH gXP6rYjIgpbKMo5qgVy3+gSZjjpfj9OKG7sLGWpc4NBN8X1gywwoaGNhsBSSX0IT0uWJpUl25aR sN3vCe2lIg4W+dZ2wHaiiPIo/AdsdT3rirsLya7esfVzdQ9Vr7AraYu4JXe3om1OQUiWru0ARe9 TAY+NEAVzWpMZV/5OJ7Psu1+Nu/pDXeYfIXhu5Dnr8I/6yAwNsJIPECcXb7O8RXs5eOqSaLU7n1 SNrXxhH4jQ1IItNLEVJx3oCo2w== X-Google-Smtp-Source: AGHT+IFRFqE0ahq5ulRUML95GVOJ0DexxJ072ed1PioG6NF+P3Y5e0hdICNgMJ1J/XjbYt4HuYIKmA== X-Received: by 2002:a05:6a00:3a19:b0:729:1c0f:b94e with SMTP id d2e1a72fcca58-73035131885mr1809338b3a.6.1738718550207; Tue, 04 Feb 2025 17:22:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:29 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:06 -0800 Subject: [PATCH v9 19/26] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-19-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-Stat-Signature: wgq6rh5fkwoutd3u3cmj1r84qmpc6m99 X-Rspamd-Queue-Id: 74ACD40012 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738718551-150946 X-HE-Meta: U2FsdGVkX19rMFGCnN2qXRnB6HYEanYHOdCV6Y63WMUXrU3BbfItGwxuq6jXGGYXZYB9oPIlslROkldOkll8jQD8w0zKPQVqW7kA4z41tKA8hJnueyVIbVL+0wwedd187E+3iRwY6rif2NDYxUUPW3nmKvPBDXDexSBY8oGqyAnV3uMmD1027hKKvZ1hMJvM8xITI6Sl7g0+0EBMqLLHA/SJ1QMbTpbOILwgBHajlTHSkHHTRq+ubUm+PvMVkKvv/KacplX9jqEbqwbQzYp19nullt+UvGusOBbaNsqWcXRa0zORGXyasCArztVlgEVcy/VdipafgjWrpiMw95SiCjOj9Awi2sbPOd+1QNMebw/Xf6knn7PTwH/bd3eMXsqGYngrEE9Rqmg/dcrRlIRz822Oyov6BEZ9O/0eNztXoF4YdQ72z1AzqusH5zXMoDq7KDDvbw2noZEXwjdEc/NFMpgP6vBlmkRCEsmBWpmfa2+vCXCQB2w6esfXGMNApMouK+jWm9CYJSHwW34RzsUevatowlrNgFV0K3ebVJ1gl5SRdcUQ4KAMZTnwtd4wsHl0dFgmese7NNOy7Ifo/nM5ZfXdP04ERwjdpTJhuvepsFrejwcbpAKGZniK+nKyDQ807FroWzZ7Cz4buTwGFpif1HG0ySkSJYzceKhGestjZPO/pFX3Tx4Go1sMDGSbSPsKyzuB2J6kZSYYy9Z9BYc0AIMt8tb+A7SAoBOxIa8gDX8l/4CVZLIzvsQgQI4HvlLogkmSfmAGqcJPMmYB/Th5gtcq4gi8Y6RUWfdLCLnPPo598wetP4NnDB4cnt8TXQEa7oh2XEUNwwL4Obkocw0xJsHwTqqdpU/AeqwSe7aXT+ie5uPRr7ln7OH6V4OqZUXRFiMHAKtaitHXxPROcFFEw96PB3e8zUkb8jbNs1OYxswP9g+SYmlQbhA7SQkJ8R/VaD4Js52jENKuKzUQ2Iu tI+47d6+ L0aJ2qqoaHDr/Y64ttWPGY2crf3Ppl9MQeZ0xUGpfz1vAugHOloiCVEB4n1DqYs4ARUPVX/1HjiU7Y2irXg0IT34GaVu3fraJI6iYRXCtYEZU671EAqiJ9N9BLQ6QklorF6ziWk4R6dyHnt2qLm3yDvRLkIYO5IBdeLhIv82kRJ8CmogkNPVhdznYxrGyXKQoj2FGXqs8EgG8lOWLhyDINRClp5dCzCwIszbvlTsmhJV/bQU1kuwRLoE2x7lBCUUOSla+fylY77aMZH70ScYKn2ndklrlIKcPpkWwheGW1UvEWJmy74Ex4th0mwjgiTEKQUg1p6vdB1e4aZuUx6gMFkpEW/b8HS1rexUZCTglvpBGBrDF7XZ3bnUcFCdluQUmB2O6G5Q99igjGpe74RZGwU18Va5Vzfc8FiChTwQL5PBeoK935WgVZmiq/ECRzpOe5egDLS964BjMOsY= 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: Adding enumeration of zicfilp and zicfiss extensions in hwprobe syscall. Signed-off-by: Deepak Gupta --- arch/riscv/include/uapi/asm/hwprobe.h | 2 ++ arch/riscv/kernel/sys_hwprobe.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/riscv/include/uapi/asm/hwprobe.h b/arch/riscv/include/uapi/asm/hwprobe.h index c3c1cc951cb9..c1b537b50158 100644 --- a/arch/riscv/include/uapi/asm/hwprobe.h +++ b/arch/riscv/include/uapi/asm/hwprobe.h @@ -73,6 +73,8 @@ struct riscv_hwprobe { #define RISCV_HWPROBE_EXT_ZCMOP (1ULL << 47) #define RISCV_HWPROBE_EXT_ZAWRS (1ULL << 48) #define RISCV_HWPROBE_EXT_SUPM (1ULL << 49) +#define RISCV_HWPROBE_EXT_ZICFILP (1ULL << 50) +#define RISCV_HWPROBE_EXT_ZICFISS (1ULL << 51) #define RISCV_HWPROBE_KEY_CPUPERF_0 5 #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprobe.c index bcd3b816306c..d802ff707913 100644 --- a/arch/riscv/kernel/sys_hwprobe.c +++ b/arch/riscv/kernel/sys_hwprobe.c @@ -108,6 +108,8 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, EXT_KEY(ZCB); EXT_KEY(ZCMOP); EXT_KEY(ZICBOZ); + EXT_KEY(ZICFILP); + EXT_KEY(ZICFISS); EXT_KEY(ZICOND); EXT_KEY(ZIHINTNTL); EXT_KEY(ZIHINTPAUSE); From patchwork Wed Feb 5 01:22:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960381 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 B9F59C02193 for ; Wed, 5 Feb 2025 01:22:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1301280021; Tue, 4 Feb 2025 20:22:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B989D280016; Tue, 4 Feb 2025 20:22:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99EEC280021; Tue, 4 Feb 2025 20:22:35 -0500 (EST) 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 75B4A280016 for ; Tue, 4 Feb 2025 20:22:35 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 24D8F140410 for ; Wed, 5 Feb 2025 01:22:35 +0000 (UTC) X-FDA: 83084141070.19.53EEB99 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf03.hostedemail.com (Postfix) with ESMTP id 32E6920002 for ; Wed, 5 Feb 2025 01:22:33 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="boEJcp/p"; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 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=1738718553; 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=a5uI84SXblQRDID2BHNWhhHsRc7xVUDdoiei4kS9c/0=; b=vAl9J04gYdMKaU+Ygqf5hpzF6+J5/BmVYpQMbkJE8e4GX8ZxcXJlrp3CsWbGc9Vel/bbvq Il7QwDyFKP6MKb/tdNAfE64xUNLryYjlEj1prE2wrdNgksEzJ4ZI/FqsyV+zyHdhCikUfQ 6ZCIHgjszXwTQqYizKOv7++Uo2RB3gs= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="boEJcp/p"; spf=pass (imf03.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718553; a=rsa-sha256; cv=none; b=SBc2LvaS03KYpy/7sF2mCkGTVGT2JQZ+wb67uV/Vzyp722CGGiPODcNX/sT1ghFKtVOTnF RgF+ajybey390LbgpBeydKbPtUnkHDhCKkP+CIzW1CJTX2ID38OCM3ZbcAOKtJWEXoJzjl 8nmOUbN0X+PO67v+KMwhdqrIQzhTqLk= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21ddab8800bso88860245ad.3 for ; Tue, 04 Feb 2025 17:22:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718552; x=1739323352; 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=a5uI84SXblQRDID2BHNWhhHsRc7xVUDdoiei4kS9c/0=; b=boEJcp/p5I3J+x3AZRsOHFdc4r//HZPtWDjZC+swiC/PPZgctT7Buk4IttKYjmfGus 4xgV591A35xT4whbMZiJvVSxjIAWxkcAoPBShArHIeVbgYVMdQy1ouFRk26DlS+g1+Ga YhJtximbLzsGYGKycaZAar/eDKg7Scvt5CH+fHY/YE9Sau1J4cnWu7M8+xR8lcGBsSjc 4y1Wme7Wl8lrnAf5aGBahp3SPxHm1PLH25toYRJDU1LO5iq+PR/zJKq2r/vOoJ6DiMob Gc6eU3pDW140X1dO4bBoaajTUZGK+sg5yKUa6TY8t/MpkEA38gfNprDbMuUrfhU6VZ6J VbYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718552; x=1739323352; 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=a5uI84SXblQRDID2BHNWhhHsRc7xVUDdoiei4kS9c/0=; b=w9Qt6ulfXFLx/86Mwq/cj1E1JV9F9d9XIXUNyNgQcUzlLP0nwe7txM5zI279on1dUc iYnH4tIzx9fXav1LfZxJB8fcK2UcW543CEPhxvyLBEiskk9o8X5+5y2XRfCoVsj5vUmT nyXPAqmuWSKtNUlzXIa+BmOuD/Qnca60g96/jL2JvdyT8CzknrCsdtelbTBlfinxrb6O mE0NhD7t6Ymv4qO6xyTuAGPBNA3vwpyFQoXt0I9pgOgzdoK25msuPAyP2itz5Kas7hDt ZsTtqArTW/mX/eLkm+PPTvd5prSTHOKB30MNM3xsFnU5eMlGKwHo1z0eOsKOMu5WSd01 AwJQ== X-Forwarded-Encrypted: i=1; AJvYcCXIgfUekuPQx8uv3ISa9MIiKYruRn6a02AmzfXsjbmJrh4+SU2/yi/MuoMqtu0FLUlGQQynYoI++g==@kvack.org X-Gm-Message-State: AOJu0YwqK59dw9dOIVt8xuU5ABbXASiVMIi0wqiH8F6za0NPSWpvdP6v nf6FAOtr/uTlWFqhJeCz2XveRHxr10SeP8zVRrJ0RhEVzWkvIP88M6+Wy7J5qNM= X-Gm-Gg: ASbGncuz8m5skYEHl2vMCr0ZvY8y/wFmv/8b+uwGTl/4bmYV06Id2ONSwqOaYaZj6Ud 3QKH5O07P0Cz7qWz/dnpPZ3VIXNicMYsOY9dXSFL03TtJ4mVyXUS3Gpv4N8z1N+BaGWWSl24GaU Cdjrakj4BLcLmVgFBu/dvpShaoXsnNo3zxzOGFucnRAq3Z5CjWXlCDPvRf01vHlGQK4tdoEhP// GGuCTG06zv7GIbms82NuA11aL9qrwugARhtenWsl+Ba7VyQDfTpVtk+/z/uONLmHj03/hmD3ISK oa+d1C1GxyxMQu/jeIgGVke6Fw== X-Google-Smtp-Source: AGHT+IFCF6Qyo3q2G3dGEoXnovMcbEOll06APDlJ/baKR1lUf1tJ5kFaxAt+4U15uatvwIepGIzY3g== X-Received: by 2002:a05:6a21:6da4:b0:1d9:2705:699e with SMTP id adf61e73a8af0-1ede88106d4mr1669830637.7.1738718552107; Tue, 04 Feb 2025 17:22:32 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:31 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:07 -0800 Subject: [PATCH v9 20/26] riscv: Add Firmware Feature SBI extensions definitions MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-20-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 X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 32E6920002 X-Stat-Signature: ueb5w8z75mjdpgbxyus6dty1qhsrgzmi X-HE-Tag: 1738718553-148950 X-HE-Meta: U2FsdGVkX18QVFtnmFb+wXG+dTuZH0FJsMw+ZXJrYA1iVyD0lbkUrvUZjQn9Od2RIim55qsLg76Up8tooXmBNKXhB4DNxvd57+yQLazRJ8t/16UaeYLMt9Hit79gtU15OKG4aHFLUTpDh5jyfJxLSN87+eyt0COonG3cmihl4GtWxNm5htzMZTn91bGS+8P6TYeBvB5YuVXZE4ImjNaMbMR8CCJQrR2Z18EJOLPO/L85JkIlXudTx84n3nDYnrPrlG6B2Xuf5W4kc2ff1hkgAbSSVtu6ZVY61zgE9gxGsN2O9HuvxoWvdquykNUk//+c0x5M2nNtFFymP/KYAUW6gShY5WS4d2loHfBlSBg3Nv5P/uaxRPeoO2ZjVX7B77Hqzp22INWx2DNXZT02Cc+5Z7uhUEgEFsTxQgrvGTXT8OokTbec+PvwVsZVMO5J1RUbnUpIH+iFzXSLBka83LJ7A2PsBQgHUcD/b3+IeuDWZFntxHbgMXS1U2faVJ3aDeuqpwQ45zwd1wK2aPpmqsj06uAVK1EJaCI/u/CIxQkzhecSAIBFa6xvtI/IO2brjVYzjiWbVN4aySpXAu/AFxBfG3Jo4taD8w8PR6i1bt4lNCz0yrIJS7z5OnwJsbOlUoHle5LzP4R6QDdmVNb8/sdtTZorTn1jTk7iI4eHZ/7Dmas9I9fpoZURjn1VxZjfNq0n8kD0DFw3nCqgAWqslCrDwqssEwJJhj3P/5KULCW/gNWCMPOMuNo4c/yLKQ2IxzpFFI9StsHYGWgGuq/1UPswxBIskz4Q2vt5jzqIqAz3sp3GU/gIFRvNzPTOQyhd+IaBjPm2q8b+CpbsupoAaucslelC1PVLG89gxzbizfbIb6zMn5WsiN6WVLlC3r7oLoNG6Wgi3lSIveHAbJtyIj/JoeFVAGp9FPcR6gqJhjvuf7W3ATfurGNAnd08ELNGFe+3mr7zI3tBIYX7wH1NIoh idTEawT9 wXOKMnyIcw9OPDToL1J4wjTAEox1gf62B/xKzziNqY6H/7qNnozvTbsZwJcYTpl2sU2unRgFRA338gFORo+yQVcyvYBFz/yFkDGqI+MQZAeQfYIYnO1kP6V4FEKU3j6qPb6aYQCfnMvRIggQ7H4Gq53C3X0GfjMxMPrFFb6rsbn2+0lzIjEKF3QL1s05+bKpmHbL8Pe3OKVqUUJcitnieBYjaLPjatRnykdZ+52iBTVbw1no8w+ysDxAQPI8EhHVht3o9A/bkz3p6SAKlP40p5/dQlS3NcGcEeWX0Ueqsq+5CIBqBAw/+icIvfGsYzFavruuPnKB7y0vqcLdeNdqQ/S895gU1nV7qBlNvbgGs4GD+IOUydXeoVenpnPY3Y+1bNiMdCKkQdTTVjdDOOVp6EXJT5pIKLp2BMVKzo3TDcyivx8f9j8TQP5+/1EvWLgMfI4Z2n2uxkz6YC8VeT5QsOmCFdQceW0eMQLL47rBJuubkktg= 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: From: Clément Léger Add necessary SBI definitions to use the FWFT extension. Signed-off-by: Clément Léger --- arch/riscv/include/asm/sbi.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 3d250824178b..23bfb254e3f4 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -35,6 +35,7 @@ enum sbi_ext_id { SBI_EXT_DBCN = 0x4442434E, SBI_EXT_STA = 0x535441, SBI_EXT_NACL = 0x4E41434C, + SBI_EXT_FWFT = 0x46574654, /* Experimentals extensions must lie within this range */ SBI_EXT_EXPERIMENTAL_START = 0x08000000, @@ -401,6 +402,31 @@ enum sbi_ext_nacl_feature { #define SBI_NACL_SHMEM_SRET_X(__i) ((__riscv_xlen / 8) * (__i)) #define SBI_NACL_SHMEM_SRET_X_LAST 31 +/* SBI function IDs for FW feature extension */ +#define SBI_EXT_FWFT_SET 0x0 +#define SBI_EXT_FWFT_GET 0x1 + +enum sbi_fwft_feature_t { + SBI_FWFT_MISALIGNED_EXC_DELEG = 0x0, + SBI_FWFT_LANDING_PAD = 0x1, + SBI_FWFT_SHADOW_STACK = 0x2, + SBI_FWFT_DOUBLE_TRAP = 0x3, + SBI_FWFT_PTE_AD_HW_UPDATING = 0x4, + SBI_FWFT_LOCAL_RESERVED_START = 0x5, + SBI_FWFT_LOCAL_RESERVED_END = 0x3fffffff, + SBI_FWFT_LOCAL_PLATFORM_START = 0x40000000, + SBI_FWFT_LOCAL_PLATFORM_END = 0x7fffffff, + + SBI_FWFT_GLOBAL_RESERVED_START = 0x80000000, + SBI_FWFT_GLOBAL_RESERVED_END = 0xbfffffff, + SBI_FWFT_GLOBAL_PLATFORM_START = 0xc0000000, + SBI_FWFT_GLOBAL_PLATFORM_END = 0xffffffff, +}; + +#define SBI_FWFT_GLOBAL_FEATURE_BIT (1 << 31) +#define SBI_FWFT_PLATFORM_FEATURE_BIT (1 << 30) + +#define SBI_FWFT_SET_FLAG_LOCK (1 << 0) /* SBI spec version fields */ #define SBI_SPEC_VERSION_DEFAULT 0x1 From patchwork Wed Feb 5 01:22:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960382 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 88E12C02196 for ; Wed, 5 Feb 2025 01:22:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0263280022; Tue, 4 Feb 2025 20:22:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A95B4280016; Tue, 4 Feb 2025 20:22:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DC40280022; Tue, 4 Feb 2025 20:22:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 6DCC0280016 for ; Tue, 4 Feb 2025 20:22:37 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2BF931A030F for ; Wed, 5 Feb 2025 01:22:37 +0000 (UTC) X-FDA: 83084141154.30.EC2BAF9 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf18.hostedemail.com (Postfix) with ESMTP id 3B2DA1C0007 for ; Wed, 5 Feb 2025 01:22:34 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="RvD/47q6"; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.51 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=1738718555; 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=YHkNmM6XuphgUqeYDdwRc1f9MaOV9mSfy6OUDBv2dEo=; b=KADcrt/jW/jiaKLBuaYgy6FOgJ4EMAFVMGnney8Ek0WbWdTzvDpV+4cnPTGnqTPP5UlMaf /GwKz7n25f5wS9SUh9cr69y6hrtul6LmQnu85XzmGFPN8uOsEp9IDODuhPvFIJ36mLDNBC DmS0gLp3gr8Wc4NvcAmMhqrdDFVIeco= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718555; a=rsa-sha256; cv=none; b=xXbtTwoMQNwLGwo6a5dXV2BElSwk7GxBy+NDt6H30rj+sjF0oZPbKrMOLkDSe7TdRiGN8L uDJYimMnXrtaS1+bdZPmuqXVb3mBmsD/lHMeb+P5keJUlh00YHwMbllTauvoQ0AEM8FlZP W8kbVRi4c+3um32UGkfqSjWfnx91Rxs= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="RvD/47q6"; spf=pass (imf18.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2f9cd9601b8so1846860a91.3 for ; Tue, 04 Feb 2025 17:22:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718554; x=1739323354; 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=YHkNmM6XuphgUqeYDdwRc1f9MaOV9mSfy6OUDBv2dEo=; b=RvD/47q6VLbEIpbB1Cr7J2+JNqp2wFHxI0H64mysZSsEg3I9xduC/IpTsS3q8WIWTR m+u3QWkw/6CpFE8yrRN0avAB9aeKyXt1tn2r/RbHN96NA6tZMt7N8qrn3T2OCndKIKPb n1TUlPPvWDZvIR89NFp5LMFI5+YHogOdsoz/M4s97a73AjQMF1Uwc2eFazmW6omD0Uxl C4W58Q+fBgZ3JBft36rQfVSvl3JJIReOb2jGafOtG5M4MqtYsK9kJF4XdieFirltRcOg gp1xEmAL+v877F+pmWMVZiOBLB8x+UCrrpVZe2u6JBPUxAisggP0ysXqrxOfWkFJkmwz nsXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718554; x=1739323354; 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=YHkNmM6XuphgUqeYDdwRc1f9MaOV9mSfy6OUDBv2dEo=; b=s415VsoqbnTQNDpCoZ/yCfLPcd5ubAXiuVQnApHEjaAEUiQmMFu0oTwnAcWwHzf/Ax HphjpdzGmYTijmr/jR3Uxg9R6ISwcUzBStKZc9DXEh1TJNtl86xErlaiRq0LwixMW0m1 qOAlMOIVKk+yVukPg2EXTEzbfZLgrs+aF2DxH487/EzEU+dZ9/L6wkifgDFtAR5rq8u/ F0Wvd6EcXWlA8999Hv1HlF9V9BEct4XeV/Dwc7SMM2eiMuybSvNwiiug93XBwNmUwKRm ijLV2srCu8jCvgjZtR/Ioo09wpQGd/IXmcjRX6O+3LqM5PjJyD1xhFMHD/qTmXF1mtGG nePw== X-Forwarded-Encrypted: i=1; AJvYcCXroTGa51PmPjyY16/CX+z0tFygfr7KvRCPch8o6l4QIe8vz3FhLABJ6a8m/wMMhjQC7V7HFb2zxQ==@kvack.org X-Gm-Message-State: AOJu0YxQ+F04HJXToMaP7QIpun6qtnKDocB1DYXphXxEcCceCaMnvASf oLJ6GavqhbXRpoe8Tfzrq96f3F5YVLDMR2koNLRs0u1OTx8CbbjfhbEuDnq21+8= X-Gm-Gg: ASbGncsGXygo0a1jEZOC27keJHL/rdYQ2EPxUpInNrV1Sdrn/o2STqKXevhtYjn9ut3 +VSkoDYugta23V7RgxziSyYjJN51wWjnwdWavULuLyDzMAPkxH5FMdCBmkD6ACXaq4v+ZM5EFGQ OMokPlONLd/a86GHbZ7Ax0qUnq0hfuU8an8XQTdEeB/GZh+VRxcoRUZYKuQffhriJgN3zy6KKXS ejZPebvGrWLUDjahVb3TXIbV7Eo/+ywTSR4HLnwxGk8rqZoz+Otg6GTyWWKgSmkXm5Qsu3BrG8b 2AL5glturKyo0GYRMzlMDe0gKg== X-Google-Smtp-Source: AGHT+IH0iBI7GsrizybTxNC+zOavZ1B/y8eyRteK7EdWTKItBlHpIizmBx4MRSyGuMGAUg4TIAF8EA== X-Received: by 2002:a05:6a00:2e14:b0:725:ffe:4dae with SMTP id d2e1a72fcca58-73035122ac9mr1196692b3a.10.1738718554007; Tue, 04 Feb 2025 17:22:34 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:33 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:08 -0800 Subject: [PATCH v9 21/26] riscv: enable kernel access to shadow stack memory via FWFT sbi call MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-21-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-Stat-Signature: hbfae98mnw8w1grrtmj94k753yhn5s3t X-Rspamd-Queue-Id: 3B2DA1C0007 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738718554-536537 X-HE-Meta: U2FsdGVkX199yEwMTGIYWr1uHWPStwUJunsmiR7xOpowgX0UkNrtZZshTTgYZZ4dk8Sk3snWpqadVaYjyypRZnDCBh/8NOX6JJsbYiXcq/HiC4qbhLLIxYGfqG7z+Lnku9vvV+thg11zjX51jy0VdwAZpPgSD2fVsDw4VcDPvyiYxH9v33fpdcegT/rGRUMfbLPfbHnNShTvxELHDuH/B6i1dyMmDrg4kXrOK6n7lb4vuArz3qIAzgKlt5UNLtRTHImg1RLYvuCK1hciDN+mDJV6Q6tOYxUApki/5v++d67PzjHijfP07dgfLedHPSNqTvLKkJ7BhAfvH8Pk4JHgmsZUR/cgV+c8pw9rwTOJvXHYD9QFaW5vWNfZQRw0u5zE6kqlKkKbtYHYeiWm4pAcGXe+BFZ2SWdkHjKFPU/TF7umSWuDBBwmabKS3itfK7nvBson3EQUTszr6Zw1EkRF1tObm9RaZ/1mKbUswOtb6VRd/eP0sRtNuTlZhbVA+l9eJ8VEBSF8Wg3MzOKXK+Z2KY/nX5Ha3zbQ7LTd1cMGKrG9ZruMx/1uRZPstOo6N0A+4kn1Yk2vjZumUVWZGIb/z7FofXo7uBl4R4BkKbNkHsoLFVgqZjvzc+pAJIAla2CEI2upIHA4/ZfsV+71B6VTNCzOtaoXrD0ZVxwrx5wJoHhA7ZXH5O7RVsIDLX1UVbBYk6vaRv1Pp1YOLhaUht4inzGLwnSpBDpIA+d0bt2QjF8j0+wkr/1PoQLb25+3nYssfkjktmbPiHDzh5F6zDxpHSLptNDA+RG0K3YNGh1u7Hof/swJHdczfgfziPhM5eNeMFbruVB6e6wR+sDU8+3nXDnW/se4MLW/asqd86m/yB5H6zi2j3/JqoDBqIzQKArpu/80ZvacEBT2ODyBWAh5CvZjHCrsmwm7fk9scXOiePzZ+iX2J21z2Ecl84JwYZ34lT2EMaZa1uzQWwg6zel m9WcXYW1 jCseA9P8TGr6UYIvpc0JsoJTZSPfaFOImcKOcbXBz8KQtuEKnlquKgekDXoecOEY9phXWw4Zao+V+8NQkGxaP8vFmkBjrr0PZaKPRXeh3phNsA+hbaBDdLO3e3YMLvjJy1M6eZWqgGyR/0ccfa7FQ+YvuilFpMpycG4ZA6VDAan+0WiUX9c3Z94I+VG596RrvPjUxwiVjui8mKxsy6hUhHC3kQJVc/ehacEdumizT1PizW93F3dasxWN2doqbojJo636j5PCTCCnDH4J9xP6vYH4WAXy6S1lNWmylVCATLCyx+P0mw28ymZWT5AXGyiW3NFmwGLAteEtKhclV6d+HBO8961hyFW3UYRDYwIju0JpFSadKyhFz+gViIM2EV3bcmsIRWZGlt0+8p7K6l2+gsGacWrA60XHOGv7XkwTMR3bz++84iibcDQYlfcMEINkdogotbxoK5Y1jp7j82kJZ4CCaxQ== 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: Kernel will have to perform shadow stack operations on user shadow stack. Like during signal delivery and sigreturn, shadow stack token must be created and validated respectively. Thus shadow stack access for kernel must be enabled. In future when kernel shadow stacks are enabled for linux kernel, it must be enabled as early as possible for better coverage and prevent imbalance between regular stack and shadow stack. After `relocate_enable_mmu` has been done, this is as early as possible it can enabled. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/asm-offsets.c | 4 ++++ arch/riscv/kernel/head.S | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/riscv/kernel/asm-offsets.c b/arch/riscv/kernel/asm-offsets.c index 0c188aaf3925..21f99d5757b6 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -515,4 +515,8 @@ void asm_offsets(void) DEFINE(FREGS_A6, offsetof(struct __arch_ftrace_regs, a6)); DEFINE(FREGS_A7, offsetof(struct __arch_ftrace_regs, a7)); #endif + DEFINE(SBI_EXT_FWFT, SBI_EXT_FWFT); + DEFINE(SBI_EXT_FWFT_SET, SBI_EXT_FWFT_SET); + DEFINE(SBI_FWFT_SHADOW_STACK, SBI_FWFT_SHADOW_STACK); + DEFINE(SBI_FWFT_SET_FLAG_LOCK, SBI_FWFT_SET_FLAG_LOCK); } diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 356d5397b2a2..6244408ca917 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -164,6 +164,12 @@ secondary_start_sbi: call relocate_enable_mmu #endif call .Lsetup_trap_vector + li a7, SBI_EXT_FWFT + li a6, SBI_EXT_FWFT_SET + li a0, SBI_FWFT_SHADOW_STACK + li a1, 1 /* enable supervisor to access shadow stack access */ + li a2, SBI_FWFT_SET_FLAG_LOCK + ecall scs_load_current call smp_callin #endif /* CONFIG_SMP */ @@ -320,6 +326,12 @@ SYM_CODE_START(_start_kernel) la tp, init_task la sp, init_thread_union + THREAD_SIZE addi sp, sp, -PT_SIZE_ON_STACK + li a7, SBI_EXT_FWFT + li a6, SBI_EXT_FWFT_SET + li a0, SBI_FWFT_SHADOW_STACK + li a1, 1 /* enable supervisor to access shadow stack access */ + li a2, SBI_FWFT_SET_FLAG_LOCK + ecall scs_load_current #ifdef CONFIG_KASAN 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); From patchwork Wed Feb 5 01:22:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960384 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 35044C02194 for ; Wed, 5 Feb 2025 01:23:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69660280024; Tue, 4 Feb 2025 20:22:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 641AB280016; Tue, 4 Feb 2025 20:22:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 46FF6280024; Tue, 4 Feb 2025 20:22:41 -0500 (EST) 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 26EDD280016 for ; Tue, 4 Feb 2025 20:22:41 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AC0641403AF for ; Wed, 5 Feb 2025 01:22:40 +0000 (UTC) X-FDA: 83084141280.29.4DC2269 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf16.hostedemail.com (Postfix) with ESMTP id C682A180003 for ; Wed, 5 Feb 2025 01:22:38 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=1ZMRhK14; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 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=1738718558; 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=9LN1OOVFFK55bIQe9Bj7KSCICvDpdODqLxcVYOIQy28=; b=MGptfNN8TSC0AqbO7vYiZEPDqJRU8UpeNo4tyZJryH8foUCmEPcsI8kt4gseL43Aa5dgMI xGcNICMyBI97gsiODu/LMGehAq/tYezol/XKGY2pqx6NCF+Db7vL8/4M+TyUblrabiaGMD on7546hHEL8s+X7oMzz/UJNQfGtJNhg= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=1ZMRhK14; spf=pass (imf16.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718558; a=rsa-sha256; cv=none; b=LU8G+fpax5zqVTt1PG+76hQQlOYvUEgYgveHL8YVRGguqPoeYmbHGQuA1CCc3082sUQUAR C4YJibv+WpBY3lhP2KMeCOMDNj96jDBu8m+jTEd4bRniBuJ1TpJc2hdNb/BNC3KD4YRlGp +rJorSaUjDduyEmpaNK7zU1OnCmKiTg= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21f1b2480a2so397115ad.0 for ; Tue, 04 Feb 2025 17:22:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718558; x=1739323358; 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=9LN1OOVFFK55bIQe9Bj7KSCICvDpdODqLxcVYOIQy28=; b=1ZMRhK14Cg4H3tV+2/jOD9T0l1yhA7/L8Rdr5I01d2MBHh1/N8gjRunWGMEfqbUTXT UMG19CQnIQWRlo12MOoOMKXXojTR+xqZO7EdSGbOzf+gISkxs8jRHos3++AlvhXuSkJQ QTdAC7kOBZgHDoGTtBI4D72YH7w4I9IYs/ZQJ0tHZypIkCvss270zkEnyXoOY3zcLFLq Qjp3J8hD01N89bK9/WyYvcWKuoHaNYcU9V5xTimTpV4Q0rzOObM8WgS/yXCJ6cq6wlZv LnniNBdixMM1ASs5eCmdIAlf5sPZQtDnsasKpQUsg3hBZJDunW+k8pLDGTtLUDEpB/IE SUnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718558; x=1739323358; 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=9LN1OOVFFK55bIQe9Bj7KSCICvDpdODqLxcVYOIQy28=; b=m3u8WbE9CKbs1Xpq+RaMDwYjSmetGvDt+hjljUSdA3IicbwUhiGYiaNMHGfEUUDI2e j3vKFTTyIRPP0z49NpMsmUPgG1S0SLmYDAruQXXMFHgupYpFC1q+oArW6hmm1pmAhmgD Ern2H5OXzYAU84iCcs2AhmvOQIc9t1yHbbwNgXUYODy38yPx0N1p/Si4U9gxR/f2i7zx 7nDzTBLhjY2Lk6LPie+/xggHzCuij8eEJS7/hmd3yy6pXMkhJ4GrDWO+ht7NGcshd6bO fecKVj0IA4XRwWd4P2nLTcHU+HYm9ZibuvEOCDrSwuzsqVgPFOLqH3fZ5ADglw22E9Ho 9NzQ== X-Forwarded-Encrypted: i=1; AJvYcCWg3kIQks1oLJAi7p3CCT5ecadAnH/HOdyWwFrnxmfXleHxEs6upIowoJ0ODfSVuu8fG/oukWVxUg==@kvack.org X-Gm-Message-State: AOJu0YyaPJqTBhz9L6Qau1og4ddPg8rURNlLSkgt8/qmwHTmVtkn9zCl iEACsO3apcamOfcjDWQielkoSlWLHYpCk3L9riNBkIcBqdQ/TIFJk4pUgQfI354= X-Gm-Gg: ASbGncua9RNbOII82o0Qlc8/Vw6mwxy+OCiazfbtdYQmfz7W5X7SlPLLFk67cW6A7bu ACsHpgSjlE97fiFLveiPbF5yIWKMgR3eOBSfCFos2NFIhv0drBTvINlSXV54p2U67rwu+fOXiM4 2m+uQXabpuuLGl9cZjrhgknMt623rNFSdNuT1+arZIoaWsT1ChoGUYYsY7qpmG2BbA3ZxETNPhh OCd85CnAtMcf4d4AwFPAA3wUFeN7DxQrmPRLzQh5OyHiCnm7W+KYTdNPk5Nn/si0nrSduj97APr 9bECRk2VSIWKgk+1a9SlTFY3eA== X-Google-Smtp-Source: AGHT+IEz0qHgqun1HMRAWwYPxj4lEXbUX4lq/KHX/YPS8k5v/b/oBuAj+3XdSaG2F4SQ1olAiHNptg== X-Received: by 2002:a05:6a20:6f09:b0:1e1:ca25:8da3 with SMTP id adf61e73a8af0-1ede8845f6amr1551216637.20.1738718557822; Tue, 04 Feb 2025 17:22:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:37 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:10 -0800 Subject: [PATCH v9 23/26] riscv: create a config for shadow stack and landing pad instr support MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-23-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: C682A180003 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: drx3irg1duyjwrd5epasubj5kugjo66t X-HE-Tag: 1738718558-648296 X-HE-Meta: U2FsdGVkX1+fhYmw1HTw4nSQbz64aIQeq8dbqc9EykMRCawUQPXmFtqqmmQHi2BUE0dvTZ9TgdbubCMNRgXVKmJggrUlYmug8oZYVA5PJ4+gVldPW03UA+c5Aj+YiBiqsy/DhTwSB/agYre3/f/XXgrosL86Ib5OzE7w6PpAextQLuGskrTfU0jdG+kdNty3qszAWDPDgoJT7qt740DqXffbJmzOz+u0PvBDvzDLryJ1yIn5nYpLYgXvyWcPeJjql+gLLFxw1Whn0IshkVl6n7OgvHCM9knGHPa7XWMClvTlAYGT3/uELrDXz1QQXhrdVMW391e55/slRj/P+dC6hC5HE1pMEivdnfKgpQwOgv0duhebcwTPKKUy6eJ7J2t/qIPKZX9FDNUyQpD1dQz7MdWQvnRWNGZYWyBqQkRWF+oJFJj5xBVOfeYROtB96/8/5OSfMirFjio32EFA6nbCuzWeDstR8mfknshvHpsa+890lWOhfmrfwdom36DirznSIo3d7B92jZkGTKjha51bRrPlCTEHmN2alqyNrkFM6BGY6Ebe22XhU8DfPAixNco09+Y5Vd1exa3t5AuEVjS6JILNHwgW5omdsaRUeN1VLP7xe7prNKEmGGBQu1WCqp8hLjgMGErZlBv4iFpz8YLMlj2X4oCitG5sV45QwCuKlgYjW6IoRvLEfddIrb76QW45NdsTb6ZvtlAfBmswtO5oSr1L9GBfrKThtDSVebbeSHk2lRbI0x4ciHWfhvhqOXNpl9WkKiC5owM+p93q8u3oGdd5QN6uEZk+3IKw8mur3Wf5LrZ5BfQX24HY7WnQmrzrnTiXgf8K0QvWVPBw0ZcCxBPoNRVPFGTRZHucxdvyZEqsNUK4DKFOoa05g0+97MekWkK1M133zE+rBZ8inliiGJj0lFyjvDwkPW1CwNa+L2FsKK8xqwrg8UiwNYWP0oO4ywQCtVrAZAmQCJRF0Fm xSxrorpi SDpkmstjigWWLje8iQMKGNiwWHtEnfpRP6vReOy2m/7XAr5ADQXAumPiAg+WxQUUtzCbrHglT234hJAc9sdjdgJS8rN3QsSsARY+csiMRPjWeGDhlxkPMEhaoBFu96XFxQPCu+CtDXPU6WdeV/2jbTWFfwI3tCUBq0CaqP1bYW7PFXqcwiDRIsOYov/aQmYUH2JaPj9dMToBSMuxqm9oKJ0wkSazSRhU9BibXHY6XLnBVgs8jJj8RT9vsrKnOWjz115/6u5g37C/WNf93PFLiRIl7676ooYIYv8BSZnxsmP4RAfQ/6mnOH39toXSgiHHAmGloPi4BSeSrjdogBMI2c010E8sWe2TzJomq8YJwHXVUnpivoMSoMkX0d4PqBsrFUxvhuzwvfvRqhnx3XppypzbdtQnPPgFfJxO/410JTAtTwquOuOC4oRD0Oi81MS2MesdRquofu5z+vZkhN8GvVGFRseAaF7MEKuGHa6yuSXu4CF0= 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`, `ARCH_HAS_USER_SHADOW_STACK` and DYNAMIC_SIGFRAME for riscv. Signed-off-by: Deepak Gupta --- arch/riscv/Kconfig | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 7612c52e9b1e..0a2e50f056e8 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -250,6 +250,26 @@ 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 + select DYNAMIC_SIGFRAME + 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 From patchwork Wed Feb 5 01:22:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960385 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 3B698C02193 for ; Wed, 5 Feb 2025 01:23:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61D5C280025; Tue, 4 Feb 2025 20:22:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A741280016; Tue, 4 Feb 2025 20:22:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3AAA7280025; Tue, 4 Feb 2025 20:22:43 -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 0AF0D280016 for ; Tue, 4 Feb 2025 20:22:43 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BEFA71605A9 for ; Wed, 5 Feb 2025 01:22:42 +0000 (UTC) X-FDA: 83084141364.13.54E3E07 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf11.hostedemail.com (Postfix) with ESMTP id D8B8C4000B for ; Wed, 5 Feb 2025 01:22:40 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mtGRig7R; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 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=1738718560; 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=vh4CUvpz/fzJO7m3g4Lrx30VWLQNLgBESiJnDVTGIvg=; b=whIxne8K95rst5uOqTlZP67RxxUJtTQQdEcqv3EG1J0eWG2raa4bIHFprKS4isZ/hl387X KtDKi0LdNS4plaWFe0+CEBlLeMGCxeOHMNOMBGxQTJ6Xij+PQ6qrHG7MLmfijUVx44DZbd 6U33Bx3IUcOxHYv3s9lWlDSzgVNb0mw= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=mtGRig7R; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718560; a=rsa-sha256; cv=none; b=qJDI6ONeuHYGo21F9DxjCuucpR4q/smfPG/i62JCQ/xU1oUbWLtHkh0UdtzPxeWDaVrVz/ L8cKXjU+gsoPOPkTgEdrTwf87AYCm+IXuPOu2Ox2Otear+V/7el9oVgmXk31dZ52B7vh2W jS0fq9v4WOCXeI25Q3MkdnCgSr5zUsg= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2166f1e589cso52647375ad.3 for ; Tue, 04 Feb 2025 17:22:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718560; x=1739323360; 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=vh4CUvpz/fzJO7m3g4Lrx30VWLQNLgBESiJnDVTGIvg=; b=mtGRig7RWyNhQAKTJ55i1G5Cf9l9xBx9PmlnniNbpNThrO23cyuwxjeo/XUDB2IHTe kcgX3xPUyjDp6WVZYEGrkvh3iRtY5BvCo6ohg7K8cZnUUOH1whEZEIxm92rp5ko844CY m/kDjRJemNVSUS9Am84JsFBM0Tan9aox8tY+sp1pIHGNeZzgKPEgYOAErLQANNesEidf /1ocCHO8oE8TSESgwT3fWS8g6749uRHjYJPxuz5+6abddwLxys94A4QgG6sS/QA7AQ9J gDlm3thCpeEckwIKpXRgfRhez4cCf7mtzkZfEsvx0W72rq20PxpG1m0YZ4rH5JnE4j1c 9rig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718560; x=1739323360; 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=vh4CUvpz/fzJO7m3g4Lrx30VWLQNLgBESiJnDVTGIvg=; b=Mz4G//mIJtYXgQQ9TCIUxshJa9uLuw10fjLAK/4IMwYBAOueLiPnmbbjG4KFSKR6N2 tXT17xetCAuPIv221zBN+zzENJjW0VTiN+TNXf+8UA/myFPv4lhk9PcAJccn6UYd5FOR RRuoCpGSU8Kr0OsqkU8xI3IbkxQtX4zQrviu3pGwl6mFCBLU5N7gsVBsaS22QKdnCeLw 4Q1Ajy2v3N7YQlzhu9FGMFLehjZWIEa8veAlHOC4rl6Cbjum/6DB6Dj5c7TLRGo3Jly0 Hc71V/dpKHr5HcOchMYhFjmYQTjW6k/AI78mXP7Ya/ajY8EI928HgMrnfh9fh+lq5fNd SwPA== X-Forwarded-Encrypted: i=1; AJvYcCXKQWrZ81nn/J6jPXTK6lE0kORC8fPsqcuJAf5jdGp6NSg6s9i/8m/25oPOrCoEXgeCzyNlYDVI8w==@kvack.org X-Gm-Message-State: AOJu0YwbH2yNLOQBuPf8ZVu+IQ1/6yJ6pJWilUKuq+KArgKxdAgKgH9x ILQB96FaMfuQyjmk5GIyIUWNNk2JIh18nMm1yc6s0SbJ3hD1UF7T7bqCOnQVlbs= X-Gm-Gg: ASbGnctQDdNo/I/62Sx4JlcDJIUJczuTOov76UMAdz6O4hwo0Jnza2JWecHBc+0IR0x 85vvhiYJM5XzxX37PT5oYzNjzCnWo6I7vLhirHTFTwQqIkEehw0W9AaP0n0qhWbW8v4Ta1FqeRx vuD5VOxciDk3FqFnCuMndeR0TEDKjlna8mmK3Bt6qMenICFKpK7GKKasZzd2zE/GRIRKfyeimkk hiilakmVS4TCTTPbh/KZc5bCu8zbEnyQwPXdSbCEZtXV63bWv/YhoC4BB4ptwL47379mbaFtxGs NWABl8BAvhspqxap+9wKljqf5g== X-Google-Smtp-Source: AGHT+IGeoQKYcs4hg862DdjQrrtWBKGNz8eQ6PlumY8b2Mk053BpOYNGRkKeyLaC94q3jdNjysT+gg== X-Received: by 2002:a05:6a20:2d0b:b0:1e1:9f77:da92 with SMTP id adf61e73a8af0-1ede88ab501mr1525342637.33.1738718559719; Tue, 04 Feb 2025 17:22:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:39 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:11 -0800 Subject: [PATCH v9 24/26] riscv: Documentation for landing pad / indirect branch tracking MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-24-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: D8B8C4000B X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: ywddumzkh4hybe34xyhw33n3iy8gz45m X-HE-Tag: 1738718560-904864 X-HE-Meta: U2FsdGVkX19HiSkDqEmBrzCNw1sUH2WyskKBaiqgPbSp3AgPWkToIRXrqVEHLpLsv8SIroR3Cm/Cmqt3400gAuHqu0ir/gQxmh4zl3ucomZABwKZQViwmyFhYm/r6kr7Ya+ibfsHmVeiRB4gU0Bjo7vvZKE5aCz79qMCRF1CvPtXgG1sIeNcXqBYrumHx0ssUxIfTfnVC+yWH1ZZu5vckBhdRdmI2BaMX8bEwVTdQWHCdl30koWJ/q/++CYU4QRFLMFR1xQD+w/8gZF+X1M5VCSKISJDWzbY2RIWhb1vswGMetJ8be2lvDotm5/Vl4GmsMA6wxF5iSVl+SURsNoagSnmd/KdBzvsS6nmHOlbfjDCTJ3J7Q9dbYZobPPoGf3zCRWE8f8Yrzp6zfTy2EyH9f5ctJGiRTW1d0j9CLKK4sFOh7KrQ7Tc7/EYWHzLY+gkCCEPLwqgjlbm54VPVvx2e2LaUW58WwvNErRyb4nsk7Mw7GoQbz2SSdhAX9HHuA8Jk7oo9Ermbflh9ZBoeEETOG2Zb3PBw8NKzU1deGZfx4X5maKHkK5po2K/ayCizAWlQNJKnU1TM7Qrvr3vZ1G52vL/9zkeNsixC+yg678dgN+nHvCIwDUttefuLE6QebmRLoBmwL/iyswBt10ufEC9ODlVdKt3VWOVXAQNsUI0pziLVSLXCObanfxAYLOxomKtjAbiF0hkPD0Lkc2zhATOm3pYtHDweTfnMpkuH42ITGS69BNtNnr0tfpIOFN+xA96l2+h3czEknI+2/xE7ROBx+G+t9dQ+o9En3TJ23EMFmhuSWzhk1gvFeSzmh0g09g1Bw+isHIDLVkWxg40zZuNpxFXeEy6Iha1WwITrT7ACYol3mK9a1uMggOwBsuOul/LkyocBLcvdjmZpOQ6JSMBe+8rDg55Fs3o3W8HO/9ma9LAaypC1vDJDQSUNN0ouHLUH3l47IYndbArc5h/W0d VJubbrZh IifJMOFil68oYCOQjdYmL0lcHZPrt/VyNfSPSvaZLZ0e6UKKntp3e/qJYAAAPvsxcgT8fcuAQwoJ2sSMd1MQf8MNhgxLxY5ztXbm+2ntcvwMj/gXWidtIbOR6WiA/y8Fl9OwC6sFzXMXv76rieH/tv2XbtEw0uWxxa6s4AODkRpSar5fKFtRQRaCYneRzthn5MqKL7wVvYQUGKl711/RFSHq2Xdn5xEDLdMTTFRu72+DZ9Uq281bkvJjArihYGwYMuTHX9vPWVeabYWtxumyj1upEAfY0wmVC42zwGsHjWSFQNUeja32JCxPvVfRFwLH5neO1dKmsyTBqKPTg6BrIS9woG/1GYu+Is+Zui9Odeogf4uvkS4TrN1Xjfz6IRJy/pkjjISyzmKPdMTKMYyhm0Xn11iw4o/6Pzpu4LxexdE+4UBcWB2i7JputdR65JlBFj3kPIHS4eyIiNib0PDNpsDRQdg== 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: Adding documentation on landing pad aka indirect branch tracking on riscv and kernel interfaces exposed so that user tasks can enable it. Signed-off-by: Deepak Gupta --- Documentation/arch/riscv/index.rst | 1 + Documentation/arch/riscv/zicfilp.rst | 115 +++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/Documentation/arch/riscv/index.rst b/Documentation/arch/riscv/index.rst index eecf347ce849..be7237b69682 100644 --- a/Documentation/arch/riscv/index.rst +++ b/Documentation/arch/riscv/index.rst @@ -14,6 +14,7 @@ RISC-V architecture uabi vector cmodx + zicfilp features diff --git a/Documentation/arch/riscv/zicfilp.rst b/Documentation/arch/riscv/zicfilp.rst new file mode 100644 index 000000000000..a188d78fcde6 --- /dev/null +++ b/Documentation/arch/riscv/zicfilp.rst @@ -0,0 +1,115 @@ +.. SPDX-License-Identifier: GPL-2.0 + +:Author: Deepak Gupta +:Date: 12 January 2024 + +==================================================== +Tracking indirect control transfers on RISC-V Linux +==================================================== + +This document briefly describes the interface provided to userspace by Linux +to enable indirect branch tracking for user mode applications on RISV-V + +1. Feature Overview +-------------------- + +Memory corruption issues usually result in to crashes, however when in hands of +an adversary and if used creatively can result into variety security issues. + +One of those security issues can be code re-use attacks on program where adversary +can use corrupt function pointers and chain them together to perform jump oriented +programming (JOP) or call oriented programming (COP) and thus compromising control +flow integrity (CFI) of the program. + +Function pointers live in read-write memory and thus are susceptible to corruption +and allows an adversary to reach any program counter (PC) in address space. On +RISC-V zicfilp extension enforces a restriction on such indirect control +transfers: + +- indirect control transfers must land on a landing pad instruction ``lpad``. + There are two exception to this rule: + + - rs1 = x1 or rs1 = x5, i.e. a return from a function and returns are + protected using shadow stack (see zicfiss.rst) + + - rs1 = x7. On RISC-V compiler usually does below to reach function + which is beyond the offset possible J-type instruction:: + + auipc x7, + jalr (x7) + + Such form of indirect control transfer are still immutable and don't rely + on memory and thus rs1=x7 is exempted from tracking and considered software + guarded jumps. + +``lpad`` instruction is pseudo of ``auipc rd, `` with ``rd=x0`` and +is a HINT nop. ``lpad`` instruction must be aligned on 4 byte boundary and +compares 20 bit immediate withx7. If ``imm_20bit`` == 0, CPU don't perform any +comparision with ``x7``. If ``imm_20bit`` != 0, then ``imm_20bit`` must match +``x7`` else CPU will raise ``software check exception`` (``cause=18``) with +``*tval = 2``. + +Compiler can generate a hash over function signatures and setup them (truncated +to 20bit) in x7 at callsites and function prologues can have ``lpad`` with same +function hash. This further reduces number of program counters a call site can +reach. + +2. ELF and psABI +----------------- + +Toolchain sets up :c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_FCFI` for property +:c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_AND` in notes section of the object file. + +3. Linux enabling +------------------ + +User space programs can have multiple shared objects loaded in its address space +and it's a difficult task to make sure all the dependencies have been compiled +with support of indirect branch. Thus it's left to dynamic loader to enable +indirect branch tracking for the program. + +4. prctl() enabling +-------------------- + +:c:macro:`PR_SET_INDIR_BR_LP_STATUS` / :c:macro:`PR_GET_INDIR_BR_LP_STATUS` / +:c:macro:`PR_LOCK_INDIR_BR_LP_STATUS` are three prctls added to manage indirect +branch tracking. prctls are arch agnostic and returns -EINVAL on other arches. + +* prctl(PR_SET_INDIR_BR_LP_STATUS, unsigned long arg) + +If arg1 is :c:macro:`PR_INDIR_BR_LP_ENABLE` and if CPU supports ``zicfilp`` +then kernel will enabled indirect branch tracking for the task. Dynamic loader +can issue this :c:macro:`prctl` once it has determined that all the objects +loaded in address space support indirect branch tracking. Additionally if there +is a `dlopen` to an object which wasn't compiled with ``zicfilp``, dynamic +loader can issue this prctl with arg1 set to 0 (i.e. +:c:macro:`PR_INDIR_BR_LP_ENABLE` being clear) + +* prctl(PR_GET_INDIR_BR_LP_STATUS, unsigned long arg) + +Returns current status of indirect branch tracking. If enabled it'll return +:c:macro:`PR_INDIR_BR_LP_ENABLE` + +* prctl(PR_LOCK_INDIR_BR_LP_STATUS, unsigned long arg) + +Locks current status of indirect branch tracking on the task. User space may +want to run with strict security posture and wouldn't want loading of objects +without ``zicfilp`` support in it and thus would want to disallow disabling of +indirect branch tracking. In that case user space can use this prctl to lock +current settings. + +5. violations related to indirect branch tracking +-------------------------------------------------- + +Pertaining to indirect branch tracking, CPU raises software check exception in +following conditions: + +- missing ``lpad`` after indirect call / jmp +- ``lpad`` not on 4 byte boundary +- ``imm_20bit`` embedded in ``lpad`` instruction doesn't match with ``x7`` + +In all 3 cases, ``*tval = 2`` is captured and software check exception is +raised (``cause=18``) + +Linux kernel will treat this as :c:macro:`SIGSEV`` with code = +:c:macro:`SEGV_CPERR` and follow normal course of signal delivery. From patchwork Wed Feb 5 01:22:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960386 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 6417EC02193 for ; Wed, 5 Feb 2025 01:23:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FA6F280026; Tue, 4 Feb 2025 20:22:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3AC4D280016; Tue, 4 Feb 2025 20:22:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20044280026; Tue, 4 Feb 2025 20:22:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F2D3F280016 for ; Tue, 4 Feb 2025 20:22:44 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AC7601203C8 for ; Wed, 5 Feb 2025 01:22:44 +0000 (UTC) X-FDA: 83084141448.28.5666638 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf29.hostedemail.com (Postfix) with ESMTP id BC54D120007 for ; Wed, 5 Feb 2025 01:22:42 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=opeys2V5; dmarc=none; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718562; a=rsa-sha256; cv=none; b=IicQpgC/mTZHgCyKeoHP9TNoZ6+UHHu8n/ZBPOHUnv5gbCjpBOdqSBQ5BOz58hSBpSi32V ROlquxysHF0y1QfGwFGSEfGxpa9529K3gSHW7rCLEr4K3Rwj6dJqx8A3fjRQ77QIUK9jiX w4RIBs11OoyLU+gBq1Kd9KRz35V6U8U= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=opeys2V5; dmarc=none; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738718562; 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=tdDNQkSVTKtNTxsV0uSmAnlAiDQNW7ggaTdWphzDp8I=; b=53klCr04m21lmN01Isk8PdeXTUchwj7d1e40mtIxooxA+W2A8+VwQQYE5pOdBbXE4HZ4u8 II0oupujB85LyhQObRQKHaKkpviBM7mxpReFMK1NXBY6M/KqdnMyOIzlB+xgiB8p6yVVBw x5T6k7GGL0Tfp1kO1T9ZXRci3oC4NJY= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-21634338cfdso54760365ad.2 for ; Tue, 04 Feb 2025 17:22:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718562; x=1739323362; 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=tdDNQkSVTKtNTxsV0uSmAnlAiDQNW7ggaTdWphzDp8I=; b=opeys2V5JBt31Y/B4bB8KXRivolpV6wbLBz6Hw/ZL9GifvsOxl5udzmYwPZSCgQ4XC zeyNeDhvWwkliRSpetwWm4nKK50my95hB8R47acTLQwGlUv/9R4heyAVHhvrANth48/3 04jV1RX/Y4jW7rD2mAWvcRqu8cPSaYVL/7P0/6zgB/Sba+YJWzfWru1ShaJuX6MpdqhG Q0Opn53du/SP/+JiBFOxv7Dph1xT3M/vK/hV8v0R+4GUZPesMVbR6I6I/gfzuU5KrVaB gVI2crpJ3JvVnnM7onAI7wsU9ub4Em6U+QKvl16DVL9BvV1DbkOmPE8Vq1lOeeVbx9CR yc0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718562; x=1739323362; 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=tdDNQkSVTKtNTxsV0uSmAnlAiDQNW7ggaTdWphzDp8I=; b=EdQmesvPKfYt4BDbxJ+yAi8tg5GxKsnTcnFDVdMwI50zixl50VWBIKISZQlGGb1hiE 7LpmutoJFPhYQzo96uOXHBgikK3MzkNtJzuyx6diNE1bEK87md1IeMQTJgp93roCgFlC GrdDyv2+WOQ9SE/JYNa2QGTF2covYTZ0AJ/MgyTSLwE9Vt5+DcX1wzsHYFQn1Cl29rPI 8rDpA0qgmnXzkEkvqJO9uZqnKr2VwxUhfQ/8IsOmiQja3/fT0Ie7GstbOAt0lSQjvUFk 168fM8yNwFgxZvFtX4winOp6M+zCVAqK7heogPTfI88AErQbi5xuSlCg9leUrMOg4U8k yqYw== X-Forwarded-Encrypted: i=1; AJvYcCURjbUcvEr8L/HWENgJimN91Lt0YA/H9gre4hjcm3QAVdK6XotSy6YOuWD+1ZJ7NysqoJkj7A8Y5Q==@kvack.org X-Gm-Message-State: AOJu0Yy2tu/3v8rpb1+FgEYg3JtF/GcOpKoZySFOBqdLNsOIvkde1wUR 0Fve1vTIEm6eT6DyvDVwAdpD/Q03scrUI3qkJmChg3o8dLGihcwMaq5y7u1PpW0= X-Gm-Gg: ASbGncvCh9PiWApe20d1YYcN7L+IPl2xZuYHOjTv7Yep55A4MTwtvYmfPWC8ak9Rd+C g9YDBTCX3RB+OXMBDMqaGR8L7hr5Mw7ZjZwMJZXANcZOB61CgNMks7nqncCA5EjyjFk3bjcRhw4 ytgaNr6hat4H7fiAlu2rZZ2EfiChOy5STotbzzMA/vyf92FFccEMyYYX3ZHGDfLWVI/5FgO0XW6 2vsBfFboi/uJg+0tEbraJo+38LzWFNH0KA8jo8ranl8zaFWtTJx94+fZPln94dUoWtBvqA9FMeL 0TLoMiqymUKxjcFOO3uVmpSBJw== X-Google-Smtp-Source: AGHT+IGL7fIu4kBCNVhHF/oYTJgronEm0XH3kZauHP9nqwG/U0J2y3PAuF3fExMjCq+Sq89z969Y4g== X-Received: by 2002:a05:6a21:2d05:b0:1e1:c0d7:7502 with SMTP id adf61e73a8af0-1ede88b872dmr1661901637.37.1738718561611; Tue, 04 Feb 2025 17:22:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:41 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:12 -0800 Subject: [PATCH v9 25/26] riscv: Documentation for shadow stack on riscv MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-25-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-Rspam-User: X-Rspamd-Queue-Id: BC54D120007 X-Rspamd-Server: rspam10 X-Stat-Signature: k1uyh5sj9sgdjpwyk9muuj3g368791og X-HE-Tag: 1738718562-168053 X-HE-Meta: U2FsdGVkX19OKKAutX3/kyEXKtV7ZQZiz7wafczlEWY0nHh1UcNJqWjWlxZK3YTSUTmUEl7sNMzE4PbvJQIyQ3Hzr31dY4We1COvIqFZiat0r2PbhpR+Gg/Mq6Y2ZD/uEzJybx+uasUggCfaaR4qTfhKGCfJLOiGymols93+RgUMZ91LuNpFBmkCyQGYgt3INvc7O2/fKCR8cd5HXKxDYFarw5QLdISvLre6BsK8CMk87xVPD+vBVbK2pVRBXip+3SHit1Z2QteQ2EJ8NrLU31K4Nud8pidoMyizDknXXU7OYiGfaGXUU0YGX/yCeEjaEJuX+k4xfp38cERJ2CGmzFv1MhGYLoiPC+DOdxM21JdYUvLboWNEp1Am95G9Wgdhf4N/KOGgK6R3HFBWrUDdxE7qYsJ237qzrb7lwPe8KuxbElhdRGdN3C6iB8MHrNkF8UgotM0rYqp2FoVBiI2ANGubDWMVBoiUvYDH6veAWSBJ7Qovj3OFeLpprX4vfUdmHm/yHvX/A1Pdyq/sPcXqq1Fhxx44Jo2b48h2aSbOdB411zkTFU1/7NGXZTz+4VAdW960Bf9nLFtLX450v2W/pz4zPf3SWaLjFIlMNmtBef5e+faIj6nXRFAcFJojWvawxazTl13ZxX1VDPFqG+lOtlm8Q9ceaU/J14egfTx1wZjJO3An5nM2vR41lPJXpKkLDJh9UERKWSLpH5IqBYJAk14vYavqHHedRgFNW5vZY3nRiq1I1OSo+3XpsQ1YgD8uzuHD6vNnC6A81kxZ/NL41HA9K7wM/ntlnP3Jyb3I0AAchaoAO7jOYyiymfgWGhikQSf7RDKVb1PRdX3Oum7C208QFdgj9tjGzXSX87hp99+g0N6VuaWjEU8nMYpf2tt2mJ1yhWPufTdvXY5SbuDUv4P1pvZaIZaeSmRHgxMZ0aB34FvH4F+pNupVlQWFB5JsBqXT2lelh+wi02aXrsW D1qJMRhC D377pWL6B4978lBsTRUJZU6aoN2YXfEeAm9bdf1q4N7Mk58X+aLT/2UTZSxygGvy+/ysDatVlmxGauAFVJSL540miMzyfuteNPD7BxXG2t3T+hltsNScIybVX7aTnYetLfZAus/syMt2wSpslJnOTRzJ/53tzlijhecE5FVLmv8P8iiWW8LHx5jMwjqEAbMse+cIQkV/1OD6vJOxlGTGlI76gh6/sitCkhcSn34LvpOWwn8amo8kKr4CWrl8ovDtcg+pI1SjJb7dxBIfxbitjbsM1DpV8oeDMiQLI+t9r4TkWBnjLywhJ6p9CwMfYFQ8fzYfZODhN3tfm1/dhzC4/hODraXJxVBreT3tI2d8Y4i/A8D5eZb3e2KrcrTvBdhXxesDwYyvlqJDI8o4boJr//vuR5F5Lgtg1boAAqxB156TVsFYBfecZiXAPLFtSnIBuw2VwdkGaRDkCl1Y= 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: Adding documentation on shadow stack for user mode on riscv and kernel interfaces exposed so that user tasks can enable it. Signed-off-by: Deepak Gupta --- Documentation/arch/riscv/index.rst | 1 + Documentation/arch/riscv/zicfiss.rst | 176 +++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+) diff --git a/Documentation/arch/riscv/index.rst b/Documentation/arch/riscv/index.rst index be7237b69682..e240eb0ceb70 100644 --- a/Documentation/arch/riscv/index.rst +++ b/Documentation/arch/riscv/index.rst @@ -15,6 +15,7 @@ RISC-V architecture vector cmodx zicfilp + zicfiss features diff --git a/Documentation/arch/riscv/zicfiss.rst b/Documentation/arch/riscv/zicfiss.rst new file mode 100644 index 000000000000..5ba389f15b3f --- /dev/null +++ b/Documentation/arch/riscv/zicfiss.rst @@ -0,0 +1,176 @@ +.. SPDX-License-Identifier: GPL-2.0 + +:Author: Deepak Gupta +:Date: 12 January 2024 + +========================================================= +Shadow stack to protect function returns on RISC-V Linux +========================================================= + +This document briefly describes the interface provided to userspace by Linux +to enable shadow stack for user mode applications on RISV-V + +1. Feature Overview +-------------------- + +Memory corruption issues usually result in to crashes, however when in hands of +an adversary and if used creatively can result into variety security issues. + +One of those security issues can be code re-use attacks on program where +adversary can use corrupt return addresses present on stack and chain them +together to perform return oriented programming (ROP) and thus compromising +control flow integrity (CFI) of the program. + +Return addresses live on stack and thus in read-write memory and thus are +susceptible to corruption and allows an adversary to reach any program counter +(PC) in address space. On RISC-V ``zicfiss`` extension provides an alternate +stack termed as shadow stack on which return addresses can be safely placed in +prolog of the function and retrieved in epilog. ``zicfiss`` extension makes +following changes: + +- PTE encodings for shadow stack virtual memory + An earlier reserved encoding in first stage translation i.e. + PTE.R=0, PTE.W=1, PTE.X=0 becomes PTE encoding for shadow stack pages. + +- ``sspush x1/x5`` instruction pushes (stores) ``x1/x5`` to shadow stack. + +- ``sspopchk x1/x5`` instruction pops (loads) from shadow stack and compares + with ``x1/x5`` and if un-equal, CPU raises ``software check exception`` with + ``*tval = 3`` + +Compiler toolchain makes sure that function prologue have ``sspush x1/x5`` to +save return address on shadow stack in addition to regular stack. Similarly +function epilogs have ``ld x5, offset(x2)`` followed by ``sspopchk x5`` to +ensure that popped value from regular stack matches with popped value from +shadow stack. + +2. Shadow stack protections and linux memory manager +----------------------------------------------------- + +As mentioned earlier, shadow stack get new page table encodings and thus have +some special properties assigned to them and instructions that operate on them +as below: + +- Regular stores to shadow stack memory raises access store faults. This way + shadow stack memory is protected from stray inadvertant writes. + +- Regular loads to shadow stack memory are allowed. This allows stack trace + utilities or backtrace functions to read true callstack (not tampered). + +- Only shadow stack instructions can generate shadow stack load or shadow stack + store. + +- Shadow stack load / shadow stack store on read-only memory raises AMO/store + page fault. Thus both ``sspush x1/x5`` and ``sspopchk x1/x5`` will raise AMO/ + store page fault. This simplies COW handling in kernel During fork, kernel + can convert shadow stack pages into read-only memory (as it does for regular + read-write memory) and as soon as subsequent ``sspush`` or ``sspopchk`` in + userspace is encountered, then kernel can perform COW. + +- Shadow stack load / shadow stack store on read-write, read-write-execute + memory raises an access fault. This is a fatal condition because shadow stack + should never be operating on read-write, read-write-execute memory. + +3. ELF and psABI +----------------- + +Toolchain sets up :c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_BCFI` for property +:c:macro:`GNU_PROPERTY_RISCV_FEATURE_1_AND` in notes section of the object file. + +4. Linux enabling +------------------ + +User space programs can have multiple shared objects loaded in its address space +and it's a difficult task to make sure all the dependencies have been compiled +with support of shadow stack. Thus it's left to dynamic loader to enable +shadow stack for the program. + +5. prctl() enabling +-------------------- + +:c:macro:`PR_SET_SHADOW_STACK_STATUS` / :c:macro:`PR_GET_SHADOW_STACK_STATUS` / +:c:macro:`PR_LOCK_SHADOW_STACK_STATUS` are three prctls added to manage shadow +stack enabling for tasks. prctls are arch agnostic and returns -EINVAL on other +arches. + +* prctl(PR_SET_SHADOW_STACK_STATUS, unsigned long arg) + +If arg1 :c:macro:`PR_SHADOW_STACK_ENABLE` and if CPU supports ``zicfiss`` then +kernel will enable shadow stack for the task. Dynamic loader can issue this +:c:macro:`prctl` once it has determined that all the objects loaded in address +space have support for shadow stack. Additionally if there is a +:c:macro:`dlopen` to an object which wasn't compiled with ``zicfiss``, dynamic +loader can issue this prctl with arg1 set to 0 (i.e. +:c:macro:`PR_SHADOW_STACK_ENABLE` being clear) + +* prctl(PR_GET_SHADOW_STACK_STATUS, unsigned long *arg) + +Returns current status of indirect branch tracking. If enabled it'll return +:c:macro:`PR_SHADOW_STACK_ENABLE`. + +* prctl(PR_LOCK_SHADOW_STACK_STATUS, unsigned long arg) + +Locks current status of shadow stack enabling on the task. User space may want +to run with strict security posture and wouldn't want loading of objects +without ``zicfiss`` support in it and thus would want to disallow disabling of +shadow stack on current task. In that case user space can use this prctl to +lock current settings. + +5. violations related to returns with shadow stack enabled +----------------------------------------------------------- + +Pertaining to shadow stack, CPU raises software check exception in following +condition: + +- On execution of ``sspopchk x1/x5``, ``x1/x5`` didn't match top of shadow + stack. If mismatch happens then cpu does ``*tval = 3`` and raise software + check exception. + +Linux kernel will treat this as :c:macro:`SIGSEV`` with code = +:c:macro:`SEGV_CPERR` and follow normal course of signal delivery. + +6. Shadow stack tokens +----------------------- +Regular stores on shadow stacks are not allowed and thus can't be tampered +with via arbitrary stray writes due to bugs. Method of pivoting / switching to +shadow stack is simply writing to csr ``CSR_SSP`` changes active shadow stack. +This can be problematic because usually value to be written to ``CSR_SSP`` will +be loaded somewhere in writeable memory and thus allows an adversary to +corruption bug in software to pivot to an any address in shadow stack range. +Shadow stack tokens can help mitigate this problem by making sure that: + +- When software is switching away from a shadow stack, shadow stack pointer + should be saved on shadow stack itself and call it ``shadow stack token`` + +- When software is switching to a shadow stack, it should read the + ``shadow stack token`` from shadow stack pointer and verify that + ``shadow stack token`` itself is pointer to shadow stack itself. + +- Once the token verification is done, software can perform the write to + ``CSR_SSP`` to switch shadow stack. + +Here software can be user mode task runtime itself which is managing various +contexts as part of single thread. Software can be kernel as well when kernel +has to deliver a signal to user task and must save shadow stack pointer. Kernel +can perform similar procedure by saving a token on user shadow stack itself. +This way whenever :c:macro:`sigreturn` happens, kernel can read the token and +verify the token and then switch to shadow stack. Using this mechanism, kernel +helps user task so that any corruption issue in user task is not exploited by +adversary by arbitrarily using :c:macro:`sigreturn`. Adversary will have to +make sure that there is a ``shadow stack token`` in addition to invoking +:c:macro:`sigreturn` + +7. Signal shadow stack +----------------------- +Following structure has been added to sigcontext for RISC-V:: + + struct __sc_riscv_cfi_state { + unsigned long ss_ptr; + }; + +As part of signal delivery, shadow stack token is saved on current shadow stack +itself and updated pointer is saved away in :c:macro:`ss_ptr` field in +:c:macro:`__sc_riscv_cfi_state` under :c:macro:`sigcontext`. Existing shadow +stack allocation is used for signal delivery. During :c:macro:`sigreturn`, +kernel will obtain :c:macro:`ss_ptr` from :c:macro:`sigcontext` and verify the +saved token on shadow stack itself and switch shadow stack. From patchwork Wed Feb 5 01:22:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960387 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 5C23BC02196 for ; Wed, 5 Feb 2025 01:23:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 66AE2280027; Tue, 4 Feb 2025 20:22:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5F420280016; Tue, 4 Feb 2025 20:22:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F98C280027; Tue, 4 Feb 2025 20:22:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 16B03280016 for ; Tue, 4 Feb 2025 20:22:47 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BF64BC05D0 for ; Wed, 5 Feb 2025 01:22:46 +0000 (UTC) X-FDA: 83084141532.05.EFED380 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by imf07.hostedemail.com (Postfix) with ESMTP id BE38340006 for ; Wed, 5 Feb 2025 01:22:44 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=OLx07eh5; spf=pass (imf07.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.51 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=1738718564; 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=ruj/JnwPHtkrEOpCEVLVNX7RrlNYJUu0NWWeo3U6Fsk=; b=skciojFuMj5HGASDIxgWPqRCXt9X+jTLjZGMm194dGPBsfXGhFQLMN+tLWZGINvfypEYCn T7v/yZy4b7357O3tqFFUeZD4J7NhBbTBuG8fI0Zhe36UYIzpRgnseg1O8iYQfExs/anq7s shv5Kd+aEq8B8PlKiXqzt8m+FgVRtHU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718564; a=rsa-sha256; cv=none; b=ljeKCQe21ubBMhkiximlu0bUdoEGzwbh4e6dsNYf07jQTi+znkwSS6jGoTAOmLJe6oFeQ4 86AIlss3RGdUovo1PYaUuSovp70fkCQuitjomFNf77V93iQC0CyPrSK3ksskXTfpnjLz5b eWJHEAcaOBm+98gklyF1CJj286EsRnI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=OLx07eh5; spf=pass (imf07.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.51 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2ef72924e53so10942991a91.3 for ; Tue, 04 Feb 2025 17:22:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718564; x=1739323364; 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=ruj/JnwPHtkrEOpCEVLVNX7RrlNYJUu0NWWeo3U6Fsk=; b=OLx07eh5fR0iRzDejn9QXUaJ5cPsRJp5+HacdLXRG4BR+mzEBiTwEro+3APAjBIhR/ lF9tkDUvUQEr70IuvrtHnz9qHMpjLVBiYKzZ3Mt7D8W0Yo70kboC59UDIgIL1pxGfjYY yPqKVcJsGn9nVje2e0cKLfvUZAQOaKnXd7FsA6D0KcCF7ZwW+6ZKHxruUqiLTsbysMcC otwSgcs6yo7px0H6xVV+rW+P+UoUuqeq1ZHXzRP5apa3sKs8r8q2GyTaPXvWBRD85geK u+KBnqjkrH5hLqMGXY2KJilHSfL9VFfFJJalQEVdZm4uSJ+fvA8rhW+Mqm/tY39D6Ysm kJKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718564; x=1739323364; 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=ruj/JnwPHtkrEOpCEVLVNX7RrlNYJUu0NWWeo3U6Fsk=; b=gq5/b6d3/qGs+zevETKMTf32JEIRd6gHTnWfYshLW3g+JddXZv7xIwyjn+NVmUFIcH iqdgkd3RpRieej1LJSUddd7eo9J7Hj3XjL0O/nXRg0adaADZFVUTi3+VrkYTXIY4M1kD AI7apjfklEkUaQoFmgqAqeZ6Enwf9l9WNj4ppZ2alwhVSlK8K+Tq3Hfx98IM+psxxSaw M+IexPrp8VAVaZmiJPPNM2R2h8+I+pgyRkjM+7/JzFIPe6scG/25btyGZJwYeTU+y3fk scVLXlW4hw3A6xynaE5rv+Y/H6P9pbxXQrUWNSPDQ34yB1WW1P35nt/3n+d7/bXfWpb7 Z5WA== X-Forwarded-Encrypted: i=1; AJvYcCVY6OGUaBLBzZVts2jLX9MU0bGdI/4h1ZRFy/jMKMnn1yF/F1FzfGdTqybdbSnXLChxeyC+0ZjB6g==@kvack.org X-Gm-Message-State: AOJu0YzWWVA9UK/GoB/OfEmq6hVu/STNPeHL3uUOFJg6kkgUOfLdhORP HBwz/WqpRiCJOQLwiejnO9Yqhn8bE7oWhp9doUhk/hTgAdwO3bjB7ryuK4Ymieg= X-Gm-Gg: ASbGncuStn/hlzCnjPZMxbtlg0k5BEop3BW/b4bUfLVccRV5/Hd0iqPzaNPNrawIRUr gSoawdvlcH4bMqAYJGERtagrvAf7eo4Vzbn9MlwQMkFlL0aN6d+Eq1AzSCUbIH0jNnNp9BcUXHh uSQHJjhnX0BRTimhWGdPS89IdoW1iqMdhbb10nr2h4bescChUGVlwFNFxvzyxOVO+tTblRYvu3W FRjOjnDhd4ZruPN4kAGZ1PRwCj0y/5J1BT6uZ5m2Uafri/qE8t/exGpFN3M60A/W+H5SZFOP5lf biU7ud8n8GGaPn55rb7EEEmJLA== X-Google-Smtp-Source: AGHT+IGovFmix8KI5SEIHoNgZcqFZZ5GF0zJzXSysIVc548LH6c/1u2ve/E4BqdnIk+ftzZNWRYx3A== X-Received: by 2002:aa7:9a82:0:b0:728:e906:e446 with SMTP id d2e1a72fcca58-7303521cbb1mr2012625b3a.24.1738718563525; Tue, 04 Feb 2025 17:22:43 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:43 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:13 -0800 Subject: [PATCH v9 26/26] kselftest/riscv: kselftest for user mode cfi MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-26-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: BE38340006 X-Stat-Signature: ga99mfdhnw5ieixbq1iksbd119y6bq41 X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738718564-888261 X-HE-Meta: U2FsdGVkX1+nqYtVE3zfvxxprFRaR9uLRdLBE05q4lLHNRB8jAnXtcmZGbH6Ew36tuxK2IerBejEBGmZBQV1dRwqKvf/gxk/chXjzQX6GcelPPefwHp4qB/YeHKH6C6mctIO2Disx3CZRrsxzB6okpe9xWIOeJdGd25cgq09p7Lm52xoVIE7esiGL7sv0i6+WlZyeUFIDn+z4UkXpMWo0lB/K3lNyFsRLsRSLQCiRj1VO8kId5XTOBALVq2x0abXnOTKjJTiM6Or33F3nbOXsy6Cfpy+eOm96w5ftGm5ptEPxMsjts4Ao7JSMhdrGlXk8mfcYYd7dVN6tAaekRJUDrsp8Hf+xLlFs8FLHsiX/Rn87wq+KCEyvOz5AKKUD7nuA2yM3sLAVVL+Va2fHtJV2oQPRC9wCHR/KzWOUGPzJQpgKEspIUmEfXAMKpV0aaDFb3uwyR/cdqwgQvbCLPLhPbk6M49H3Az/OKE7I+dBHejyAypInT/O64WuZer/4740FSx3QJWDsunQs+lOUMCUwkTOlZ5CxADhWp8jAsix4fNcCVJGZmoCGhplZlhEyITcPhpF0jcM9jD1Ll4W/Ydy6p3o2jArunftoPy7ZX9vc++l77b999Z2wniXr5kK1g3j4M9LNaHHLhpRxmc9xHIYkvMxHS954doGLJo4/rWW5g5ol18WJMdmC9IZ8yYylsHGb/kBQyxtHGDKWCiyD7tmqelVwPy3yYP04cRaM+Y6inWn7RA7eMKxR3cekGQAHI+L5ZMZUngpX6w/Sn+x5s68h6NpzipqDVdY7cczsdC6FXvkr3khds9GyHK52MWT4wwvh4RAh9hUCOt1oKTjfN7O6RAbpRNJmuXB5myty1Gh0fZxmRi5DTB6TWAdhKx7mB7q58Rub79bsv+LFQMz39lXu+N5pUVWJVRJF+eCvAvIxbuWNlig7IkU445A94ypA5JPn3Nc2PbK10/gWH4H8+S 2MwemOOx RmGKWxm6Tq62kUqa0epRnLJfvJlB2dx+Bi23hpMaNDSlKrMgMCG+wwgvxcD8tdTS+2kLwIdRKHC/X5wisAUOMcDZrMLE2IBCACRaEq8ZTbY350UXa5oy30CusmigNTE4dS3JlOx7xc3pyrWk3DucwdtHkfeqg6TsMx0u7aamb2byuGPHgD83x0l+zQRfQUJVOlnVbfs+V8+MaBijZvK0TRQ9F53S2E39vBmkG+ol0cdTdgJUX7l/kJctjcEizXWjd98oMmlBKZ7VTIKUQsJYP8fWypt0TSdMUi5m2ukLbW9v0UIozXGYA+DdUMeYJJXrldyBhEsbyvjqRTLrtK/oWJn36I/0kIutUW6hMwWnHmgl2WLCCi9oeT7tKwSlB4t9Cf2TxUXluCEEZSdmmIlFwvw4FPBU6nak8DDzqQXwUCicbVYyu6epjrDiVybDMBLmhn1glY7vdZb7YmBSWLysCKqhcLQ== 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: Adds kselftest for RISC-V control flow integrity implementation for user mode. There is not a lot going on in kernel for enabling landing pad for user mode. cfi selftest are intended to be compiled with zicfilp and zicfiss enabled compiler. Thus kselftest simply checks if landing pad and shadow stack for the binary and process are enabled or not. selftest then register a signal handler for SIGSEGV. Any control flow violation are reported as SIGSEGV with si_code = SEGV_CPERR. Test will fail on receiving any SEGV_CPERR. Shadow stack part has more changes in kernel and thus there are separate tests for that - Exercise `map_shadow_stack` syscall - `fork` test to make sure COW works for shadow stack pages - gup tests Kernel uses FOLL_FORCE when access happens to memory via /proc//mem. Not breaking that for shadow stack. - signal test. Make sure signal delivery results in token creation on shadow stack and consumes (and verifies) token on sigreturn - shadow stack protection test. attempts to write using regular store instruction on shadow stack memory must result in access faults Test outut ========== """ TAP version 13 1..5 This is to ensure shadow stack is indeed enabled and working This is to ensure shadow stack is indeed enabled and working ok 1 shstk fork test ok 2 map shadow stack syscall ok 3 shadow stack gup tests ok 4 shadow stack signal tests ok 5 memory protections of shadow stack memory """ Signed-off-by: Deepak Gupta --- tools/testing/selftests/riscv/Makefile | 2 +- tools/testing/selftests/riscv/cfi/.gitignore | 3 + tools/testing/selftests/riscv/cfi/Makefile | 10 + tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 84 +++++ tools/testing/selftests/riscv/cfi/riscv_cfi_test.c | 78 +++++ tools/testing/selftests/riscv/cfi/shadowstack.c | 375 +++++++++++++++++++++ tools/testing/selftests/riscv/cfi/shadowstack.h | 37 ++ 7 files changed, 588 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/riscv/Makefile b/tools/testing/selftests/riscv/Makefile index 099b8c1f46f8..5671b4405a12 100644 --- a/tools/testing/selftests/riscv/Makefile +++ b/tools/testing/selftests/riscv/Makefile @@ -5,7 +5,7 @@ ARCH ?= $(shell uname -m 2>/dev/null || echo not) ifneq (,$(filter $(ARCH),riscv)) -RISCV_SUBTARGETS ?= abi hwprobe mm sigreturn vector +RISCV_SUBTARGETS ?= abi hwprobe mm sigreturn vector cfi else RISCV_SUBTARGETS := endif diff --git a/tools/testing/selftests/riscv/cfi/.gitignore b/tools/testing/selftests/riscv/cfi/.gitignore new file mode 100644 index 000000000000..82545863bac6 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/.gitignore @@ -0,0 +1,3 @@ +cfitests +riscv_cfi_test +shadowstack diff --git a/tools/testing/selftests/riscv/cfi/Makefile b/tools/testing/selftests/riscv/cfi/Makefile new file mode 100644 index 000000000000..b65f7ff38a32 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/Makefile @@ -0,0 +1,10 @@ +CFLAGS += -I$(top_srcdir)/tools/include + +CFLAGS += -march=rv64gc_zicfilp_zicfiss + +TEST_GEN_PROGS := cfitests + +include ../../lib.mk + +$(OUTPUT)/cfitests: riscv_cfi_test.c shadowstack.c + $(CC) -o$@ $(CFLAGS) $(LDFLAGS) $^ diff --git a/tools/testing/selftests/riscv/cfi/cfi_rv_test.h b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h new file mode 100644 index 000000000000..a9d5d6f8e29c --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SELFTEST_RISCV_CFI_H +#define SELFTEST_RISCV_CFI_H +#include +#include +#include "shadowstack.h" + +#define RISCV_CFI_SELFTEST_COUNT RISCV_SHADOW_STACK_TESTS + +#define CHILD_EXIT_CODE_SSWRITE 10 +#define CHILD_EXIT_CODE_SIG_TEST 11 + +#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5) \ +({ \ + register long _num __asm__ ("a7") = (num); \ + register long _arg1 __asm__ ("a0") = (long)(arg1); \ + register long _arg2 __asm__ ("a1") = (long)(arg2); \ + register long _arg3 __asm__ ("a2") = (long)(arg3); \ + register long _arg4 __asm__ ("a3") = (long)(arg4); \ + register long _arg5 __asm__ ("a4") = (long)(arg5); \ + \ + __asm__ volatile( \ + "ecall\n" \ + : "+r" \ + (_arg1) \ + : "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \ + "r"(_num) \ + : "memory", "cc" \ + ); \ + _arg1; \ +}) + +#define my_syscall3(num, arg1, arg2, arg3) \ +({ \ + register long _num __asm__ ("a7") = (num); \ + register long _arg1 __asm__ ("a0") = (long)(arg1); \ + register long _arg2 __asm__ ("a1") = (long)(arg2); \ + register long _arg3 __asm__ ("a2") = (long)(arg3); \ + \ + __asm__ volatile( \ + "ecall\n" \ + : "+r" (_arg1) \ + : "r"(_arg2), "r"(_arg3), \ + "r"(_num) \ + : "memory", "cc" \ + ); \ + _arg1; \ +}) + +#ifndef __NR_prctl +#define __NR_prctl 167 +#endif + +#ifndef __NR_map_shadow_stack +#define __NR_map_shadow_stack 453 +#endif + +#define CSR_SSP 0x011 + +#ifdef __ASSEMBLY__ +#define __ASM_STR(x) x +#else +#define __ASM_STR(x) #x +#endif + +#define csr_read(csr) \ +({ \ + register unsigned long __v; \ + __asm__ __volatile__ ("csrr %0, " __ASM_STR(csr) \ + : "=r" (__v) : \ + : "memory"); \ + __v; \ +}) + +#define csr_write(csr, val) \ +({ \ + unsigned long __v = (unsigned long)(val); \ + __asm__ __volatile__ ("csrw " __ASM_STR(csr) ", %0" \ + : : "rK" (__v) \ + : "memory"); \ +}) + +#endif diff --git a/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c b/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c new file mode 100644 index 000000000000..cf33aa25cc73 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/riscv_cfi_test.c @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../../kselftest.h" +#include +#include +#include +#include "cfi_rv_test.h" + +/* do not optimize cfi related test functions */ +#pragma GCC push_options +#pragma GCC optimize("O0") + +void sigsegv_handler(int signum, siginfo_t *si, void *uc) +{ + struct ucontext *ctx = (struct ucontext *)uc; + + if (si->si_code == SEGV_CPERR) { + ksft_print_msg("Control flow violation happened somewhere\n"); + ksft_print_msg("PC where violation happened %lx\n", ctx->uc_mcontext.gregs[0]); + exit(-1); + } + + /* all other cases are expected to be of shadow stack write case */ + exit(CHILD_EXIT_CODE_SSWRITE); +} + +bool register_signal_handler(void) +{ + struct sigaction sa = {}; + + sa.sa_sigaction = sigsegv_handler; + sa.sa_flags = SA_SIGINFO; + if (sigaction(SIGSEGV, &sa, NULL)) { + ksft_print_msg("Registering signal handler for landing pad violation failed\n"); + return false; + } + + return true; +} + +int main(int argc, char *argv[]) +{ + int ret = 0; + unsigned long lpad_status = 0, ss_status = 0; + + ksft_print_header(); + + ksft_print_msg("Starting risc-v tests\n"); + + /* + * Landing pad test. Not a lot of kernel changes to support landing + * pad for user mode except lighting up a bit in senvcfg via a prctl + * Enable landing pad through out the execution of test binary + */ + ret = my_syscall5(__NR_prctl, PR_GET_INDIR_BR_LP_STATUS, &lpad_status, 0, 0, 0); + if (ret) + ksft_exit_fail_msg("Get landing pad status failed with %d\n", ret); + + if (!(lpad_status & PR_INDIR_BR_LP_ENABLE)) + ksft_exit_fail_msg("Landing pad is not enabled, should be enabled via glibc\n"); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); + if (ret) + ksft_exit_fail_msg("Get shadow stack failed with %d\n", ret); + + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) + ksft_exit_fail_msg("Shadow stack is not enabled, should be enabled via glibc\n"); + + if (!register_signal_handler()) + ksft_exit_fail_msg("Registering signal handler for SIGSEGV failed\n"); + + ksft_print_msg("Landing pad and shadow stack are enabled for binary\n"); + execute_shadow_stack_tests(); + + return 0; +} + +#pragma GCC pop_options diff --git a/tools/testing/selftests/riscv/cfi/shadowstack.c b/tools/testing/selftests/riscv/cfi/shadowstack.c new file mode 100644 index 000000000000..a0ef066e98ab --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/shadowstack.c @@ -0,0 +1,375 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../../kselftest.h" +#include +#include +#include +#include +#include +#include "shadowstack.h" +#include "cfi_rv_test.h" + +/* do not optimize shadow stack related test functions */ +#pragma GCC push_options +#pragma GCC optimize("O0") + +void zar(void) +{ + unsigned long ssp = 0; + + ssp = csr_read(CSR_SSP); + ksft_print_msg("Spewing out shadow stack ptr: %lx\n" + " This is to ensure shadow stack is indeed enabled and working\n", + ssp); +} + +void bar(void) +{ + zar(); +} + +void foo(void) +{ + bar(); +} + +void zar_child(void) +{ + unsigned long ssp = 0; + + ssp = csr_read(CSR_SSP); + ksft_print_msg("Spewing out shadow stack ptr: %lx\n" + " This is to ensure shadow stack is indeed enabled and working\n", + ssp); +} + +void bar_child(void) +{ + zar_child(); +} + +void foo_child(void) +{ + bar_child(); +} + +typedef void (call_func_ptr)(void); +/* + * call couple of functions to test push pop. + */ +int shadow_stack_call_tests(call_func_ptr fn_ptr, bool parent) +{ + ksft_print_msg("dummy calls for sspush and sspopchk in context of %s\n", + parent ? "parent" : "child"); + + (fn_ptr)(); + + return 0; +} + +/* forks a thread, and ensure shadow stacks fork out */ +bool shadow_stack_fork_test(unsigned long test_num, void *ctx) +{ + int pid = 0, child_status = 0, parent_pid = 0, ret = 0; + unsigned long ss_status = 0; + + ksft_print_msg("Exercising shadow stack fork test\n"); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); + if (ret) { + ksft_exit_skip("Shadow stack get status prctl failed with errorcode %d\n", ret); + return false; + } + + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) + ksft_exit_skip("Shadow stack is not enabled, should be enabled via glibc\n"); + + parent_pid = getpid(); + pid = fork(); + + if (pid) { + ksft_print_msg("Parent pid %d and child pid %d\n", parent_pid, pid); + shadow_stack_call_tests(&foo, true); + } else { + shadow_stack_call_tests(&foo_child, false); + } + + if (pid) { + ksft_print_msg("Waiting on child to finish\n"); + wait(&child_status); + } else { + /* exit child gracefully */ + exit(0); + } + + if (pid && WIFSIGNALED(child_status)) { + ksft_print_msg("Child faulted, fork test failed\n"); + return false; + } + + return true; +} + +/* exercise `map_shadow_stack`, pivot to it and call some functions to ensure it works */ +#define SHADOW_STACK_ALLOC_SIZE 4096 +bool shadow_stack_map_test(unsigned long test_num, void *ctx) +{ + unsigned long shdw_addr; + int ret = 0; + + ksft_print_msg("Exercising shadow stack map test\n"); + + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); + + if (((long)shdw_addr) <= 0) { + ksft_print_msg("map_shadow_stack failed with error code %d\n", + (int)shdw_addr); + return false; + } + + ret = munmap((void *)shdw_addr, SHADOW_STACK_ALLOC_SIZE); + + if (ret) { + ksft_print_msg("munmap failed with error code %d\n", ret); + return false; + } + + return true; +} + +/* + * shadow stack protection tests. map a shadow stack and + * validate all memory protections work on it + */ +bool shadow_stack_protection_test(unsigned long test_num, void *ctx) +{ + unsigned long shdw_addr; + unsigned long *write_addr = NULL; + int ret = 0, pid = 0, child_status = 0; + + ksft_print_msg("Exercising shadow stack protection test (WPT)\n"); + + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); + + if (((long)shdw_addr) <= 0) { + ksft_print_msg("map_shadow_stack failed with error code %d\n", + (int)shdw_addr); + return false; + } + + write_addr = (unsigned long *)shdw_addr; + pid = fork(); + + /* no child was created, return false */ + if (pid == -1) + return false; + + /* + * try to perform a store from child on shadow stack memory + * it should result in SIGSEGV + */ + if (!pid) { + /* below write must lead to SIGSEGV */ + *write_addr = 0xdeadbeef; + } else { + wait(&child_status); + } + + /* test fail, if 0xdeadbeef present on shadow stack address */ + if (*write_addr == 0xdeadbeef) { + ksft_print_msg("Shadow stack WPT failed\n"); + return false; + } + + /* if child reached here, then fail */ + if (!pid) { + ksft_print_msg("Shadow stack WPT failed: child reached unreachable state\n"); + return false; + } + + /* if child exited via signal handler but not for write on ss */ + if (WIFEXITED(child_status) && + WEXITSTATUS(child_status) != CHILD_EXIT_CODE_SSWRITE) { + ksft_print_msg("Shadow stack WPT failed: child wasn't signaled for write\n"); + return false; + } + + ret = munmap(write_addr, SHADOW_STACK_ALLOC_SIZE); + if (ret) { + ksft_print_msg("Shadow stack WPT failed: munmap failed, error code %d\n", + ret); + return false; + } + + return true; +} + +#define SS_MAGIC_WRITE_VAL 0xbeefdead + +int gup_tests(int mem_fd, unsigned long *shdw_addr) +{ + unsigned long val = 0; + + lseek(mem_fd, (unsigned long)shdw_addr, SEEK_SET); + if (read(mem_fd, &val, sizeof(val)) < 0) { + ksft_print_msg("Reading shadow stack mem via gup failed\n"); + return 1; + } + + val = SS_MAGIC_WRITE_VAL; + lseek(mem_fd, (unsigned long)shdw_addr, SEEK_SET); + if (write(mem_fd, &val, sizeof(val)) < 0) { + ksft_print_msg("Writing shadow stack mem via gup failed\n"); + return 1; + } + + if (*shdw_addr != SS_MAGIC_WRITE_VAL) { + ksft_print_msg("GUP write to shadow stack memory failed\n"); + return 1; + } + + return 0; +} + +bool shadow_stack_gup_tests(unsigned long test_num, void *ctx) +{ + unsigned long shdw_addr = 0; + unsigned long *write_addr = NULL; + int fd = 0; + bool ret = false; + + ksft_print_msg("Exercising shadow stack gup tests\n"); + shdw_addr = my_syscall3(__NR_map_shadow_stack, NULL, SHADOW_STACK_ALLOC_SIZE, 0); + + if (((long)shdw_addr) <= 0) { + ksft_print_msg("map_shadow_stack failed with error code %d\n", (int)shdw_addr); + return false; + } + + write_addr = (unsigned long *)shdw_addr; + + fd = open("/proc/self/mem", O_RDWR); + if (fd == -1) + return false; + + if (gup_tests(fd, write_addr)) { + ksft_print_msg("gup tests failed\n"); + goto out; + } + + ret = true; +out: + if (shdw_addr && munmap(write_addr, SHADOW_STACK_ALLOC_SIZE)) { + ksft_print_msg("munmap failed with error code %d\n", ret); + ret = false; + } + + return ret; +} + +volatile bool break_loop; + +void sigusr1_handler(int signo) +{ + break_loop = true; +} + +bool sigusr1_signal_test(void) +{ + struct sigaction sa = {}; + + sa.sa_handler = sigusr1_handler; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + if (sigaction(SIGUSR1, &sa, NULL)) { + ksft_print_msg("Registering signal handler for SIGUSR1 failed\n"); + return false; + } + + return true; +} + +/* + * shadow stack signal test. shadow stack must be enabled. + * register a signal, fork another thread which is waiting + * on signal. Send a signal from parent to child, verify + * that signal was received by child. If not test fails + */ +bool shadow_stack_signal_test(unsigned long test_num, void *ctx) +{ + int pid = 0, child_status = 0, ret = 0; + unsigned long ss_status = 0; + + ksft_print_msg("Exercising shadow stack signal test\n"); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &ss_status, 0, 0, 0); + if (ret) { + ksft_print_msg("Shadow stack get status prctl failed with errorcode %d\n", ret); + return false; + } + + if (!(ss_status & PR_SHADOW_STACK_ENABLE)) + ksft_print_msg("Shadow stack is not enabled, should be enabled via glibc\n"); + + /* this should be caught by signal handler and do an exit */ + if (!sigusr1_signal_test()) { + ksft_print_msg("Registering sigusr1 handler failed\n"); + exit(-1); + } + + pid = fork(); + + if (pid == -1) { + ksft_print_msg("Signal test: fork failed\n"); + goto out; + } + + if (pid == 0) { + while (!break_loop) + sleep(1); + + exit(11); + /* child shouldn't go beyond here */ + } + + /* send SIGUSR1 to child */ + kill(pid, SIGUSR1); + wait(&child_status); + +out: + + return (WIFEXITED(child_status) && + WEXITSTATUS(child_status) == 11); +} + +int execute_shadow_stack_tests(void) +{ + int ret = 0; + unsigned long test_count = 0; + unsigned long shstk_status = 0; + bool test_pass = false; + + ksft_print_msg("Executing RISC-V shadow stack self tests\n"); + ksft_set_plan(RISCV_SHADOW_STACK_TESTS); + + ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &shstk_status, 0, 0, 0); + + if (ret != 0) + ksft_exit_fail_msg("Get shadow stack status failed with %d\n", ret); + + /* + * If we are here that means get shadow stack status succeeded and + * thus shadow stack support is baked in the kernel. + */ + while (test_count < ARRAY_SIZE(shstk_tests)) { + test_pass = (*shstk_tests[test_count].t_func)(test_count, NULL); + ksft_test_result(test_pass, shstk_tests[test_count].name); + test_count++; + } + + ksft_finished(); + + return 0; +} + +#pragma GCC pop_options diff --git a/tools/testing/selftests/riscv/cfi/shadowstack.h b/tools/testing/selftests/riscv/cfi/shadowstack.h new file mode 100644 index 000000000000..b43e74136a26 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/shadowstack.h @@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SELFTEST_SHADOWSTACK_TEST_H +#define SELFTEST_SHADOWSTACK_TEST_H +#include +#include + +/* + * a cfi test returns true for success or false for fail + * takes a number for test number to index into array and void pointer. + */ +typedef bool (*shstk_test_func)(unsigned long test_num, void *); + +struct shadow_stack_tests { + char *name; + shstk_test_func t_func; +}; + +bool shadow_stack_fork_test(unsigned long test_num, void *ctx); +bool shadow_stack_map_test(unsigned long test_num, void *ctx); +bool shadow_stack_protection_test(unsigned long test_num, void *ctx); +bool shadow_stack_gup_tests(unsigned long test_num, void *ctx); +bool shadow_stack_signal_test(unsigned long test_num, void *ctx); + +static struct shadow_stack_tests shstk_tests[] = { + { "shstk fork test\n", shadow_stack_fork_test }, + { "map shadow stack syscall\n", shadow_stack_map_test }, + { "shadow stack gup tests\n", shadow_stack_gup_tests }, + { "shadow stack signal tests\n", shadow_stack_signal_test}, + { "memory protections of shadow stack memory\n", shadow_stack_protection_test } +}; + +#define RISCV_SHADOW_STACK_TESTS ARRAY_SIZE(shstk_tests) + +int execute_shadow_stack_tests(void); + +#endif