From patchwork Fri Mar 14 21:39:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017488 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 1F1CEC282EC for ; Fri, 14 Mar 2025 21:39:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39BD2280010; Fri, 14 Mar 2025 17:39:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 34CCA280004; Fri, 14 Mar 2025 17:39:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C55E280010; Fri, 14 Mar 2025 17:39:32 -0400 (EDT) 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 02298280004 for ; Fri, 14 Mar 2025 17:39:31 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EFFB8120E86 for ; Fri, 14 Mar 2025 21:39:32 +0000 (UTC) X-FDA: 83221473384.30.8082DB7 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf17.hostedemail.com (Postfix) with ESMTP id 1082140007 for ; Fri, 14 Mar 2025 21:39:30 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=E77Z8Z5k; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1741988371; 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=SDDw4jYk8ElhORayLnctVQ+77ceNByh8dqs8gmZ197w=; b=6FMKul5Ip0qObsULOyW1gxAXOptZHfcP4Xg9J6Y+tkaAz4poFclprFiqLK8ua84oDnGKP0 ebV/6Yp9ziJzgRhHPQukmik7IqliEKyGBrKdDKa2A8oY7e1dlMFomlheAXqlsOLJLQJ2sV jNisT+YM68W4yV6+22izXmQ6e64bjNg= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=E77Z8Z5k; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988371; a=rsa-sha256; cv=none; b=5y/1VojyNBYLVoD4C/6UW/Z05jQ/R50eTUazJ6lMn8va1c3snnSwhA3W/Pd0TWNc5tA7+M P5W0AnB4cdZr4NtzAHZiMXnwgguQV/kw3vWb5fmwGdLYBJkYLhjuvqE/s8owT6ELs7fcHu twd7kMMOAeZpCO1OUVPFISvAzj+3x/o= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22349bb8605so56803645ad.0 for ; Fri, 14 Mar 2025 14:39:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988370; x=1742593170; 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=SDDw4jYk8ElhORayLnctVQ+77ceNByh8dqs8gmZ197w=; b=E77Z8Z5kbfv4Is81tIYdWbv7AWZEU1jStzCLeNX/NG8DhvM2I76CQzYL147pOlX4Ri 74mRBSUu0o0U/tSY6WEWkzbiZgfL8QLSiiOr9kOhZy0CW2G/bWReU7IfXCsG/gdwFZ25 WYyMNbRMM+fL+b8y45JS54nUKDWYTQ5a8iCQxP5PPI8E02mSXSQtEgE5S9WfW/fbSDWg sqsJfKnqi0zQ14RS2hfdFYs2HpY0m3AZvqpLECrdUmeaVttbx8XK28w+7Rq9LzW86xr/ nxvlo9+qQgRJJQuKWfygf5V/Ye2jy2NjbcSx529La+F4XrFttEl5lNSioV7SojAMCJ5B OfiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988370; x=1742593170; 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=SDDw4jYk8ElhORayLnctVQ+77ceNByh8dqs8gmZ197w=; b=M2vDYZ+gtIrhULgHZX14CrhU/vp5JKHW/xn1NfhXBjneoZJmEwteDcKDhJB7XwTUh0 khtxxsIyMC3wUrQDDN+i0WATvq/yKyca1tabDGxETdMiSvaANG0+/hN1L4qmN28HKG08 wBxKet2RDJWYsplrJnpDpxIW+pZp4Ygu9fuWw6/arLRoL38b1/6bexTnHXp5dlx2k54L RASOKR0nKJYvJnxQz2THoXGUhCdRQdGca6dh22r/lwtnognQFTwHvBww11k9hLfyLery cOj/NrfMsU/SM8vSOoRB8KAkzUi4IGMKDFg72eadP5x4eLUFrvu9NQC7GQRq3ys2uJby wm2Q== X-Forwarded-Encrypted: i=1; AJvYcCVBLNas8L/KLA3GD7tZ2wkJsBRJeMHGzVf5W2a2aahwhU7jEf1gRvMQ5VCA23Y5RwPoSxvR+UbEzg==@kvack.org X-Gm-Message-State: AOJu0YykrfQ/A38+k/T0af2v/2UsC75ISmQWNWkZln9ZjJ5SDYMwA//o f+CNMhsBUZ14QRLiaLYZ6q/jeWuoaljzPX8lUyGm2KRdXCfDxco2iNhxMxaRvx8= X-Gm-Gg: ASbGncs9tpx6+q2Bz7D45mO7A2HuxAcmqIC52jGZIerORv6v3MwDM6qB5jGnbaJgPOL CddFpica3oR4FmeeC5YWA0XOiTMlEECeLezrB078OvqxockAPGv56PDh2tWZgDNclJXXEA8OxtI FbdbwAz/N0Hn1E0Iv61ZlCONaQB1aJ5U82A62wI+/v1aR4OLE6BE22cgYBcbvlipzRZuqHd8KZJ f+PJ8as+7EimM27qJ2z35t0AYzpHqFF5C65hpjIP75ohl88LNRARdvrL9APjiefgqsyeVPnKCeL /a5YAXTm3wDK384qEengTbYc4kCca1z6H4Y+1Ucafh9BtKE1m6yfktCUkQG/xO+dlw== X-Google-Smtp-Source: AGHT+IFpg7z+OE/2A1gqmKjw7jqoEU+X8gr8RuneE9Exr7j30nKzCtL2OnQx5eLIT+ktDst/E1FOnA== X-Received: by 2002:a17:902:db04:b0:224:8bd:a482 with SMTP id d9443c01a7336-225e0aa7e06mr46126855ad.25.1741988369862; Fri, 14 Mar 2025 14:39:29 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:29 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:20 -0700 Subject: [PATCH v12 01/28] mm: VM_SHADOW_STACK definition for riscv MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-1-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 1082140007 X-Rspamd-Server: rspam03 X-Stat-Signature: 81k9dojkk6q5ish713rdgk88r61twms1 X-HE-Tag: 1741988370-965293 X-HE-Meta: U2FsdGVkX18kGKMouiSV2HHJKi+0CUjkj+ER/3rNv9bJyXNFfBuvqj8xmPrB6MjrohscG2KCE3fqb91sNOAacINM2M/+ClJeeqeoCMUlHTLz1L9bNS0ukafMSHK+xpUQvGnK2Jpv97xHZKsTRYyU9enRQw6iaHu9ddGXszGYoJ4ji36ZTE6yqwtuF4kP0l5H+oig+SduO0lqkO5g4QHr6ovzeDcHF9AzFkEqZ8ySi3/DKMFTzx8Ch+zZs361Y4PqhVvz0RftkWJ/UbFkceSA3HSg9Xdydz5Zvt/MS1p7Xi38jLnFn1vDq6Qa4BCCKwbMoAF5OHIAP7mzP2TUNXhf+0eV8QXQk3baVM2IqIoKMZG4hcf8n36Byi6MmFFnONHA4WEoyrWgqnEZhffoBTm68Mny1wNXLxlNACabjxbjdsgPN/b6dvYNSoaQA3L8/tvvbK0CFxSGhfjq0Wf3YnD6uTS5f0Lycy8uI0hdVnaFq8g0NKnMyKN2W017tdZLKW73W+l1Az2RYt3g+Ah+gpzvNtisL09yYDHyAops1hf6mEstDQWu9wnkRK/J8WKShsCKCswf99o5HzozhLgqbcGpGp8M04eEHPR+G/ha96GF0FEnUTur7/EVJnIWLOpnqHqP2cTDlUDO1eH5/n8wK2t0D9khkejBeloLY3K/bvW5i39E2ztNDY4vZ6ItKv+SQqT4kNzRjYfPir4EyqG5tBj9c8gUt31BURSe5Ky312HeQ29eXBcA0HxTuD4AgDylN9OGSCiMd/j32b4jlm352tFTlQu0lYQ625O4y+BvcM0PoqV9WdLQBBnkwrYxmjcQiMllKMhcF2e9vbfThL/EE24wwBYrQdZ6NU/2WVZftQcMTnszPrmBB3iXI2EpSEJ6gkCSl78gzF67mQ+1o1oM0QjQkSew0w7r3+q8srSXojSCxNsucIsyk0WRViM8aS7nE1NeuDcTnDTQ9TmSq8ozHJ+ S+qml3KW oQLEnhN40hxXp66ezXKmqmFxMC0J2hJIZf+HzvQ1ybK+QJ9SipyKCnEo5Lf15P/gWY5P7YHZiSgKD+v5Uf00jpZuBSBkyhZt9Xr8hWdlsH3mgjfS1oZtj4vWaxCfXYma+FTIaPpGC/LfaxzoNGY5gp0GWrt36FjGXQHE0pBAzmwmSi4mGwLQuc/q5RqREWmRNpRN7SAd0jDGaxAhGigzBhIzdtRSKoJvanUonfcL7PgP4ZY50KymYNSz+/Nf12L3I8eA8h3MWkAgTPNrTPfudvfRD7QlsFwaWBcQYT47rbJ+dMry01eXMyhvkFg0gcwy2a8ddvnCJ9mJCx4X+OHHpD5vuy9agRBlNUjV7zaKBvjeAVbJPu1LdYZikzP+LdM8btJK/93B2oTC9V1xrQHDjHfmegEkMcW7YAdwesNEvdJURF1KDMdSy9G6nPWxoYiorZxsoYr5yGAIA7I5Y8nTzDqhPeiC5jKUn63N0W6c7M7ZaDH2XuQhq//9VrteqmMegkRQLYN7NS8RIoMrIcT7pr3XHO5RVXKhczPW6lXfyZXTXZuEa93RuRhjqEWxf2wb0MGSA 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_HIGH_ARCH_5 is used for riscv Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- include/linux/mm.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7b1068ddcbb7..1ef231cbc8fe 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -378,6 +378,13 @@ extern unsigned int kobjsize(const void *objp); # define VM_SHADOW_STACK VM_HIGH_ARCH_6 #endif +#if defined(CONFIG_RISCV_USER_CFI) +/* + * Following x86 and picking up the same bitpos. + */ +# define VM_SHADOW_STACK VM_HIGH_ARCH_5 +#endif + #ifndef VM_SHADOW_STACK # define VM_SHADOW_STACK VM_NONE #endif From patchwork Fri Mar 14 21:39:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017489 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 73D63C28B2F for ; Fri, 14 Mar 2025 21:39:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8957E280011; Fri, 14 Mar 2025 17:39:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 82035280004; Fri, 14 Mar 2025 17:39:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 626B0280011; Fri, 14 Mar 2025 17:39:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3DA13280004 for ; Fri, 14 Mar 2025 17:39:34 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 5B557C15B6 for ; Fri, 14 Mar 2025 21:39:35 +0000 (UTC) X-FDA: 83221473510.06.3243A7C Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf05.hostedemail.com (Postfix) with ESMTP id 6BDDF100004 for ; Fri, 14 Mar 2025 21:39:33 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LFgjVREY; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1741988373; 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=m55rqSJnIT3iSewC8NP8Egx8eoe0H+7jkYrcsMbI/hojF8qrk7Avcx3nLP59y++SYSfGQr rYXM9wrqzlW2yM1bNViERODL8TtTykvJJZF911MrQ8A0GtDM4GhKIf38NUzYCRbo65mvUo niGgCbJBW6szf/4nT6PW8wohPv+dU48= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LFgjVREY; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988373; a=rsa-sha256; cv=none; b=6JWwHzRENtVu/BLkl2oCdVR2BtxEmjg1B7kqMnFDfEtGlJAUMVP/Uj0op3nmTa1l4metgo aU0gMTL+DE+DeB39QB92U8c68t3H2aVf9fY2Z0+zZhUZ0vRGAY3jmeNAdxPDUH+Aert3ZV BB+mb6IG1f1iEioI+uZv1GvLuGrErbs= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22359001f1aso66236405ad.3 for ; Fri, 14 Mar 2025 14:39:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988372; x=1742593172; 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=LFgjVREYZ2Yb7QY9UYVxB3S3rSikW8xn2elHczC17ZMALzE8Uhfzy27Vw9rU+2bgDo ZfZoeXwn/esiz9BviYlDk+jd6ff1UBu955fZhYnuIZn4FiojzRBm9Yto+7jm4zYQlaAM A7i1TkBSf25Me8f9yNJ+a/zljbBQrU8gRqzzIy8GCG6FBR5xRdHeyPQIRQQIPilO3Aj/ Bw4wK2ManZuhjkvGe66OZi0d/zAR/82gxLEugEFIeEfF+GUIwsVL2xQ+nW4uyAPnpT6S kLbh1a86uMXky3T+T/A6HxDfCUqmhAJ0VmKzKOskQxNPt2XTyE4JcT88bRO2mUu4WPTE ycQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988372; x=1742593172; 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=f04dvjTQJQN/dhpu4PrDITrRPZEwlyMltcKKL+DzFEhSou5Gn+z16TD8rmHcHvLRMH qQ4LXfzfm/e7WDqrqI9QUHz08avwNoixr/XBTekiGQD/IsPL0yuCeMqnR6tAUbR9lAjL LQ+4GIvZwuKg0nBPEGHYLW3dJ4UfHN8Y2beW0nTolexyDCGAL8EXgX7VHNT+mMhQlbYG XuA2C5NrziYDR8fG/eX4PgZUJcrK1B9czfLFZDQPDGmb4rOFW5csA8nAlyt+2S+H4+wk dx68KIFfR3eHK81oYe6On83bfVpHZWpM1BROf6i04ZjUzBlnw6lBygfwl2+hjN7AHYgX DQxg== X-Forwarded-Encrypted: i=1; AJvYcCV5hvQd4hDG/ke4Bm1Z0uTTjyOsIk7IJ0jZnc7olFP5W1GtOxuH7KWjGFgq9+bSfSLwOroyrb0WMQ==@kvack.org X-Gm-Message-State: AOJu0YytcuVmvki1abm4uzhm6c+9k+bqT+p8WFmvz0gFZQTKvpWaN6z0 tksdmTtr3IpFF/lHNWNcj2jIARmDK4SYW06zMCCHzDk+++FadepIhFalav6dYc4= X-Gm-Gg: ASbGncu6f6ltQ7i7pZJDrVkszXHkRfH/RSkSos66bbGX3sVyXXcYFequ+T+eF6mEt58 Lt4eMjjUuMdVwR0NA0id9RPUcYSiS2cDFDjMptQ4I1Wco8oClXFXTdNT/v2zyVlIbisM3D1Qy4g 4XIw5C9RtUxijLGH9vXrMfmieJoL6EUaJnBgQ6LaYNi1sceacwgYyumZd2eHb0R/YwJ5CdTkKXR p0NAaQ/IbzYlv9FlBN7q2AeGWP7Dj+HwtrqWeSSVj0HUqAUt6x2Le1BWG6D2PAwXvJSBdV9SjlY 9YFe2J8xkNkPNngYM8Pa5w1AXLbQSSyo0vegj+Q86hUpLRZvC7JMDuc= X-Google-Smtp-Source: AGHT+IHD2xqF6ISXqrc66wt93NwJ9QpiMUhs8Y+9GVF8Ev9srJWeDiSZWraNiRIMMMrHSoWJEgWxBw== X-Received: by 2002:a17:902:d50e:b0:215:94eb:adb6 with SMTP id d9443c01a7336-225e0aee9bbmr48831645ad.40.1741988372408; Fri, 14 Mar 2025 14:39:32 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:32 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:21 -0700 Subject: [PATCH v12 02/28] dt-bindings: riscv: zicfilp and zicfiss in dt-bindings (extensions.yaml) MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-2-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 6BDDF100004 X-Rspamd-Server: rspam08 X-Stat-Signature: jd8o4zgek9z7exec7cksge64xw5jatww X-HE-Tag: 1741988373-126423 X-HE-Meta: U2FsdGVkX1+vs4lO4QeJEaVJvvH3HsxTMtp6r+Lngrt9xy+ECkWQdH9WThlCTjY/vebhNyo114XlsM8SIRFQ1az2QYvJN5ti2jJxPEUFo0YhXUMdqXZ/LVMv1LwxuiJelbghAiX9lQkoxvD/bTQt56DPa2sDLFpngncwgpfbwZ+JgKoKT42uwVer4bh8sjt3p5N6/aHdHWfG2fOZq9KHMCKg+tpMrQBn28vJxjVXhbTO66b1pkeTCg2/F4ArS2YxTWEWLao7wOrErbUhAHF2G2HWeBiKf5euqSrOBuao0a9Uejz/65XXAjb/wdAtnlCtqtlDcgfvUuuWp9lvOeo9M/ZuGAgpBXEDhgapjOqlypbjVv/O6hytzx3/LUsQGAulwT5hk9KVF5eS6u6GMPQrs1VKkiMoOor5ISwkY1o3A4nTFV+vfIRIwS5FLwDD53zhbHdVAu017wEct1X4p7vdiIhrpTp+toqZXDIQ5SvM9rmMpcX1Y9WudJ3i+hW/SZgR/M8EZFRSuq9tpa6VT3s39GVGyZs8Bu+kdImFPKY+lJHAUI/DI0b+r0EwwktYBcWaC3eb4DzmhF9AAh07IxL/Tjx5aGpWG5u89E6Tr/jcTY/v9+Kk4GLWfRe48hMcxXZGcAKz6PO/517hREg5Ku6ZjL4eAwceO0EsaXGACQCNbxK08zkIk4F16j1I9zsXSjGpQ9p1jFEKBbJvt6tGidRUegR70lWa4eJr2w/xd36xqN8BaxFY1YI0ia07M4HjkuJWRbo4pvjQ7m+hhuHUlE5EsxfOK4RVCggCGelTSia31LgSugntgVtVAd+IfA8qTr2QQn3YKfclaEUqJ29NVbV4ZeF98P5RSMEtPXhpAucZ2htfv7HqphchGlqAqFIT1Z1QlJTTV1Er2jpgDbToZ76F2ypuzgofSGvIWYLO6Ug6a+Vbf+pnnnonnqFeZDhmGJTRZN2PCA6YnaarhdAf+lZ bKsYXaBZ osKPPE1WYHm7+aX/RuBwZ89fTvAfjy8tInYo6riKm4D/TBgNl4VhyTOVNg4+i6PrqYROQc9g2+kvA+b8U8vRmbJqCeaz0o7yR3zWpPMoBinNDU0n07RTqFUQRwGddoQ/PCTXIlbnTQzYK0lXyBCA8bnAwWTWmiHm2l2bLVEvhPl9ptDijvDUQY8nwjGYBJsm4akBg/IOi9SeXzOQAe1VqXdCjgLOvL50ElC+V5NWx9tvBLi4yJ+aPB4lw7o9NTU8FcGEAZPmdGzZyRxZ+mnPEWAhrFYjU1M+Er0/zSaraAQtW3DZgeMTAzqXRki5tW6qZpEs7CG6sainV2yBEZwLdoQglaldd/IK2fd1qXQiV5kgXAh8+iL/NT/DAQGVWu8mZB392tmYqWQPklCys4kvIrgExlTJlYhtbkB/Nrv7Y8G/doQpds3KZm+HiDrxt8qcnTs3HZf3FBp4IKZueLqBaTGdYulX1rCavwTxf/N1uYFVKFws= 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 Fri Mar 14 21:39:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017490 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 5EC51C282EC for ; Fri, 14 Mar 2025 21:39:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 72138280012; Fri, 14 Mar 2025 17:39:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A8F7280004; Fri, 14 Mar 2025 17:39:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FF04280012; Fri, 14 Mar 2025 17:39:37 -0400 (EDT) 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 30AE7280004 for ; Fri, 14 Mar 2025 17:39:37 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 161CF161614 for ; Fri, 14 Mar 2025 21:39:38 +0000 (UTC) X-FDA: 83221473636.14.CD14E8A Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf09.hostedemail.com (Postfix) with ESMTP id 293DE140007 for ; Fri, 14 Mar 2025 21:39:35 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=DhD5unA7; dmarc=none; spf=pass (imf09.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=1741988376; a=rsa-sha256; cv=none; b=oUM1haORjz1SnbF3QUKT2MwMQTu2CsMnSMFfhN89Th6qhsTns6HPnNjR21VFIoo2AYd0iW RF6GHly0PhMj/TnzSrRsol9FEq+GV0LSyzrMVjjhobWWzPY95gT1EaXejjxy7Gx/mI6Iqy TOAHEb2ttMs63EzhngSWz9aRd8yfyQ4= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=DhD5unA7; dmarc=none; spf=pass (imf09.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=1741988376; 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=2gHC+OQH/HyLVaEB8d5yyptpM2IOJ5Z6rZqVaRKPZQE=; b=kUSf3/2eQjw2s9siX7DXgNEf0FCoVeZXMpppAT2RrNFuOefhk0l1fwVHPCUfk5uMPJW0PZ HZfpAgnXuCnW+hMd33YirOEfnuIRaTqL6LScHVzuxKe1p1OqL7zaYAQ07Mv1LCRPkHDEfu dgtrRTacIM3wfgflo3V3ZS/rgEieTRI= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-225477548e1so47277805ad.0 for ; Fri, 14 Mar 2025 14:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988375; x=1742593175; 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=2gHC+OQH/HyLVaEB8d5yyptpM2IOJ5Z6rZqVaRKPZQE=; b=DhD5unA7bws7/PA5Kpn4/8E4uLhbf/+5cmYbstja19O3mwATWBjnBnxxBXKKlAImNG hdIRap60klUrD0ShYoQZQDhjw7Q9Z9SHtxOgUaoGnecHiBI0uKuWJ/joTwGXjrpdTMZB K9HKb0p/k8MmHyu7QwubXmSglEwB7JGdf27VZWZniIQwix+u0yA7q8izcAY3Zv39Uuaz Arp3wh3jKZaG6/8NMQLz/0icb82K0X9kRp2Q9CMHthIR+HozyFyXBcgw7Yp5XJ7MsaWO UgEiaDGYGmGWylh+IlsI8GOCTcz/HO8YLNI4QhBLAqUWquHemItqkov4WMhmrh7WmjOb I5Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988375; x=1742593175; 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=2gHC+OQH/HyLVaEB8d5yyptpM2IOJ5Z6rZqVaRKPZQE=; b=tfGhRf6KsHnCiNq1fLf27lCX5QeD7akiUPM5NMKxMuwkffmCLDnKeaF/3w2DQvsw4M 0TML+8XYt8VFrtnKsvyCRApkwMLnmS9sCediLyXczqzAGTS+CvzYZZXd/5W9H0JVeN4s c2SV38e0jv5hw3PKjYpSNKggWYssw/k3DCDsinCV5KT5z/YnTYmzGmdatGs5NA2LwV8u kW8HeQezZQA5f0s9eF6kQ+6DxqrwDi+le6eAtEL6tzahQXj1dup2HqruOvrs9izyDZ/2 3e6qShK2+2bdA8a0zoPIqsfJAdTLzB8zgNKWVifiYnpsFjRkYJ6JId4ZZJBOVNDV5xQQ gq7w== X-Forwarded-Encrypted: i=1; AJvYcCVTqmJhqiJVUc3mgPP/5KpOaF/MTw5XMvQ0hJzPdb338DqprhFZ+26DXJ7ZFW8WDiJVr5Ra+dqgOw==@kvack.org X-Gm-Message-State: AOJu0YwcecZACCMuRv+vg0Qb84i26UnlL359VLyS3s5HSFVqKwIaRrr+ El1Vg220+tLmgjI7DzYHNcTQvIgOQcBqvomRrT5PlsKaHXyrs9KYuCEUdX4LsoU= X-Gm-Gg: ASbGncuq8kjLb0KHN+qW5GeizUM7KLOIbYQrK4ccHcifrtaivSPI6YgMebjfMv+Lvjd gj/tetHj4dxeaDfRjEKNBf2ST7Wr348a85bGD04l4X6NspAP1Wnr4VH1D45GGJI69y1atwZIwnP XT8tYfel5IqWFu/csNgFr5QTo7IPVoUhKhU2dg004Gf4TAlV5DB89+Cx9Uvji6TVYbRl1RdpG2p rpTSbMqniKucGyUwiU2GEYA0kdHZUq7yPUd5jS7SLO6Wbs3bGuFIul9UhlFce23eWXMiJJt6Wi8 7m/xPazvri1SSX+3f6fsfy/mMRmMuU5Hl+BuqWq6BDprWfLnvwG+1Y0= X-Google-Smtp-Source: AGHT+IHvHW2W/QvmAtTQpnpsWWRaM1HH0j3AoAcqaAS/SF4n712ckDXuPjUXwXP+UZCTKkiG9rvh0w== X-Received: by 2002:a17:902:f54c:b0:224:1935:fb7e with SMTP id d9443c01a7336-225e0a75439mr57801355ad.24.1741988374981; Fri, 14 Mar 2025 14:39:34 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:34 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:22 -0700 Subject: [PATCH v12 03/28] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-3-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 293DE140007 X-Rspamd-Server: rspam05 X-Stat-Signature: 1ymdazbshmz3naz9cn8m4c89ncfkfd5c X-HE-Tag: 1741988375-305199 X-HE-Meta: U2FsdGVkX1/5rKNjQ1g5IIA45BTc4J9HUbF1V7sGE464NKNsOsIymg5W5L6zxe+oLZo8xZCAqPzHVlo/tGmaHcjW0yUmV2LPA04UJZgEI7BdZmhMs9Vclz2f1ve1tNmRxFtSq2t1xm7BFSOFVmu6RK12hsgp2iWVty1oouDS8bD6pqHUAdQBs/m8qEi2i+c/zAwWHALv+Wul0hYLNT9AkKKx9lG8ZcbQSkrorYoMUaRX4AiM/5ZnWNwQEpyCoWyQgZuy4QhuOn7+i5AUGmZURb8yuipfXrmBxquDsKvdDQeYUeBtLNaIfQxzJn3b2maUs0D4fFLbxfmC2kPWQmNbq8yOqk2SzaZxHErEVW8D9AiJoh9kfOA16ZGGY821Z8CQEdQLLeOgxPPNXn35LK7oo+nixFWdlCLHdVLBxRsaqEEej0hqKjaCQwiA7gFiuy4MVTUpznZSRxCmuHcXXiFF0H81r3S2uNHK29bdf1OcAHvrl3GFkrIG7qUDLb0Zn9E42jw/DuKGmKwFqVNwouAvAY1tCqGgEHJXqGJqrA7Zt1HLe925RuxayepDcL0sNSVWeKoC3U0sDuj5VJ8nqnqhygeomH8FKvxRWgjWhghjFMYs4emoEKH+00P+A8UVhgmFJkUNmIXVAXBnIdr8xSOulBCgYynw4CM4wk8eU4H+8QZWb7tknk/kl2zIEKEcxZ5LrYukXUTtk/WcbYkw/YpmWkej2An2Qd94ISDeO31+TViga2M/CaPFBuI5HcxCyFAm8Q6n0mgHnNgUioKrH48jIH064UuNX/7yGxfFPYrDC4SZ5FuhtmusTqW/8gLjT7E4tIBB9OerZk4VvQh6UxcPSGcH05LN4UPgYkKRnlX5Minwv9DOWT7CroXrzaP5NSznQq8024C5xQdM+/IIwy3a/RRJTvs8HoHZ0J8l7/2IQukf25C6KYl9kjbAT/ATlAcArp3AXJN6Aj5evO6a2Xm zDtNWGoa HqPbb2sPysOpRzNl5flDqZ5I3kd3Uxjo1kbHgwAgu//2vux1Tc2K7TFjewo2ePtekwJ7M+XYrcJofR/EFacVRWl3KSv3W6aRR597o6/aHuiiI22vV8wFVTPiRHckDv0MVc3ajI8Q0SIhICfg/qBvLgqwfs+66H48XVzJR7QZVfXFKCFSRlib+RkffjNYksRrL6jlUfm4x/ID+LyDK2BBvor7trgOItuzpYlsgT4VfajvaBaD8Z7eVO5EZ20Jr3ZEMgsSFwcYM00MgSMwwVYx25SDxVYoznjlnKgFM8IyGAxffUxdaqKAGEwgMvC4yT4pDLScbIeIFX/Y+AqzkfK+BoHK1VwJloZvESPcGyiPEjKikUFxcAGQnYaeTu1tQMvjvrPV9UFiya8/oky/tm48WuOfiCQFGo6mPSQ/E/In4xH0hKrH5spEMf5XKDVLCVdokmPa+8fQuaxqaUd7QZliSHaWgVZp65OHokATghJ82b5hGt3PdyeCq1UfHqub3BA7SZMVkEE47zWC7O/w= 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. Reviewed-by: Zong Li 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 | 13 +++++++++++++ 4 files changed, 29 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..82065cc55822 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -150,6 +150,15 @@ static int riscv_ext_svadu_validate(const struct riscv_isa_ext_data *data, return 0; } +static int riscv_cfi_validate(const struct riscv_isa_ext_data *data, + const unsigned long *isa_bitmap) +{ + if (!IS_ENABLED(CONFIG_RISCV_USER_CFI)) + return -EINVAL; + + return 0; +} + static const unsigned int riscv_zk_bundled_exts[] = { RISCV_ISA_EXT_ZBKB, RISCV_ISA_EXT_ZBKC, @@ -333,6 +342,10 @@ 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_VALIDATE(zicfilp, RISCV_ISA_EXT_ZICFILP, riscv_xlinuxenvcfg_exts, + riscv_cfi_validate), + __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicfiss, RISCV_ISA_EXT_ZICFISS, riscv_xlinuxenvcfg_exts, + riscv_cfi_validate), __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 Fri Mar 14 21:39:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017491 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 08173C282EC for ; Fri, 14 Mar 2025 21:39:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8C51280013; Fri, 14 Mar 2025 17:39:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E3D6D280004; Fri, 14 Mar 2025 17:39:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF3BB280013; Fri, 14 Mar 2025 17:39:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9AA5B280004 for ; Fri, 14 Mar 2025 17:39:39 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id AD79416014E for ; Fri, 14 Mar 2025 21:39:40 +0000 (UTC) X-FDA: 83221473720.26.D1710BB Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf05.hostedemail.com (Postfix) with ESMTP id BF1E2100003 for ; Fri, 14 Mar 2025 21:39:38 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lQnj7E0i; spf=pass (imf05.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=1741988378; 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=ovPc5uvtxj5CTfaRQMSSD70PDXlbAvMyRz3I5ZkkOyo+WINjIgzeqQxH/hErODGiq9FSvk FVfurmvP2UjdoaMnLgNsB9bDXc+566oh7e9w3mK2Y2+rqeUK2FA3Zc3e7S3PYDkMt7Q3p2 jnc69XAAx4lqdYXFGZeFIFXtQxAv4Aw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988378; a=rsa-sha256; cv=none; b=L6MqMfaJjTioRVqPrjO/Woy7uJQ+3XgXmow4NxBd01pUBekhQF9ohWhZfDQmblNBaect1w yuwipQqZfxtbTpBBSwJcKq8PCkht2dPC9+m43hQO7Qv0eyHsOeTkZ/RnWhfhsO6tmq0QEl UdAgFvuJKXWCY9RCLIabJWNHOsddlak= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=lQnj7E0i; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-225b5448519so48018675ad.0 for ; Fri, 14 Mar 2025 14:39:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988378; x=1742593178; 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=lQnj7E0i5ogLDnFAL2RWts6ijs9gC6OocWmCwsymKxYBqTqlRh+CMl9wyGu9cfEBil y2QtdcaBIZhoPZpivKNfcx4J9CAQI3e3ZYup/WS/qZjxxhAK2LRWwPe+HsgMNKc9cCL/ IBZEjqaadPFLXgJL6ggA/O4ReK0M/1R6rtNAYtLDhS8KZz3PyxJNG+b1iNvT98jDReaJ wxWlmPL0o1IaKODPJLKL/y4cue2yv6CRavsrEOZFvyYf9FuKaIFWFwUomH94/JeFcvmk KQlw+sQoIpn12svN+uBc9UpLN2cymwIIifJhjBZXswRb6xuFOewJVe9HuKPFH8EHTrp8 ljLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988378; x=1742593178; 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=Q1t80LmaswFEtZLTYo4jgCN4J1ZeIY3rHWbkAkvWcyLR6qrbSl3a/ZgKglTZJiBuz4 nrijElWdNnWnQXn0XIQQcHh6jNbw4R/96T6w+znX5SwLn/4F8Sk1/bE/Nm2Jc0yum0Q2 OS+wzt1Msb3zRYbcBVn4M2zlE/QNtUKOOGu+/IrntXiVJEEylzEi+gG2F1S5qgbTbVrY JzRiayzIR2jaB33TWzOyc7RtaZ5tQIbbtMDTgGCU597Djg5JekhgNXfpfX7lDdBSUmKu Z2/FdJB65IfRpLoXuPG+Z0Tgmg/J1mDch0sJPB/HlRuySQWEpjYwWrO6T+wdECMrqwEk ldHA== X-Forwarded-Encrypted: i=1; AJvYcCX2UOCOMm3/3L6ROgqdJg/hxSP2NnIO8ImbCjJlj/EBFM+vY7By8ZBlcLtiragOjW6/1BbXGzOKAg==@kvack.org X-Gm-Message-State: AOJu0YyvHNkjLWcZ8y/4JAljjAkKerHaarbo2TN32+OWvG6EeWly7nMD BEkSH7GF1HsrY/BWwx4Fs+Zz2adGi0P1AMTy/JjGZ4OWQdRbN8T3zaXdklFrQ2E= X-Gm-Gg: ASbGncsjYI0t7ID4ZOsdrTLKZVsIB3CXdpkJsRG91XnonvywnwmYDJZYz0xj9BPpOxA X7fhbROSzbowbSmZ2mrZemvZrgtdjhrao96+Yf2e9Z6oeaXsEvpZ/ACDdn8sQGWQyZI5Ukl2vRf 1ws175w9Jr1KqYMek8xgq1gtXodvUymy3PjdaYdt6XTX7ASwbX5zmWYKXic17QM5CCEFeC7naTM rTCQOFemjBm9q0FCrwI8TV5Mf8NeenOK3IYcH5QRHLSoX+8uuJ2Jd1v/tt7kfvqUmi7QuK7gKoU sCYdUDlPeQLxngNYyiAl9mwCgbZi/aKTCAAnUvgG8nPcMNocrdPAy9uG946bQvraZw== X-Google-Smtp-Source: AGHT+IEd6y00tJpY5AwKZ0G453WB85qrfmfVkSTQW7JFb/Aht1BlD2RcJLOAn300bIU+BiCy9clyEg== X-Received: by 2002:a17:902:cec5:b0:224:abb:92c with SMTP id d9443c01a7336-225e0b19692mr43817135ad.50.1741988377710; Fri, 14 Mar 2025 14:39:37 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:37 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:23 -0700 Subject: [PATCH v12 04/28] riscv: zicfiss / zicfilp extension csr and bit definitions MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-4-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: BF1E2100003 X-Stat-Signature: 1dnn54n4mh9xpgqds1uqi4wj3ey3n3oh X-HE-Tag: 1741988378-408433 X-HE-Meta: U2FsdGVkX1++c4lrWM5edWrfy1awNmuDvcDNEwT0MdE/gNEX04t9gZIW4jSl2K86CQ57aCXp5oe/4wRCHTRVKUn9dxX/3xfNRh1hnisuqzK427HjAxHZIsc6MyGmjN4xlOP6eUygSUs6Z8TVD/X4W5LsvjFsG2ST/it/x+5HwvqLAyFBHT6pJKOnpqCc6qihVs46X8Hz5wKkGiPW35mwWlhr7lLFJpTNzK9hRhyclDFo6nStRlDu3xt+xW6tP5EO6APrLlssT+YxAd0RxgixhASl7bYBlf6LBSyhtY1K1nQOHngKzSbWyoG8+ZdJtvov4tHL3/BeH+AMm1+Vk1uIUq8obW3FRsQv8IU55zry1RjsIFnVbBMp3xVGw6Z7hBpQsw5yFE64wJq6JTCH1vIYfzGjhYR/rBDIQIMQ+oj9xQLCAx2PWST6DGkg9mczXRg8i83CWuaY2/5U+1psNvDVsU7SZiWn74zPoVT290rUflAXdLp16/W2A8Dmtl7nhqM9N17nawUUerJAws8QwcKLAqtBc52tyEr7uvNF4nKlqtA3D7xubKp0jGZ3hh7+wBJGkDNlolhRIRNKSVG+mXCyVVFnBV6b7y6UjMFLnv1JZwPeUPiz5oCZRKgb/wAwORSxu4PFIQ8p5aYBMJsVSybWvdxE/IGqJNvZIo2ndq9+82YxlzrocZRqfqQUT1q4OHkEepXapc5bhCwrEOfZIzrZimbw32gKJzJ7S2tFTJBYbCrFgJ8aeRUOO+KWXeokl8XlR24tg04ZdTUiB9Rd0889AFvXXFUonMSKmMzioKw/L/M6tM8Hg1DIWK7R+7s7OR8g7x76E4B5y+PITPs1Vs0pq4PdQr8nQgVIhuOfLDwp2q86ey+BawrXnKj1MkkzXAAiwYSq3BjoD9h5K1ZMGPW0rQXbmT3cDYFIiNhOZbuXel0uKo7ywK4Nwnz/ByXORfcwuKBogCwcyYbm2tN1Mm6 D7Frn1eq VQLEQN5+ZotgkxM0CNfhBUtz/IpU8ePCmWbLjEYBr0DkVZ/6Y4Z/m6vzSsYXIhCOn4aWUHD1vL0S5nUy5kagmit28TAloTLdhgVKmn+MprKSjCE1JxhF9QLHIpm31uy5jjBrvGBFCy9UImCremDRDgme3dglpfOpockQCWHoslwbHqz7DYM4dFqpnHjUL3LYYhkaQROnL2k+G3T/fKfP1xXNafaYKE7S5x6HXi7ha1wkCWKdYBJEBcxvh0aPJpPx6K380DRU35xaWn9Bjrkux0ZFcolW5NdqGsH9Gk3YwzLzjZH6ucOLEzWTsJ7xsj+9QpqQRUa+CLRYhAeex15+zYc8jRrtNEp6tBhOhZAfQbAcZhiyd98amCjbXdycgfwAGHvDhdL4/2jku0Vu9xrSZ9YZbcjjOUH3PW1MAXfp1BOmDKoH1pSDFPxuBt8I6ZQ8yDMUZqvOTY7TcNGw= 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 Fri Mar 14 21:39:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017492 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 E1661C28B2F for ; Fri, 14 Mar 2025 21:39:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92613280014; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85B20280004; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ED75280014; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3D994280004 for ; Fri, 14 Mar 2025 17:39:42 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 663F214105E for ; Fri, 14 Mar 2025 21:39:43 +0000 (UTC) X-FDA: 83221473846.07.41B4D44 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf01.hostedemail.com (Postfix) with ESMTP id 735C940007 for ; Fri, 14 Mar 2025 21:39:41 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NoDOsddV; spf=pass (imf01.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=1741988381; 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=EvIiEqJjsqgbsYMUY6NKV1JWZOMquSSP9DBah5grL80=; b=h4ZYEmSzOqr3HeWuJYxg+Ta04OBp34V98MFe01byeWQmKOmlvje5x06OpB2xI9/Pu7rnlM R/E4KixuXpYNACOJ2V5VqHt7MKAAAN0kxPsJN4XmN+W9omJCqcfe+sJJYrkQR7Fp5xlYJK wcnUQzhLmS0zglYypv0i96/r49MzR1k= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=NoDOsddV; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988381; a=rsa-sha256; cv=none; b=AWVsYSj+akDjlsw/LI6hiC+4W5pdDhrO38zIkBdCrhYNsRt7aunSwl0wW0ZmdnK63ljz8u NlcsNU+KzpKZS+ohh0yGu1l2kDjY3AbvKj32MZ7oVAiNq5nsGomeDta17lMEFqBnUpUZes kaPF0vMS27iF4gPqutNm55AwUPIUIQg= Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2fec13a4067so263119a91.2 for ; Fri, 14 Mar 2025 14:39:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988380; x=1742593180; 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=EvIiEqJjsqgbsYMUY6NKV1JWZOMquSSP9DBah5grL80=; b=NoDOsddVITIPYi5JS28MnwI8iFdGBRfTCg+n+5j4lMAoT80IEcqLBrT11y9g7UEVF2 pst65CA9B8dbgvvbclQhvyOet6lPG8T6Xrzone3uxj3OQIUC7CY9PLxK9iFSGmvaxmrC VBfQrdpjbPYun46MiIbBM+siAi5fhNyEwavIbrvFZaC7BxdD/Qn4g4OlnNAc3Rp+idDY Q+34iBEM9cfAhcemr606CJL4JxpIF4Zc/IO+1f1PvLvUzkd8M+ZUxUmzA0u88GrG3eMf BhL6bGDhVAgMftJhuCb3l/ZkIUYUOrQ874uepR16JmlEEuY+j545NnqTFiz5GGOjqvG4 8TVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988380; x=1742593180; 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=EvIiEqJjsqgbsYMUY6NKV1JWZOMquSSP9DBah5grL80=; b=qE2PvBRdHt/2nTbnX7HsJyBUQh1BNKUk6AyPXR/XgWMkvxwJKpkzAemZ9tTLQsRjns Qdooc95kjAo77xPE89rMHb/eseZkgKzhvw2SmbJY3d/AF1FNGdFsZ36QT+19bQnvG+5b RD9igMKL+LFqZ7ceGo5QRSYygYUx1vOy1vvP5OdksMk+QZO1fY7Ib0MdfLUuVHwrNh9D Abv7p38dRUhOxqlVJkZj0RUdxUUckN8bECLf3cy5L9An+9l+EEWTuVS3h+sq18SVD3cX Xxy6+dHOM4gLKqUVQ1YnsWd1avesVG6ov6pjBSPpFFwq96z4xNnf8w2xwIGqYSJaNsHT AjAA== X-Forwarded-Encrypted: i=1; AJvYcCVoOgv4pbaSK2EAEu472ZexNydjAY0UV95v5Q2f3Zw/n4qXHst2MyB5cyt2N7ygsGrktCdeLvPVdg==@kvack.org X-Gm-Message-State: AOJu0YwRD81fAF3lXKdqAx4wNkoQSPLczeIlGcYBG62focYl23QuRk8o aV+H4iR6X6trI+Sur8BXEndfI/Lmh1TukZO+Y//tQA+7Qp6KW7a2u/XrQIcnWG4= X-Gm-Gg: ASbGncvDpvcP6vrDzrjq3PxYZI78ALK04uwp8p8VYfVp8S/O66Ii1leDUffA665TnGM 8jlvTjLWaDipH785P5rSXPgGRkNljpyzwm5jPHUMFt27VSi8fEUD8KCC/hUQTpGtB0UVAJu91sL Cw0wFI/ThuQ4frYa36vTS1E6pvy4U+00m+RpWsmNIxGGiSWhR/DCEzxkAA2k8jVI5NKn3n1wAne SJKGigTYzIKR6zHq33XX6M6IHAU69rsXPNFM/pWvPW9w40QtQRdZe44JFk836dncCzc1u4qxJdz iP/dxggaTIxg3+sZ3zJ9OBYox8pEuPcPhedJ5Id3RJW0zZIXwARQ0uM= X-Google-Smtp-Source: AGHT+IF8ug4c9Y+jOxof384y9deWCg2zD3mmcGlgW83PZeg3Mt1WDeZf/8sTLDXIp12wuvsfq/2KLQ== X-Received: by 2002:a17:90b:51c7:b0:2f4:49d8:e6f6 with SMTP id 98e67ed59e1d1-30151cab271mr4923714a91.3.1741988380285; Fri, 14 Mar 2025 14:39:40 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:39 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:24 -0700 Subject: [PATCH v12 05/28] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-5-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: 4zpcmg7gttr9wuqfxmz5ibwkzjcdih6x X-Rspamd-Queue-Id: 735C940007 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741988381-463041 X-HE-Meta: U2FsdGVkX190or1vRIQafzq6ZVzjTvX3puTcC3JhiJxziRmiCZLIZuH4SwPU20p/CQR369QYDW+lkO/0e40YCRPFL1By/7BvSiw/J/RFjlIiq8RMKj76sLV9xj73cZB468bcrtVAD6F7p1NUye16qf1AwARmfZDzQ2mBUvYohpJw8xgUqhEZ2/stDz2NAxNDCSzfSthGY8batrgQqBzidDB1cf4GXNT+NolNPWM6n7F1EJoP6mdYB+rEgM0nsbxSaaMWdNFjUKZGmUSO8m412GVOvBMo710GWG9/sEKllTj9vKxxkKlkE+I9/Pm6Tw2xokPhR+B5r/IiI2UYnKxvrGLppQRb1tjkPRezU/BgZ8kQxNfBezbaYL22uC2UowUTSuTKWAnQBJLgicKQvx5xh0xiX0JoByb7oTcBN7Q2Ligd2QAIYri6Q3l94NgVjE72Yo9CxwhLFc/NmgaDb7ZEuCm3dkvMWi86Xz8YI/fUeeZOZN8Ame0QXGnOhv+yjpw8w79Ijl1qEfrKAfwuDoh+lQyz0mGuxYvd4PMz1M5qqZfL+I1NIlz2IYRJwyNhp81VaBS23mSJXFtH2NHN7VIjOjCwSpZQt0DJjU7b98Y9mqpam355CVfQdtGs1pMGs77dUAILSIJrEH78xs20ckt8+zMpb7gUWL1kp6CTJxGHwfrrIVSrAdhuDeUOBzMrJDRIW4dU/HKrNyUwYfapq6FGiWUXQYUDwl7Vf78B7lUJBztm0GOM4hlyWNopiYA/4BXXKZpv/1DoAc2YoHC9GrSvhfhNsCo6giNxSN0Jx9nUyhy1qMpkQSVdsH28njNEyO9J9HgwuhA/c+g7D2svxKdS4WCxPXdSuS33YVJqiNF29OLZHiDHX01/fSscB1oab3ruPEMUu2OJP/ahStLWiQK5XlSW4sD/6ImFMhqtChq1ACcKRCJd/sC/agTJwLPZUr1Ai9dTKHnz2EfMr8t9eiF SwgKy2Ml 5vfvwpc0WjDtYpzfVRAd2E9UDstqjfEAlGNpOpwihNN2Q5Fh1VvX2J1WQGFcYLhbjtVjRFPGxgfC66lNlp6otTI/7+h4WrMA+qWMl71myNzGJXPhdy40dyJc9yuYmjA/eQOS0jHMb0/G6X1dGqqJKfbc7qpVgChAv6MW6vdDN352/xb/RUiGMhAGbsSBLA9a7KwEJ3MV+HMzYUOb5fTfInB+d2s21OqI7yqZidloQ7RLGzgetbDuPMmYSnDImXzCOp7rEZzcbb9bUHCPApDycgq9Zi+L9015fKl76rylN1CLqQV2pZrU3s6wCecm0t0HsDK08cZIjBfyft9GIzzAgojhfGotfgVvjIIn55EUdJZXtju+2VoDKz0RbHgQmpbI/k+4dtOg3/BUbQD49vlRGGlf1DG0QL1z6IpC9pSm+iY6z1cp65/gLjDrQOGJy1eYONDlpQH0zYsZy6pwbPHStta39xOWOfu70YbVVIwcu5hPF0SmXxmBrGCn5KhQsqoov6Rvx8WelziA7lCscXkuG9p0DY3+vbRYld7evffNHQOhtMogDUuzVzK/7f81Mceph/6Ie 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`. Reviewed-by: Charlie Jenkins Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- 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 Fri Mar 14 21:39:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017493 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 8131BC28B30 for ; Fri, 14 Mar 2025 21:39:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F734280015; Fri, 14 Mar 2025 17:39:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42C11280004; Fri, 14 Mar 2025 17:39:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20B53280015; Fri, 14 Mar 2025 17:39:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id F278B280004 for ; Fri, 14 Mar 2025 17:39:44 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E8DD0141539 for ; Fri, 14 Mar 2025 21:39:45 +0000 (UTC) X-FDA: 83221473930.28.4B79E02 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf06.hostedemail.com (Postfix) with ESMTP id 07828180006 for ; Fri, 14 Mar 2025 21:39:43 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=GQMtMIha; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 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=1741988384; 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=gQxyFEGdxJnYf6tF0dDNzkrR4Tdl8J2Aoq3Zv3gQ3iw=; b=fcR2AqU0dkbFouuJq1Juh5gLjW4UuBeaxpwOoOcPkT6lXG53FvfAzC/bIw1aD7+0UEXUE+ q1mQZBeFmNyOWyzPzdsx38q1SsK4dNj+JN+U2E4NUPVaUijjJhraIWoKFgLXHN5eg0v0p9 opHQgKT33TW/QxIfhJPo6Vhrtu2nDGE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988384; a=rsa-sha256; cv=none; b=aYADMMhcdo6t6NW/TFY71rZb8DG3PGg3vsR+lD4FF8T1dfS9N/BuUb7+tfwYnQRGdspnW2 twyRYObV21GJpJ/NP6gdkLOaFcjjJaiQbdzed9RTIJXck3EmYxxsvF2+UDJaAXE4rYkvJZ 8ZJD04ckRGQpZ2pzKwPsoUm9aKQpBzo= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=GQMtMIha; spf=pass (imf06.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2241053582dso61484165ad.1 for ; Fri, 14 Mar 2025 14:39:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988383; x=1742593183; 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=gQxyFEGdxJnYf6tF0dDNzkrR4Tdl8J2Aoq3Zv3gQ3iw=; b=GQMtMIha9WQAOYIDPYQJtbEWWbER/Hd7Vc/2J8FIJMZJqS9i6S8ADUeST36+UsErkF hRBG7s5IqDmEJUdqh6G+6tG0xbuS9Re1zZWfD170YltU+rAzy6oONqTgU5FDTAqcdvwz YUvyD6FfO5n4jMeMi/Yo37KjvB4hsHaWCKcrf1vK38C3V4vDmsQhPqAcIv7xsKJSQ0yY /GFQp28LniXa1RqazNM5MwmJDFAkWYsFVhw6eYGLKa/AwvYuR4ZPjlfzclVpV88laVmt 2l0KNpFAbFACCa9rDtlF0YZkUm4P7Ch+UnRsHnLyJKlwGc1OmZ6oeFCWyc5jyzSTNFno IPYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988383; x=1742593183; 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=gQxyFEGdxJnYf6tF0dDNzkrR4Tdl8J2Aoq3Zv3gQ3iw=; b=Q/gOMH12cennuicMl/puNMArVQQMIlJneOZtvMdEIm/QDKPH1JlxDNA5EC0ETfp+nr TK7dGqkFIQQ6Dh4WpOWgZlb96wyo5PMfFRi+XSTNVKDnIQGLrWy3IwDlulMTGMEunZeV SrSqYvWwoJyVZcJSC0ySzUEdWLX7bNlOs9heGQItlRVdzLRAUz3Oe+cXNYQbB3TVie8h gslSU9SNM5uFLmh8ZuOx8pH7wveT2vkaLpwSf6nw4T1uwSFUTguDc+9p2nNf38PHHsje kwWoLB/epKlc5l9mkHsX7xPzth8+8hRQ/Fzz/suF+XLgFq6q71zvxR4V1FpD02oUcp+o E8PA== X-Forwarded-Encrypted: i=1; AJvYcCU2SpN2+EGJKSKUiEWRDEkEsgGLEb6AQe0XpzsDeHeXBMj3mcXJbw1qQgnIN5dDj2zQ/NDdwOwEkA==@kvack.org X-Gm-Message-State: AOJu0YzqLgL23EKHfZ1hW7brHSYa45mj/Lk2P+ehrLk0NuVi3CKGIGv4 gtyWSJsvhU77g8p+4L1SUjFkQbQM5rEAB8ACvue2xOF0BRS1o7qTordGRZwW53I= X-Gm-Gg: ASbGncs/zYQGqS0bC0OGQo6hzPoFbiGIf/ekUaibqcD88zjJWQ+BfUgo/gPSdu6O0Hi zVcyXlNZmR2DnleqB/pxh0zF5+4uFfsx1G3X/b/PPfduzrguX+6INb62t9QxtpNgicOl/D4/jno /aQrsPwyVVUWqVbdTeLQi0kqMHiUbJ1HrPWuuBqEvdb668tAnCKZO23n6sRPVXBz3OlCD3ghsU/ LU2HUN5jEyWf+fkbXQqtPDnXIpFVkoETpQK0bW43vg4HCKjIVHhhQozUxVNJieyeIiQFTHq5AAt /PFJ3Vw0VZ58DuwqfvA94n2wKsL7ZnyywAF9vglIaXF6euITTOg2Q8w= X-Google-Smtp-Source: AGHT+IG1XKNpuQB9eoNKiKGV8OaMyZRapBWvcssowC/o6htzWDndePZH0CVmNsc5LDFT4JSdbgFB4Q== X-Received: by 2002:a17:902:f693:b0:21d:3bd7:afdd with SMTP id d9443c01a7336-225e0868050mr56743905ad.0.1741988382861; Fri, 14 Mar 2025 14:39:42 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:42 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:25 -0700 Subject: [PATCH v12 06/28] riscv/mm : ensure PROT_WRITE leads to VM_READ | VM_WRITE MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-6-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 07828180006 X-Stat-Signature: zhcowxgyeg6npwo8sy7bwkwgkgm4do3c X-HE-Tag: 1741988383-593814 X-HE-Meta: U2FsdGVkX1+UcfLoT3fubzogjgrA8Psd725VD3opNn7X7W0MQm+dIX1yx9++/9kRoRQ57JByLwYOMAwm5G/Y5hEbXZc5I59oqPabQjXCujIbeGJd4080fXe/Ezpf+xNt0jnBjHUtGcEgbkjnpd9qT2+jmYmV8pDQvaiseR7jzj0oVOvY/s66hIldMSEjvoznMygO1V+m9xfUZYVT9QgB264CqlH2bKgjynmcQ+mTIKZgpSxjYSvFVuyKrs/qEBsW9GNESKnYjuFwJ8jwlt0R5VXi9RCr5fzEm4pPcOEcQ5aDFQAZURC4ekC429EFbnff/F4CRHrGrdIB+LF/CGkXJk6fE3Y5QcHG9GmRgpiotjQbU2C9GrGaDHvvMJAMgza7z+NE27bjhNqKEf75CTk1mI8Yhc12jXzCsOT7Vwh2JMhZQTXlnbEBtVuerPmO5yuTT8I3mCuL93DSp/JTbfypnQcR/0Oi3G8/tCTxs8F5tqJ0nIfRUktteynT2w5/S/oOW2oFMMBTItCWAnsKOeIwmQ/Vd7HhypS+/tR9UJgxRL7MMPDLdtCJNxr8WAv5g6uNqZsGVCfRf0tOYdYTMbMOlUFOtzoo+N35ncBhQH1fLRGxdpy+Wp8pmVAddw3COGOjb1yXg2N8Li4kRU+EGyhwuBRPIr/9SBLxa7NOUQQouz6MegBU7oU9/A9F5RYJWxw0pL6GfKBulZsnnhhm01XIDV/2mlR/6ssJ+uHNc3UJdBrhgnxytLv4PxHLGGiZa3y/H2IvHAxNkMRATqRGBxFKYJ6I4EBQLmvm6Gabj8dm4/T98/7KZIaqLwKBA44E0WHhQZvxIk7HbnHfhDO2Y7P5WFNYvL/N4utOPLEHm6fFT8Wk4qjMW6utzRWQ5LJdcHQ249orPw40j+zs1pI9sLvBCzMs5ZTj7ky9hAc1QxgUOUwpU1pqbZ7k2HmCMwed6zfFQMMVEh+Vi+AfmDsAqGU trE1iebG jA1yHdSS7oCmmIiweWkBgRFu9/mQikyfqDAWLEaZpc4PTNlEhxHQc2sJqdnX2TOnpiCGwqHY983kfCUaXjQuRzjDZYzfDil5Oa++zLRN00uUrHNXhyCdodppIzAbElZ8AIpadTVtTXNz7CvaoYKUoviueXw1vBKeyiodXNOXUMekEWzMJfLJGtoKcPO/HhE8zVfm0hwa1d00DutjqUg9PRDacw2Gy92wUW/ofnVodhFW+IFqf2i2a7bu9mVY/KUnBYsZjGt+tYETafirCD/oz0SrKnqRol94ScNuaeYpoIdxVUkOdtDGroS8uetqH1QZjv4BmKy95hh1TuX9hNmdUYBcsF0Cpq7QNLHCbiSpATln/P2ckjfSxVbLDHyJpAW7LQsIZoKrWHE6GBDjrx6g6hPlb4CUwvrELkAlnyKYh84MOpkI+Szv0++85rPiISZDVi1NzXaT6Ge/+Emd5VhDv7CybEwCGlMlqPuy8fC25dRvTB8SmZObbO41w6B4LkyOC40CyAF4jqFKC9tT/+0mkQE/PzqzfbFQPLXVZP/WYJht9ufKrrbQZMIU7EklHaPBCwGrS 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017494 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 23C0CC35FF8 for ; Fri, 14 Mar 2025 21:39:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97520280016; Fri, 14 Mar 2025 17:39:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 90004280004; Fri, 14 Mar 2025 17:39:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 664F4280016; Fri, 14 Mar 2025 17:39:47 -0400 (EDT) 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 43779280004 for ; Fri, 14 Mar 2025 17:39:47 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6C8B781624 for ; Fri, 14 Mar 2025 21:39:48 +0000 (UTC) X-FDA: 83221474056.20.EBA55E9 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf01.hostedemail.com (Postfix) with ESMTP id 81AA640005 for ; Fri, 14 Mar 2025 21:39:46 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PpT1EQqi; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 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=1741988386; 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=J0cdClzbcf4jwWk6NNoAER7Uol3lcFHrvU6ecxcolCg=; b=6J7p4WGgnE74pB/uWCDgF+tirvqzC9yO24GYiCz6+4wqZxmBZDSSOI60381hp1hZDo9Kzt 01x9LlipKR4a9fg6zMkA6cuT7QI3XMRXDMH/c5AOZFrZ/Yb9j3iHaW/VvRcskRy26Al0oo WfJFUgUVIC5D7kQS5A/KJBVqDjMcRTY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988386; a=rsa-sha256; cv=none; b=YVR1j35r6uXzlN4umwZGcc/KZqxZaGR+X1QkhX05i3cqqSIcET/COxQ3irwdVxEE+lYzRp qiZYE+A/4Uhxvq84rdkO3bEWDnSHolTuCO3gloh9TDBQZv3iH+mDORqpFjL7pcHnc4UwOe EguIgpddqmSbNcqXLPIvhHhPCCWUchI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PpT1EQqi; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-22409077c06so66608685ad.1 for ; Fri, 14 Mar 2025 14:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988385; x=1742593185; 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=J0cdClzbcf4jwWk6NNoAER7Uol3lcFHrvU6ecxcolCg=; b=PpT1EQqiF4tMt3YHfLQtF6SWcuiUR0HW6+vUi+4GzJ3OMR6oGrL11Yxaqg+RZpice3 v/O/eumQOJYVwXGDFqERzWme+TmsM4C4MNJeKgCRSHuGvhOdjreT9WAKra7WrOt8L+fI 8kC3k+ttV+XWexmhX/pkYiN4gHgBcGHYBn9GqsPJMw4bqEA32qJWXSXGB+6306bz60fv 9o/1RS0gI0rB7YOk+xGjIYbvAnFrco3DdIjOhu2o0QMVvk6yV+60YA80k/34zpduPG+n /vKR96abcnKmUreMN0ZgcPEmajFDUdg+Ghns+KI6PDsLt5TjaRGBVqTrzFYmIQOfVUH9 0A1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988385; x=1742593185; 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=J0cdClzbcf4jwWk6NNoAER7Uol3lcFHrvU6ecxcolCg=; b=sEVu4uyQpfK8oDxewi1v9WtlCbvexJi+z17NrfUNLWMGk1Sqq7+gPN7qVq+i/X4R84 /SX+UpHYw6o/bj/X9FBZfhtZPz4eXVnWqmQxSdNz777yjOWWprzwvW2AUq7zrgP3cUOA Yr5KbGS1epPQEL7rDW/an23tdBLzFvf5iCjgK88H4Da57CLBUXs2jIV2gZC/B5QTPxZs cW4eqkXEug/YQpAQAKsvGcVKXx6FB4JH1TDbso9vUvAKB9jqIhyZ+2xzaYPDAckTjasz jmg+ip+sR9oLjHDitsTgrHrBcsf67ur3p4SippUhibSIWek44OlnjXcHQcZ9Tn79hY3l VrRQ== X-Forwarded-Encrypted: i=1; AJvYcCXcGCWYy4C/7BIuuK/CKnyccfC9CdTF1H5aaUrTtZREj774OKySmRKg9bW63LCJ7rnr2BNc2OfgLA==@kvack.org X-Gm-Message-State: AOJu0Yxfu8qSsX65boDIZ7HwZ3jhPCZGd+sMNCehfoik4h+lI/Aa4z4O s81kpoYM43Ge3N8dGBUp/kVQ8NKn+1Ac8mc3vFNkr+KuT4/8s50rs2TiUhE4mpc= X-Gm-Gg: ASbGnctd480QHVRsN4qqp6R4IXNrOOhKKMMe/n3zmZv9FS1mWFHbtGeTzLiH/kDzdK4 lKO322nlCsBx79Dv6htnpW28VZ9THUKrK6aQHiVSdwXHist9ZWsmLURSt6japNyk0k7obVk+YKt /Gt9YPvArXMj22EDP4peiKpGUv3FqysKAHM3tqtHVubpJqvHGlyXrHMl82JHh5lmEeejwk0V3rG ie8UoOPutJDpfz4Aco1fBfyxql0NJEDxakyiN3y728fUNj2FXKUV5XFkdorkrd0xsNb9lS1aFeu f6yN21fuLKUB7UoXn4kmZK9bQpH4UkHSqCmrunbL8uOwF2wlxTmg/hJR0klq05uszA== X-Google-Smtp-Source: AGHT+IFZaFTcFkxKWE6fnM6U3z3NBo+SecOR6nfScdkNYaVzLCXCW0qb6at3qhL4+W3vIc9ENh5Ndg== X-Received: by 2002:a17:902:dad1:b0:21b:b3c9:38ff with SMTP id d9443c01a7336-225e0aee9ffmr52390865ad.37.1741988385430; Fri, 14 Mar 2025 14:39:45 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:45 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:26 -0700 Subject: [PATCH v12 07/28] riscv mm: manufacture shadow stack pte MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-7-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 81AA640005 X-Stat-Signature: iz4bag5d6s5r4877icpomwertkwydkr6 X-HE-Tag: 1741988386-435353 X-HE-Meta: U2FsdGVkX1+h3DfMHYOvFwyFKjxb5WONVnLkLlCqI9B9cHlXacwtQ5Ew6tB63M4nPatpNO9OfpUj0rXa18dCU2ErwfMism3hFgCVoL1s4rWsyne7zB7nz0Okl1WmwGAOHVuJBuuyqbDGgWjd6d4PvYU04+U0gFEWTbwyTa4vLgtyNjQMsiLscaMnyz6raokLEvU85WJ9qWqweyZlUAkcqh2HFazeNvx2tSSXGkdNHL20bjqQIVDKIkVaTKLXayssSlk0JuVbcYtIDjFXWFOb2gij3GwWjply+cRndrET9X8Q9U5voe8I4CtGHLCUm9dDe7fDj5o5sg+CeKt+//yZFUsKz98C6OcVFuhKwbgF132Vz7+5LEniP83Ejj1PnXg4WgMz4whTDuaOxNk356shFaMLgw26ifUhruykdMaJQoJK4auYGzu5Qzm7mbRovEjuqE/LMcnvwGvEqJdlHaPY/ImHyrEuc68qHyQoXV3dKujJuZKvNTgR6+dcXKTOGcgx+ANDobpI6raVew++lttbtdqwD7mAAz+QC3KwAWg+W369jy6sr6aveNGi2cMYercfVVFwV55YbJfRUCcxlVy3mWWnevSxf4UC7OyQWhJi/7cZyMUFAp66jwj+n0CkPptJOfVvcElB4ajPGjXAWR+QVnwVBHy/vD9SF4L6UmEEYzHdVyQKaUgxbdgXcfFoK/JjZneGSF2HgbeRamtafmCi8ww+AQKeg7d0X2bHTqmxnJFyzJ6AU5cTRXuQIocKCOKH89XK1iMR2GOyfLlc0ZWh/9BwXOQGBQ9dN8fpCloFbA2LJKl8P9AN9FCDYf6/WtPLixpS51LEg91fexhSuleMWQVxinkXa3iTUZH4wiwQqSvZXFo0rBKLACCqYQ449T8pyKi3aqyQlw6Jxj0fv1FCB9tG6mvxG8BY0tFbBW4wvedTcnon3SepafEq6pOvDopVlO4sKyHxEyjl0uSkpl8 tkKvvWkq Lf6G0HgmwrK2fj3TzOpNovW35TrqLlHA2Tyicvwo6hmaEuKqAmm/cHiRSYNnyMLtMB9RV7SYdiwAeWX8By9ztqvhRIkjon2SfKAemDpZQ4h9wADx4PRU9JE5afdDi8zzjto9BAYcRUzwUXG5NK+PVhg9etm/pmGsBvqde6H0huYIfi6+yeDfotoQIVc31dS986SjBHVgvYiFIf6LJR628yDsYi7QbzHAMT1OEQtDotzz4OlLzZJ5wHKZfghUmz5cRGBHxG1K3dg/h1kuySoFcAjg2vHJSNuc+8Q0RpDYrH0HLxpHN4K8P7lAUrfIMR9dVJd2zZXXwJeKmFoF3YlKhYu8BejzBZi+PtuVc89NkdC+p8+MtuDIBahjRYVkdvMu/mdZiEO1Z5wqz+suyg3wRfNl8IrSZMiwTiQkM2lkuN7RHYbCp7gYd2xKlnModOMNsFLmwfF9emRNpzb64shNvhxpItQaDfHoI2PYNkjweTw6Y33eIUSBkGdz+0O6jbM9lJZdTYvBRehq4N7Q= 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. Reviewed-by: Alexandre Ghiti Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- 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 Fri Mar 14 21:39:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017495 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 CAF78C28B30 for ; Fri, 14 Mar 2025 21:39:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BFB2280018; Fri, 14 Mar 2025 17:39:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 36F08280017; Fri, 14 Mar 2025 17:39:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19BB6280018; Fri, 14 Mar 2025 17:39:50 -0400 (EDT) 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 ED665280017 for ; Fri, 14 Mar 2025 17:39:49 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2EC3CB9555 for ; Fri, 14 Mar 2025 21:39:51 +0000 (UTC) X-FDA: 83221474182.08.2E06B31 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf25.hostedemail.com (Postfix) with ESMTP id 3E367A0014 for ; Fri, 14 Mar 2025 21:39:49 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=SWXvRGtS; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1741988389; 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=kAIAgpv3AXe4grYgMLwnUee/eXYDz+xNUbGxtfEmLwk=; b=US5vOaacjvknabTnmDmucovz/haXnpjBjhkMQjWnWuLSegrFiAmE93x527lygAJc6GfblV LZfHoz4OnX1JOLjMTchoU/dhonAaE43xwEhikhC8GZ+uxyLL69VqBUC/PFQBRt82FsTXJ2 1OOfns0xlHkMIZ0HYtQeWcXMqw1tAbQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=SWXvRGtS; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988389; a=rsa-sha256; cv=none; b=WJ8jmMb8s8ojySP1UxHMIDd4aCESrxPpPC+/54AefdL8R5HLodLDHjr0AFJgUcfOlUCuDA +FdzLnsfHvIBLVUA/2qe3MGSGLMxBH5nsVPT/0ZJ8c0TXf/G/0Y4pT69mxMH88qJ2I/2s2 Cd1mxUTo4KU07Lx9PIqwcTA4BwDxDJM= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-223fb0f619dso45704805ad.1 for ; Fri, 14 Mar 2025 14:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988388; x=1742593188; 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=kAIAgpv3AXe4grYgMLwnUee/eXYDz+xNUbGxtfEmLwk=; b=SWXvRGtSmZiPutIZEreCzdomhWpDX75l/M6GQ10wqkW/zsrUiEubpACFrQLMIqjDgN MBr8XIAx1RSOBKd3tK7o2NUzPJjoLp+PyumgV0BC/bVxTCu6G11VAqUI2GxEHN8k8mDf K+kSsKP7hQiPdrV22QiChuph6pJURiEwhXRrA0PmyYByF1Bvk8/W1UZ5VHh1pfy3lmnK JArrrPhC8M7e1FanRzaP+j9wbHKOVfTkC/6QpKmkQ6C09Cmgsog6d90Clb1Z6NrxNwV4 N57NQKVNhR0h6sRrOKSAst7SX8se0u7yer5+ygaDOd6+iLF0vF+RaFK1x45A3UBO4UWF yuCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988388; x=1742593188; 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=kAIAgpv3AXe4grYgMLwnUee/eXYDz+xNUbGxtfEmLwk=; b=OUw9UxzOexegSv1TbZd0YmbOMCJhfj7fQOavjd3ZpcPegtyMCXbYTfbiiBiL5jAt/B yWbnSPvlBWsEtX+8XBAMKmY8xjcRw32dQNnM+awMdzb/Oe3avEgE7vfkxTmyyQ6e1ZH2 hWLq0WRzisCONj8ESeSaWAEsj1/J+1s5s8+WU/gugo5z/6zLkBvfKwlQAHTioHL2A8+U SB8e9orN4mjpzvozl4BvPCA+2k69dhfVrZyOn7v8oASJdO398BRx2CG1w3BxJd/deF1V ghINQyB7lXQksdHva12yLoYZkx0VSAYADU6e8OVo5etM1Q2Gm37jajPTuYQepTAFwwqY FLDA== X-Forwarded-Encrypted: i=1; AJvYcCVguXCUwsuBqcjHdmnlwqdkU6deUOasRUQrkXLZrYc292Bsvi55cObiHMZ74Z49TvoIcZYQN2S3zw==@kvack.org X-Gm-Message-State: AOJu0Ywvcq1zOiI5zeXd8LXJ+CHDj5JMScEgK5bDZsW4G6FNcmwzOjFa nID9NWEoFv6OIFRPHTjCNDhFCwNf6BM3R9rG/W/LXS5YsNKGoy6PZBj4m8hcpGs= X-Gm-Gg: ASbGncu3l/j3JbqBmStKVfqNB0KzIYrv7ttKVJq3Sy2brjrWvIi9ZchK8sofrjDNqN1 BBofX8ji4Z9R3isTOTJDS5r7QQ5eMQK1G1undEqXGNzNz3YCWhdFHItaNVLdFxI9M5ChNdVgTrR bWim0Mee9tQwGRWbd6sL/dqu6qWFs1W4NLjfzV6Ro8n7BBFjsla/3cMC63vBDiwpcjmv5qDLFef 7qOy6FFl3i50pdShK+MgP5CGLole3UjQOb/AdcMqTr/MFce/YP8iHaobAmRrr5vLWZ6FP6UBfOh S4frRmliEs1FOu7u2kquIcKfYskHzJDKff4H9cBQ2gk+ASdxxe68cP4= X-Google-Smtp-Source: AGHT+IHx7WQpWru2fKimtMpSmVFwsTrooQDFYBOULcY3q47kcw+TEVwpgQle1i3yqVDeVf/+DpJMig== X-Received: by 2002:a17:902:d2ca:b0:224:fa0:36d2 with SMTP id d9443c01a7336-225e0a82dcamr59199255ad.26.1741988388068; Fri, 14 Mar 2025 14:39:48 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:47 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:27 -0700 Subject: [PATCH v12 08/28] riscv mmu: teach pte_mkwrite to manufacture shadow stack PTEs MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-8-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 3E367A0014 X-Rspamd-Server: rspam08 X-Stat-Signature: d94rbaeesxzre16188w88inrrc5donxn X-HE-Tag: 1741988389-330321 X-HE-Meta: U2FsdGVkX19+6OvqmW/jPFQvtUEr9aq7j75lvLx061KyXmjUV5lrN4zl1jN4PVM2uDLyk5vildJO4qqrwp80sC/wyHEJZB1BJA8d5z/2wAKUMRp6H9ji+NYKJck6VX9CGLVm3dxSRJl+GHU8njTTelzGYREHoYzSTm3lnTbAYA7V4Aw/g00iItfoggjkQ6gJri+8FB+NSwmWMQQfDuRigDbCEwXP2rJ3bpylYM9IgBECg/huzxDLobGUeMX5E2uC12RFPiy/XEjoTU+WOo4WjgtODl7z23pKhSLOmvchFp/eBbPgx7hJmsWy2idO6CZLanKNFWq3Q2k/0QEwC40J94ikFMBI/+Wm5AVdkbmxmS2sW+DbR2T+vqas1cwRjZpbZNA/Ni5ZxyMqBdmyHW3QbAfolTW92bdrrhypz9fd+oiHp4+nz7u5WLZOR6Oo0hZ/UxOil8OKjtqAzwhs4wWNBhQ6iB7U/DNQsHsZdG0WxDYnWbKAvQkRoCNtTViL/D3XIbaMuhHZzl5OWA+erG3l+nh1QapEtVN6EWFgict56XYGne1gGaGfa6N/RTeudBMPC+TMUs8i55aN9u4nuXvRsc6xc4gbmSRft2I37IJCFgPGbtMe0dKqWFhcH/4XmY5RAma0HS622xbJZwBF3ZLjC8aOFxKvX556vBKP/r79jHmRf3/0fNU/J1h6cliR86W/KW+oO7vJKAidmDRmpSPlwgV2V0uSjkMquHt3tab95oMlC8kIeDOjW+ee6ge9Jwc7kKiDPCpUq4NG/8kiZ36J5BNODTlavUJlrdV+MKbDTVmWkkwr05ZOb2q2KAGPIiRQ7HBU1p9x2ueABx7CZFD2cc+m2z+A2PfqxLtlXa0jNUUzp2+UiHUvnyRPAJrZmN1vV7NMGKHfeeV3M+uwBloLaMPqhuuicCQZ7eD5ChHuXDpexRXOF4FSS2wgIsieziW4osWZfZHUC9pN6lK5tXd z7Go3UkU 6YaLLU8Za7LdveJyhBbjDoUfgOXRWj2okGigSX7NcROzitivM81b5WXwulgTwoZJ0HY1MLS/OCNPyERThI2CMmkB37hAWs1Uk+K6HGue+Z4IN+pCBhayGUW3qgS7on5A8i6sPw0N5cttN/GtPYLeDVWjoWXBclKju6CqoYQ7Ih1r0RHgwK6pnVLP1s2+b4YLMFLkL2rozFwMILpE1wk6JxnwuP9ddv1VANB6pPHByTr+mX8LBK5khOrdkKfbJcl5Kewjed2OqVPHqI1M4RX+K/SaKqrqqdo3KAywos7R5XO+GYFq6+FFhZbz7RTA76fRbirvz0b4CHGGB4DkIpeF50rNsPBBwbnqHYqbd6mf9N6eSjP+cjJD2FSz+OUVgzQ31rzX3zXzVR0RXf1o1j2Qu13wL3KFVd2bGxPvQLQSCS+W/5cj5vI6hsWLuX1W/kUO6ewwC5fYmfqHy90ZXEBJwfoVq0WHqFQ2m9X0ex0eXKFe3xQjpBTA65Eyo2/v/90QIy4JHendS5Vx5opxxpgQFV6h3kYTfewUUGzKWxDYUehHzsopvdKdE+WzGMhpmw8IimG+G 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) Reviewed-by: Alexandre Ghiti Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- 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 Fri Mar 14 21:39:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017496 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 D3303C282EC for ; Fri, 14 Mar 2025 21:39:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61F0E280019; Fri, 14 Mar 2025 17:39:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A604280017; Fri, 14 Mar 2025 17:39:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FD54280019; Fri, 14 Mar 2025 17:39:52 -0400 (EDT) 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 19C7B280017 for ; Fri, 14 Mar 2025 17:39:52 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5459C140FCC for ; Fri, 14 Mar 2025 21:39:53 +0000 (UTC) X-FDA: 83221474266.05.1AADBD5 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf14.hostedemail.com (Postfix) with ESMTP id A3DF8100002 for ; Fri, 14 Mar 2025 21:39:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ILaxd8XN; spf=pass (imf14.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=1741988391; 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=0XcHZdxwrXOxfjvym0f4ldwiX/cDoifADRl7Uwkj6t8=; b=mT42DFDi0hSvxRnL4/87/6X71C5TkqGizAs08GePJ+HyMN1rOjyS/xLchCIKH8GQ4dTNUi eDesQz48V30mlov5g06PI/AQFDSiVJVQq+nFt436hV6cQPcgNS41/XXEOZgd/VXLO6O8Ix oDkCGYW5tLNV90HoOFar0CJYAzzOuds= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ILaxd8XN; spf=pass (imf14.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=1741988391; a=rsa-sha256; cv=none; b=ldsBabQtJeeFYvNRrCcieU2SIGGJJaRix4uENyA2KDLgr5kj2VZ+lzIkw/DjlnMAFU8PaD CyJ3w5FZWVtRxlxvGq140jbppON8vRJABgZ2lusSbd5Uj5S4VeE2FNGslf687SOaX6/4P6 FkrUTRT2po0GpSGH6usZ5xEvZOYrigk= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22409077c06so66610205ad.1 for ; Fri, 14 Mar 2025 14:39:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988390; x=1742593190; 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=0XcHZdxwrXOxfjvym0f4ldwiX/cDoifADRl7Uwkj6t8=; b=ILaxd8XN7Yn0omeGG0ZLnSVfvc5v/YyYV9cUKHAq2ebTVGeL01d+WeCJ8pBWHBNrN1 rqUJBZQ1YvYPL5qWBWMfGqGsGXE+3gM322JrDallwpzfBVoa3W1ac8akHpzCYMqzJzbp M4cbPt5+eYqtiVCppW34ibe1DyHF7UFzUWm33cvIeTyXPuLJ93wFxQfzYSujB/GWhKHD r+LV507O2dy0n6+qiNr56yChrEnH2edNAcT7oLlKY7JqjoUmhq1kR0hEheDf2sat9b5s 9Kj8nk1nCkz8/rINWssb+0Ko7P8ByX33cr9BVUQdVgiEkNdLzbX9A38s7kP/mt2Ose9A pARw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988390; x=1742593190; 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=0XcHZdxwrXOxfjvym0f4ldwiX/cDoifADRl7Uwkj6t8=; b=RNstlUM/CgEK46q0AuY/URYLIAIiFXCEllOcu8U+UoOn7dbgYZAbTWS1EfrMV50Z+y lKnRQGJk/tEcWxkzd+/kT8JJF1OBq4AzDdwGc/QwfZ0sqbUuFzpzS0YEj3sBt02hWJ8W Ps70sZP9FD26ds2ZZ5CMiIa3Lsd8s9+dgCmmvJr1OigAzkShWVZqGQmrT/aEW8Rf2pGi XOB5QGGWYD42vKJVxeZRnRIbxQcKkMywnjgmVimYh1WGbwmxj/ZFvL/CKXtElfYkOcyX 1AW74zTaoJs2tLY0D3aF9TTsVf8yZo0TP918OVsTsDpoGEF/nVQ3gAWQhQ5CBPJ4TUQJ 1DjA== X-Forwarded-Encrypted: i=1; AJvYcCXRu+dFViCS/hgU2RBwfXofpF72fSXZmfErntGmC16l/kwEw5DivzsiusjThmtX1kG4OpdW4wzndw==@kvack.org X-Gm-Message-State: AOJu0YzcnDAyRsG8s08iJQra+nxEzA8iPdiSXTVf391Wh8YktCT7kaaQ fX56pd+DQBVQFY1Ez0GKWrsrcaTNCiv6WXrqXeZs9C79kNn/W3ZjFthknpej6co= X-Gm-Gg: ASbGncvlNkhg2+n2hkVfOeKbpZvy1v6R4C7gK1XVgLcDypGjs6tK1ixytVTfXYEiQ3o aXgEbpvuXP6KXvjEXIdtbTxyUhmJEJZna3mJF/HM016rjbQWP/G6xO+rjCM3ysocpkjADIDrvz7 4bjlKQYs5QUWL943D+vM+uEtb2safOiE/G6uLpXiNiskXu52t87RropThDSYmEw6bF3dz+cjiAV xCF7SBlmn2Pjt9BDK1A4qH6YbDaZ5zpJkFpYNh1yoKy6bn8xFBqsQucodj1ii5qL6NKbtWl2KR/ dPfN9tbM/gvZ/Rde+mMMo1ejJUmw4+ZgZkHV2uNQ2FrrZ3Oz4yKbQZk= X-Google-Smtp-Source: AGHT+IFpAfWeI9aPllc1CwqYl/66ArnIXE3uKAZ+LvLNawWnKsDtpPp8xhAGnGFewoMM9kaYyptgHA== X-Received: by 2002:a17:903:2b0f:b0:220:e655:d77 with SMTP id d9443c01a7336-225e0aee8bemr51023205ad.36.1741988390643; Fri, 14 Mar 2025 14:39:50 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:50 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:28 -0700 Subject: [PATCH v12 09/28] riscv mmu: write protect and shadow stack MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-9-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: A3DF8100002 X-Rspamd-Server: rspam03 X-Stat-Signature: peo4sdme5qjrbs5r1kk6h5h93t9yjmyk X-HE-Tag: 1741988391-974752 X-HE-Meta: U2FsdGVkX19HmtZFDGWnNt1cjoZF13OxXEqLRXHuzpC0Bkq/HaC2Xa3RCJwjssKjx6D/YgOeXlCn8ciBgMRYMu6jMuddvh1h2ACUj7+j+hEoW1m4a3wyvqJ1wAtmsxuzktaImXzGYd8YbJcDr9glP751fpRY5tqdkNLUB6eSwKfrG61WfIF4bd3rdJ55hIUtWmHXmubETou8O1ic6utx3rmvEwZm1yPNZ8QEt7ipkIgOu/Km9ZfWfAMqCfJiZrGB3F+jVPvgyvxURgz3ukiTy7HhZXfD7J+Y4f/PklSOJxw+1J+HimvE0Lem2XuJocoQ2U3RGJJ6c0tX0D3FTJVbmMJlf31UZdXT9Flj3d/JwNPH+pIhpIeyb1/wmB3rx8OPrqtz3JI2YIdzXxQEAAm0A7RLgd2jS28iST8vt+Jec1OHkTHP+/XxUsFRIZXcsuVeiEFUpd2Q9SqPBOCN/WEFQXtkdX7wsjXK68WjkRFqUJxIMzHBkIPAoGlr39vdyUJYw1pP7kORDdJQk1QtBoORxwdtgvRIIzs3wGCEg4gIboVuguAlMf7pBTmBn9cUGWkPnBAXY5PZOr/hNuzDSvwVd66AuuPaqca0TL/COiQeZA+5rQmIidcIG5ScsOtfukMCqxusEOIPcbmvVnZvZ7hdu/Jpvn94HAAxw1ZVbS7R+x+p7BmQzaB408mQXPttvwEESyncuZMdGAhf6FVGnDqp7hxgc6vfa+USGZlZl6P/g0SBtymXU9uJEtlHwxreweTpqHsF3npa75gyRU/0l2M9+mrNUvGRyZV8Iv9Vm7LH1jw18v3vqUDMuWpHsJJKwtTM3lcFN9eqERlplaPeMCJWUxZyerE8XDa98df3n/XGaTHzQkEUfJmHqQ3mk/TEaZ9/2VLMdqEqMUIFw9OVpyMvhJKZmjBs6J5e4GMMMG3DUy3ZjbwdB8JH7i4cn3Fk76gZNebXjJYsRT5QraSjO+R Z+3CduHt GQCFA3pe1i2d3RlCtYA4qehka+p3XLW34pho38lQcZ2czC/NtlB0mrbiHyWc5G4cdDAAnx7IWTmR2cHswWbtjDb2UE/65DSSlHy1MVp8+yt6vrpg= 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. Reviewed-by: Alexandre Ghiti Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- 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 Fri Mar 14 21:39:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017497 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 C6EB4C28B30 for ; Fri, 14 Mar 2025 21:39:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63C5228001A; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BC47280017; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 398E728001A; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) 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 10B89280017 for ; Fri, 14 Mar 2025 17:39:55 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3B6021A1551 for ; Fri, 14 Mar 2025 21:39:56 +0000 (UTC) X-FDA: 83221474392.23.13176C1 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf23.hostedemail.com (Postfix) with ESMTP id 52656140009 for ; Fri, 14 Mar 2025 21:39:54 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=nquHllbh; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 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=1741988394; 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=ZL2v/gS+0+DF34n+ZrnHt0WiY6OgvVWONOJtZHYCX1s=; b=Aw8X9y7rLR8FKwtDGcXgFBFCU4tIHonooWEDoa0QVybgXqOHCiFehs9TQ/+Eezo9UU36Nf /kSaoxpz06IUclBsadWfPa5nPGVI/bKUweJYG4g0J6qIvAg57qXJQp57hvF0SZU8fb8hbx 9xW/Ini1YgUofnLLT/qP3M9j7XRCe20= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=nquHllbh; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988394; a=rsa-sha256; cv=none; b=WQyphwS77+a+FZiFoSEiSVo2924x0z1oVPUwcm5lDtmhcQrSdtFwiQVUvFf22sn0eIxYdq mlfQ9ZFoEeADx3Lou3BP9FF4+d1jvE73wI7wdf2FJ+MASwMMo4jNvZ3R3S2w/ghnlu6y5s hyCYqcxWLPWDwY6XKtrMUeI9dzmQKjU= Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-22423adf751so41791695ad.2 for ; Fri, 14 Mar 2025 14:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988393; x=1742593193; 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=ZL2v/gS+0+DF34n+ZrnHt0WiY6OgvVWONOJtZHYCX1s=; b=nquHllbhbOa4gT0WdijsuMrSjKNojXz4cI1X3I/H/tpenjwMutraY5WMXtcJ4i0lYE giIhz73yAndPTXYZBqzHQ3nFE/LonIuUExWZC77k/aEX4F/e/Ta4MV1OsZDBdVTh8SiZ /uIp2S46EulGY8jFDiI8HDrWzGJ6o0ct2g3PRoc3OYSU6GtVOVW0F3G6nZzRfJYrz6yW zc+NbWrDtej7Wo+R2FRpxeVGc4v7KFSfbcG/uJJ3zblhFHOuvlP6VCmj2/bmQlBf1rRp Ia5HHvNgiiMimv4JbhONk0b8YRve2TffNJdMfacqK+1KaRxpBQfKjhcMDcal0Sj2G3Y7 9VGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988393; x=1742593193; 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=ZL2v/gS+0+DF34n+ZrnHt0WiY6OgvVWONOJtZHYCX1s=; b=Gb/cjqnpJzaGsN7PdlX5cDVRn8REPf1aEcbsQMDjjhgBI7zhrriQ0sbgLXIDxlmvdp AOW5YgFTqgFXKieJ3bBhXVl86m+Ny90XbynlDWoaoxqbH8rJWHGuDM7aaGvYpuiXdOd/ KRUpvRH95dLP2otp1riZwHsm9tlQjbB0nMVvPlHzcjsomGp65JkuD6Jc3tmHVK+YLvhN dLaC1+iLsnMULoXuC7BM3rm0A4LwWRhSrG8KS28KhGdWNyYHZueQUsfwNU7KpeFLrMmT uid960UghVpTc5mYokSNj1J6tbCpEAAeRd+dxlwVekY/3ZWRmTrCfkvd+v3zo/A55cYY zffw== X-Forwarded-Encrypted: i=1; AJvYcCV2TZ28UUw4OduGG2AB+cJmiTnjQ2SXt7I6R4JJ107qaeED2GtOHeHK2ZlyZiWu/wZcvpH9LHdjDw==@kvack.org X-Gm-Message-State: AOJu0YxLRzQZtrOCrlD/3sqXlo2GLtbDw8WY1wwa9VsiEjzg5XMaBn1/ isuAwoPlYROwnVjUgYPiHX6sWY3UdYa3dt3iHFHKahBR8stiTF1PrFhn8Qzdptc= X-Gm-Gg: ASbGncvDgN21FIJdxz5OUKhBWOu7kjx1GW8NE2L1TikXv3v+6geGBoeh99RgeNlviz6 SkOrm1wL3pU5bNsFm2tTp0UKhbQZ0D4B4r85CKxLbQZEihbi9hL3ZVK/+zsHD2dtBqcNff8RBCq x4TeeQyJuGsROMhrVmY3l3LQhV1DGKhBRQ9g06fet6hspimlSywjjirqjAukJXCpX15XV4JKCy/ S0l0gNjOsHApzkx6I0/LiMYqIIIOqYE16Wfo7G0BmIAf/N739HDZaXuTeDHC7U6jOMy2TI8bhjQ LZNKxJl10gr0kmZ2KttHtBni4rnKERKsvrw7ZF8oao/VD4rQ1HCEhWI= X-Google-Smtp-Source: AGHT+IExiBLi5afxFVIy1qmyPdBKTHq7Fhk/9edJe1Uyl1tqXfGvVFk/2MK6lH2iHYAUQvjSyaVdrQ== X-Received: by 2002:a17:902:d4cb:b0:223:402b:cce2 with SMTP id d9443c01a7336-225e0aeefcdmr42109185ad.33.1741988393228; Fri, 14 Mar 2025 14:39:53 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:52 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:29 -0700 Subject: [PATCH v12 10/28] riscv/mm: Implement map_shadow_stack() syscall MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-10-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 52656140009 X-Stat-Signature: 6rmcnq4y3mm8ex4up61qm77pm6sj8bba X-HE-Tag: 1741988394-537044 X-HE-Meta: U2FsdGVkX18CKwJH/Xu1mMn5YiPqFxPTxTzuGZQOfln56/7P7i8Rm3bVT/PsXuzlh6pFKYPIIzktcWSHEwm8gBzzB7p+bWK64jxCWTwJiYeQV5HZuaqB+nS6gIszHhWYC4stC0G+3Ae1gDUNpn1mUQYWOpvlSjPol8HwoGxbaNNhu2RxU2+S6Wgb1Fnmqmf8PmD1FtnWzx+S2aEjjjC/j9IUvsUtdeOR84B8sdZn2CWbS3hvPbHSriOOvwsBlewVuNorBRuDt0nFnEJ7sYs5f8bPQdND/OzPcpgY23AmfWZ0yW/8W7k0prEkfJalqAJ9rMRiedE7KHmyRjVqLO/UxwQCifqua/RWo+beJBaty/wGMFVLUAy75WBJ8r4RXgcAen0M6HSJ4BdoJfuHq72XObkEgjbAI9YtoMAjtpEHsYIOS/RN0qhF/81R4eO66G8Y9hKPD5OClOzY84oDhsQGI9Px6kLysh+vEAy2EXWm3bepfFvlwPU98uAg0ddLet+VfyjaHfA5hs/vU4w50F/khcakmhcoQ3YLiO6qYkx67vu1tjPJSKSH8Mwo2B7B8ipe1XVMo0t54Y0s4pE330+JUOGxEUAQUekhIQfvYRDXUGLNVgNUCCvE+WJeDmD3pxqCrHwp0SfMKmLMMMZaFsHC82uPbG49yK7IrLpJc/EeOq5AT8Tf2A8lk4M6g/dTKyDm7f05EK8P/ANokgqM747OBXmabhZzMejUOeSZklfRqlJqY4CIWE/Ox9btYI2cgJEc9apQZslnwLMd1uUeOjoSDiGUUhsZHGXFtNXISVMdHEzZ2z6Oc8DekvDIkfrYjfMHlEeasTvQ8aiuuJyQRpuhuDU9puXiJio5WwXLVV5bHdkik6nRWkyEPHT92oWLzHMkwOoo7+3iInlWjzb0lGuiZETsFXHlzswn+dPNWYHOTnrB477kO6dJ+ROtvF4RtCuwpFkDbDtZZ1cfxsG7EuC Wjh7k410 SP9KlTrSmFy6WodEoJ+0oUhkWrGQPxTQViQ1dRdma9MEF3jj1VQs25Yp2uwNTeJO6SayYUP4SYT4RbqRy7tlm0EebonxQZuxKvBZQ6InRDF4rDseXP43hRQK6Aygjaph4nxnpnPf5USJIDgV3hNRWmAJ8vW7g6zFaPcECI48CwwTEkvzU0P0P5AD/vyWfEiJmMnnR0GuiFrqxsmvPGNHy32GtvVX22t5+sbtIpaLI70KVpYwtQ0cfeglvIZ29SdV/uQWxKNFGht9YzYk1xkqc0wbY3SESMG/xS6nANy7Oze5WGviqTBEI00SqmK5MPafB9TvV2e1BBPRXbU5mK0pHGkjqOl/srnHrcq9IWntFvl0HdhUs+TuBlF5+DKgwe71sugOqohQ3Z/aeaHY6C5c1d4923IligFJcihuVkZsGy3iUtrpNrVl8O6pcsrGXNst2EWSg1pL/VUnXzYKrKb2EXtFJcJGOcWLX9RzdNeinvp9p/V46fqZ6XaW59qeugHz0zPXqthUFXNMqRevigeFGpOKmLnYYqZ/54sqKjKp/11JZKfz6oKRiA8A8eLr1D3FN/Nga 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017498 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 B0FC7C282EC for ; Fri, 14 Mar 2025 21:40:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D02D028001B; Fri, 14 Mar 2025 17:39:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CAD00280017; Fri, 14 Mar 2025 17:39:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A915528001B; Fri, 14 Mar 2025 17:39:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 840DC280017 for ; Fri, 14 Mar 2025 17:39:57 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B2100140FCC for ; Fri, 14 Mar 2025 21:39:58 +0000 (UTC) X-FDA: 83221474476.09.4E062A2 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf09.hostedemail.com (Postfix) with ESMTP id F1251140003 for ; Fri, 14 Mar 2025 21:39:56 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=JSZyP5QT; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 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=1741988397; 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=DxdMdi2cubLlt4TIGXXJrBSyWEjwvqF79MEiREZoHyk=; b=KvpV69GneDYX7HS+sIbfJWBrfyp15J0c4XXIkgBbPhPPSMjHv0TKgJ5OK+67JWHgZ0wRdq BV0SetdgvDXSrPxE/G/v+1f6JA3LB/tpEE+9+cP7aWFBofOgPofVsyLcS1nmIz+lJBlBVC nasO5tRoKCkbaGpc6GqD3PdIHGwP2/s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988397; a=rsa-sha256; cv=none; b=Nh5rTyqYgYj38R7xGPG7+Bdsr7yU/WL4uym7YwFuD5hP+GeHiQ2ZL+jtGXR/1NuT2TAals 0FQ1VS3EEd30xtplAw/wU7JP3rjz7twq7TDduuVUrgWiIQco9ddlp6A0041LIVBS2PC51Y OmhiFdmpY10GMWkGL0JVxXSI8qgp53U= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=JSZyP5QT; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.169 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2240b4de12bso69472695ad.2 for ; Fri, 14 Mar 2025 14:39:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988396; x=1742593196; 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=DxdMdi2cubLlt4TIGXXJrBSyWEjwvqF79MEiREZoHyk=; b=JSZyP5QTqeyG/YmIHcPeoJR7R/65DfBU71I5cQH5iLeo9Z9crIlu4lI/MAyxOOY8t1 At1faVwqoMU5pCVByO6W0GgwEXiwdaEiwcS4KYUhOdUc6RNnGcVDKxWyhrIuLmCqTYhO VNCAAdOF8jkoak3HORZdhoLQbw4NP4DY7b5Lhuudg3FqkcFjtlQ3l+NUhfPXDYm9pPJf ty2UR1UrLIw5UCsIfXUHROAZmLAagvSQjKcchasLipmz4ybE7HoZkEwkM4zxWwWJOpr4 GY68QdCh0ikj6aL5AZg2BTlhzzr7DaiPd0EnOx86F1G04WaqCfL1PK885s6Bw6WM1Xjl vGmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988396; x=1742593196; 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=DxdMdi2cubLlt4TIGXXJrBSyWEjwvqF79MEiREZoHyk=; b=u9dqlYBT9F65rXVg6+3eGFZLwuj8J7kvkENpa6N6nvkTzQ0L0GtwAyw7dyaEmpr5Vo 2BPe10+tifs7c1H9kOugKCuUuIpXVQzS75DGFLBNiNLJZY5JmeOA8azoFBGg1uucEsxA u+cYgwtfEGDaNwX71a1ztU0fvWGGqfUIR7kCFyTjtY+o55DIsXUXHH/ebjGYFY5S2epU Nqg7mrvp6x7P/Ua0ur8R2VSjtleIbzQdt6dRTidmSTZkJgM/1r8wAgLJhWlXVFzYeVmS MMq2nwiXdAK8jvi4DHZdThziJNTAC+QHZIgvqY+0cmNC5IGdXTLeOY4JW3FiSiYl3zH8 m+Eg== X-Forwarded-Encrypted: i=1; AJvYcCV8KCCEJkwOAdy3XrZreqLIf2NGtIZJjjm/mCBysVTdLiUuyN80JXDZ6AXLytwsp2Ylepx8PnHOpw==@kvack.org X-Gm-Message-State: AOJu0YxKoNPiJYA7q3279h4DnVPSFGcsdnJS3B1pcrz61WCWzIttWSh3 8+b1FXio3RvlzxzH/IyO/Z3MjN1oANz/o3qQ70Y+0ZYCysmphuOGBMKjIR6XDdg= X-Gm-Gg: ASbGncuqlbCEdFO4c2+qhNAaqSHdiHFJo4L3coO2OkiyAEVPzEiSH2Y5l6gxqq3r1oS WIdSuQIddwVEF8CmNeqcIUfoOYwYPmgGvoV5aiQZhA2gMKdui2LNiVWAsfvqDkO8trYEUyEGa2o uYhRN+jXSuY/+2aBdsXN7LUXZaOsFkE+/+Hh6uPPH45RCu5KscWKqorgapWWHYQPKSgyslYlR3a XNWIGWRbWA9+w5Y3VAi1e/mTJwLUvQwsBtdlTbJCZeN4nED5Q+uYuajI/8SEH9H8cz7vOe7UKAr RdRV9Z5I5QSaw8tWOIQOcRPIY8gACB8yeTAHP+lQeCN/wV6y2dPspwO9KuhTWcVftA== X-Google-Smtp-Source: AGHT+IH+xCwTKv/QOpKiV4NU+zofe+/FULTNwPU3AjuhKtiuzJi1q2DiCU071AO1IM2f30UQ36o6NQ== X-Received: by 2002:a17:903:3c6f:b0:224:1ce1:a3f4 with SMTP id d9443c01a7336-225e0a62f48mr57173645ad.1.1741988395873; Fri, 14 Mar 2025 14:39:55 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:55 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:30 -0700 Subject: [PATCH v12 11/28] riscv/shstk: If needed allocate a new shadow stack on clone MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-11-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: F1251140003 X-Stat-Signature: 7zqs9cfbaokeixbqhzt8b1t4b3bx87tm X-HE-Tag: 1741988396-669298 X-HE-Meta: U2FsdGVkX188TwB+TNVnkhAhpJ4fxqaXOi9gXtd2M1ic7DQrLFSpkihERfKmrLtAQMkjXieD/is5/4zyjzqrUoJYxuIQpffobkvq/1x5x5aQ0o+qZc8f8i+t5t2rHPqR5AE37SuNOrbf/fxXRLqrcjJljAFag0GqRaeHXsI+EwUf/63hcUdFTRBR4C2Y8fDqF1cbPRMrAuGv9ro+sE9/hEKDJy9a4o8HTpzxHIP/Jy+zbTOWNS6b9rgAUY9YaljXQoidMa5FA7xxxFO1P5+MRV/Ul1yOBlMruS4qfqoohCwrua3dHHUtbT0zFNn2Tqx5o40JXQQGGyssgqigscHy7xWPOXCSB9YT2RpDtBiEpa0qm0M3RcoLOoke0O5WCBov1SH8u3oT1vuUPOF6B7xoKqRSZjlUTKoBauwtpgjE0MNBiU+wajfP3Kjd0XoIydjPF1FHKJ2X34sj9QbOR/v9h6eFLSKnY5aahFRAqkJ7GJ1HmkcnIPopwrCy2Zr46DBguov58AW9bN+rLIG6lpPM5U9fqu8atAPyCSih7WjsBY5oxVk1PA2FgHKKMxNMLUU/YvXhAm06jjlgESCrETlRhTClczJNMMOGj+hklk/qMfWaDkXaJB6mAY+nf4oKmtEPLXOIYTqlOtolW5dKVdMZy2wZN8DBYJMRi1VpPoBngGQPzC5CtHhDyGhUmbYibJRQgU3SKFsaXLMv8PuLzAsOr0/yw1PilWyZlftbcGqkbvv2RyTgAuxizNlekB4F0baHAOA6MP7UXXZxMQPuk/u04We4hpFZToyOPg8YSlBMtjf3u+E9wRPZRu9xC+3nsqGp7+eCkKcnKa3t4mTW9nI+j9EnJH7Hb30Eg0OuKi+whOsg+mFyUaaQ57QGXesPJbRwfPYP7oOasOj6oXbDLvcVcYKv5xD94bHl1wnXFTrk1M8Iq95rGxFey5l48/JrtYEzFr6t2INioEa1xSdJmV+ zagxcTdi h2o5ne0XqtHtg9vNAGJLR9JpwdZVDGbFl1gFLmcdnOXY82RXIF7DLuY0M2ugi5TjR2eYFyD/aUa1Lih3Q374JjwWWOQewuG7ir7NC4oDyx9q7C6Q= 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017499 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 8A4BBC28B30 for ; Fri, 14 Mar 2025 21:40:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A54E828001C; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B5CD280017; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EB4C28001C; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) 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 5E5E6280017 for ; Fri, 14 Mar 2025 17:40:00 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 87E03140FCC for ; Fri, 14 Mar 2025 21:40:01 +0000 (UTC) X-FDA: 83221474602.19.1C588F4 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf29.hostedemail.com (Postfix) with ESMTP id 96807120006 for ; Fri, 14 Mar 2025 21:39:59 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=attndUuA; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1741988399; 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=FSXRiaPQhF3C8L1paZRazUCu0Au2I7GQSlOCeptG0mo=; b=B7V/Ecxq52mgg0hvY8OjkDy9lTO16J2qOzzzvpmzbxTXdn/CvCIMHFHhRZFBAgnNnV3097 we1acR6ZUKfDTePNYiTHwKe3Ftbj9nzfDXnZbk7a3+hNVv6zemvmBQ8zV6pyvdLSahLs8G XiN3uEtOKDEFsWcxtZr6PLKPi3yx7NA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=attndUuA; spf=pass (imf29.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988399; a=rsa-sha256; cv=none; b=lNGxlxNZwqdJMXOp783lC7q3dfCR7qlbm1499UygHoMSj8fBlt2BIy/vcvwU6swL7cetej HYColtRSWBnTn4mEN+cscRUCBBW6HarwCXsukIEYubhz0fKB+SbHM8FceVlNLLgRwycQZY jdJf7RNViUz2L6JKtKZvx0Tw+TgV0JQ= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2241053582dso61487385ad.1 for ; Fri, 14 Mar 2025 14:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988398; x=1742593198; 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=FSXRiaPQhF3C8L1paZRazUCu0Au2I7GQSlOCeptG0mo=; b=attndUuALlcwAXiFce9rbaN/N3SO57kaSVLDa6piXGhPSWI5spIWNEs1inTwTXYUL5 Ques0vJyzet+81ksfUk+4/LhhDjlxkAOgk2RRp6II88fLqjnelFuFEQ8NJgaCrmATqbw pUnWoW1x7+iBhQfJiVMn+lImMd9OgpKMRXf+eG/Tchb+/xPZC6AC7c17pxWHKOLLq9XE Vmyko7Y3Yc687FVNVFDKQgAElqAAVeP7VFv1DYYz5Z0+tAfugDw0Xjy2Wv1ohr7kNQMb 9n62F1TTXXB6nRFZAZM4Zw+E/NpDbo9l6rGareeh2LelCSKBRXXVtq8oGByFov0n4onG 2R3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988398; x=1742593198; 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=FSXRiaPQhF3C8L1paZRazUCu0Au2I7GQSlOCeptG0mo=; b=qHYXRwXwOz93zxuumPc/xB1w33arBj4hGrQY1Ws9GVHcGNXPlk8X+CcCHYY72AsRvS I6BBL+bMTWGi5Nr+zMwkrlfdFLDIS5dOL0VuJYFkwzgaZ5yFnGrlEe1irdBOYspTo6mg HTnvQ5Iyor3RBKtM6+e+utosC8kfRFojlMu2CCU53Zae2gwfSe5YbLqjU7s5V0f9WVZz Yw5js8x/3wr2o5lRQ/UqxXQQjD7KlqK5DxJFnTgA+4tg35Cr+PTUSXz/dmRTi5V6CnOA 03BOib/3mNiSOZ8cM4+rpV1FsY2fg3D7Eefe4f2VXkv9cBM0VTLYXe5/ayuYiQSkgWX6 WLiQ== X-Forwarded-Encrypted: i=1; AJvYcCVS+U1SePjeuHo3zsnUukrWaCtuFW/TGJChjfX5yDAVG8Fd7ppzeqyQXC8EmlPX6x7rCBPANEjOFA==@kvack.org X-Gm-Message-State: AOJu0YyGrV2/yYl86m5fV4sgBVyRyXhzNQGOjsx3PZPPtRbfU7nMsffC Cmx8fpIOdEFdB5ccOTs+1BWgjRvZoCPaDnUZ4TiUDJxEeFvxsm9Qx2TZeqE7JkU= X-Gm-Gg: ASbGnctNUg64Lbe81lx1BwWuqtXCXcEwnnhK4x/MDLHAxzSzt7Zi2c4psPdQ7Woxbps KtCdgjmsG9HJDufBkXrGmivzdFOwyg+8pDRmP4uyOs9qKuoenJ/8Vcma1tTcChr4LOoP6zyjyr4 REZnmwUiLdVZVLhQXFYbKAChlc6wZdAuK4/070lW4QGPP44p/ijQ4+6NdVa/+UUiZuoXfH6nCUB FCg3/mEzNO4x3iXlV4zo/vytT31EgjhDnPFVg/DZGPtm5Scxf9BU50yZdLVYFs3zkHlM33vlfzt zAhCR8MgXN+Y2BBabTufh3nCstGQzkBJMM++XVoD3w4iixtQMF6rT3c= X-Google-Smtp-Source: AGHT+IH7jCIcDWCYr0Yu49RNZKZq6VgNs1mV3Eqj70D9Zm/jlLYpyqAM9w/Tb7MkRDYTOPVbu+3myA== X-Received: by 2002:a17:902:d50b:b0:223:5379:5e4e with SMTP id d9443c01a7336-225e0a62e97mr58609575ad.10.1741988398438; Fri, 14 Mar 2025 14:39:58 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:39:58 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:31 -0700 Subject: [PATCH v12 12/28] riscv: Implements arch agnostic shadow stack prctls MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-12-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: xypx8xy8frh1ixuxx95tor4yktn5zh6s X-Rspamd-Queue-Id: 96807120006 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741988399-250922 X-HE-Meta: U2FsdGVkX1/bpZV/KJFz9TiobfAPhUNqh5r3uCLuc/mP8H/kG0yiuX2D/hJKu/IueJEdAaREi3Tk8yLyjJL9/kYzNr7GwZrj7o+czRTDgubVooPj/JztbWl2hy1OKbCicGO6xKyHCIhKxA4eWbK7obNKfeL6Ab1RCmEhkeM7hO04ilVfupwb1mGF6aR5dX6q7OFJanJQdHJEJy/RKPNT2ZjZh7jQ870WuaGN5ofZST1XCVSgyF4oK2G8s6ZmKu6qpc0QJLQj/UC2er6NSb8a+UhylG1HXHbHjbrLG2Jva+4RezpVxQVQtVRNwcr3zu2UTaI+WlRVhGqmDv8xBHwB4H8CYcMdJZsBLYugCdmZNWcvF+8eC5KL03xl06iKp001bzUG7IKlJlWMxzW6+J+xYIkpVrFzoNEAwdGaNPBmjZCTQzJrRxdHwG2u1HoVjhWSh8rzbus64XFV5frUWHvUGqckakghxQ2Of5ZoRfJTmIOGRDl4l3fZysmhFPsg7V/qBh3cdhT7vnLZmQbSMzRoD3kbQo7oywmp2XIrhz+q3ncEQe6DcZ6wXewgi+m0wBambseC7CW66eGY+LcM3tFHi0JIDrF7MWtL+tQv7yLyUgSXhVyDLuUJp+hGKHLXTaCIPECVZr0IB/LXRgwV2JOqmtiYnGzRjcyjjuMI6TYce+feMKQEWgdwkfQ+Mp6BlXVp+d8OVYTNbkFv+ydOQMCv/y1NZm3xxmmGvb3khmC/A05ZXu3CZo0ii4RqxHn+a2E7WnU85zQJulpq0ws0SUc2fQdF25NjJkWAX6jzlPomTeIiBgDyYTE9SVBVI5t+kL7Vfagw6AvD5ft57rBZLvkR8fJ3t+TBPrBMZSD/18D5AIwg6wd2TnPlYO6EVtufRNunniASZ/TjTuADQSA1iZhrirYQB0s1shbZyt5FkKDWsjNE/WCrvr/1adhFp7XlE+E2k6gjsnU+dkvbheeeuQL mI7rFRth 28g1mKLOmdhElIfAiIKDR3qm7l4/AEo84Fv5L8G9YWWL6rpUyN/T/xtLLJVQq+re5fU6K5cuGItYMxNe77VLMrNtstMzd1UqXLdpR7pQnEVEEw+dPN8sfm0zlkPIoY2+CBCCRqKbEVUMqMvDdd72hwxTaHy4h2PHufOpHyqyancZpGezk1GBu1qb3OjphSpDmwZcx9j1QJz5C3ckDnV4p4zotGB1RrEN38YWSHV8JDRfEA4votqe0+hzOkP84Q2kxsYlA9t2apgDjvPdyslE+i8cDN71iuduFqzqqJLT8euGmbAZwtQnavqtbkPfPr4zO9OQzoYbMoZDExlcSNgjZPULYtwtEP1GLQdbXlrSKtk+py1Mme7meC6r2wVZgNbczDEuLFsPQALfHgET8BoTazi4ZMlYwMoMdyM2OQ8o9UwB1coKNvjFkzKKsLjEVVyoRSOcQK8q1F7nxS3E= 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 | 110 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 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..b93b324eed26 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,26 @@ 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) +{ + if (!cpu_supports_shadow_stack()) + return; + + 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 +292,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 Fri Mar 14 21:39:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017500 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 56493C35FF6 for ; Fri, 14 Mar 2025 21:40:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E41AF280017; Fri, 14 Mar 2025 17:40:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC8CD280002; Fri, 14 Mar 2025 17:40:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF27E280017; Fri, 14 Mar 2025 17:40:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9662A280002 for ; Fri, 14 Mar 2025 17:40:02 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CEF331614D2 for ; Fri, 14 Mar 2025 21:40:03 +0000 (UTC) X-FDA: 83221474686.19.37A461D Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf30.hostedemail.com (Postfix) with ESMTP id 21EB38000C for ; Fri, 14 Mar 2025 21:40:01 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XCg04qN5; spf=pass (imf30.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=1741988402; 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=onO6gV+gwl07vxhB4is21Yez1q3KjrVLviDZSIMIBso=; b=aK4x1VVRQMHD9Jgg5CdYENFARm2ubjpwV5vQob7NqVHwrclctbm1Lwkq7ZWKjuzFRrQNEU k9VkWYLBfAy5g0hTKCNihi6GxmzlwYCRidMRntieCnIkHLCgGGJWORwN2lpeLDyWakZx6j htbnmUljJepRDM59NChiue9WU8PsCH4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988402; a=rsa-sha256; cv=none; b=UfJmlrSET9IxE+E4fBmmNNP5b01t4EdnVwiCLYD/tS07Bmx5vnswmm6E7pIbHJpP4uodAC 0NbEkCdfhUORQfxrFNTPnLHAm8xZSrZ3gEdYYkX3M0u8As7t+e0GvPprHdEnkediRCcq4n VGRl0S/zWQeIe0sZ/iO6LSg5Y6sVGRM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=XCg04qN5; spf=pass (imf30.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-223a7065ff8so70882105ad.0 for ; Fri, 14 Mar 2025 14:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988401; x=1742593201; 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=onO6gV+gwl07vxhB4is21Yez1q3KjrVLviDZSIMIBso=; b=XCg04qN5CnvEm3m994HDZe1O5QXbe1NCzHu7K13YfzvrohCh6BoM0vofnLfxbc/Kjg 2IZmKepUxvjSBKOadjnr8hdHV8Tam1PjhwJnOzrFfO30ZTATkx8q5V/MeaQAU1HaJ46j R0jl3aGNmojny3Z+g+Iq4tyohwlxHUEa1XSDjU6+rO8P6wFgeYS+sbilwPEM1kX2sH0D OEel6ykZkt8nJfxtRbA8/DK80aNG8ZRUpQV801u/VH9453fuHppyDDvXo2245rlks3Fx CCmIze3C6tevdwzeVbiYSriyCz2qH3Wvr53gimnkNzALHnOYkANhwK66JISQy6f6ne+P q9WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988401; x=1742593201; 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=onO6gV+gwl07vxhB4is21Yez1q3KjrVLviDZSIMIBso=; b=a5LGOUuoEgX90rETKS55cdK0hT9L+Mxlm6hBwZfZcGNLi7fN++Tu9P6pNYTSQZjVlT PFGTKLOOr0TGUwZcQVj4Lscpca2mYN81UZSfuMQvT/8l+FBC8bc1nrVmcq0jYoJQ217X xzifZpQMKcPV0SyK0JPkz99ywF33lF48TMbDwdPEXfHjX7pLF9FPs9+dbnipsRttQAhR cqhBTpre/sspjp3hnBeqLIWmFKIVKDDUN6VdY1zVOJY8TMuq9jmZ2JGAUVTA5yo4mWcz KmvPcUmv7Km8u68jyE5FisZyxdtgRB7cTgHWp5FLlYhE4ZLaPN6YJ4P3/Ktxn01xi1T5 Hg0g== X-Forwarded-Encrypted: i=1; AJvYcCXx2xrBYN78PiQlgX5ifg4c2BI3Rf/XplRRa3oJ8MXt47KLXVZJ0kNuhyjrvufljVE2vZoKRyVtqA==@kvack.org X-Gm-Message-State: AOJu0YwrLUVgy0SLpZ5RF4/UyvF0Ud+cIlNr/wlabAHB3tNUo4agFjrq y9Au7BWgOrEY4wHa0jxudc/Z8ooXMyB1TrqO8pDu9q78e5weWNnpKEGTcaT8HWg= X-Gm-Gg: ASbGnctFhCVTkDFeA3AJTzcQLjr7ta4zTkt3tzwap6VfDQbpnkruZIMQOkz1vIKbJeg UH1HWofOJTQ5YhCJfRfC28jALENUe5cbLM1iOWn9wuavgTaAyrA+fYV3DNDnSvff8GiObZofFWz GYLcxQea5XVtW07+8jIK68GeIBPIss7VX83qQeZAX2/3DQy9TfDtEgz2PgWzGhmAGWniCGTCL+m +fDzD8yTuTFUaC3SDe1LY3bUKysx7psMHcTHjM5nIMYbCPTHBnK86MGuenp+jHxmUwwpsFjzklQ oi9nhRoTr1j5CmoxpYYMUHwbSaZY2MmuJxaj+Cm9KZpgv7Q5kbnLLwM= X-Google-Smtp-Source: AGHT+IFRRNpqWVi1Ekf4KJDdZ9UetFfwRyekdTeabqYxkLE9P/UbVTlwOASvnLTEKfIF4erNHXNXJQ== X-Received: by 2002:a17:902:ef51:b0:220:c143:90a0 with SMTP id d9443c01a7336-225e0aaf01dmr67336755ad.24.1741988401012; Fri, 14 Mar 2025 14:40:01 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:00 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:32 -0700 Subject: [PATCH v12 13/28] prctl: arch-agnostic prctl for indirect branch tracking MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-13-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 21EB38000C X-Stat-Signature: 5cgroehstzatpjg5wyqga3dkp494zrdu X-HE-Tag: 1741988401-97360 X-HE-Meta: U2FsdGVkX1/yLDcIiNHw2ZzutJRyZnsvs44H8wOkzWH/3huI0UAU2Rx6o6epcAakAqkfQakwj5d1wKy9Roc0mqc4XR4Ozn/mu3jlgzemYBXXXFIotu6m4RsYgKgo0qS21BQ4t/p7FQCLG6aJtj6WpmZfOzdqs1us5Liw3uDVSKQAgFOHTZrRu2MSUpf9Rj61obqsmRg55VucovwT9L4UXSIvX1u1sCyxSMIkRCgphy2PxyvPIXu5jpO8stM/mSRL6Fg8gcb0fOokHrGmZoNRULd6t1JSQCpm7pXHzs2ue1cw5Q61G0h22UQan2JP+UwF4AoSsoVCFk4+ieVibytsl+6t0dCKVjD/f4Fg1pkttmPBPmBAkq2lKsO8s1o/23kZo43l7+HMgWhR6pi++Iw6RAImkYVzdjcroltr27mD0L61FO0B4gZFN1saKp19VK3kGy98ugpKiU2IendgLxMGIx4AuGQq7LmdBgwELpZO9t8v4Vhm7LcXd6iJU4z63hq7h2Qhzlu/G40SHSF7f2QNY9dswneFytRPCbTrjQRJM/ArsnlSm4ReIA5bxLjbKGLPPxrIKv9PfDxE7S4lQoo9PW4Ca0ohEkVEPdvMFpxWaOm4cEscUsNciSDkethKhNivSK1OU4Ic4Z41jf6QAHF7uK4Az/A4B9zxzQK2Rzmu7qBkqjvUOi9VSNo1iI/L2a/FKI2RXzzTbczEWVH+U1ntC90Z+15vhgT0UoVWSY+/NTqpnn0tAz1wwBJ153pAHCWpvehDEtANZtWMUZjoM4cI5MCNm34km9w2MstrJgIpGnZAauPzFWBvdbIm0KvsvfcWD5UlxPQ5ta0nqixzOrW1DkwQsAB0Pj2daP3zwPyErb8VpLVlHhB/83+XQXgQV4qtX728Mmjur5K4SdJOYZWRlf95MCSodWs03LJ9vPamr5G8e4weqtiRblfGP8H+jCPmTMCWD/yVrGanny0K1dY h9fFEPnJ io3Fxy8dy0nfY0FWLbVh00vypyiG9v12j7w2/KLGBV4U9RNX9tPKSwQG3dUX3X561PQ/1gCngR2Eq6wLOLL7BBSbIbLcjI+L96R0ubslVRFKNjzg= 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` arch64 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 --- include/linux/cpu.h | 4 ++++ include/uapi/linux/prctl.h | 27 +++++++++++++++++++++++++++ kernel/sys.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) 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 Fri Mar 14 21:39:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017501 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 1CA21C282EC for ; Fri, 14 Mar 2025 21:40:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6CBE28001E; Fri, 14 Mar 2025 17:40:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF3A128001D; Fri, 14 Mar 2025 17:40:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DD1728001E; Fri, 14 Mar 2025 17:40:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 689A928001D for ; Fri, 14 Mar 2025 17:40:05 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 998B85701C for ; Fri, 14 Mar 2025 21:40:06 +0000 (UTC) X-FDA: 83221474812.16.559B385 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf15.hostedemail.com (Postfix) with ESMTP id D3833A000A for ; Fri, 14 Mar 2025 21:40:04 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=r3VmVs0u; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1741988404; 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=rWrKgiNxYfbME3P70C/T1Lq76CoQh/bECvkoPEvcu2k=; b=oDK/sn3E7iu8tqdTW6auX8Rpj/kEG+ACNij2cIjD9p7Tq/yk21Yd9SQ87ZyYDY9RM/vGtt gIfn+q0c8qre8gAy21UiPB9tv+ITMjMGqVTAZEH3TInVkP+tTgeBx77dPr6/7U3MvRR2ED 58QDPWdDyC/FwV9Xq4njqHG1Nw88VaU= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=r3VmVs0u; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988404; a=rsa-sha256; cv=none; b=0ssnsjKCdfEtjR9VvzVXnNqBWl6FVwAtWW3DRBDQLynNSbLP/HrNq0Mrm82OfJjLPccD8J 5jRQRrhqOWPycDiRAyT/pCez7M9DZEaobfvdfhSOvJzWBYiwpEa3e4fzS7udMwmnxUCASO UF5ubiqexyfBnWCYYUici5H6btRAEiE= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-223f4c06e9fso47193695ad.1 for ; Fri, 14 Mar 2025 14:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988404; x=1742593204; 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=rWrKgiNxYfbME3P70C/T1Lq76CoQh/bECvkoPEvcu2k=; b=r3VmVs0u+ivlPic7oM236Z9pqkLfpCNta7y5DqBMUO2grl3hZFGGTO/btqum/cXEdu 90xZIal98bazk4vHX2M3gifw/yY80cgc8bIO3jGRQB/WZPlcpKZ6DHPa7SC+yXW61EWe tjaWAwOl976VqEpb9SRNQXkJ9sfLEpoDbl+0SBl82QNzqUQt/DE8uYd2FiEs5YeuVs/d Wh/sfpggGd8tcJTlF4OF3WzD8oS/XO5qK+IcGsOWNwDXUVh9lWtzO8i73sZaNVnKnQcB eJLa7y78qI5qgRmS3MEh477SY9j7QMsv4dCB2QIrkxfc5MJpko1s09Jz8S8Pvc6UwMda rOdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988404; x=1742593204; 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=rWrKgiNxYfbME3P70C/T1Lq76CoQh/bECvkoPEvcu2k=; b=HuH8jlm4DKR87KnBftIv2VLPHC0gcpmHHQhAS/da2/z8wl0J7Ry9IyfsPLhjj9voXj RNI/VjPUxKXHSOtuh4esKD67rKTzkMNM8iQJzG+Qgi82cEQJzyav1XnL88OnWG5HXEpT DWkjyTObZVOmMXKl+DyEyqdtv4vLwIfqk5yjNkSXzg/FKCTie/f6CnMebpCPEb/jZg7m cHLmrSW6+RqjIBN4MZQ+1RZ1zqDLpLDJW2CstB3NMsPcWV6LeCzWgagOv10oeP1mTmTD dc6btx0hqA+CrZeBvgqGq0l8kk4UURRRRrzxzDR3YB03eiLWH6OQAzOJjyG28Z5oonpk emKg== X-Forwarded-Encrypted: i=1; AJvYcCVgLu/s3oT6oiddkcfeXgcJJ2NWz+bY0KNXWv2nBLnkeSGCvH+bQBNrXt8dOLD0hwwLoSwsXMfoFw==@kvack.org X-Gm-Message-State: AOJu0YwSxqVCgGnnGQ/+Hd4c/xX8kPmOgN0XoPTpq1KbloSizYi55Rcc sTaTOSGkRY/O99PxPdao3gyRVlqKO1Iwvv0suuM8vD2nNgDtDG0ZnRO6tdKYPRM= X-Gm-Gg: ASbGncvE8l8j+CXMLlQIztdzJuqT+bgQ6aOMAq2mUmb+vzok5+AriWReUvTzmu0cL0z zXNTKvlywsfAg0wEU78QhYflGDAqlSpNs81fb0M1Jz43SXC6YkoqyIYLzUAdhqt3J7Fwkx5a5y1 C/ew3XuiWh7sQzoWyrcV42TMe78fOqyLi5LyFzWj31FGHfhcOQoPqlKrk8DzxapTALE9CBZplgT Cou8aPY7uImm7QaQXuXLTdlFL00VMGSxapRH6+izeD1BRdl3x/GWkED7UdcLLXdAQ8DUJmRQ5Uq cASjoLQSbon3IOJ1rwr/MZKWszcNwNnmMRdgbPOWpE+5Bx6xout6XoY= X-Google-Smtp-Source: AGHT+IFB7KLzuKm3iRuPqbgCrAWr33vleUkeuBdLiqwVXE3Idc26W6StRutTcYSVfvNmBJhH5yZY7A== X-Received: by 2002:a17:902:e5c7:b0:216:4676:dfb5 with SMTP id d9443c01a7336-225e177d49amr54022925ad.21.1741988403722; Fri, 14 Mar 2025 14:40:03 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:03 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:33 -0700 Subject: [PATCH v12 14/28] riscv: Implements arch agnostic indirect branch tracking prctls MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-14-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: fkozr6jztfem9rj6z7cirhzsdzp5gdkb X-Rspamd-Queue-Id: D3833A000A X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741988404-681713 X-HE-Meta: U2FsdGVkX1+3k0Abjdt9aCNSdsVcA+acjjE0nR5fVEmCDP0XAo3hOMHgP1Li9U3Z4C+l0XIkbPlKimmxR5Rl63CW8Uo0DXOwhtIpaSpq7xADVfbuAOCJVvWXa3Z1ADJ4oAg5z9WH7iaC+9NQT9fFUOSSMNvMm765Y9Mij2QWmGtbr2lYdT1LAb/6y12jc9Wjctiel3ZGbYPfHNVA4d54bUcRw8gXOK7fHZMJxNbeQvVRLV42i6dTdmpFPnvzOO974+V6W5Sbs1Ny49blDLKJ5dqeO5V0iZgqvwSChbTe+jDCAYb6JNIxvEKgPPwMZRd72mVvprHk3CXLfOfyqWOGAqvsN+kmJgrOjp8yY8TQVEtV1sgHAhJ6EgdiDX4pdavkn6aLDa7ae8zw3XokagsBF3POf5lhEQt+NsxIkxmF5WBpRTVvx6BIpJ4kSmm39yfSFGdCLcp3NgZkGhomWHfxHCFUUlYqipPvJ7KctY2J48C4/jDB5nGoyPIwyjhjXfgx4fRvKRq6vA3sio2JYQQubzXeVIPAd+VWTzWoAE737QTSI1PdpyFVPzuZBUG/XaurGtmNIOrdccfL8ojEKNOBctmqCOO1p38PfPSnXuOh5tMGZBHvpy8yc+gbyMa83Mjnn7YO6fYNpSgFFWh999UnHNUxyubLnAi/jaHOwbV2iRdydm+kZuY4MdX23zuVnnKJVc+2+FTcoJZyXxn5/Sv0faV9v60jkwQ6knnao+MO9gnbLIZsGLPstoa5c7v54OAGgRIXJZAZdQy5HcFbspfVaRvcL6Zqu7iBEdRgC+qkMT02qb7FBFqAtymaEisCWxOBFOB1+8ZyBHR0esIVGPLF3MPgJzN1ZtKUbJJ1PgJVwitvXWCdWG/lQ7i6iBtE6Mdvuz9p5McD+bk2gFrjpe7yiKL64CaWjXHxyEc1MuVoS6D/Ji5ZNEacz/oPqDeIAHx7gj5PuyaLYDNu6mow7MG tRm679EV eLAz5YKt8ZGfNK7eA41UjaBJzbGZI9jz7E3uTWlGcEZ0I/yfpCc14TqbmWJnBeZzjm6KgeFnimizW30ZKTL6AfF70GvqiGhHGUa30WyCj5IiYnQc= 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: prctls implemented are: PR_SET_INDIR_BR_LP_STATUS, PR_GET_INDIR_BR_LP_STATUS and PR_LOCK_INDIR_BR_LP_STATUS Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 16 +++++++- arch/riscv/kernel/entry.S | 2 +- arch/riscv/kernel/process.c | 5 +++ arch/riscv/kernel/usercfi.c | 79 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 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 b93b324eed26..7937bcef9271 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -72,6 +72,35 @@ 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) +{ + if (!cpu_supports_indirect_br_lp_instr()) + return; + + 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 @@ -372,3 +401,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; +} From patchwork Fri Mar 14 21:39:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017502 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 C6F58C28B30 for ; Fri, 14 Mar 2025 21:40:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EC57280020; Fri, 14 Mar 2025 17:40:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 671A728001D; Fri, 14 Mar 2025 17:40:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 428CD280020; Fri, 14 Mar 2025 17:40:08 -0400 (EDT) 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 1F0A228001D for ; Fri, 14 Mar 2025 17:40:08 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 593AF141532 for ; Fri, 14 Mar 2025 21:40:09 +0000 (UTC) X-FDA: 83221474938.25.1B1FACA Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf26.hostedemail.com (Postfix) with ESMTP id 66FC1140004 for ; Fri, 14 Mar 2025 21:40:07 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=GqnSS96C; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 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=1741988407; 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=2Qy+LghJ4/M4JzYV3TrsgP9mTB2OIgCnt82uf+yKrnE=; b=IHY7ttc7SQi+YmtayhpvMb2BkBgr3EvUevCz8TvjNYK2UgmJBnplRbxhXtlj6PvSsdyXkQ thAGLeBBr5+BWUcBXzihBeqWTmEYP8kDElPU9MyheJRM7G+5wvmjek3HIfoB2NJo8paCrl Zcw4UoPHhplMCN2j1q/Yr+11CZ7LfUs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988407; a=rsa-sha256; cv=none; b=HvYm005DbdjZPSYmsjfvRp5ulz9FHViYpahuyxOVHMrAwYovTIKhY7nX5nRnbNiCcx2So4 Ywvy6ocAKT9C82lAeFnzpyC5IoslZ0gLdzyGdQg3/VGlYSQyZEhoaNpT09jGjATwVHoEIU br603I/46Lo1Jh7P8voUSvO5e/CsB7I= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=GqnSS96C; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22403cbb47fso48238725ad.0 for ; Fri, 14 Mar 2025 14:40:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988406; x=1742593206; 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=2Qy+LghJ4/M4JzYV3TrsgP9mTB2OIgCnt82uf+yKrnE=; b=GqnSS96CYKYx/PbiazMHG4Lb6QTwa53IKPImMjIoTOS+xeuSbRQxB1JK40fJEpOFkf Ay5G4xb4NLiMhSUOhupoR0IN96SjH17m1m0KCi8CmI7NvrZIp5ZFb4prcdijljkuxEqz /osXWPFXbXANtZJ4NsXanRJxklzcIhzDD8cUgayp9bjtw+JN0xSksFOvoZ3Q1bw8yQa6 axhNyAY0i5/lF3zOrqf6x3aSVw1Z/CBV0st83dBoS8MsFKA5Ngx8mnmyAyJSevt2vKxO 9zoqttIAnDMJ5JGyYCpxfS9xphFlPvPM2c5vw4TCBcNHAw994iby6AIwge3ByRwMyAEH Z8vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988406; x=1742593206; 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=2Qy+LghJ4/M4JzYV3TrsgP9mTB2OIgCnt82uf+yKrnE=; b=aY/7B0SXHIqpbEt4Gid3el2XLYOSyZSkyGSiEuZLpk8tlzyszVWlXQsZwZT9qjaKcN WDISEzEX5bop7RYSXHLb7V3VXPb4B7IFO+bDmn1jeGzrzLgK++Jhig2LVoeBPMZhhTpi 9nWf27ElHQ6CwhCEoDGoLwH6IYfucLAbxD2vtWTsZh29AWzU8pFYWYMw/tQKAYO1udp6 sGUbRUX3vZyHKmN55M9MmKH++I/3WytIycE55Mi3SVsqb8DTKGgSi8f5QKt8etMtgcvi 9RaHClmDBV2HqY3oLA9gOqEocHPVJuAIVzWGvRZaw0DOwJdWOF2Wtip4rUr26Xf8sJ6E 9vqg== X-Forwarded-Encrypted: i=1; AJvYcCWbTj+pkCHKFSHtbAO1LhjryCyULe1UjrqZ/MVJBkXnaRIlAJJcvTRt7LPfwng2RIv0TC2AS/hP3g==@kvack.org X-Gm-Message-State: AOJu0YxytIAuYO9UrsWoAPRTKjCrMfw87YmHiJmsHsKSqRJcpmryWjBy Q7f7jj+Dbwd9fVEJGIqm4+pa1L5Xz3tghIabwTJTKEgjV2nGCTTJ+lRP1NwKXjI= X-Gm-Gg: ASbGncu1vpVDgt1ltUxpviUVQVJdYlSIfiXTl7kQvfs9Hydq7M6Kil2WoD99hBDQWtM 0xEo/9GdePLIG/AN04HcBuT/x0xGWp9iPzbnkpHnMTMgsi6kpOiRDHiSWfb3g5gGYjHWGLA1gZD BUE1hmUeZueUY/xDnvpT20oF0JmSuaYMN4LvnHJdZlePWm0f0HqwPkt/CaptnM/JVZRDN5WrUPr 8y/twB1vSaOPEZ/73kzO1wlB6k3uqLyDuMCT7sNClzlJXMfDQhS4d7JybADA/fkRc96Wk6W/Syw Zz8OyMw+ejywdUqSlOuJBNnZBRltFhYeI0Pw08MTcwrcvi3npOGD0BLH+vZHPkQnqQ== X-Google-Smtp-Source: AGHT+IFZGoCstNHVFobdYDMcxqcukAL5Q469eJyWCBWchEfbvVnOKA7zPff+GIgC5IBMZVr9zGx+qg== X-Received: by 2002:a17:903:40cb:b0:224:a74:28cd with SMTP id d9443c01a7336-225e0ab5216mr53565875ad.31.1741988406346; Fri, 14 Mar 2025 14:40:06 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:06 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:34 -0700 Subject: [PATCH v12 15/28] riscv/traps: Introduce software check exception MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-15-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 66FC1140004 X-Stat-Signature: iqfw45fjsyq93eybqk5ifqcnhzjwe674 X-HE-Tag: 1741988407-590171 X-HE-Meta: U2FsdGVkX1/GXx3yoCoabsSsfcqtuWRgFCjyQ68TNJCH+L1X5ObVnA6V7q75vkACxLwVB1gHz6jITegmt97phP61pzBcHZuYMZZjtnUiNDTWPRcotC+Y2avDw5iJgJbcPvtSaadgj01B+7Y8JDhFtWRga5NWXj4kGJN0FsG1NGE3cwB8EnDEsAumYQ2K6gGKdG/kh3ZNmqn01H/Edq2zyTOis6ySteaJ5TspHhMthnbGkQLIhcmgPTH95pEHcDpwJblZLZI/3IpdvIxZvNXIyRzN9W4EGtNx5DxxDf7SPzn/oVW88fdfrWtphO1JR6B3lIb/7xDWiw3I0eUhMWN5r3lYz5YcTHZ9CAqJhNyOs+R2xYt80Fg+v5I3lIfk359UIjKO4+hC9CUyK+1TaExPIVs/aPrUo/OMihGyDI9ULRUIN3U6W0dV/dfL/8nnYXxwuEiLdEDaBq+Aow0V5owy1285AKwICRisu4ggnCi61w50SBRbH+cnlE96van1Aw2nkatQuhMLAVB9feJ/9RqMvtZtGUJh9hXxb1vLHcZr0Axftyc/41NgCIjDYKmXNzIiCxyO7tiAwVhO1We+mwBtkEbBg9FOrhOqhUvXAR3hOa6t5GzRpMw7SVBI9XCr9LR75v+yaTAd7aICiPsiDy+9tbYWKCH142bkoQlDgA0pA1dtCz0cYYqqZ4N0f0rd2CbYagOZPA/0Obu0QOK0/5toBD/niegYiZb3D17FOYFvLQMjp0lFeP/st4vDq3cU3NQhIpXOU12ZboTHoTso1QipDwzxQuTfddHke86OFCn3PdgAVgaOMxmmCGOFi9BgFTzaNTuOsy/moW7PGgczRj9k04KOocBxplQDCSrrnvPRtwK7MpRKlEOq+ugPOAdHdMlMGV+a4CPpv8cYQSjY3mqLsv24puF+elkBqCAq3fvz/Pa438Z85e7daIgtfqe1vPyhh4POiv6GAWQe8OvXyiI qfiRLzxp fKBSRk8P8glLO1hKP76TyV5iDtRtDsB0V0TseIkrdnHCqrzOaWgWwVBvF80ZGf1NXPozyRH0KlCg/ZvVpRTfLhrlxgeqQoLLG4N+GWMntEedrGHYLC9TqYug0zua1+wDV9f0yXgs9zCv/L58lz2X3FiQHGlhTLeHRlbq6ELYpZjGI46T846QHgBaDZ69PzGAimgghYmxnhltCi4/3MCNKA58dkGhE6hNOeyeqWrFjtLqhB+8z1Uz+0/AaA/qrWYYD70w2BbE2l1Fa8MeMsO2h1fDliMIfvHNoegKgKWPaxXXTs4/nKChsug7dq4pcWpu99ChZp2DzxY5hD9YgBIq6XJi4Ha0yE5k+9Ef1WPTbO6gmIxKlQk58BtLsOMulOvadjv4NEVX9OVu6qt2UWibbGYF3iG9DGDVsTtNru94tbsyf1PYas+UYdd84EcvIvKb1Vt0riUMUhVgdAVndHF7T1hQW8I5bNYClTW0k437xnJhbNK4esWdzrUHQHCI4ZmQyTihDDSPJU4ugdpE= 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017503 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 6129FC28B2F for ; Fri, 14 Mar 2025 21:40:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18198280021; Fri, 14 Mar 2025 17:40:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10ADF28001D; Fri, 14 Mar 2025 17:40:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E78D8280021; Fri, 14 Mar 2025 17:40:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BF30F28001D for ; Fri, 14 Mar 2025 17:40:10 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0B1ACB8EDB for ; Fri, 14 Mar 2025 21:40:12 +0000 (UTC) X-FDA: 83221475064.04.0C8FA43 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf03.hostedemail.com (Postfix) with ESMTP id 1A87120011 for ; Fri, 14 Mar 2025 21:40:09 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KH6cbUnd; 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=1741988410; 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=prqwnMhjskxAywrKsb3lpT2AAkw2mKmv96mfj6Q3cX2iisFRkYn5qLlpN6WGZgeyxnh3QP 8UjpEKvlwSVE6gsHLs/CyBUg9pywcuCtE/9kQLApd4HdJd7GIoAbP5xUQrJfsJO4fq9+DL GDRMIgE8I8IftCQpCs0yryOPPizQAnA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KH6cbUnd; 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=1741988410; a=rsa-sha256; cv=none; b=CXp8VXdZqjWNm4vp8gtff8p+DhoKgZmNBRtHijgZ6rdb7jEbmi1acaiSRHFFe3AJlmWeeA 8yGuPVJK6ztjlHNl/0EFz3D+HV1Ahi5J51b8ZFaULnZRmM0kRJ1WIONkrPKS/lE/Lxa3y/ /EUofr603zOftleGQ9/kKxSpfr2zHK4= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22401f4d35aso50705185ad.2 for ; Fri, 14 Mar 2025 14:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988409; x=1742593209; 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=KH6cbUnd00LQcJqWfBVX+6HPCqQ1w24ZFNf61so0uKG1RxRCwkkl8JmrkjHiLhoiTK je3ADLI980gGpdzw+sX8UaKVrdW6uucG1zcAuAYLRVkJILpgTFsR8CaelHrqhOBVUT/4 ZbD7Fob+uH0atILqmI0BwgyDuYqJEo8z4X2IKz/xVtnlM/Ba4Lm4yG0VOLaJwjXNJs3u e40tMjHD21b+QekW2zNJ2RROH7xeszwYgL3Uw59aA80n/0fvSIdzmNvWbBJAKYciyfbU wvl0P/cniXdXsAR8Mkx2CJUzHm425vyb32KBc7Lkju2XH8qV+kkNYu91eB1oIHhUU1iN mHjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988409; x=1742593209; 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=sUyCqDfTocbBsv9Kv0aM+IjBxVaie1uU5g+SA3nJkUQOpse6nZnhV4pTjfCkqe2+sF 0i7Z1ZVyvNFAdhzeEUq2TJJFL1T7wf7HPUMEQ0eBIgTK9m48J9dDX4Y/rfg8FooPXw8Y BDAOSARb2QNhFJBWIShuIBnSOcMhfM8ztnp6yR8tBNXi3AdO4pB7lgXYVZO3K9o3B33k 5v8fYBbSdxM3NuAXbjeT+0AjOrTMCrLb8gr7MP49LOPs6sVWufBAkfy+XrmPzEbTSzbY fg864ydQU5M9jh+x00WEg5dsxisQWAbDMRBh5a4MK/sbLvVhj7S+OfxfFZq6pBEgo9wZ xLyQ== X-Forwarded-Encrypted: i=1; AJvYcCU7BzucfDwRAKReHNqoPXfBhuYW+r6rgWWNpiVHBCVLZayqlvzqp2h525uJRLv4q+ygA4I0QYb69Q==@kvack.org X-Gm-Message-State: AOJu0YyW4FIU8ndRO8PWzpRdcDbruSzZy6G3vZocobsDZcugZ84zdpQQ OlwPvimSTDmagkIgOlmYsB+CVyQX8Z2KKrQ8z5LWLO5tMCTYZMJHCq0aNQZs6m8= X-Gm-Gg: ASbGnct/MDdwzW7GmccdIozeczBAjut7CDzzXzcPRuXK1qsqJ6HGWFuSIj3WwJXps8v JGFNzZzPszUzl3uwfAXSSjETagXFuB6uBUgzn84vW9ppQP3znkPFt3E5+BaPyJLg1qDOvDnro2O pPEXDuhlE3wTNc1Hne/euk2TmWbKQ67PqvxpQ3Ym3OVzUxzEOCzUUz8WRzAVT1JaTWi6Wm+wNYN 9lu9sl25N1a+N1Go36LoMWeFUIzFnq6tpCyUz9qT7pTawmWiwhWJQXXbJ+bwpdNQmHgk5sf7/9X hAXnQT4hirlE9meeECy3dGBZod3rJCrKtBjKvAlkJDsz5ftYnwa0/tQ= X-Google-Smtp-Source: AGHT+IFSKd+2xICbPyI9jv8e0eee8m28O0Z2xE2zkf1BJxJdHUC0s7Oxq9dFc7HadAqrreCNrCxPSg== X-Received: by 2002:a17:902:f712:b0:223:42ca:10ef with SMTP id d9443c01a7336-225e0b09816mr52846915ad.43.1741988408934; Fri, 14 Mar 2025 14:40:08 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:08 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:35 -0700 Subject: [PATCH v12 16/28] riscv: signal: abstract header saving for setup_sigcontext MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-16-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 1A87120011 X-Stat-Signature: kpmtawui9s9t4biyw8ggj4cw3cc9xfey X-HE-Tag: 1741988409-84534 X-HE-Meta: U2FsdGVkX1+A8WcEhz0nsPdf0rAPf1okvBZNomInrZaP8iJzzbHe6rEriCwviy/Nmx5z5ZXwrsAfCyac4bdS7qFWVimeXQXUPdIiZ0r1L+UzLjd0+bioi8hBf3cA6FLR6oatAslKo1vYZYqSHYGc3+Rp5vr+3SIApr8Fdk54uLwqxrJtsJueyvpbvtG+/eVWYUnwcc6xA9EzqtaHwCuV+DwwvjkWSp/lGv7AIeM5ftQgxpkfNi3QN/QQ2wpmYF/TvG34ApPfeizCqePfwYatfFBYwv1Xnpq8wdfYRG/lIAkhkcXbw7w6mgT4rJfxlwKq9SX5Xrb5MvhwDpXuc642CS27YkLJquizawP2YxcqKHA8w6TiyyC+U7F1Qsg7Jv15b51aTjwcLB6BQ1Iul5YFn+D1VBJjQkrB8N4gDX3U6D54ZTCaL5BRBrVTeCVuEVp2WWhDr40xRtzGXcbERM7BnhH41wppE3kb+ZqpwgbhhTgW1qISIdR6JWgT57QjL17OmRF2E60Xw+iWbJzUiJ1WWWRCvw08IP150FlZCwd1r3zJmIewXuM+22SQo89UfWtHF70OEQpIjYRmeF4S+dp9zjOhgo2Os+mg52RA8ZNbkVnkdVpwy9jtRWF1QG7kASJZJuuvz906bEG2yXLyNJhApqqHDmQXs0UcF8zthhkWeGOSVU3VuzL7687JkmFTHnT3Jb0AO/luMqokYXvg6cEqf6ysrNbc7XAV7uml/5yNXdopUcCvKgAXVLofJDVIOat3hYY40wlWTu4kDVVMNTeueFLpaJUUiibB5LYizQE4Waic/G82wP2oHY01dPVtYaOGwgeUovmR9iQ7XSN6Y/IZOdwTifW665IXnke3Urqzb+VFhatEpF9GFzkTQE6Z4lavDWgKiVCyJC5QFOTRI67JVJ7rTC79yl5Y5tREO/Dk8LjaQzQj62GFBg0Dw2nyJyJSJg9JeHTFrUMiZy5fmlT lPbHDP8k m4aEq27BLoZSu3/AbnqtV/V+aK2Ry5gGGjYGZrAqrulau0bdTIs/4R/wfIHkYeth7j135lI5pKz+ua9h6INn8AbUI/kQguFdRzi/h+E8B+wey/+50ldwAOQr2D6itpBRaHXe5uDndEZlgACgsUGWuQxZP14VgqocunmtYbKSnEjAyZl3RkoJ0f+w0E3o2axnlrUcXDuMQpDJa8Ez3cIAmeJb2kAv3QX40/7VMrOn38NzncIZbnJyAMXjEXPXDybHo4HV+6u7H6YTlDkCjDiJWWjGiLldlIJ0X0eotEM2xUO4whpxVx6KbzehKaWLSh2ZkuiFdsO1Knj19JUrt2Sy0cnzRq8yn84t2F8m1pWsofH5XvWEge/CS9EvuLHuqxKnvqF7GR7Yoy8H+CkpHtcLrYoxYkMtsIX1jD0WiqssRi2WA+MsphVZzBshUKaS3Pe4uZGVa3ofedCJ4+HS1kQWY/hpOsDUPy3sa8gi3 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 Fri Mar 14 21:39:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017504 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 ECA98C28B2F for ; Fri, 14 Mar 2025 21:40:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C6AC2280022; Fri, 14 Mar 2025 17:40:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF2DA28001D; Fri, 14 Mar 2025 17:40:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D1F5280022; Fri, 14 Mar 2025 17:40:13 -0400 (EDT) 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 7538128001D for ; Fri, 14 Mar 2025 17:40:13 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B4DB9B8EDB for ; Fri, 14 Mar 2025 21:40:14 +0000 (UTC) X-FDA: 83221475148.13.D1CE406 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf23.hostedemail.com (Postfix) with ESMTP id BE4C2140007 for ; Fri, 14 Mar 2025 21:40:12 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=WKRlZC8c; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988412; a=rsa-sha256; cv=none; b=EsgeP9Ipg4RyOmyYGKx/fKKyCZwM+CQSKdaie7819Azp9AdC3GRTkr/VO/uK6ccN2Sa8TZ XbQ37uW8BXrGaz0Xy0QtbwFuM9VE/tsN6Zh3yHPhLO7fA8AYlq7LLFTVkAOSCpyTTp4GKX q0/Vol9/sbudxakSXGLgZ/Vobq53D7U= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=WKRlZC8c; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.180 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=1741988412; 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=ylS/7auodeR2tA3gsEjRjjzbbCoTIX+8VvBmJDYwjkA=; b=TrlnPFnRuWm2f17K4tVNJPSqRiAstXNj/pZwgZM2R0moqBCNryzlydG7f8Rum+eu32cbej 61pRqbm4/s6uSrd+zQTHyCM3KoOKzVArkNiMj8IjOGrYObY99rik1VWUxrg7OIgt7ciSzU 1fqsbATcvKOC2X/YS0tYXq4vLQAzxhc= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2241053582dso61490775ad.1 for ; Fri, 14 Mar 2025 14:40:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988412; x=1742593212; 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=ylS/7auodeR2tA3gsEjRjjzbbCoTIX+8VvBmJDYwjkA=; b=WKRlZC8cLlup9/CIRwaTEABmshV2bun5g5Mis3DirDC6sYcr3A0oTwLaWcLNakcAzQ F6BXSA/yxMpi3HLYr9fJYJ55pGscs7q+ljL8xRiwP/VHJTWJkuxuGPiLQTecoinBfZEo bbOApm97jaXc7JWBfy4NtZaHbiRdOoA/xe3yuAsOWRjyzcQ+XbntGleeNG0eeCfdtZXL WxUxwmtLTHx7ksBthhGc49rAxb7cU4EDBrYiM3nmHLZOa/fQltyfz7mI1mxPhGAS4ZeR FO6QFNdELbBO7LSiCAgDJ+hqAeGxMda4tLNum3lRBUcg5kN9c4YTn1XGtKt7LkjLDvtD 5C+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988412; x=1742593212; 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=ylS/7auodeR2tA3gsEjRjjzbbCoTIX+8VvBmJDYwjkA=; b=QyiSqkFVtR/8W0tT+yWhAjrDdUb7RcdYQtadXX1iZXOrCH/5AMx+rB2BZAsY+S78dc iyvZvE2q3dQwVYc8fJ4LwiBPVHETivvPupSckJB1qTYy4Gwn1s8GCW5AiVMfBt3UHFWR Py8Xj5XRzxPAbwAohqcAZFTQt/WTn8eVqXoijmi6YL8Yt4dm8dd99UErK3ZNbBT1saOS uznNaPJawqlBIKWqVzMTf/SQkqqwDwAPv59mugj+WbE/YENCaFmfMWmgQU4L/wbcOvLg fB94YCd4LOFrrgRnPQfxiYdUDVtFI+SBt4vY8Zb0AIUyioEKrfDudNMsdViiP1AZM0Cf XQvQ== X-Forwarded-Encrypted: i=1; AJvYcCVBOiFTPvmp6IdsPYQWzzxjGfpJ2txqV/npwAzqo3ntFdpsjuxZUc6FtMtHJmspgfsMoh97ZZMQPQ==@kvack.org X-Gm-Message-State: AOJu0YwUANW4b9IRx0hJgZXheGOzEE7zpJgU4tKbkrweK2FWVMKJd7dK OZUZYYtxn3+3BOdwfkMBxOait1tfJ678Yu9s627XKc3kRbCSudB9T4U9Qu61cMw= X-Gm-Gg: ASbGnctaAsBFqAFmU5PdOD9Lr9DGpsOeP+gZioIPImLTu90OwXH3+o35Uc2xHUD9N6X yqtfGL7sq2q+XmxFsGuKF/p2UM8KUUlIS+7fEwovf2SAtmnbUyXwJm/zEt+sjAhWKAIrTOCsUzG nxDrXdgbVFipQg2QkU+et6NoSUrxfGOFHU6DN+wT92ds3HUGpLKZ4Z9Q2uxC0hiA22LDAukk7nY 93C3L0pbuKMUYBBM9bw0C6R+Yv6B5fZCXeLEbcDnrRNkiDR2J9DKwLTzLF8dmf9X/itaNSm0P7p hPguFrXRvxDs/LMWMrT2m4wf0HPfHsUNgl64z8w8UtWR/2xwMypH98M= X-Google-Smtp-Source: AGHT+IHOxFmuAegtqCte/c3FDu53tbalBV2n4me+J2S3APOVDJM7l3Em8+cF8KvTD/JuSP72+ZiDAg== X-Received: by 2002:a17:903:2793:b0:224:255b:c92e with SMTP id d9443c01a7336-225e0a62f23mr36836485ad.3.1741988411683; Fri, 14 Mar 2025 14:40:11 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:11 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:36 -0700 Subject: [PATCH v12 17/28] riscv/signal: save and restore of shadow stack for signal MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-17-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta , Andy Chiu X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: disbtamxzjtn67a6mxuo8rrmx69ch4tt X-Rspamd-Queue-Id: BE4C2140007 X-HE-Tag: 1741988412-359092 X-HE-Meta: U2FsdGVkX1/tel5ROv3+Pi2EjlWD23HvwO32d+bhVIG4B2YMVL4c+4mmNvaurPembt74tegODS/0paqYydQEHVb7/4Zu7dUY6eUM28fECeJI34BcFZbbaTQs+WZsiW+NAHx4MXo79ePK1JZG46GMuyw0J20635y+qaOMmxrLz/fj0Q2LgpaAKkLXpQ5LeTUDPA89Of3B0G8Md5zHt7DrR6o6sgyI+hvDIgA2J3G3xGSRs8LR4yC5MKrQw5eMv7VyySGU+sUDS0kS6ZuEkQcYjN1k6vd1irG4zvbQ7zgTFLDJZqa+mcBixHqIpleQDrnW67J7IZqqdoL9OeibolxAgnpZ/mUbD7I7GBqSOxLSQPl2UqygDLFoCn4AkTJjg3USSJdcOpanF0Qat4Y2OXUkX+U6fbzKUU+E9mvmZVd6KWuA7tE2jTELEkDHV5uVa9ejnszFmHSz+HKQ426GvGQzxh5u51K7q4e7MFoasmtHih1YK3+ZPYFCF3s+FBtTLsei7Ty7fUdhcW2zwTDrHJv6qF5MpSR1qxQrLaRWT/y7iJ2dvobPy2KAzRHl0B6JOYM/+E/80JrQ7ukfizkd6ByFIlCMvcauj8CYqm8EY489GmPDPc3O4eR3z0EKCaV4RTTzrwYlUwUi6mh+/fxb2dAB9zDByxvPvtbDSKNQK7UHNnW7xslASNd9wQVGNRWtTmmLpjkJW/QYtzjsPhwhaaEM0T1PJKvATapKxJm/AD1CxHNZgRVl+PIO+aKcWmUiuYiHJc+o+3t2j0eCul7+OXC8Hi2bwCH/ChwEtYZNllwafitK+V4WjEQjHq6D4SNktV/HC8gjyyUb6e+2+tUGsBTnltOFvUOZpwkNghnHG0+A15Q+RVLi0s1bSMtE2i12I+3cs4NDFUR16dj+UXL3eg6GC2LfUgSl9u+JOOl2STCtTXVQQ9k84mQQcu6PDOIdtgRRzfPv+xR9m+/IsDXILy7 fj8CfW2M LSNR1G0lAkL6nYDT/rkCTZC3fbtTh59tcHx30DAxgXMMb3W2XQdlrvA84YOAWpdjHiftxsDAVyULzMokEYJLmziqeRc2qG76KzAQgoW1WwvYpMbSzt42fD8L8wxB7nRQC9RFWiU0XayPFo+SeVL7QGjlLlCPMSPhdNPgO9Zlp3t0fCvP2+dl9/vfnp4sApSQyeVKa0ROG9ei82AScLvlDn1zA90sLE/JIiY43SX5Pw3bmlE4WBSQXXbgMdyEWqhS4vVFm8GVLh6rHjK356h3jj8y2EoPLuPVHl3raaoEyCcXMtg3m9NdwBXpJjsYhHuQHBOXAOdhfArFS7j4KhprcK7/MTPwmNnvqhL8yibEqdC/hWSwdQUlBFiUGASiOv3eLFdfGOztcDcmJ4XiGyE6w4REEqJetvaY/Y+Rh29J1RWYbcZTp7/eJGdpDYteHSlffliyePsmm8BFEuO2FwJxU5U8fBz7Tw0UExBUsjmddt2OdysFMSGbu40duZuRlM9A6JriAV5Dbnp4AV5I= 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 7937bcef9271..d31d89618763 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) { if (!cpu_supports_shadow_stack()) @@ -170,6 +175,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 Fri Mar 14 21:39:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017505 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 B8E6FC282EC for ; Fri, 14 Mar 2025 21:40:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F30E280023; Fri, 14 Mar 2025 17:40:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 576B428001D; Fri, 14 Mar 2025 17:40:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F0C4280023; Fri, 14 Mar 2025 17:40:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 130F928001D for ; Fri, 14 Mar 2025 17:40:16 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4BA8BB9976 for ; Fri, 14 Mar 2025 21:40:17 +0000 (UTC) X-FDA: 83221475274.23.EEC48BE Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf19.hostedemail.com (Postfix) with ESMTP id 62BD41A0002 for ; Fri, 14 Mar 2025 21:40:15 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="H3Q4b/wS"; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 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=1741988415; 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=w+UtvKPO+nOj7Nm6ZthJK2yWpv8Fo0RNEvZgILDRH5IJOP+vwViS+IkvF4ZUTpLg1TJWZC tT+do3VFRhi/UIrHoFidMFEk9m2BK7rgBPOSAZG5qQeFbb96orvfu4/A8tobkwtT8GUv9O qG6b0WVM2Q4KLoUNKw9JP3wfh2Mdqdw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="H3Q4b/wS"; spf=pass (imf19.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988415; a=rsa-sha256; cv=none; b=iPcNEpiBbpX1ybuvb9NisdIDOvXV2HJY+7ccqquVVjQunC+9cBrKVqEfcfTrZusr+rsf3S 3EpWpLJxJBqEJbxvMW+MGaYIwKAfoqjPhCJmTZTPwxtydHampOAsaGe1B1lCgkFZ7N2wjB 5dX3viZh3VZKWIzq2M94y2ldlLTVzcQ= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2239aa5da08so52112225ad.3 for ; Fri, 14 Mar 2025 14:40:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988414; x=1742593214; 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=H3Q4b/wS48KeGYQMGbpW+Hrw0Kepf2nWp/SIIGzOr71QQxcEiFnC8BB4QLQ5otY/bS PFNeNHvTuBdmlG5P7HlaN6/xZRZzVMUKFChsXVozDoUSBb/zlXNc/qvFIJKuTvmb3HUY 3o8U3w/WZjVrVZcTeGYmKLskjLE278gYTIJUXc2yAjZ8tMnRwsv8VjsPpXslNsovsUA7 I3xXSSh3A+RkZi7OGRVZQFw7HOxQyPvmk0FPMalR4ShUnO0LHiuj94H6JTAkZjzbUrwv eq7VMWYAz8I76uMutzRzhVzol/PZItdN02JiWzN+XOrP5xaXDXDwztm/M+EUaBcSVOQk MIUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988414; x=1742593214; 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=MZSf5p3yNWNnoiNr7LbBHOlU8gOt5JPsLUJ+IwXHnxf6X9yhK3Lal/p2BWED9S2Ng7 J2VUAtib+4JAt5o0QVTOKSt6o+q9dwHJBCAOay4g2yVaddrdNnSoYf4FLLq0TG/rlyXE p3Bzk5XUDl9w0bhHKkyc7IQM+Q6HIKR9QHvwF5iSyT+HvRHDxAhwCMHq6H3we/KfVyiN 1eXgEcP41QOmzxmku3GCZ2RHba3esXO329mDBePZiF6eabHCfnlCW1WCD6urjxQm1Msu frBwfSfx4kYLa5/8CJAuBL6ZBYghsn+tv5mJsEcNQeAKwE5P8P0gk9H+LQ0Ky1UuYq2r cHcg== X-Forwarded-Encrypted: i=1; AJvYcCVgAp/U3c7QUOJjL4I7fCBl+1nmyGOxtTFGZiYSf7rSzw6ykD8404pviqijQhWOsfIJ+Sl3tZ4GJA==@kvack.org X-Gm-Message-State: AOJu0YzYZPXNwvlE6QIGHw1s1g+EhpyiG2pKDZgocFrHEuhJMk5I/YwV zHrKCOideh0iKdP3wSIRUQ+NCIYgFaFRvaZH0lStIW2jty1L0+a9lSh0+VxPwjc= X-Gm-Gg: ASbGncvSQdl2opVdhyXy0H/quG0sG3gWZDixEfhbeVHkWADv8nJ31/CtvwNkwTaNAf7 ty3uBKcfsojdr+sWdFVTyZqi1H9ADHn8kExBk6eFnU/aOszOiruLJEYGqRGP2jabnnUzHlyKZ3s IkaIZvGQ/ohwAXglrQH0u9w018IZzlsaYIy7VWSYL9vXKlut0fULL5Tntf1BwKQwM1gk1R6v8Jc 7c/RRMngZ4fmPBYCNlGYoPWBqofMt89I2buaLPkfXt8FyDdhk9NW8R55MBOy43+t/SyYhU+2lcX kctLlo6W54hj3Vv91Hei5Ual2I2sVCnolVXSQG5nu62aBUR82dTpvCc= X-Google-Smtp-Source: AGHT+IFf7KDxEVU9NtNTwXHHWwqDPalXGdl70DI+8CNTgQz9PWl/u1/S9R+7SGLAPbVztXvT9lTY2A== X-Received: by 2002:a17:903:18f:b0:21f:768:cced with SMTP id d9443c01a7336-225e0a1644emr36247295ad.8.1741988414327; Fri, 14 Mar 2025 14:40:14 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:14 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:37 -0700 Subject: [PATCH v12 18/28] riscv/kernel: update __show_regs to print shadow stack register MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-18-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 62BD41A0002 X-Rspamd-Server: rspam08 X-Stat-Signature: 7ag7zcsnzg6nx7khyucsiyxadmzopzda X-HE-Tag: 1741988415-795469 X-HE-Meta: U2FsdGVkX19DaRSA06plqGrpJXzPZaYLJ/YYzAO1OLvd9g/OqCX/PGhRGrwi0wIN66ICsiDUd1IJTcDl6rIe7ADUZHqHppHcrpkdOenpp9XvCdA8LFwTpxHyMBzsRqvxoMnDgXj0q3GRRsMURwWd+ZmM4Ufhna9z+p8bFZMuaB+9oui4/x3PyZCc3K/2vsu46cZ0QZhPj0BPXwTUdeFeUPJWeAroCpyFIVAYaBOa/vuOMD/fAV3F/yIiPG9Z0FbpjCXPo27s687V2DL7oHa5bhJBmOrvWgTMySUEBV2PDQ6ypBnwa82qKBYPzlNxSjerBrNO774eJ4hfwrvRw23Cj0FTN4ojP7HnJTTCeUnh9scccUKRAB5WWv5Usdm781XL8kuq1drJBN+EXcghtP8CYoua5jQ8zrKLkODLs8oN7za8rqoFoqUH4w9xfgAERxzmIKd77gs2yEfr0bVx7Is3ifbst58yzxRmCdb+r9cJua7Htmo9WaZ07maz+wHJvHzjVNrTMG0ugmSxoaARSoV1gi3ivZOtc6K5EgmBNc/gUp+fvzp5C+dL4vN/Iz9EH0reCgYlj1j3OhkR9PiteCV3lmDLmTrUBmVZ3ITZQOeLESydPIEZwtgp5tbQrm23nNsJwZsgdZtpblWHUj546JtmQrUoY8HGi799n9lV2iCtFtzQb7J/k4EQu256O0c3FfAQng8JjRPheC9mG/2zlPYfN2vonoFBfgMwlSbO4L9sT8bFwJL+Swb3zyyqQCAJyvMIa6xtiAFOsWvHWzPqyYhBu9kdWtcutCg9xT/0xO1GYXd5trsj24ryV6ETPsNLMe050hnoBgC5yQzp1vjw78zqsvhr5ARlpFJ4GQHR8ALn4Gbx8tngwZa2latNMpimP8MguLs19dUhov5whIZ8Dst3SSLlXvfh/06wMfFFvn+hIHhxsZczP1Euhd8Mv7Khka12KE1NDKI6NCg5pcrcU9E B0E+gyX/ Y9fEv+hrx0l0+6yMBJRyGtW9dyHZeX1nzoI34KQ2VuarhMgvCgwU3AHCwT3OITH+0BwL2h+B5mrM9FQN82tnzvNYzeB6CZCtcEhn85fVXHXH8Se2UeEq1FdKkZw2u0Qkz+Qp81KZcWkZ3il1to35f/Uvq91Pv/srpngwpQb1jCsrhaFdE4GHSZbuxDwMvG5WXNBiYH4o3rZYfrtfBQT3phcmYoexeHMtQtNXCrVoEPLLNMXFj3jWO7I/AuwP9l4bTob2jhnCLPN5WCljoEliYc4ulVhafMJ6HferdBexWjQNx9tDvDZjuznDkfMvHTIp/rFYEIOGFObwrSo7B602ZVF9jM726KcMvQQiaXY47BtYeXdihNtvr5R2me7jOh3d6jLUmtanRzUnmlRUk9GUNlB9v5ncxnV5330nvc+ll5IHrbC1zeUNMcSIYLbG3hYOX7sTe04ThyJ4NhlvOcY4xDs2z9/UYHZJwDWCkyPJPLrXAxeV/77uRF4BruqSYvmo05eQ/ 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 Fri Mar 14 21:39:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017506 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 647D3C282EC for ; Fri, 14 Mar 2025 21:40:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F6F2280024; Fri, 14 Mar 2025 17:40:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2841228001D; Fri, 14 Mar 2025 17:40:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D2A2280024; Fri, 14 Mar 2025 17:40:19 -0400 (EDT) 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 D85D028001D for ; Fri, 14 Mar 2025 17:40:18 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 220EE1CB68B for ; Fri, 14 Mar 2025 21:40:20 +0000 (UTC) X-FDA: 83221475400.10.B9752A9 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf25.hostedemail.com (Postfix) with ESMTP id 2EB04A0006 for ; Fri, 14 Mar 2025 21:40:17 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=g74ubeVR; dmarc=none; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988418; a=rsa-sha256; cv=none; b=Dm1gkSpHTyRbO2Y+f7RhYx1X37ZEa7gXzhlz8pJ7+wl9kOuD7/lJ1HVoTc48AGK9xi2wy+ 9P1OFnCmTbubokyyV26BuimBn9XsKJtKzARKD9JKPsG+We7x6o4Bbor6HBD5ShWA9YTE74 WEA/UjF1vYStXdL0OQgUIpwfHjPXtvE= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=g74ubeVR; dmarc=none; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 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=1741988418; 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=ETMuPXY01wvMtWrz61R0YnrEbOlcCozn8uLkqR6dKYDc4IdyDoU9ImmmDKUn0SBbtJvzcJ 27Dp8Q8OgiiWp2oquL5ZTirPqoP32PC0SplB4P3zaksIAzzoPLtp6gR4silBn6TaKc+D+9 h6sFjcsE9MFI/5xfgqVhIJeOGz3qFL8= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-22349bb8605so56812335ad.0 for ; Fri, 14 Mar 2025 14:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988417; x=1742593217; 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=g74ubeVRB5LjyZqe3N5TfK51MoUdO0JIhDqqNLSEa6n3Mo9ukxL1IrF39ki6h8kx3d DgcfRUHNoydvSSrzSJeqwa9iKQ1XELChOcksh90tn1ZdCkVaeNawzLzvvEbL/PBZtQjC dVlZpbyGnEo+nG/ygyobPYTnupAEJ86V7IOM9ltpxfWC1oJBtVIrJUmrvzCqBCcjs6bp m95+/Y2AkEhCyKxh04F8NgzueHldOAlyqXapP1Ndep6i/km2ex1KQQBdPHlTof0DLf/x xi21fsokPVWaNn2nB5eO9HUb0Q3s87SH7BWS1VRE0bxaxqcV7JT2wTG7dTTrDUxLejk6 m8Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988417; x=1742593217; 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=Dy6hvXjOzStzh9jRg70+fvBZ+l+sIIbE/P8cRZHALU6oWOKGC/0IFX3PExrlikbewF Vp1iRL5Y6IFQYLzmsuZp6152f/LVkKGRFrLJvBJ8epQRPh03W/PUdv+TYi4Z23HWosbC DIGGrRSQ2Ohm7bs83kIa8fjJVhwPnR982p82PYoeixET+zNgGZ0zdGyPLNb+43fjMF0p lAbueO03JJuQvKNnS1Iv9+fqyotKkhaHWEbWTop00CHVKv2rqOzHsGkS/4POcV6ng3bm CnY/9zHEyfKTTrRBcveQ14EuJNbCAAoU0FmTIYVvSKmJAdrHPsyWDcP8lB66lyqk/2rk XfkA== X-Forwarded-Encrypted: i=1; AJvYcCXTlnwZcwtax0pS0rJF6B9fQgDaeoY41uGxqR+5Bl2EXl57uJiRTmrEOXn8bIhK7aWhVdO8Tu2gBg==@kvack.org X-Gm-Message-State: AOJu0YzDjyK/LaD7hPKsmz6/dCcFergkW2GoU+S1R8Dc7OqmhqrYzZ+E hz0+0XMmcH5NypILye+CJawVLgIr6IgFfwRJjO6iWz/BYTLSo3jCzya+eXolSkE= X-Gm-Gg: ASbGncsuRs2q2NxrNbfUPP3tzqTAEW15tjga9uvbr/TyOajhkSPcP9fL3NfPCD8LUKj lZX81z0SsPdXWqfgymrqyB6RpiFhdVwZXql0361yJ2hAHmzYi8F7ecpBAZEvygFkVssCzTB9B4c OGrtX+LyewSbWFqwbfWyxI02vz9vKag2CqFBcm5ws9jjjFw5rPyB1uvImn5ZZpUrNMyncoaMNnf C7CKcqdAumBzvWhM5tstYzTSZ5tO9Zd4IWHNpZgrSvuM02oziWzVhBypgM5II0Rn4p5zV7CDE3Z SYg74MGcdlorJ/yiowVekpNGOZl6XDeHOctk0Lsd+OeQkcipJ72YOZQ= X-Google-Smtp-Source: AGHT+IEHTIgzeGQs95nPlCKytt5z5yea/NHClPHPp1BUNubi4Uv9wCiZoYw+B2CYuOVgi1HkJrteRg== X-Received: by 2002:a17:902:da90:b0:224:10a2:cae7 with SMTP id d9443c01a7336-225e0af9d92mr50201135ad.40.1741988417057; Fri, 14 Mar 2025 14:40:17 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:16 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:38 -0700 Subject: [PATCH v12 19/28] riscv/ptrace: riscv cfi status and state via ptrace and in core files MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-19-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: p1whijz6xo5gzhuhb3xjifwzc1y8zndj X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2EB04A0006 X-Rspam-User: X-HE-Tag: 1741988417-255716 X-HE-Meta: U2FsdGVkX18xeRFd8PFHEqhZH7oTP+lt2aqzxEgamq+Xuu5Gf9QqIUykjCK78dwtlO6YnWhAT2210n3XUun7Fmq1Wh1+rUGnzWKqLw6UijEK30z4x4mkKqyynh21Msuy9pDtjITeRgvLpxThtb99UkiE93H5VK25FTd6T4pi9AHcKL5Bg69ttYR/wWdso5uNz+NdP7e1an8NBJIUNmBWqOY16DT0BXMN+tKTka6oGcIFVOkWVJHge2y/rDnj86W4rAZNiAF+KTLYi+KLKjhzmlcom0F2Ft8CMeVHssTw+3m01MhcsqWWOt8Zs/g9cFKXUG9XxMN+OurxwU9hJ1GcddJMm6ZLm0gr2ycbKQO9pO0wgaS4mWdtJJ95BzW9DR6T3ZegslDAYCNOIT57t12g1WFKfGvmmzxjE7LRHnWONMp65XeMBRfpSWDvSAzsEdZ7tTHxaHVjV0bq30U6DJkkMbV6IeglpcpGvwTWGPABIAWWTLpGl40WCk1kMJZ4yajeeqRh4rTmZ+ew3oHe+pk9w3qxT8a3yawUW/73IqHjwQZcNwPfcDd+m7ln8Ou5x/vxEyma6LkZTUIJthJFkwI5cSkPcGCy3vN8HR8AiqtbONSNhg9Y6Sreog1i36x6er97zO8B5n7rN+FIpcqI0TakhXlzHAx852oWrIC3lbWv5QOfQEGqeCqMkKMatTDhcpWHuEMDh7IMtgMoG7bFZ00UokMUe8y3l0yFmrOhcvoz1H9r/rv4QaMnj0Rzn1QwQt/rTc+GI3M7hITxkfQWwIQGjpwav/xGLatBBrTQsAb1EVrZr5rRQdYi8G2uvD+1vWdOV8HRDFzd1UB5AH9aucOJ8R0WDHL/IHkQ+C11Icg21hL622wZmIKPXKIpSc7iaa+Q0CDJyvkqlJwE2P+fZLZlHkX4JoWOsEbxVaSdBLezPQMh++cK55gcKN8rDUQOHgHULRsOsI4bA/gi1uQ8lYx R7vu9Vu8 oyKweQ/Cu8iKyI2/Vvrr/7IE4cNWwWgdRP7mwlQESCkuvoRL09qQv2DRGvK6NEg9WaooKfCUQTpCbSqciPe5LDbzfU7nmuOnapIVAqokK0q5924yq3Qn1lAQ9f1pCg56x/M1OfOkg0vWx3ofCGR+0wv6ZlYL8Ay2pPF35ywkuR9BkCw4TBM5XaECPoyHc2slcie8e+yj27EO2sV7cm6lU6R68rmVS/q97ktivlHs30RE7CdMDFgNeWuI1mBsi1JNJyF9xb1MX5aCU1SpQYq3LOylWWBd0cFAxNFAtA1ATI3ftpXHzQKha2/9vMOf0bDOmyZNe86p482jFvuh/5tc4tZNE9otJkmsBbtoHeDsOb52TOWjcyOtAImWedZ7kZk+xlT80ABifpdNn1e+GmFvvUp/zoM2q7w2PnGn8V13yYczD3yEZh64RwaZzXwotg5ig1g5o+YdIuuaauDs= 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 Fri Mar 14 21:39:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017507 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 76006C282EC for ; Fri, 14 Mar 2025 21:40:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0F09280025; Fri, 14 Mar 2025 17:40:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BE1E28001D; Fri, 14 Mar 2025 17:40:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81210280025; Fri, 14 Mar 2025 17:40:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5F22C28001D for ; Fri, 14 Mar 2025 17:40:21 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 968CC1C9B2D for ; Fri, 14 Mar 2025 21:40:22 +0000 (UTC) X-FDA: 83221475484.17.02EB89D Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf09.hostedemail.com (Postfix) with ESMTP id CE3D314000D for ; Fri, 14 Mar 2025 21:40:20 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="gsdJhym/"; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988420; a=rsa-sha256; cv=none; b=kaSJHh8AlV8f2AvFH/KPNzKlCEE/6CB8Sce7a9DbcSIuRyMidK9w365GChmSb/hLw4DaXI gQwQ3d2tCNBaETslK/LG7NyZU6HClsM2tDkD+Os9onkAlq+XrjU2wdBHSYkkOvJxwcIVdr uCvA72akcP9Is6iNZD6sx1RZ4x5NTQU= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="gsdJhym/"; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1741988420; 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=Vuh2Ubzjjn4sOmi3QJw6bgfZV88K7WLhUaWOfvtqDdM=; b=kA8z7DCFdv7Pyz77CtCiPK4bL4sWfKQDMpzrRt4QVIKOX2eJeXCu3Q3k+CSHMBPbl6GA0b 58sKu11zwI0V+JnVzXnQ9zYsungMvzDhnXGpXVqRl0RC4QoGl0SVvGZMoaqocMP/O+30by Kp5lUGRtQQZLhQ3YTmaycMiy8l9EcKw= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-224019ad9edso65707735ad.1 for ; Fri, 14 Mar 2025 14:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988420; x=1742593220; 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=Vuh2Ubzjjn4sOmi3QJw6bgfZV88K7WLhUaWOfvtqDdM=; b=gsdJhym/fUebrkU4gcJiO5qQjcTxQai+lds7Gab2f6SRBe5Ec3IdrLLRwLwuWaMjnh f3QdZivxUzsQInOLgxRSmRO+uplRhZezFJhbDXuHn0CC63dpk208VzZRBpqFwAsTHdoL R++5vwueKqj22Tu2XH3nyHhW79wGXUo61lS1RQ11Gnhp3VNcZ3W85lmfOeTZCNECEZ5v qC/MUg/Lf4MOE9TfIu27aapADLBeU88d5uVsJbSjGrZ1aAOplRkBBHEDmDIGQc64lznZ Ab13gvdCImHdxGQUQyYirqBG2F1owIFDgsYFSCDkbI/2caEMg8rI/6EYNg5PGYJDdwxW W5Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988420; x=1742593220; 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=Vuh2Ubzjjn4sOmi3QJw6bgfZV88K7WLhUaWOfvtqDdM=; b=rgHW/gtXoMkahmpmRIwfWVgt5aJkQ+c99SLoemVfGHCCD2KLvqzoaxUyx4osYQAadD e4pJwIxW9zlNnFqukoO6bvFsws4NLcOjlt9PjD4M469kf+efiU1RS4nR7jQxGHiftmav aAZ3hOS+r/3voVOw5wcKRU+OPtDeUnzBmQ8FH3b/WBE8DuTst5sceOnIxQAsLVD2QN4n gUblyyXjkKhIyIZZYJ32KJ7ifJhlbhSyFwS0VXS16Ftc9rdph/RPE6nVzYGg68dSvjno q9VBeOUIAuROaOLV7oqi7c8zIwpHlSHJKRribiikOnPV3jd0IvCFWbQhETlQ04AMdq0z FwcQ== X-Forwarded-Encrypted: i=1; AJvYcCWSPCN0bVVFD6EKU32at2EbP6UZZE9Fk8rsngwG6DUkbKWq16eogwvO0eQMlojxyZ8TRrugXJfwvw==@kvack.org X-Gm-Message-State: AOJu0YzcSzbqGqa5rflW3O8jiU9o/LlE28zhQ+XIqIXlIbkSQhOPH9Wp VWntebO7T4To0ZfiJAkeLUbYu3J9HGsne4yufK5F2NzoZumGgVgdOdv8MPOG2u4= X-Gm-Gg: ASbGnctbjUefjM2sxDl67Es1rClFu3HjcQw3RlxP1+5nyd0uWaWoCeOuylt5472bO/V 0p9UsMumrDsf7urxn6/GM3BpYgpydX4kI1FmGNPWQQ4w2qjEma1PKAGmQ+NxkGnesURUIGfo+Hh SuDruZJgRoUEqcU/ZNSKlsySTmDJbrU+zFFEXVNuQrwg6u+0MfwHoja9aEHRKQ64GA/0acI6/Nh XSBlSB3qDbrYHKsbgA1AqtiWv/fobsT65zbRhfwrWGc2LbF73PruePVPlJl2D9U0qboGMzfF1nk 8Niy98qveGOJn/aFxycAUZd4thn3jpyDKsfYGFJS21s/lUYG3qOWJhA= X-Google-Smtp-Source: AGHT+IFEy8ShegH7q+9OBJ6uPIx07DqrMw8WFpOVCCYLkkSk1e6aSP/3QYX2LQ2zeOkBSAdDiCkRtw== X-Received: by 2002:a17:902:d50e:b0:215:94eb:adb6 with SMTP id d9443c01a7336-225e0aee9bbmr48850065ad.40.1741988419768; Fri, 14 Mar 2025 14:40:19 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:19 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:39 -0700 Subject: [PATCH v12 20/28] riscv/hwprobe: zicfilp / zicfiss enumeration in hwprobe MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-20-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: wnszr1fjof9ih4mumxq4z4dmragdqxjh X-Rspamd-Queue-Id: CE3D314000D X-HE-Tag: 1741988420-242217 X-HE-Meta: U2FsdGVkX1+Ud0XTLI7szmJvGaFcJSsRxCTUqc6CGGn+kofTXy3KfC6xFVCruV3gvEpHN3Rw15foRmsJTljHSAF73vVW3RnilJY5BhzeKlBgW+zaGfIFWQPSuhsDE8LjOsuNifvuUcTdxMsAgvv4FMKgZWziLlVph0OmF6hWmW0RLvThqUSKplbARsbb3nFWWj5uNgwBE7c1nbgxqgun+CxUIwpl3VmGfOlj9ATbp+VMwAW3a71d2pwoGwd9Sn4FjMLDeKnKX/DflLIzeriq8g5OwCWaZ0tcF/RhoiUuR/R2SkN59StWHbu7CdPvJ43ZKS4gx3+aU8YBZ/xx2A8pK8U7ObZdppRdNyPUd2jWvz61+EmJ6SF9ghUDauG4oTIhQVb9dS0m7VyQaoj5Ltk+2Qv25w90bqUOfh0UD1LwRXeSJ1dH2MGq0VAmlR0RWLyGOEmld2iq7xlsp0zmSiHDwhUoBk3lvfsiky0+QpLgk2GqbygjwOPqWVmeLf03tgr0Qwvl2BUuKg3vrhWMKU6d4kCCHw1TFsn8a5sLHTZu0GQueV1HCmwCTuZtrdX/BE7qhVNUg0r4n8uqV5QNZZa0HVUu8kiWkdMt0vY3pD0rbki2UjmnRTSL4688iOUcgttPXdwMpe+BZEb5oTl2f7mdi+O8pfj/IZfFX9ULcczycqaif0SHzvB1cVlezdX6Mb8YnwSG/FScQyUtQWbc6V1o3nVGRCnZnImNQKI6y1BeYM1s0iunOoesYAH1lck6eYi+3RgIM8rRlFTVu9jGA2pc6eH8gCHa8U4EG288uL/skjUccI/wfBpHJCFEuYLSXfHGbqJb+p5cWZGRpDC/uVxFhPTtragnD+xJOM0D6AlqA0I7zs3cvB/4uoSGJDeVct6GEi4TCDkXhgqlfg24/btTSxjZqMG49d5Cn7dsZomx7K3+HkkDIq853sdXUOjaALGJl/zXbjCNGXpDY/PTU+9 AQlJOHpd 30Gqn03RpV6eE91kQT+Xpn3YXhA7Bba0nv6bvFJSCMjr/wB7sZARLe7cdQqK4vZKNaWAPrB23Nlzs1JHwozz9bFrtccZvdse+tJ/wKoVhdrZnjyo= 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017508 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 3531EC282EC for ; Fri, 14 Mar 2025 21:40:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FB24280026; Fri, 14 Mar 2025 17:40:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 983B428001D; Fri, 14 Mar 2025 17:40:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7DCB8280026; Fri, 14 Mar 2025 17:40:24 -0400 (EDT) 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 5CFE128001D for ; Fri, 14 Mar 2025 17:40:24 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 918CD140FCC for ; Fri, 14 Mar 2025 21:40:25 +0000 (UTC) X-FDA: 83221475610.19.F3D3062 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf10.hostedemail.com (Postfix) with ESMTP id AD6BFC0009 for ; Fri, 14 Mar 2025 21:40:23 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kDbALaBk; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988423; a=rsa-sha256; cv=none; b=J1RWoKF7qFH1YvM84XTsPHDiuSNQXGxUEuF5hiKQ24icHdzRNjx9Ftb1sV1LCXQO+sxxAc BZ0D4Y8Fb6CbVJ3SLEjiTiw+CrS0aC37lK4hQ9UXTb8q2GdGIrjAlP1KbH9/FMVmYWPIUd F0Ixe2aVDTLz0xecDMrdzpohtaiOjFw= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kDbALaBk; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1741988423; 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=wxaplZUgROh7QEyvXgaGSGBpfUL9KoHoiOWsJ+5Erjg=; b=2oZRL5P3i4GII64i4xg/JRu+o2SCDJTbKkupu9a8ChgA27lijqQQs1LTMehM8BNCWbU3Fl VvS+TLTWtJvoH5cHNH/dAMwulDe44chd8nZz5t8FAiwup/+9lx5o0PD3DntEfNXBBzkPrn FaoQ3tlfx3jyeSH5ujzy7mMyAjKFoLs= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-219f8263ae0so45146985ad.0 for ; Fri, 14 Mar 2025 14:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988422; x=1742593222; 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=wxaplZUgROh7QEyvXgaGSGBpfUL9KoHoiOWsJ+5Erjg=; b=kDbALaBkknIgmAsh/yuWGugzG2ITkj91uhG46zT10fcBgXupTi8eCCYRq63IwUnITA D5JIwRJnZgfRCUO1k9+t5WKKBIbMsaar+rJoyqs8M+17qMm5OkV5Micb8b7xlirk2PgK UcGT5lPnxM7C/tc5kJJ2q83l9kiLvrlkqI0+F6d5xJUncLHhb/eH7jytZoZR7YCZIacp t3bejkdQ3kuAjdCHIwnpRWgmgq4b+pQqLh0xLyk9UDmK8evtBmbIm+cNIyKr2Uuog933 fZ7srmHaMCiq92Lt/eCLB3ZS4/gOiU1hecGGapNrrBd17LnRNHetIGF1BTE621cIu68I 9n3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988422; x=1742593222; 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=wxaplZUgROh7QEyvXgaGSGBpfUL9KoHoiOWsJ+5Erjg=; b=ichg51Wy6J/33OfEAWjYOnf9yXBThQJ/i0s18ngoDJI/4pxtfxO9kRnGcCOWjz3b/o 4zPR4D1ZtIpecjrAQsuIB9rMJ2F0rkV5ecHdzxnmFApFkX5Dj1zzxlZ/98TtGX4l9Y2l iuzn7Kkqg0HTnxrbspbCZkefc9beJMiQwDE8VdVQMAiBlPHKYFQ/J78dE0yXue292APi 93hNCyYQxctXEe0e71HpWCak50Jp8cMKmoa24IqvPuo9xxanNOxAzriQt8+eabEM3RtL lvvyZg6+dJ2FWwwTANSqzTrhqiaoYE/plzGT8tDCKbs04PfZbuUrJ8aIszkzFbwJlltm XR+w== X-Forwarded-Encrypted: i=1; AJvYcCUNlZ4Fa1LBYbye6uTYZ5VSS95Im41sO+Ysi9l6iiWflf0WkF1BooYAYFsKFZVHozxHLan0x6qRag==@kvack.org X-Gm-Message-State: AOJu0YxtCzm3EAQTdDmpojtnPEPgC7y8gkWkqVayuHi8yQF9YIkni9qp v/blYOpQQ3UHQ5xAPcdHvsohZDqBvnVCMObb/4WRPRQd7B8lRgxQYBYuNiNdsOg= X-Gm-Gg: ASbGncs1YZk3bdwfE7yuVV86BD8EV/YFbiBkfKF6cZkCKI3mtiVZnDf2L3O1xhaUvUH pi6HeOrqtdjFqNsR2QMgVCO6u3F+CbKj38f4cnTUETjoNyhV77WZWMOpraSesacWkD6lqc2Rc9L rW5mmtJX9zJRLCLP5WUuE64AjNg2WO78KRECLAEjjYrBQCCZEbUwajTX2jPyScOWQ+wOlwCRkl4 z6gtjv6J4A7MzFATQTF1vn7ONhBC6L65DLqHJ4GPqroL3xryV3Y08/XyrkdpuXqgcpS/bw9sGan sHCSgz5nmMdF+O143l0uLlllR3Nng0Hf42oWzRvntBGccjHkh6uMstg= X-Google-Smtp-Source: AGHT+IFnWo7zLhMGwvu4KurXEf7kIkAyH1HMaWOYapOqu0jjJNCjRbXuH7ozNEXPbffeeQud8LolDg== X-Received: by 2002:a17:902:fc84:b0:223:fb3a:8647 with SMTP id d9443c01a7336-225e0aee9c6mr56406685ad.41.1741988422612; Fri, 14 Mar 2025 14:40:22 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:22 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:40 -0700 Subject: [PATCH v12 21/28] riscv: Add Firmware Feature SBI extensions definitions MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-21-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li X-Mailer: b4 0.14.0 X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: xwhdn8i59paej4bn3gu45gj3otmjd6gj X-Rspamd-Queue-Id: AD6BFC0009 X-HE-Tag: 1741988423-196964 X-HE-Meta: U2FsdGVkX1+TrqVIoF3rlmag/9BP0FenVU3Rl5op1IiRZeCFv6FvmlXhOJYCstglzSMBc1QPlAsq8cBf2Qae9ecuNcBVW3ZybXAiXP1TGx+UdUIKfYHGZjt+TeRMD+SO15HrLVtV5SqOx0dTx5dEsNuxkC9GvzaDkvA1zyyifYd1W2a8Mi7xyWZBw3MDig8C7luEkhIoi8XPJhalbK1YTBFSE0t4P9LbhdHey79EBne7WT/UBwh69HMX7SpWJ1L9fNxAWFgcroaQqar4FGTEUPTPr0L/6bfjabgXQAE8gTSkC7RZ5KdBHQO9r36EXaEr67PbfpvilPX0BEKfihO3DPTOcVCdgr5LU0CVKAdweollCYMfpZe9JMfSOSbqOKNjXnTrkkXjeVrn/VJKPXTHheY+I1IgpKSODmM8vBpnes9Tr3pHn3Qob9tNeh4tCkcNy5E0BKFYrnP8UDiKLZK0IQUvEUS8fEOY1y46BoKyj2cqZi9mYH0Mo/CA0MuCz12rBZQZ+9fsUKegFTnIRLU0TvCHPhJN/hKPDyAZtby3+TcCg9lgwnNvvFycy9SnV2MFo3MYJtW8J9qPPa3FFk9WFJH4wm5H0+jzik8ejsn7KGah7hmJcTkYT12e6xgGwyf7VK60hIrp2B/PvgP2Q15wTIgQnNjE6QKcE3mZDDe559cnAbxWnjVc9UNOjRbHcnPEYBe6A6INttmcsI3HNydkkWjmAWSuJH/u3wkt7cq9mmn88KwLZ49ofsUObXRNs/c63flsRT5IqDksuwNTnVsXryunK4D60CQTD8kM4PD3VNQU5+2HWC8TbR1i/lq2XM3fvaRzLCJX7iCC20wQWPl43oUgJpZl+38DbGLAGvNBTbzPqGGgFPR7S05MxrMgHyME0Rlqj6d7CYkzkMtNR1wi/PvWXgyRKfAsgbGmnFHq67q0ghql4UB/5t1CT+ZePji78WaXErGWJa2oogKqDaY SyVLEg5I 2L0KlOwWBQSlAppjWnr8EyU6oUImAmuN9xjJDXKpnSGkeHXYDPdy5MTSFzgw9F+BImq4ijNZaL+HJVDSfFQUSYnKDFIUc3i6jknPJQUNkLFqxNYyu+lc82XgliqEG9Nn27rC8p/wr3Bxg/mmUbIxJ5/qLUYRjQd82D/+SCs3ZkkGHXn+0dblsFkweicu3BqX7UASWT7k5daxQJ8TvE1IlZWpGvSZaMEOUjpa7kapUNqREXF79yFDKr6tjAml+88ty4HnMcEJaDKhLq+Ms7qDkaeG2Q5uSt2jg5XDG8r5e/yjWXwScqiR4LRzdOhV4M1d1WvDwdqcMBveQ8ugj3aaOfEu9hC+NTfnEHoJp+XE3RLeulzFbTIB38IERf1Df4f8RFscxFdzzPtP++QIZlTcp1Xut/G4Xq5k+ErN+OXv9VvriRkg9I+db/2z0++Tq2BjeTwdqwG7mAfsdTGYP9vNRYuK06tqvcwPtzJMKY4Fx5xyx4uj6HcrEMI4q1+0sGYz62JdW6+IPQYgyjlQGiv9128gmADCQx6vOYYlfso6Ok3Ip5DI= 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 Reviewed-by: Zong Li --- 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 Fri Mar 14 21:39:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017509 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 036C6C28B2F for ; Fri, 14 Mar 2025 21:40:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 57CBB280027; Fri, 14 Mar 2025 17:40:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 507A328001D; Fri, 14 Mar 2025 17:40:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30BEB280027; Fri, 14 Mar 2025 17:40:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 0FEF928001D for ; Fri, 14 Mar 2025 17:40:27 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 55432C156B for ; Fri, 14 Mar 2025 21:40:28 +0000 (UTC) X-FDA: 83221475736.19.DADBC31 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf17.hostedemail.com (Postfix) with ESMTP id 6129F40005 for ; Fri, 14 Mar 2025 21:40:26 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=OK5s3Em0; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 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=1741988426; 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=E9n3/K4KBqR/53b0jV+O9N/MxE5W9V2LBO7V34JU3SY=; b=NlQEwIG5j7VabmMeoE8btyoB0qYH+qlt72Eo6VHVouTTaA7Iwzy40WNLlRtCKiGAp8VpB4 n1ns0n2rRCoPOYfc26IPuJ3M+AEYjjO9pGkMOJBDlaU6t27PgdD7RvQRcTc6Jt6UhIec4M 0x2+8s+rsWNq6GpAxYAXtTFBWB0mQ5c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988426; a=rsa-sha256; cv=none; b=Z6YOG7kPp3V3ZXFHHNFLN7pWiC/9tUBDb9Nat6tJiX1cj6zjBmz31MEjN2VbEHz7uipxSF ZYfVzuQuj7fGHMW6P6TTUqYUvtNbxjeeGuQ38FGnaWjnulC7EkHIf2/ygQcB1trroqmLtq RiS/7mDOjeTbCfypg7pXr2YZ75XPX9o= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=OK5s3Em0; spf=pass (imf17.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-224171d6826so63854895ad.3 for ; Fri, 14 Mar 2025 14:40:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988425; x=1742593225; 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=E9n3/K4KBqR/53b0jV+O9N/MxE5W9V2LBO7V34JU3SY=; b=OK5s3Em0bxQDPqpSaVPRlCOJJeUZvnSabOzb0m/HJlHj/g9awWrcUCSXgdfGHO2/eC zNrCMdld0vZVGzvbtRaYR/xe/EOrdKJocfdPVO+I2GzKE8lBE8mqzfcB38WURmLUYKt3 gOmmZ8GO7vRa3MQ9ontGI9CwoUQVp5BhvwK/JSP6+hPPE2IezKN8pucpnv71/38EClmN X5h9dXbPFqSV9hOgFVAS+kO3y/cTcfPLbNnP0egg55IEmcQ4P861kKMNBJHBFqRu15gZ sf4XzuAvC1KvHKzFKqxXa55o9AD5wysJ0jrAe3J8uWLERqLXSZhWts69UjAOQC+nwAsE 6ZRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988425; x=1742593225; 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=E9n3/K4KBqR/53b0jV+O9N/MxE5W9V2LBO7V34JU3SY=; b=HsF5hK9qj2QgkZ0t0qoqjSv4678KzS6xNvT9bgyl15D6Efyh7nrsF4IbW78sVQxpQb hi6AqzQzU73R4GCg84wzNMcxru3FTvOhFFoQOa+x4Jin9RUPDPfKE0MGh86oDZo1jMML Z4tsE1CLK5r9LcTBk+RHpr5EyjZaj8+R8ESeBDJoK+9G4WC6Sh1WdWuWtU3maWaXApk3 I7tiRz7U6HK8KdCn0K6c1PftVgWcy10D3EEb1dnYx6VuFp3s77WBF5pB6Nvb2WWVrAap iRwqkGoLix2aB9Tum+BCupTBoyztazMpqhscvlWl9L40iH751YbGcS5pTk4lRh69Oug/ /2gg== X-Forwarded-Encrypted: i=1; AJvYcCWK0RJXNKdjJMSDvjdHeMQ3pW1Xh95+FiSryiTr8JAtgyiyDX7DIsyL1DeGcK+Z+o+7Gqk0x5L+Tg==@kvack.org X-Gm-Message-State: AOJu0Yydz66v0rct3m0HWxKvw+1RDgydwhKAqyZVStpBHzOxFnR1r/iW PC17QCUaIDs+vI0WYHc66BQCADVh5xZn0J3rIpJxVOU1Xtrz+khNLIzplDKD/gk= X-Gm-Gg: ASbGncv2rTWNjxXGJcXbZe/kGHIwW+QJWMU1KsJGKk8UgeLAkKfbq0HSjJkI/xE7FgX 7etc6vlcfmIThJDip4QcJmthrxozi9aXG/oDpfHybHKN4vexK9PefldwRAp1P6dQnpfH8RUFqVL bkGjrDm3iQWnZ3q018S+Y5iHcNUFMz2wQmO7u/XRHsDyYOhEwEbpZNceXC6PnnbScg1nwtszYK1 WIC8hHM7qw9RGr05AGw5VgLnGeshdSc9zMonPyT+IRH7Kuf0/z+n/Y3jqyorQO+IvDj6hhZAlMN vm9CNHInFpgdAmIuBehnB268vQgVl7pqk0S21tqxDYtSn8gSTnUQeUc7gmm8d+HDow== X-Google-Smtp-Source: AGHT+IElyciILdjHw/3i0RPFBnjTqOBGsA25cCwm/QkQU1/hQmx1TwMvm2SBws42y5o8HIBP24yMlw== X-Received: by 2002:a17:902:f645:b0:216:3c36:69a7 with SMTP id d9443c01a7336-225e0b4970dmr65622535ad.45.1741988425325; Fri, 14 Mar 2025 14:40:25 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:24 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:41 -0700 Subject: [PATCH v12 22/28] riscv: enable kernel access to shadow stack memory via FWFT sbi call MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-22-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 6129F40005 X-Stat-Signature: u36da11thd4hyr7wz5kn4eb6f6j73ts9 X-HE-Tag: 1741988426-267350 X-HE-Meta: U2FsdGVkX18pNfkXPRQpqq0Jy3r0s9tDmX4mU1QOwmpNGLFEiStPTgsCKpEtzzc/Njo7FPxWCqR5/iPLXCBCetAi4bhhTAcLeIT0g+BBYYr/fqw1dT+S4/NEEyJwh1KlBaMt9y47ofD5WI14rdmmOgQ5mBN0RmyHSuOTdvw3A7WcJeuABe1chnZR1fOquUfQ0r8Por5ldZzLfrdwirPLjj7auF2d5c6JOfTd38Kq0yy2rcSkek/0bBRo2SARE8UkkdB5Qn/s26VvxLLJU976HMcyc3kKNRs3gNgNGQ0v8aIoysvjRMoyBB5NfxB3w1+9jFNpNQ2CnRbBVakoCmEp9aCfnbAosE3NIuDjDt6wiVBv4Lkdu6zDtJCom60YoAt9n3iKiJSOzvoj76HIVjg440n8BzCgbSHx9vZSp3Fs60jTdX1uwt5Pp6KbN75nEB1s3wSocfYug8bKDcQ11HUn5XJodf9BM63DfkgPCi8AelQ0blBe5Dih1GBLUfQr7El5HX1ekIZEx6MV5lIaACMOFFIKvJadq83/v8kYx34HsrZemJAj3OdInH04ZEwMEOr8Zfck30SSlDxm3azJc9BK+sGrSveWFDBrdled7cFkKWMjyZl0YxFeJ4nOo+RHNzW/bt8JgUYufY2sreemKIBjeJph75KWnsXu7D7SJvhS23dOZnWmv4N94VIw3J/8uRCJugyQ9MIvSNgzhRkeFlpclTzR0//B0EtPNzFjhNKOvr7Ha4fWagYsmcTCOGhljra4gjfwOl7nG6qG1t3F6NRBb71i9DHYBBlktkBOWX4AIWScSVTM1I9d2hZ1ZnnBGxQS9aCJvUUlblAJAiLlYUz/uFKBlLTlG4ry9Ua1EvJjxTFN0nMbnOnRdbAyd8BLyeQMCSAThhUW3svq3+Bykb7bMeQflZqhEb5xTjTlmHOBwYZTpES7869uc/FVQl2Gt1hoRswjb3xjz1D49rN3z+U Py58uKWL Cy+lEh2dlUdlFJL2i8/k7B7PkKVgrGFKzu//vfkOp7P2hVKFu/xHozz8PY5YvuxpPanZscR/+6wxWB22lHMmKr9hEJqNT4ndQTllUIRibgbU1acmrx8Lv/Q/RyWvjyBcDwVfg8Otbw3CqsfSWOFSxYCRZxHx4nPpEfUhm9gKBvwFXLdPn0ew+QuIlcX6VZUkJOE8b3DVywNNddGHUq7DeVyXup+wjrUfzbLYLs/IqnTNy+nXhgt/ywW5WL7I6+b8p5Z0RO/z6pigcbgCfNyqA7tyyFaZDexzDHmqkQn+0Tsw1UiVqfIgf7xM0vB8249kv5F7+60uCcuxvEOIFLUJII7p73bbpupoBaLSU45WQMCEK+BdduuESyOVvhLqxbKzcjP9dVSDR/7QGB8D/rMGpRlIdyEaVVdChPfheHVIAYV09tBPB5zzEzv1NfvB6ImqtQqM1yX9tNpBMYDLXY8vDuoGkW8QtNG6rv9/NSAqYJuuRGX7mo2uP3CVf5qGl6bjoGhX2hDBmfXdiN2I= 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017510 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ACE0C282EC for ; Fri, 14 Mar 2025 21:40:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5BCA2280028; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 53DCC28001D; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3461D280028; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0A8DA28001D for ; Fri, 14 Mar 2025 17:40:30 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3E27A120551 for ; Fri, 14 Mar 2025 21:40:31 +0000 (UTC) X-FDA: 83221475862.23.ABF9CB0 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf23.hostedemail.com (Postfix) with ESMTP id 5125C140007 for ; Fri, 14 Mar 2025 21:40:29 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xAilaJ+Z; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741988429; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=a7L6jEjphmSCVBHcxl5XAt3Us7qrk/UvaMSfIdPEx6k=; b=mLOVCrv/NqeySJiu6mhyzTuhxyckAnObpUYDST7NSCBe7d7O6HYR/xXtlYkSbZWEbkiaqs XRNaHZRVpWy0wGyPni+ANm6a88+WUcp2YwJwo21DUwno0f7LUT/d/Vw0HiCU+ianTD+AmP GJQLtR0ssCnn8A1IM3/kfT669B75mgg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988429; a=rsa-sha256; cv=none; b=m8qvFxgJ1ntTnhpJGgBBqKUK/2iyN3NAetavkcByZnoU6H75GwYsunUwsTjpLfhPW1fMwh zWVsNu1uOytvnoZ92hs+rGUK6FMJPopZ6o5XeepxWHyqzS+SbsvGavOPh9zEfomfygL/zH OSllHqFnKk/LNH5gMatzAKyldhJqyyI= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=xAilaJ+Z; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-223a7065ff8so70890045ad.0 for ; Fri, 14 Mar 2025 14:40:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988428; x=1742593228; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=a7L6jEjphmSCVBHcxl5XAt3Us7qrk/UvaMSfIdPEx6k=; b=xAilaJ+Z3kdzQ0B/8K9Mthp3QQhjy7ny1gJsLby61zxi0M99lfTEVXUvnhnXYVDHKZ 6KBTLRJsHDC1KrQC+Mtn15m37AKTg8104rv23caintNNWTHPKAH8kAHUi7pe7kruKzw8 5LXnz85QDzpgjicWxe7WqtNP62C925vYH+sMchuVOXjNYCwBUpV4z63Slw5haF+a/PEf vhqtXh0VPGXS3V0us9rI5FZbNueoZHNUdZzlo1rhQLMZqr6tzEqzS06F537qV4AqwfAj 41Y5KCs/cnKqYsQScHng5f4oKFhwuWqxeviHeWUDrlSxXq3kALCfS83sv7Q5kgK2N0lA u/Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988428; x=1742593228; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a7L6jEjphmSCVBHcxl5XAt3Us7qrk/UvaMSfIdPEx6k=; b=ayOnRYnpJuBWMow41jplSfC7P+cjlP7dKhjWd2KrBZSXgez3eyTIT1J+2eC7TFwqtM E9NbvYahTvYgCpS3jDaFAzIXyWY1m8Kw6dvPd/QZBxZdgvQP4iTjYsCePSxq+A933ULa cBsh91ErEaqrI5Rghgr0XzpNCmuwX2ctnn0/HL7dfnPBQcNqNJcWkXfro/GdP12Fs+LH S0krKZj4e5IF5s3xIerz3+k3j3t66obqIGCdvWM3kf3gXIEi9oD5bfkjd0hQReXL4B6C mep3D7cHhBF3P4CVkZtKSE3ZpW5jQwFZvNrCLo2RYyW9if5CSj5hUx5vy7cGXSb2Ev+y Ifrg== X-Forwarded-Encrypted: i=1; AJvYcCVXwhduJVuHlbIkAqOu2uIJxaW6QjcWLIpk1tmvbHrBrtmKRXahn94JcQDR0MR0OSy2eNvQtw5KGw==@kvack.org X-Gm-Message-State: AOJu0Yw+NSpaAWzq0b6GOIaRR5+Jex9Ho3ez5gYb88SOoULgOm3EzELA DRgudqxLNshVFMAUtK9J4IDGoJ6459D5shDIDjZqfS/BKSj4i2bPMtoG1OokZk8= X-Gm-Gg: ASbGncsF9DDunPU8S/ofHArFNkC2nSp+g1NH1XgGBgV3W8XLqHpV/4YAIayBMYgW3HA VfBP8ibYDrEDjR0LsKrJrEkYWtY7iXaly9iRvpfO/T1XXzlyyshv8O56pC0ecJTzhrj5BiyVx4S 5tC0lcwejpIHbBln8f1p5f1c9Z4qW6I5E5rPE6nL0W/dQGL9F0SC7Rf9Sl1oQeOs0SuIc5b2xO/ ciaWaSpExvvbbqUxO/QvOM6i8tdL6PEOewnNpTS36DKW/o080QXCi3pn0EeGc3dbPSEwND72QeW sfhv6tvNl3YlfZwu8otZRZAfTCIxS2AjhETmuCcnSF1LjOfrquQk+Qo= X-Google-Smtp-Source: AGHT+IHAGPYqUS71chjGuiJ8YNLnk78WQ4QXPzZzrnBV+tP+kBaD6/rfE4E8XKuF5NR7jHoZswbG+g== X-Received: by 2002:a17:902:aa4a:b0:224:1dd5:4878 with SMTP id d9443c01a7336-225e0a62f2emr37059015ad.7.1741988428224; Fri, 14 Mar 2025 14:40:28 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:27 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:42 -0700 Subject: [PATCH v12 23/28] riscv: kernel command line option to opt out of user cfi MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-23-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 5125C140007 X-Stat-Signature: kyh4ayt1tq3z4q6mciuc66b9up6xy6xb X-HE-Tag: 1741988429-10298 X-HE-Meta: U2FsdGVkX1+GJ0XZFcA6uVb4KAZxPaKmRkEQYBp4HgWgPpaGxCP0kwRoj9uxt06EonKnloa3xl2K9AmUPaAImJ2SdELJZA7+M0/urf32NNMR8mbNAV7ihjGLYWzx9z5cqPPghimtuTS2h0WjJFoJt50pSl6unEl5Vnp5pZm8+kqiOkCbxC/T21NmhkC9WKzkckvWVeiAGFrSChtNR5I13q3SCj7tuNnc8us41OY4KBM5VQ1epNNfNVbQ298kkqHYIAcoRPMmDnI9TJPAd8mwI6FiVMAY1JlQCYxpIsbvpMrVzM0keov88xFTnls+Sq2ysK/0HqLYJok2RnhaifIAodztMAAkyJmG7dbTwaq/01onM2hQWzqrJabgy4NRvXAXkqiOfz8OP/7yjy7wCyyVPXpyVARcvFfrvaNhXUeoU/dqzMbmufJ2NwRaMWOgM2ElN4p4/fupBJPxa9Znc9Uu7SI9fcAL6FiEmKkL48XgpyH8CVI93ES3UTjERW0tuwsqaNJnp5wiKvio2Hl/T4A1bf4hueYxMFiNMqhG0eey3tL25+WBhoj/xt0zIBQ/DmCt437rXDMpuUcggpnoJ9heYfotub3v09IkniISnrdGhifGKX6wz3eeaDQId75fTMrv6lqK256k/WTndDv/AghJzF55fvLbuioaRxxnO6qxAFUnvbETl5f3b6A9j74xSyoGLJxWGMe6EEmPd9fpUy9di4pFgBHG3ZnTkiDiuGUILBt3qiVNAA2ZwRbLrB6EPKyOmCqi6CsiQI4GMu/oGzo6aUAGYz2SCvtCfNhB/aGfU5KCuYibuM4dOfaPwAial0vaRHeGKTuP6dG/dO/F6ckiC+1/V7AFISWEG6pCrjHX4v4o0NUux9RJunuTKgiM1lCUOms70q6ZUmRvw4leURC5uz22Pykbct/hjMk66uzSWiy56cxE1uB0Vf7EwQlwvCvhTndU0pCx3gkKfORNJYT nAvj3W3+ qk5Egh1RUuEPYD26Qiw7mW4gbeim6Z8lEt7jXgadnu/Skzg8J2FtSvwzP0o5CObVLu9NqwhZdyNdQIOYwBPQRYUAxzzatBzuNXmAkI31cpvm6Z2ws1AZcP9+Owm+BnDHxBfB/NGIDSQmd6Bcb+cdOMFx7P8jkS4ERYGXbIZbd3OYttNgKHHR/uwYHf6dlBBkR/8kMAwpHQt+KFhDwQwYQYeZ5OkPNagzskYelzUdjDSSez4NGxP4LGOUFyLrsnHI8JCBgGCyk89E6EhF6Qd9P9I69PtdaWMJMO7F2G1jZOwJ3qzd+g04qpPTeJ/MDO91e99ss+hwksazIbxlN2s+PrzNoK3nEeWv2MGTbFBXaOmGq8x0jux4Ojlbg9+cooGAuMItmguZp2EpeAHujHh1iADosiHTQDIdZmtr+11Fs7rE7lweK7uqQ+xbY26joZEk33EG4AJZGHsr1vMilEepfONKpOw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This commit adds a kernel command line option using which user cfi can be disabled. Signed-off-by: Deepak Gupta --- arch/riscv/kernel/usercfi.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index d31d89618763..813162ce4f15 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -17,6 +17,8 @@ #include #include +bool disable_riscv_usercfi; + #define SHSTK_ENTRY_SIZE sizeof(void *) bool is_shstk_enabled(struct task_struct *task) @@ -396,6 +398,9 @@ int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status) unsigned long size = 0, addr = 0; bool enable_shstk = false; + if (disable_riscv_usercfi) + return 0; + if (!cpu_supports_shadow_stack()) return -EINVAL; @@ -475,6 +480,9 @@ int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) { bool enable_indir_lp = false; + if (disable_riscv_usercfi) + return 0; + if (!cpu_supports_indirect_br_lp_instr()) return -EINVAL; @@ -507,3 +515,16 @@ int arch_lock_indir_br_lp_status(struct task_struct *task, return 0; } + +static int __init setup_global_riscv_enable(char *str) +{ + if (strcmp(str, "true") == 0) + disable_riscv_usercfi = true; + + pr_info("Setting riscv usercfi to be %s\n", + (disable_riscv_usercfi ? "disabled" : "enabled")); + + return 1; +} + +__setup("disable_riscv_usercfi=", setup_global_riscv_enable); From patchwork Fri Mar 14 21:39:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017511 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 3362FC282EC for ; Fri, 14 Mar 2025 21:40:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2950B280029; Fri, 14 Mar 2025 17:40:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2250E28001D; Fri, 14 Mar 2025 17:40:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 021F6280029; Fri, 14 Mar 2025 17:40:32 -0400 (EDT) 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 CFB8D28001D for ; Fri, 14 Mar 2025 17:40:32 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 121CBAA397 for ; Fri, 14 Mar 2025 21:40:34 +0000 (UTC) X-FDA: 83221475988.03.75F90BF Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf26.hostedemail.com (Postfix) with ESMTP id 1D705140008 for ; Fri, 14 Mar 2025 21:40:31 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LCV3WKXg; dmarc=none; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988432; a=rsa-sha256; cv=none; b=sBj9/Nvse03iXaFWawPMLuQ7ln0CND9F0okfJqjywMZ3KDjtX10T/S9mySocOyHzbt8v+9 vsv4IL10r9z9CSQSGIkE59smBEpPpEeJzLV9NZIIynjeK0NpZeupyvM7McZI4eylJ2L3xH jzRNo8FVbPBEklyssQbdxwtTxDFvy4A= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LCV3WKXg; dmarc=none; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.176 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=1741988432; 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=m6UfP2exNMdeoKXUR2vjpjSCKDIb3uPINIMtTyZwoe4=; b=HVH04bMMbfWag+p7SNONn5UdS052Y1XYm8g3oflOnkQivYSmrG1D0vcKGSFhBgpmbNcp8C nZ4v21tr7hoIsNtU4anADmpDmg5CSFuFPQ109gYqJMbd93wTXoSEYEr/d15tFE4NOrcXH/ tat7r/tLMWUnpsMBOcFuPh4qYM1ZAd8= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-225a28a511eso45854785ad.1 for ; Fri, 14 Mar 2025 14:40:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988431; x=1742593231; 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=m6UfP2exNMdeoKXUR2vjpjSCKDIb3uPINIMtTyZwoe4=; b=LCV3WKXgji5tHj/xKxfd+yZBGQD2J+vy+/NbMuWI/b4Czjcf8F2uVHBYj8S3WNgW7c ANTO05utBPtQFl1oU1d2JY5zRS3s1/Jwx3AP3/EJzgvuebnrkomjhWW09yNgswvO9oEO VBcvBpVmLuto8awz38h7tt/ZgMbGQGhOxqVw2XjSNE9frak7kfpP1+t0M8G1fLvmt+6i TVkvrki/NIUwxCoCicUYzeohVOV+E7fXuNkhpcBMItC/vpwRTC6EajsZdDwVKUhyPfe+ 6b2Ej8klTWRzrlz0b0RgBtgNCGK2mTetU03MgUGy2gQuGgTIsUHXD7bpQFCP8T0n5v5n O6ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988431; x=1742593231; 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=m6UfP2exNMdeoKXUR2vjpjSCKDIb3uPINIMtTyZwoe4=; b=DbupFlbZF1fUxGnaV4S8Sqg97FbS3+X7ImQ4PXOHyz/Lq1JuzR+knVZn4G3V8Jmotn 7ASA2hTvO49b9vy7hQ6y0aEvfRs1l0MDDR3/OiYvMp6DVYvgEymjo986kho4AXHOjZQq Yelp2idFf3I5LAniuXg6S34K17oUdDe2wuLRJtICYeR8TNsmtLafyjG1v+6OwtWchQcJ +2LjLSahAoiAs//wBQdGPLSKM4HX2P6BtACZyHFpROCmM49t2r4bXiMkkHLPTFNVWGoo I4CasT+jo8kh4RVjL7lJfoCBC+I02kAmqjLjAfCdmc2VXkDAaKRxMGQBXacfYjC/n4Kw JQjw== X-Forwarded-Encrypted: i=1; AJvYcCWOfnBATwuVi2rxj9RZ9OadeLXar/DIK5XEwR+lvkHzbYeg/g93mJOOJnp0QFi/yyaQoNMF9O97hA==@kvack.org X-Gm-Message-State: AOJu0Yxy2f/YOLJRN8VnEFRixQwbYfzkGw5LaVCfNPNHjVYesjOf68Kt y5VnNlwyOl+FLQRZjmYBilEzJ040WSHjL4DRPcY9mBt6q83a3LFGhXFyNITBAgs= X-Gm-Gg: ASbGncumeLbkXjVUEbLgWlGzAkiXmUyvL6zRFN5+qvd8n77WEpX/aBq39637mMh7Pt6 lmGA6TR0UxKzSe/RoMtqjI39Bp7LQeE1811Tc4pILVJHbk7z7yhaP1yxq2rfE1cj9mWE1YYNl1C TO+St8tSiygsuokP5Y0hSJw+rHpmwsxndq4pTZOu1XWpZBP0J205TujU8iWZTN3d+Y2kPuxvG5K jeczwnDXwSM4hrMnWloCJvQxF2T+AtWbxJ43y/eNPSQu5R9YWbZM+YA0DIEZ4JJ4g/8AfpxMy02 gi6RCMoDwQoczu67K3wcBXiD6kp3luzz9cjkXbG+gytqwQsXzkOzbo0= X-Google-Smtp-Source: AGHT+IGRsLxN2WiToQ98rm3Kyv/RZmRX4iaBavru7/daCtC/YW0IPfGcg+wLCe+5mRJhPUTio+oyeg== X-Received: by 2002:a17:902:e5d2:b0:21f:ba77:c45e with SMTP id d9443c01a7336-225e0b194c2mr57083025ad.45.1741988430991; Fri, 14 Mar 2025 14:40:30 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:30 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:43 -0700 Subject: [PATCH v12 24/28] arch/riscv: compile vdso with landing pad MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-24-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 1D705140008 X-Stat-Signature: 555343fox7hdexfngnymimgw5f5ukr9e X-Rspamd-Server: rspam06 X-HE-Tag: 1741988431-824029 X-HE-Meta: U2FsdGVkX1/0uIAjYBHQcxvTIPKb+BVNKpk9ROtf2R/YQ+rjFwEqwySTUOJhRDt1U6cC89EUH1lR4U4vA8KR5W3a4FD6dlU2vq8wbhAC/wjjW9qH4ti1TtlismdFBMLSGC9soCEOqSprtEC/m8htTJDQTxsrPe7T38SHWdFb+H6/zxOj2Cv3gHQwTBZf7GAhH2HDyNRtAua9ciUTzFfutJryzRWryGWn+La9wOB5Ezqi3HNSmvRSzO8CdZX8PSLmcOGG4HjpASwhn9oL16oCGAFi4nmnzIr8YYadfS+D3szJWX47G4wj/YmZTrBvQzHAjOvUjQC0K2YtUtEdF05dJinkmDl8Z3QKMZX+1axFKxzhMwXgLypdZdURSCYYJfg3SGwT8JD2lZhemKm7r4ylMMZEyfRQuSocdlQkHdtQ9mDBbO5L9udJW0LOTbT7q3nssMB8+aQGmVjv6TDuMtKNMg566krx7oZitGJXiCk0G0xQhHbSYryJu137fD6ye61QrwpZQMeRAU7RP1P3LCSZAOBW8tSBcIDiUS86XJjgOO8bBqwM6JTS193seOaEktFwKhYViuFyrLjuost3dYshIMQ85fMuUJyPmaJzEY155EyE+oN/pfkgVoOLBqDtG0ZkKCDh7aoilxtK2BgxaEOvLPAiO1ME83qzNOrakbfzHJI7WFpTkldgYf4h4vrS3As5qb5F1cE8CExCXBQSw4vDgXXgdF4bWO2dGRXqx5OvKn2+JPoSGzM8KTtsJ+LHyRAdYyrhKHGijXlD5YaxSDX9bR3X7Ev58JGmdHtUQL+1eWXiq4UWUVXdyLkvhKdjvTSsSRD3enyQkfGfrhk1Aoztbw5EaD/2gBMa3+p0ffLe7oVH64p4qOEs/eDzo9eaPv3foaJSAt7PDBL9JGbHaNdO2s9zSIMLSqyGMTy0ZrnksRvZKaw9xjFlHffamI85M1pwhhDQxD9V4cRFDfIvVHK I9Fspa6x S+RcnxlmoRaau24+Ast6CxYC20flTdmWsCnMpBQZKDDUZAuY2f4KYBEgKgwQ5NaxsamEPlaDrtsLwjz5w+PtQGWMVRUSz0u9kKN6pkgVPQGl6ErgfYTOQ+LEaxPuw1ePo0auCLCSoU6rlAQZ4wP7OSAzc1zL6YZaFU0Yr6i3NacuOmAeSBESr94COJY/kTGoYdtOmD/WylTkwPUWBYAnGn/iCl9M55ybpgc8OQyjMYVMt2YQT/Oikejhn3hojJDWx0KSW15AUkcreoFn9B+ijFcQufmfkbuMlPFg3xYem2yGuPyKxIjhkW3h3kKc9eGZ83/6g7RoeX7uifGHiwQn3xRckGRyzQsC+DFFSt+dOGD7WMf2Pm6FCCe08tctM3kVyZH4uTVhWE1FKe2omgPhkrgfZkHyR5/jiNNca0FOYR43UOOev6Dm0L0qW9YXOieeebuJTcwgq1npYo9SIT/uNMJKQHxBSpjLbynBXmSm+UbveDzE6hbA5hVV9rYlTrPBfQ563m5sGtTgqwYU= 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: Jim Shu user mode tasks compiled with zicfilp may call indirectly into vdso (like hwprobe indirect calls). Add landing pad compile support in vdso. vdso with landing pad in it will be nop for tasks which have not enabled landing pad. This patch allows to run user mode tasks with cfi eanbled and do no harm. Future work can be done on this to do below - labeled landing pad on vdso functions (whenever labeling support shows up in gnu-toolchain) - emit shadow stack instructions only in vdso compiled objects as part of kernel compile. Signed-off-by: Jim Shu Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- arch/riscv/Makefile | 5 +++- arch/riscv/include/asm/assembler.h | 44 +++++++++++++++++++++++++++++++++++ arch/riscv/kernel/vdso/Makefile | 12 ++++++++++ arch/riscv/kernel/vdso/flush_icache.S | 4 ++++ arch/riscv/kernel/vdso/getcpu.S | 4 ++++ arch/riscv/kernel/vdso/rt_sigreturn.S | 4 ++++ arch/riscv/kernel/vdso/sys_hwprobe.S | 4 ++++ 7 files changed, 76 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 13fbc0f94238..eca94246cda6 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -88,9 +88,12 @@ riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZACAS) := $(riscv-march-y)_zacas # Check if the toolchain supports Zabha riscv-march-$(CONFIG_TOOLCHAIN_HAS_ZABHA) := $(riscv-march-y)_zabha +KBUILD_BASE_ISA = -march=$(shell echo $(riscv-march-y) | sed -E 's/(rv32ima|rv64ima)fd([^v_]*)v?/\1\2/') +export KBUILD_BASE_ISA + # Remove F,D,V from isa string for all. Keep extensions between "fd" and "v" by # matching non-v and non-multi-letter extensions out with the filter ([^v_]*) -KBUILD_CFLAGS += -march=$(shell echo $(riscv-march-y) | sed -E 's/(rv32ima|rv64ima)fd([^v_]*)v?/\1\2/') +KBUILD_CFLAGS += $(KBUILD_BASE_ISA) KBUILD_AFLAGS += -march=$(riscv-march-y) diff --git a/arch/riscv/include/asm/assembler.h b/arch/riscv/include/asm/assembler.h index 44b1457d3e95..a058ea5e9c58 100644 --- a/arch/riscv/include/asm/assembler.h +++ b/arch/riscv/include/asm/assembler.h @@ -80,3 +80,47 @@ .endm #endif /* __ASM_ASSEMBLER_H */ + +#if defined(CONFIG_RISCV_USER_CFI) && (__riscv_xlen == 64) +.macro vdso_lpad +lpad 0 +.endm +#else +.macro vdso_lpad +.endm +#endif + +/* + * This macro emits a program property note section identifying + * architecture features which require special handling, mainly for + * use in assembly files included in the VDSO. + */ +#define NT_GNU_PROPERTY_TYPE_0 5 +#define GNU_PROPERTY_RISCV_FEATURE_1_AND 0xc0000000 + +#define GNU_PROPERTY_RISCV_FEATURE_1_ZICFILP (1U << 0) +#define GNU_PROPERTY_RISCV_FEATURE_1_ZICFISS (1U << 1) + +#if defined(CONFIG_RISCV_USER_CFI) && (__riscv_xlen == 64) +#define GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT \ + (GNU_PROPERTY_RISCV_FEATURE_1_ZICFILP) +#endif + +#ifdef GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT +.macro emit_riscv_feature_1_and, feat = GNU_PROPERTY_RISCV_FEATURE_1_DEFAULT + .pushsection .note.gnu.property, "a" + .p2align 3 + .word 4 + .word 16 + .word NT_GNU_PROPERTY_TYPE_0 + .asciz "GNU" + .word GNU_PROPERTY_RISCV_FEATURE_1_AND + .word 4 + .word \feat + .word 0 + .popsection +.endm +#else +.macro emit_riscv_feature_1_and, feat = 0 +.endm +#endif diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile index 9a1b555e8733..daa10c2b0dd1 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -13,12 +13,18 @@ vdso-syms += flush_icache vdso-syms += hwprobe vdso-syms += sys_hwprobe +ifdef CONFIG_RISCV_USER_CFI +LPAD_MARCH = _zicfilp +endif + # Files to link into the vdso obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o ccflags-y := -fno-stack-protector ccflags-y += -DDISABLE_BRANCH_PROFILING ccflags-y += -fno-builtin +ccflags-y += $(KBUILD_BASE_ISA)$(LPAD_MARCH) +asflags-y += $(KBUILD_BASE_ISA)$(LPAD_MARCH) ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) @@ -40,6 +46,12 @@ endif CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) CFLAGS_REMOVE_hwprobe.o = $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) +# Disable profiling and instrumentation for VDSO code +GCOV_PROFILE := n +KCOV_INSTRUMENT := n +KASAN_SANITIZE := n +UBSAN_SANITIZE := n + # Force dependency $(obj)/vdso.o: $(obj)/vdso.so diff --git a/arch/riscv/kernel/vdso/flush_icache.S b/arch/riscv/kernel/vdso/flush_icache.S index 8f884227e8bc..e4c56970905e 100644 --- a/arch/riscv/kernel/vdso/flush_icache.S +++ b/arch/riscv/kernel/vdso/flush_icache.S @@ -5,11 +5,13 @@ #include #include +#include .text /* int __vdso_flush_icache(void *start, void *end, unsigned long flags); */ SYM_FUNC_START(__vdso_flush_icache) .cfi_startproc + vdso_lpad #ifdef CONFIG_SMP li a7, __NR_riscv_flush_icache ecall @@ -20,3 +22,5 @@ SYM_FUNC_START(__vdso_flush_icache) ret .cfi_endproc SYM_FUNC_END(__vdso_flush_icache) + +emit_riscv_feature_1_and diff --git a/arch/riscv/kernel/vdso/getcpu.S b/arch/riscv/kernel/vdso/getcpu.S index 9c1bd531907f..5c1ecc4e1465 100644 --- a/arch/riscv/kernel/vdso/getcpu.S +++ b/arch/riscv/kernel/vdso/getcpu.S @@ -5,14 +5,18 @@ #include #include +#include .text /* int __vdso_getcpu(unsigned *cpu, unsigned *node, void *unused); */ SYM_FUNC_START(__vdso_getcpu) .cfi_startproc + vdso_lpad /* For now, just do the syscall. */ li a7, __NR_getcpu ecall ret .cfi_endproc SYM_FUNC_END(__vdso_getcpu) + +emit_riscv_feature_1_and diff --git a/arch/riscv/kernel/vdso/rt_sigreturn.S b/arch/riscv/kernel/vdso/rt_sigreturn.S index 3dc022aa8931..e82987dc3739 100644 --- a/arch/riscv/kernel/vdso/rt_sigreturn.S +++ b/arch/riscv/kernel/vdso/rt_sigreturn.S @@ -5,12 +5,16 @@ #include #include +#include .text SYM_FUNC_START(__vdso_rt_sigreturn) .cfi_startproc .cfi_signal_frame + vdso_lpad li a7, __NR_rt_sigreturn ecall .cfi_endproc SYM_FUNC_END(__vdso_rt_sigreturn) + +emit_riscv_feature_1_and diff --git a/arch/riscv/kernel/vdso/sys_hwprobe.S b/arch/riscv/kernel/vdso/sys_hwprobe.S index 77e57f830521..f1694451a60c 100644 --- a/arch/riscv/kernel/vdso/sys_hwprobe.S +++ b/arch/riscv/kernel/vdso/sys_hwprobe.S @@ -3,13 +3,17 @@ #include #include +#include .text SYM_FUNC_START(riscv_hwprobe) .cfi_startproc + vdso_lpad li a7, __NR_riscv_hwprobe ecall ret .cfi_endproc SYM_FUNC_END(riscv_hwprobe) + +emit_riscv_feature_1_and From patchwork Fri Mar 14 21:39:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017512 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 06DEBC28B30 for ; Fri, 14 Mar 2025 21:40:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 93B8828002A; Fri, 14 Mar 2025 17:40:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C48428001D; Fri, 14 Mar 2025 17:40:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F21F28002A; Fri, 14 Mar 2025 17:40:35 -0400 (EDT) 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 4CAA228001D for ; Fri, 14 Mar 2025 17:40:35 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 945C11A149A for ; Fri, 14 Mar 2025 21:40:36 +0000 (UTC) X-FDA: 83221476072.27.51F029B Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf26.hostedemail.com (Postfix) with ESMTP id C770914000B for ; Fri, 14 Mar 2025 21:40:34 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=yeNugvW6; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 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=1741988434; 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=RHgO3WLw+YmwdWGhLYAhQ6tJSqW/uFwu3lLubQj4jZ0=; b=TTsmaHoilZqgFhQsgz71nLw36bZ12g28uNBZ+nEN2RB3mgEfCIyEb2SHvdx94X7hB8M9Id nLxaeN6i0J/Rqd++VsZWKJV8Dh8OBjnaA7rSXhDmqNj0IxLPLwEszJV7RtzwQ2WnmNhCEX BIKHcyBLNN4RRGMXPmBMH6qxtFDiyDM= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=yeNugvW6; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.171 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988434; a=rsa-sha256; cv=none; b=KmvC/N/cYGOnWtGC7kJT74hFvCENkaHci8P9SmPsAlPqWx9ylQKFcPb61gJo3NaY5I+aAq 6ymDYom+4txNYbVoYgDP7gy5IcjVqz+eqmBHJgmm5i8Gm9YjlRB0utb4tw5aeKcck9D5I9 d25jfKRtGrWWDKWI9hUtW5Jqb1TBNkA= Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-22349bb8605so56814445ad.0 for ; Fri, 14 Mar 2025 14:40:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988434; x=1742593234; 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=RHgO3WLw+YmwdWGhLYAhQ6tJSqW/uFwu3lLubQj4jZ0=; b=yeNugvW6mCbhDbAY6Gzk0xIwhDQgF4F2VlILLf7MUoOMV/rkn7d6MYTgU0ovMG1bJN S0NV0PUJ1s34f7tlXQYrieD6CUHnSRz6pMTLlAJw/y4akACiLFvBLi0J4hQNLUqUGCor tb5Cq+cdNI4uUOpFe7pMST2oloTF7a9UOojdaJEYCTJAQJG9f3gB0iTqoZuxMsMpe/z1 88J3MzYYO8Hlfp1c4xz89WsnIejoXaUB+inDK8YdGSI+io4l62oulwDyNmsjt0rchOxk UxnIwa803Oqb6JWHO0rdSn0KhjbPiwIlSN4/GvS5y9KMOg8PocVFJwL9wcaUG17ttcWm crag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988434; x=1742593234; 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=RHgO3WLw+YmwdWGhLYAhQ6tJSqW/uFwu3lLubQj4jZ0=; b=rJ15CduiJdRBBtEWXW7aV/MA3B1xH83IkWbF4ZTNZ04gbYGQod3X3RFGWY7F4cxYy+ HVyEa0QGHUqO+imCG9f/1riHdGCJAKTVSv3qV4V5Ym2RcXrRK2lYJNyuJxO/NbE4Ne7d zGnjVGPTCFBW+W5MMUjZBPQLRtPuaCLC95iGj7YF4XC6J5QT0I2vXhvD3xS5PYhmTXUi Ufw6RFysi7BlVKmvJe6ShFqWHMBXGoC/BFSehHxfmarquDAzsKqQJCj862bZDI7SXgbH UnyjQZMMi/hHaEyVkYjNXGPeBhuUZdHukq7CAdZZqNEjR+1pJ0wofQQYvxCKHTkIpxgf J4/A== X-Forwarded-Encrypted: i=1; AJvYcCXXvC4o1VutYFGimVgvI4a2UrxwQnXIf6ui3zBsFHx9bf695u3CggeOxHjScdpMvE6VTwK46QFmEA==@kvack.org X-Gm-Message-State: AOJu0YzPMmgTApMwd0v7cS7xmIaMfTdhlYNEKAK60Nzq1l1p3sgfsZZL OmLgGPzNQQbBfGT9nb5Ml+SgyWlsZnBqF2zNJIEI/zEkiG3NrNkekgAYEetmFqY= X-Gm-Gg: ASbGnctbSleRNXkbGX0eZgDSn+dpqa+LSDpUacX7NU8WEeg4d36SRSSZ2TPpOhA0TYQ qRLXqpLZmXnIg7hPpVNB7iwl1P34J7nSptn9clEB2eYJkGes4Snn94A6RPw6PgVz/Ss4G/MWkZ4 5O/IY0tRUR83R0JGZC1IqHOLGRkbYaZo354CKDXJfJ9S90m0z5xLSDOnLPxPlQGm1le2BvJ5DfS C2uaSBrtWNDftMcXH+wzXtsFRVFDJJjrE4/E0paPGKHMlpGlv1N98Tw6gNLXpj6ZsQtaQSVSLlt gekQ58AEEaiCDksxRvC7Dj6yY9wl3ZlXmdk7Op9PVb76Qv0crP+1jWs= X-Google-Smtp-Source: AGHT+IGwO6FdmJUbA9RsVYM+YTvEHEJUu4luaiuDWiqjNtcj9WvZlSftHA3OvhahsPKrta0EdbsKUA== X-Received: by 2002:a05:6a21:394c:b0:1f5:7d57:8309 with SMTP id adf61e73a8af0-1f5c119438dmr5984307637.21.1741988433739; Fri, 14 Mar 2025 14:40:33 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:33 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:44 -0700 Subject: [PATCH v12 25/28] riscv: create a config for shadow stack and landing pad instr support MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-25-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: C770914000B X-Rspamd-Server: rspam08 X-Stat-Signature: cq7ufwa3ygtpw4tsm7xjydjjmqqahyu3 X-HE-Tag: 1741988434-245515 X-HE-Meta: U2FsdGVkX1/8y2ka2vvcLds9RHzSAtHcxh/97rG4E5cToeZNINVLNEtj3HUelRosgEa4zzAVyO3JLIWW7E6pNB9dX/Y0SlTDSUN9EKj0nKTqPBhL5OfLCpY52ulk6cvjU7ArKyfA45p12vtdA0kyDugrPItg015ruJJUOdSOgMDmYJ4oC5bu/MbOLYbKidfABQtOE9Rk9jsKSl74nCdsNrHmqpOaH8wN8znFHigH0mNSE5qGD1Fi/Kt6wOFO6Fbk0L8k6i9YNnh3Fw8G6Ar957i5nPeYGKp7xBbAwi7IM50VQW2deSEKihn8g6WeIuAjSL0N7W3YlJRGqIc7W5fPZ25jfPEhgpC7V7s+SVsWCR85QZZucvaBFRD8WGNGz4cGg/Oi5UUJc2hEik4jErP3jp5p/VxQpIj1mlvBd4cAy+wuD1F0s6uhI/NbPweumU8l9eDOHAAWyfTU+ib3XlWk/EgvFV/Yqk6opdc5/nzq92rZLGbzRj9tVgRHj/pIxmZ0pSVXdjNh4TRrRanmv2wlXtkr4QuhHF35dVHplIRie8WQxmlKuGiAtHl2aa92IqHv86dB6Yp1wWRXiZNyTdpaVK0Rm25+Wcbd8ofOK/TPnobxy2J0w2Wo6OrI1A+iw/L41Wu7lxpL4Qz+VagLKB8GhReIupZUyotPyNvOFf3Pq4EmU+xFegoTWo8wjJ8dYPBKe4bHCL+IzUaFbbG3nppgbeSajdIB6h6K9Rdmo/g1p8oRb3HtEk1Hp9uPJ47s4H7UnmBQ28Q8aad30BtI3H23qF8KuoESx5j8piAP/nr7tcZU0Fw2Rp/hKFyy4NY9bgw5hApST/2go7ITbgcLm7E6HwkCWx6ewCtT/V1LjdYFGUggLcQAf27PcKQMDs2dLiJVVUuoMA01BiM7VepXlehgHvKeS7LjCUm3v0X+7rpfPv/glGph0FoXeQIiuZZ7Ri0ftur0ka7M1QkcOcpS/aC SurK02Y7 3kf+HPyjOwt1D7dvLiXOUW2DWRsfoddPxVFKHFYBjdKbmwus876hVRItn+v6tY5eBp5XMQAlkKormyGHgnu32eHSRxSh+e1NXnHj6+4ILniYktNA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000045, 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017513 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 4A401C282EC for ; Fri, 14 Mar 2025 21:40:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FF5028002B; Fri, 14 Mar 2025 17:40:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 88AAA28001D; Fri, 14 Mar 2025 17:40:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B7B528002B; Fri, 14 Mar 2025 17:40:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 47DB228001D for ; Fri, 14 Mar 2025 17:40:38 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 766E112158B for ; Fri, 14 Mar 2025 21:40:39 +0000 (UTC) X-FDA: 83221476198.12.2E2BA4D Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf04.hostedemail.com (Postfix) with ESMTP id 8951440007 for ; Fri, 14 Mar 2025 21:40:37 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Z1zAUVNZ; dmarc=none; spf=pass (imf04.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988437; a=rsa-sha256; cv=none; b=d71N0ttFdviThFSYUpwss/hgYKC/guEcI4RYPxG2+gjx7otjfDWIZX3rU4UOyEZ46wiRO9 sUt44Wor/g/vXVYOElan8z7ewtRifgB70vpxCJ4Uf5EW/dE9vIkYlwmOU81Qubz1VQ1giJ 68vSTLw5rQkmpTNdxl4kor22SKO0q5c= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=Z1zAUVNZ; dmarc=none; spf=pass (imf04.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1741988437; 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=S58lE55A7IFUYe9923mKAAObQ+TwOi1jWkuglFq4t0Q=; b=IxQ+rKpQIlKDvfpBtkcqtTm2Fpz5DN5AZ5O8dpRc63H2HSzfS+58vJQuFa1eYyGcDgf6P0 thvrGXXpNs2eyD65OwebRzNkXRKvbqi3W97A8J25hhFcRWjMYEocK1bNBIHWNlNzPVqrOs GfLWstOqtLvb9xarFTtsfrUASp2/1aI= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22349bb8605so56814925ad.0 for ; Fri, 14 Mar 2025 14:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988436; x=1742593236; 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=S58lE55A7IFUYe9923mKAAObQ+TwOi1jWkuglFq4t0Q=; b=Z1zAUVNZJFZv3HNGM+h17apDpTERCv6FCD1SQMmHlh4Y35nuBVdhHiuGptsF71N6MQ p4e8J5147jIe6Ws/RV2+xlTkvrpWRRs4Xs8kmvLourEN1za6grG8MxwZa1IwW2xUakDS A4nPfo/oAVOS1h4gdkusxR6ZR1ksc2bcxf/hf7xGn8lSCoFpjtWZAwywIgaaCHBpMudw WbTZYbciQ6UV+IEPadCZ37CWEbHejp8p0RjhabMCpCTlAew7trIAl0msWqCNm+b0uPCL qADPBuK2/tcjssjqE/YyTbr6+dYFAvYjazNFdjcGcASjNHA9nWl8kTEYMezaS/O0qAhz GphA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988436; x=1742593236; 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=S58lE55A7IFUYe9923mKAAObQ+TwOi1jWkuglFq4t0Q=; b=mFMToU/3VNXN9Hmk2lLnoThUD6NA48ld1eoynAOnWkt074eBAbIYR8F0kBJLftdPPr iR59oBYcCmOkIs3h/GW9qTs2aXyhws8wMu8zgm0WNTj3KQMhBpgg7rUviCgmoq8H6l5u QvXSsZEtUEfd2dcBQdLraY0cgkfs2vqd4LsK7410h3w3NP3c8v2gQyNeZbOJL8+p70jm pTN3HWfqeczW+0HDHxv2SvfDmZg+VUwUBauYtsDucwUSM3AUpzA/QGZrqUcYXCrzaQuc OkNOKmyKqex0p7QzvcaSuBqdEgoypzyEOKgi6MgeLqfhWpxvG3REJyp2n1TjuKos5I0l +kUQ== X-Forwarded-Encrypted: i=1; AJvYcCVIvN5uBuUiOL6ZyCyFucW6Wk6X4tXxuwrJdP44PXQ6j8z0z4wpGxiVH5GJJGsn6tb5x1R+9jAiAA==@kvack.org X-Gm-Message-State: AOJu0YwCs6kPol87YwLIWzhP74oxT46V+eBLeWSKBZs+hh/znHLfz0x0 EvBks9x/b2g746/qMJ7CT7LLe1GAhUGAvGWYQhHoEE4GsaFrSn5nijqM5AqnITQ= X-Gm-Gg: ASbGncttQO6/ObW01Mw6ycMTMNU1gtCBlZG2M2u6P7PsmporuCtbjc3P4HC62aq2Ymz zApqeOYNhWL0fRlYHW4PdYFTiyGvg9MJk6YEBrj3aWJwY36zzBzNJP0xt85BOdGP1duuLZX8pJz VxfZkGZDSoLbsNUUC+x4aIc0i5hYozRGAaZ7h/seUZmu9Gs/qhE02cdGC5iPYLCD6sgQ8c1WbQG g5Q4qbDwMmEPVK5D8Yq6l1EjfHxUwBGDQkxm8wiosfQ9Pnk0fKao5mJSg1E0bMgOUmvW04Usbp/ Ub/j0AhqGwDGii5UvPsv4y3N70TSYD6oHhrKdGt/invY6GjOh4j5t62ms8d5KpK8IQ== X-Google-Smtp-Source: AGHT+IHxioJjWTqWYTnSKNhIGhNEZD+Fw6H3+v9MmF1O2GdMnurdCyxzj4vsKuZgW7kLmsjMSOe+qA== X-Received: by 2002:a17:902:da90:b0:224:10a2:cae7 with SMTP id d9443c01a7336-225e0af9d92mr50203725ad.40.1741988436457; Fri, 14 Mar 2025 14:40:36 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:36 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:45 -0700 Subject: [PATCH v12 26/28] riscv: Documentation for landing pad / indirect branch tracking MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-26-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: bs49uaqmjgcpsx46tozdh5dao783s35p X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8951440007 X-Rspam-User: X-HE-Tag: 1741988437-393781 X-HE-Meta: U2FsdGVkX1+1ivcggAxzAdqFakn8KYC7xTa1Nmli9a8+GhAdtxmAMfucHbV+YXR3d+7oBXgJuSVreHi/+ZD3TYrBfE+acQ8BACmP8072nPyd6T6icVRDKQ9ol4E5dpBzjrGsfitgtKnURawhvUNURZ90ornHZMMCGVeSlewa4W6uFZSA8XATfn4kLZwPVaWBb9Hfy1Fe7Z34kk+UVoe5Nu6nwxgUKm2ZxAkZvqklwN9LCQ+ev8k4smo7nEgZYYtk6ObhpoorByBygXVLKPuZDw36ItaYOQFkrbngEEZSUHmN8QI4Hq2+biu4hQBdah+17ffJ56OGR/CFkZYGegAK+zBVaTL5i62liBBqPrTkhxeu69mraEBhNYi05kNvAo/Gj7dPXU7LzzMUYFjspNUtTyLFeGIiEOhq5cCmqcXpa97b5hTajm/73KmNtQrSeIGS3o33mT0o4PrLMQYe1FdzuUW0I36PaSAECrKt1hq2yE1z+ON93BnEae9d51yDz/VC5jXh4OnwGx5s/x9EIQ9N9QYHtYBZiSitG/f3p+TLjJehWSwcY6e8GpC37f1HfK65MADOLcw5yqxGwhhq6zA8XNVueXMkNP5zedDRamtB+I4CHUxjQz8jNIFdeflyBgbYNy4Qb8BFj0W+to40KVps8B/UQBafJFHHgvH+iGF2cyS5Xh+PYBtu39AgeAwShu+iPMICkjOK5vtG3JHZlh9Q1HZEzpSprGfIPttpVFug92zHWMBFS4G1984U4SnFzQ9fZKInJkHZOMaVEdxqekV0pxAD6jjHkqtkqmvO7/T+ec1myyzmKBj79HzcWYhBL3f4NO5Qj+Ns2gy1cxTrclrKz3EUs8H1jd6bU9Ax0FSU8Zi5GaYW1nqE6I4JgWsFIB7oOjOjHHQL3LGYvxfyiFuYjoL15m3oXEAhSwgstNWNWyKJ/C7Kxdxm/SMxeSSulwVKOs9AegHQCCQuYYmuVgc w8XVCYuc Mmp5P1CbpUM8ga+bLtUQU3eeCmKsVZLRN/9MOGWMhvpyM4tLqyzyuv5TvVHvnU9PVzc4PkoOUSnLJLByhGyPGzAUUJY5EFSiD7eZjrkuETad3x8BM8lXA4YyaRNJYAfnASE3akPAk1DQDhjbElt43yzmYwMENKcwXM7vvHfCFEqwIjTcASTCljrUNfadnA2hFo17IYiYa9+jLSpa81RNkfjXtJl1PPS7oBb0wCjLGOp+dyGXAxikg+eJoOe5r5DCxsWM7PeYldVs/NrERe3TQGYJSumcaujfy7A5iw1XcUiqnyxEM0HyD8RNadmQ9o5XZnoNKNvqkDYSEXcYIELxB9NJD6p2VGRtjicra6E+lt3WgtqjtHfGTer2a6b56yqDVZlyEZ2NSW82bf4NvO7gy1rWWGnkJlaKMdZhHJwCjT38iXglCfWbzU1usJ8RdQXxUw1d5ZcnPXuowsVsHhprKMhMsrD2uFQJYgCkxiaUd1Z4qxMXBD175dDhpC5m6FozdMxdrQeo/zTYe/cw= 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017514 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 384D1C28B2F for ; Fri, 14 Mar 2025 21:40:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CC7028002C; Fri, 14 Mar 2025 17:40:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6520C28001D; Fri, 14 Mar 2025 17:40:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 458BD28002C; Fri, 14 Mar 2025 17:40:41 -0400 (EDT) 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 1E2DF28001D for ; Fri, 14 Mar 2025 17:40:41 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 53C3AC1584 for ; Fri, 14 Mar 2025 21:40:42 +0000 (UTC) X-FDA: 83221476324.18.6B50FAA Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf27.hostedemail.com (Postfix) with ESMTP id 66AE240009 for ; Fri, 14 Mar 2025 21:40:40 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=os5yYDUO; spf=pass (imf27.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=1741988440; 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=ZcP/paQnVT7Rdltm9MHSxDkYfx/z6vUAqK1vSSq+KwM=; b=e1v8SqBo6oyFdEmrcdu38hD/LI2586ywePUPlBFXehiECH7HiIil0OolaqWQr9uzKpG5DC nyHStlqNXxk9ShA+4Ufm1k756bqRnXld5uSEJpaqS4EF6gkFjzfcOHA0JweliiyuKmr/MX 3APHzzCPvLbrvbLYfZ28+9e03vqmvw8= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=os5yYDUO; spf=pass (imf27.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=1741988440; a=rsa-sha256; cv=none; b=B4feSRalGdrDKrbFP4DpdLfyKfCvYb4jsskjEL7TXVoCYGNUBOeWcgz3pDLiqZyaDbm+bH E4GUZnW1M7KJJ0CgPpt2pbBaRWpEQ8v+5uHnvInzHl6PyaaKRHl12QYObRZmU8ovE1MQtY lyMU2tn6pRlNaQR849/r6t/fGrHtRwI= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-223a7065ff8so70892925ad.0 for ; Fri, 14 Mar 2025 14:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988439; x=1742593239; 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=ZcP/paQnVT7Rdltm9MHSxDkYfx/z6vUAqK1vSSq+KwM=; b=os5yYDUOuxgwPT13NsWWmc72oS2fLHqMiVZ+6M/SNH7NsHWUvCAVtq7I1Xy/zJxFnf 2y/yZ2o1qJYJbbS2hpZykoio9pRZ82GuKLMr5QxiRX3SmQ92hxXOGzlASSJRoIld9z9L 6rB2iW8wO1vMnweitfQ5xsk6RXTaWqF1Fz4/n/8BJziLKFiqSMaG+EFq7vZ4X5dkQaF0 3nXBQfYCJ2Ugrg7XfJKq2+PivIjpRsg8kEZ9Ob33Z8dfdIxu65FgfnS9gxxQFYblw2fU xEn75r/F+uj9nF2cZshysxGoxActpBjAkJl6ogKpqxlM1T9+KcwhhKX3ckDrY/7faOvC CR+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988439; x=1742593239; 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=ZcP/paQnVT7Rdltm9MHSxDkYfx/z6vUAqK1vSSq+KwM=; b=d/vWJ4ktjX4XwgwdLknm+Dc0AU/rsF6HK9CkUsvTavGPqTFO3urcwVQPbltck/jacg gUQSyPxMzPDEe3gmfKsgJLg5Rq5Da1RyE+ZQH4Yscw8l3pXznGr4wOw9Zle1lvoI6y+v bTCyNzge6n55o56Yttl8cCG9C4zShgvt8pyR1fjESzKHONGMBZwcKIdTaRFTQF7dy4u8 6mJMV8mvxA2BUfBYiq1bHwRWushYn1LXqCbC6CZuw1OuC++Q9QAcQKVWqwLatV4Kq+W2 NIzilWZ4feg9WOuujgLu6e+DVn96BnmcZqc1K5l2iVVhjCvQVlsi0rGjIZMBonS2cZfx MyHA== X-Forwarded-Encrypted: i=1; AJvYcCUTGRNWFMjLufwYJtZMOWt7kW57OchQjjkJ6xG09O3YHVCY6KkJ8SP+o2C5lm7DQxxPbGRikMz5Bg==@kvack.org X-Gm-Message-State: AOJu0YxfyxuOUsl8WY0X3POkReS37sV0GsiibzVjFTw46GgwWH+0jvKQ EVt+cRQVpGWBffWWzVF5CWVcWHCUpS3X4QX/trYjEB6bR3k/HEkUo83egx/6VEE= X-Gm-Gg: ASbGnctf++S3kgyi0e9TcvhaYu93qBtlCSPzQ/jbNVPNlYEjxlfoViGt9hFLLUTAcs2 TEaifMSpPuQM4jOE0uZs8gPuAhWDfk0S9SYbLUau3vVunEcXZAMeMNyux4Fw6NBAnN88p0fxkUu lBhMizpAFweiphAyQ+5sujlHXvxxow9ibO0C3Eoq+72iSV0ovdjAXN5j03XggEaVkgegKy6r7PI p8adi0O8gEQpW5SItOXoQ1/eta2146D6G2zpK159C44JsutgQE49VfqVyDbiac3MU+q0oRX9GW5 19VhdvI4kyWT2fUl8w+XP/llytr5p/T7gUUNDIk44uVwYun46csEtY8= X-Google-Smtp-Source: AGHT+IFAr9w0NnfJekHlQM0Z291vOiYWAmpXp0eFWmQKfncujb2meKT0mbAImpm+WZ61lNPTT6Tc/g== X-Received: by 2002:a17:902:f70c:b0:224:191d:8a79 with SMTP id d9443c01a7336-225e0ac31aamr56778535ad.27.1741988439190; Fri, 14 Mar 2025 14:40:39 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:38 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:46 -0700 Subject: [PATCH v12 27/28] riscv: Documentation for shadow stack on riscv MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-27-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Zong Li , Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: 66AE240009 X-Rspamd-Server: rspam03 X-Stat-Signature: xghqouder8jd43e43mk851xh3ms7a4ok X-HE-Tag: 1741988440-123390 X-HE-Meta: U2FsdGVkX18rqUCftmB/2WUmo2qP5gV5TeAyPTPsfJZ8KpuDZ4Lb0y70cumgOkBt6lQrlNF6L4c7d6kKv/Os8YMtCLRh/C8CIuTAN/rubj78C0ydx7u2kt/6uMr2BiTiPgIhwlGAcku3icYtYt8u+mRemksY6UUZV+dOWD2T0MTpDx0OL2bWYV9LZgv7icy3m52/e2GCRB8y0cA0rGyiCBLcy2vdBDZWEJAOOnSFLZpycb8Ow5JbzJ5GzNqO+3P7Qx4lMYe7gsJlrVMk27ZlJsu8PggzYsh4mFy15Ht6GFgRRQ+yIyll3voi4ttoOP1apxwBykJ28kfPT+kown6stBk0a6PbgntVjLMYzv0BFiEFC/z4z9XZygDLIwy743JbRsglDopZ3URZKmz7IE5LpxxOM76GCxJUy6hsBaUk7szJSOR9r91AuSzO5+CAPksSof96AWyXce2JuL9hfD26gzRUBk2BzhsrSw8bKbVFYCPmRne7/TlsVObN8eCdb4bsg5UZ6K4JBQ9mtzNdG/Km9tVWknDCQT5BNBRsBfg8BlXvhL3D+BmenglprYP5XYd2TTS7eIJzZPNvrtuwnRPjwBhPU6Vfc34/kwEXDxbSoqt4aINAsu+t3IFHeHaFXP8ZY9H7qdMKBw9CBC9+Bz7xi+o5GkTYiDT2qnlO7RbQgAkRrLEOHF3808+eIasA37X+xP/aO62RU5TFjRn7CDmj6XVDEbk9jhi36myB3nWLnLqUIgPIPDg0P2RFM80ppcx5gSO1BClM6amjho6u+dzI2PT48qLgGK5V8wd3mCxaNuFemC8HSBctxqj7dR3wk4O9CNUNUsnP53yLtCG2yW1IMSRNJgBbmjElH5EUuee3qsXtindzfWt1sqXwtnl2KlBXRW1kKOc59ZNMnjSNip0wbcvEjoepL+qVQN2eeRMRpNWuQONWTygUiUaTt4pTWsYAa7CjdQQbZbwEtpuCZxu Qtxwfqmq nHwvCYo8wxBpfwgYNq8mhHm0AzFfZJDA7DQ46GMsA1Y2YzWNwU6hsSEQcjwPVb8F4ySz4qJuK/R4ruO844ajrX/FHc59s3bQEmlVojvIZS5V+1XVIHm6VdqhizF00LS0HXmKdo1jyVD4+3DTDeSQnTRPPKsh6846cB35oo2qkb8nSmDhRBMrCEruy4ZYr54Y+0WUi8Dz6/XtnwpgLRLbo79fXIPaIG4H6gHFcFnnnVrd5PSjnZxFCGkC/wrzlF1EUmZNXYtu9R7VELRQsdIiqAUy11th9Mz9SVOjR9qnQRSDwFp8uIINDSXfIIvm1zxLJ8wIlIJhRp1uDKtKcewU+W6Lg0D3T2BuSwROmt8L+PWozTOvNDdMoz8cP1MkKUfHHsZdK3SFH5l0KvAS9x8AVYYurqwhDebAidWSKdr7yR1svASn+NSrj+FDYTP4QsgpW1Xl5Iqf0zcpbV9ciDVwMKH+wa8Vy68HLRyPagUiuwNFVCa2zymUo27yM7wyqNUjiLQkD8QSJgPBdSJU= 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. Reviewed-by: Zong Li 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 Fri Mar 14 21:39:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017515 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 97D5DC282EC for ; Fri, 14 Mar 2025 21:40:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 113DB28002D; Fri, 14 Mar 2025 17:40:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A0AC28001D; Fri, 14 Mar 2025 17:40:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBCC028002D; Fri, 14 Mar 2025 17:40:43 -0400 (EDT) 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 B4F9028001D for ; Fri, 14 Mar 2025 17:40:43 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 034195704B for ; Fri, 14 Mar 2025 21:40:44 +0000 (UTC) X-FDA: 83221476450.12.ED18C23 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf26.hostedemail.com (Postfix) with ESMTP id EE10B14000C for ; Fri, 14 Mar 2025 21:40:42 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LpcgR7qm; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1741988443; 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=RmfcaIG2+ZxQBL2rW8bdYIb6OkoBiSfoVoV6JRsGlDE=; b=6IqOUtsLGl06L3/nYKhOm+4ECd3kvlsKAY0oSFQiNxV6zyTx1fuK2hQaBScARR5QNHyQHb PPVzwAEsvaqWrsQWg2lIjBYP4DRLuLR05B3IeFiLFxsRB9io3q4LfcvafGeH0SNrbNV9jd UfBXprsudtP1nZuubR43OdUhgqKU7to= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=LpcgR7qm; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988443; a=rsa-sha256; cv=none; b=QGptOYI+tUhDX9UHHtT1irIAx+pGaMTFLUEG8bL6HNYrUKAlqa0TFBYlXH68NIAPpajpAt psez7a+4jHMlulMiWs0M5Nu82xPW2ct/y7MnfkOb4TZp72lGeV+9b4gte/FxMI3G4X+x1Z TZ9FZoY9GGcodHUkXqNXUItW0pX/C40= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2254e0b4b79so65818375ad.2 for ; Fri, 14 Mar 2025 14:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988442; x=1742593242; 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=RmfcaIG2+ZxQBL2rW8bdYIb6OkoBiSfoVoV6JRsGlDE=; b=LpcgR7qmAb2oqbrB1VOp0MzqkaHUkLPpMCGf99xP5JZ9R9erAYcWSiPDjuHWiNlSU+ wFFcw+T0tjvpxWgBviCuNuel/Yo0l4H+gHTkqdoT9jku9F+maRyZM3fQUkx0TM/lo+Ea yRA/wqFjPMWEP5I711kSttvjzhksK9RCg83/hfwIn3uDknIZdU39PZWHAf/DYu+Cdbze nK7z4r8boI835Ww+W2u10iDfcPIWTMjP9P5wExbm/txkqROZEFXU0WxRq0jINb1m35TC AKwBiMEtXIES6P00GJZZqx5jLYBFLhY8qunMXRbdb2hZ4SQp/ZkibgLUEvArYw5/w02u aV/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988442; x=1742593242; 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=RmfcaIG2+ZxQBL2rW8bdYIb6OkoBiSfoVoV6JRsGlDE=; b=TGDRH6Hv4+BzD0LHyG0NWf/Zj80XTJkDae2ARAqNzaUhOwV6V2MYR2+ggo0uffJgV/ 3MZCtn3l5TQivGZRWGyuRYQXNGhs9ChMvxLJT3dOD4VBekx/Yx1NLUtvtNr1nlTX0MsM mWEdiMkuRceqlSoDeJccf92ahf9bhJd2pHLt9+gS8i/KCmg2z5ToXK8eqKjO8Z+i96go e3u4ri13Hf+cVz9lufhLT6QykztX2RWO9f+N8+oX23gXq+YfdV7irohcqCexy1iQGbXk Hm89QguJs+I9/nBR/6hj+TVw4jA6IjCT+D8RE+2UzU/P6Fr74WussBuMFu3dHrv6gfI/ 8wnQ== X-Forwarded-Encrypted: i=1; AJvYcCXQg9uN037OTmjb2pcQ8UCe0kfNFHGFi9MDG5KEMZBG9Vojr/yPIUec/GE6o4N8SjhWLgzgeDN+Tg==@kvack.org X-Gm-Message-State: AOJu0YworEx8q030AjwvlTe38429X5EbwsgnsfyiwieFyShUCgLk5FFt Mu/3RZnNjkBtwaamT9IkghOOrLlPOkQH8WNV6L9GBC/Sr74hZWZVcUidb70b+y4= X-Gm-Gg: ASbGnctU8X/hEXbkIaC1Q1AQvMoSUA41gXnajk8V5UyFLntFKYR8s0gRPIXCbghvJ8f JPMAQVztWi8oMmtplNoSr9x4iDPQ226jEC5gE1EiGyT1O0PDl2JW6AoKde4LaOCGpaQSzKRB74r i1Ksw1/W+qitVh2md6Itb1nB+UDTxmeAorulDR07yGOaQZOdDtczN44f95nCEVmzdk9BQrIR14Y QiSf7bstLaLd8ELusLj4Yyi3+9zX3+YO+ZOHc+W7OGVu9AcdnadC6ky2jroQOm9fZJY+QlsXrcY 42u93LCb0bJs4QaYDQvPfh+l7l0y+AmEQNlmdMzvkbhqu6vRWE0fxS0= X-Google-Smtp-Source: AGHT+IE/Z8vCidWa22GabdcVyMtBUcBNFMuQ7kyBxtmbMBnahHWy+xRZHQk35AiDOY5DS3SuGw5AFw== X-Received: by 2002:a17:903:19ed:b0:224:26f5:9c1e with SMTP id d9443c01a7336-225e0a15b4dmr54069005ad.2.1741988441930; Fri, 14 Mar 2025 14:40:41 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:41 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:47 -0700 Subject: [PATCH v12 28/28] kselftest/riscv: kselftest for user mode cfi MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-28-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: EE10B14000C X-Rspamd-Server: rspam03 X-Stat-Signature: tbh7suis4xwcwefettuur5rum3rrrx3g X-HE-Tag: 1741988442-642326 X-HE-Meta: U2FsdGVkX18kLMOj+WGQby3UsNiiEZYoY3RjG2XHgNUoFacHxdStMBk6ORM4q7I2EEiWlUP0wDnn1kBtyUCy22UfqvG82b9hvVVhGxcdUH4NWs905FrmTZlVgdHjV3t6ZVueXhu9Sz8uQxjephQyGGijln03oHwVpDcaOoK/nCoSZZgdH7elRu58fxxMt4Ba+3Zen1/jntpmX8qAD9HadXngXCIFSgUGNf039TbBKA5Yep3IgyDz1w33/G8rzXmInjiv6fdSlSQ2K4cqtF7ss7NwXiRe/9UhvKXjkVmTRrARaO3xPnIZkOBjgWeVWiaDi22GalymqRRgZ+6VWiYtTzCqRIiVH3rYBREphEAOt39Qlla3aRczaFfmN7fYQfT9kjCuaD+LuPDmHnlD4MvVycJMmIsRXlVdG4CJg1gr+Dq1Bo0Ma6YKMrCrAeNVyHRwmkS1dB/qt4NHP4KfWmF5y8MDE3Lx8I/m+VK9QQV731E9ce1aAgsB6A1wd/bN72RWG7Os2USxoCMHllUTk96ajgX2L7Kv3f3HQ/2FvI27dnsFaAKsVWrR0lRXtmR519OFz8fKwyG+O41/2/X7Ef/4XMOeoyXar+etZbqV8DFqQoK9r9wOetHiEAjHhIOSbQzwjZbKJ9UF2Vvi2L8azHTrRPDCYs/z2bt/BLp8F7Ac8yNUtObmWlemhsrxYjxV23CPCAb6KVKlxUcdyPww/eQdZ8Fw8PQZ+B1kpdyom5jT8V0bDbs5fbJRuZAhkMTLWttS2EE8GP3Pyusy3tgkPJNCboKTRubB4sSg0qM0ncjfcwRk4AXPgT1uvcoXW55gZdubeBpAdNJAa6qKflS5p5Gl3e2Z7Yq4PYV/9amBZFRod0KG53WYFg3uGh6Epk7paKVYWm0h94r3+NQ1A30R0NjXQer3qiySxbY/IafAq7Crz0XJXLv7nOrBycSkbVtg7/KEdw0YDUT434Z9h48H9zm i3FouEFa yT8Zd6HNuJJgq7zv9hNIfhzAhdhejEZoLvk2uGRo4uDxExZvoPXbbZhFsGnhBt614tnHdojY72ehCyN1Ox5gE31b6l02xGmD9t8DSWCQp6N63RbQzzqcUGNIQn+Wi6lBrIXvL2jXLDL0RvTT4lFUS5bObupLwSfSE2HO7rZqnQxdzsPZ3IHNsNRrzPpUeLieMBK6/AirvaleWI+AfXG4sFXKT7gvDd1x4Y7EynnVUjBzXOc2YcokJgkhvmT+Rc3aQ/zmfLKsSU/VDB87CgaKoucd4ILxl+tML0LvNP/ABusw0YUWZxcndPSGSyqXaw+LDRlZvEZ7lJFxbS6N9nafrerUv269zKyEt/130cHDT1W6xfOiWmTU8Mh/Wx82O59ASs/x5CbHOivzraVxHKKb0PwQoCqLfQJ1SrC91I3/uONneYu8hqCUCLyP5nQDn5CGwafqx2GdoGtMH/Bw= 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 | 82 +++++ tools/testing/selftests/riscv/cfi/riscv_cfi_test.c | 78 +++++ tools/testing/selftests/riscv/cfi/shadowstack.c | 385 +++++++++++++++++++++ tools/testing/selftests/riscv/cfi/shadowstack.h | 27 ++ 7 files changed, 586 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..1c8043f2b778 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/cfi_rv_test.h @@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef SELFTEST_RISCV_CFI_H +#define SELFTEST_RISCV_CFI_H +#include +#include +#include "shadowstack.h" + +#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..53387dbd9cf5 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/shadowstack.c @@ -0,0 +1,385 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "../../kselftest.h" +#include +#include +#include +#include +#include +#include "shadowstack.h" +#include "cfi_rv_test.h" + +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) + +/* 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 < RISCV_SHADOW_STACK_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..0be510167de3 --- /dev/null +++ b/tools/testing/selftests/riscv/cfi/shadowstack.h @@ -0,0 +1,27 @@ +/* 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); + +int execute_shadow_stack_tests(void); + +#endif