From patchwork Wed Apr 3 23:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13616816 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 67022CD1288 for ; Wed, 3 Apr 2024 23:42:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 58C826B00BF; Wed, 3 Apr 2024 19:42:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4EFAF6B00C0; Wed, 3 Apr 2024 19:42:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2590F6B00C1; Wed, 3 Apr 2024 19:42:37 -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 E71096B00BF for ; Wed, 3 Apr 2024 19:42:36 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B1C58140AED for ; Wed, 3 Apr 2024 23:42:36 +0000 (UTC) X-FDA: 81969847512.01.E33CD7A Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf09.hostedemail.com (Postfix) with ESMTP id 19839140012 for ; Wed, 3 Apr 2024 23:42:34 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ijQP5OU3; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712187755; a=rsa-sha256; cv=none; b=JsyRbfDV4Ea+CwXrI2dosEHySrCdlB/ncHCLaMPlhaB+cI83H54OHGkLhcw0IsUhyg/pIa cQYo2BO37ao+xn2FWnKIPf6u6CNYLS/skEmgHy1DLTAn0KV+KIS/crQHv6/DSjsdnD31t0 LcxjS96E7zKRil8a22GEoUReC2ggCjQ= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=ijQP5OU3; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712187755; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0OEwRph0hX4JYK2tSpTwj/IHXbbgfxXFL6/9jyQkq+Y=; b=yGbkO8zwzqJpss0IDxAfE//sP+uDgHvr1qeoaYpdVDxcGzywFmGoBxKX9/8/i4xCrppsrc Zzzsfh/iA4ZnhKXlzh39dgLo8SxFyBzqo2k8A6cxdUG1xPAbG+SseiDSsEzGV7VNNrEMc6 HUKjphQ2xF5PWb1KjrsQQ2U+wpX2Vns= Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-6eaf1005fcaso274832b3a.3 for ; Wed, 03 Apr 2024 16:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1712187754; x=1712792554; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0OEwRph0hX4JYK2tSpTwj/IHXbbgfxXFL6/9jyQkq+Y=; b=ijQP5OU3YoV/pNf8iyaPbWZh2KsBudnjHQF7R3+nZmnE9esvrqg5ybW0dhkOJXBCjV f67qQu/DWYdg2t0pWLHtQgeId3nmdV35ArZtSpzr2XajbAyannnVzLNE6m2nmPp9ynTo PduKl1lb3hyW8bmKfxco6x2MUYQ1jEIgJOE5XN24PRW2FEVbV+1OveV2Wpj4dOf7/frw cztFCz+BB6dbNluEtY9J2lLQCpwzaYIBj6kQ/zgoO5A/HX9Z4nJyUQw8yO17od57jzWF e/J8mwyQ8NamM1BT3zWjKak+0mVgtyTgJbIB1LqToNDG2DggiwiyBIxP0D6qqN7Fc8/y 4cVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712187754; x=1712792554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0OEwRph0hX4JYK2tSpTwj/IHXbbgfxXFL6/9jyQkq+Y=; b=lvy9FCQ7AQ9i4QikEaCUAJFewzm8vPNOUCzsHhNmzIliVoMd9waf7w6aO+7CjQ+5ko hUIXVBPy5+L6XJGqZfHGcvRyz+g2Gm8I1W1QufywEr1RL6Ch2roVd38a6RHV122/2Xqp TArYbfX2sITwMOAQfataRfP3+wFzMmN6g7Jg6jkZzBs5dDvdX2spuf1OGgOdPgP5SyhC tIccGlIAoKFAkuwgapv+R2JGRj1knXbmRt9CtMLvSJle10jFgTgiD7GoYeWnsqaYTkVQ ULnU3/HTJERP4EBt8hp4UQ0/G2rHsJYR7gIxPC6eVnwqxlj3WAmu0FtSkK6NBEoDyi2Z bM2Q== X-Forwarded-Encrypted: i=1; AJvYcCWLr87PcHf0s8llUpIErV5TMCQHh6hUV/c66ShFbIcM3LolDbSz1eDGq1TJSRDKzK4jGs+mLVSIwWvcJss7MICrwSA= X-Gm-Message-State: AOJu0Yx4thxc/XzcuY8SBl4kZsX014XgoskwCgEeMQSCJ6XJ5MrbZgGq KbNEy0cvgGABhzbJXhR4UdBQX+R3udPQu+/DbVXFgIcEwoNA7WJ0ZOOj8Rw8gZc= X-Google-Smtp-Source: AGHT+IFFY1JJO6kTtTJnAWqFL/OBzyhhxXawvUaTnL2Gmm8PkkBK+tirtybimz9kqqx/Fu1xtzZ+EQ== X-Received: by 2002:a05:6a20:6d9c:b0:1a3:6833:1cf5 with SMTP id gl28-20020a056a206d9c00b001a368331cf5mr947386pzb.29.1712187754011; Wed, 03 Apr 2024 16:42:34 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id b18-20020a170902d51200b001deeac592absm13899117plg.180.2024.04.03.16.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 16:42:33 -0700 (PDT) From: Deepak Gupta To: paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com Subject: [PATCH v3 21/29] riscv/traps: Introduce software check exception Date: Wed, 3 Apr 2024 16:35:09 -0700 Message-ID: <20240403234054.2020347-22-debug@rivosinc.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240403234054.2020347-1-debug@rivosinc.com> References: <20240403234054.2020347-1-debug@rivosinc.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 19839140012 X-Stat-Signature: 6znmrxwu7rpnk6hd369sseuiqxxazrch X-HE-Tag: 1712187754-441133 X-HE-Meta: U2FsdGVkX1+KBelQiAwMTuY+ZL1l+2XsGKsR86NxBPsEbUID7lJE8MKfJaoNmfB4G9vLXcx+BzmJP542IUlrzNDvzFNLVc5kVGB3WUfMbvTxHpzKZgLq43M4ndsxV3iOh8ICnEgDseWTTMWNDJQS0WVDognv7mMMFQKXBPbI5nV8IyhYCWcybLbMfF+YSuR8XmwHQsqyvxDRhuZFNGVHu5GhgTLzhWr0d7I7sjKFbCA2DeA9ipBaToztRv9fAgzHmuVSyEQ0QOIyj5aD1F8OTVnW739b7kFD30vnYPErMTKY9lO/7jku69R3Vir2UjLwyA7CJQoAiCC5Pe36R8SWFi08XScG4zlL5bUTyDFkCmHX7jlfaizVtVmoyZgXOKXaTAAU9wpBMzzl+E6TKqZek8ZSu/pWnJpDqWQnO3qfJiJFrIsGNYsVVEB3zurc/FW3dysRHKJCqBzTdP111OLiY0wp06c6VWD1rrUjhIbRCrKvIgmbgUJtMtSAsQXcgLLExAnFRfS+IgUA2KfcSM5T+CJVfJxUkAcFt+VCul492HQlbJIhfLaSpR+jxmdIr3/aUPuDeBdmyzna/woICUU4xyL5oj3QR7eBeobRh9PbER1SkDU3oNgTVRCp+GYdvWOxaSyIbLgvlUehhnMZcnu4OUa8XJbsnF/5YQsarYQA6HIwXQV02jJsVNgZCOhSMNX0Gw9pE+Q3aKgiuzKRkurkXpGqLTu7F/F1ZtPX9rk413AMXwtY8KhVweQiYIHN0kGTa0TItErns7/5LQyIXSiM+eF7RZEehx4bYWNS2PYWz6hEZHLEukSFsTgPAkyQrU9EBouwLQZ4P8BZvJiOC2I+PRNzbSJR590WQFqUGv76TnW82MQvczKPex3/H90aMlIpaali5ya2HTxPSKysC+1P665BA9lOKF52/cVbVQDBIM4DqMEnLkGtlg5fYvtXnZYtEy6fdtgG22blh9sFInB +SaASP0r tyJqz4zcEEKOzMOvE8+Iy9f9CbIHKxAh9ASeOGR6vFcWzd6Go8JGeuudiYpuyBBkR1CRy6O9pMqVryTfrybLrxwjmWGjNSkzaZs9L7GomlpdhoLmDYM5Hvb+lb2sutihQm5jU7SaA3MUJJ2IkdByrOZax4pXjX5nOjlS0LJMX98RP6Hwyp+wILpIBY+5tIXUVNEXiC7PHs9CDgL7InVqQC5XJCcXghuB/N+LTTJYVi5BJwjw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: zicfiss / zicfilp introduces a new exception to priv isa `software check exception` with cause code = 18. This patch implements software check exception. Additionally it implements a cfi violation handler which checks for code in xtval. If xtval=2, it means that sw check exception happened because of an indirect branch not landing on 4 byte aligned PC or not landing on `lpad` instruction or label value embedded in `lpad` not matching label value setup in `x7`. If xtval=3, it means that sw check exception happened because of mismatch between link register (x1 or x5) and top of shadow stack (on execution of `sspopchk`). In case of cfi violation, SIGSEGV is raised with code=SEGV_CPERR. SEGV_CPERR was introduced by x86 shadow stack patches. Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/asm-prototypes.h | 1 + arch/riscv/kernel/entry.S | 3 ++ arch/riscv/kernel/traps.c | 38 +++++++++++++++++++++++++ 3 files changed, 42 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/kernel/entry.S b/arch/riscv/kernel/entry.S index 7245a0ea25c1..f97af4ff5237 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -374,6 +374,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 a1b9be3c4332..9fba263428a1 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -339,6 +339,44 @@ asmlinkage __visible __trap_section 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)) { + /* not a cfi violation, then merge into flow of unknown trap handler */ + if (!handle_user_cfi_violation(regs)) + do_trap_unknown(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) {