From mboxrd@z Thu Jan 1 00:00:00 1970 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 7CFE9C47258 for ; Thu, 25 Jan 2024 07:20:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B12AD6B009E; Thu, 25 Jan 2024 02:20:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A9B496B009F; Thu, 25 Jan 2024 02:20:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C6926B00A0; Thu, 25 Jan 2024 02:20:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 73BCF6B009E for ; Thu, 25 Jan 2024 02:20:00 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3A1B3120D96 for ; Thu, 25 Jan 2024 07:20:00 +0000 (UTC) X-FDA: 81716984160.17.61990A0 Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) by imf20.hostedemail.com (Postfix) with ESMTP id 1CADA1C0008 for ; Thu, 25 Jan 2024 07:19:57 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=fastmail.com header.s=fm3 header.b=ihcT370B; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=cCuKUF7M; spf=pass (imf20.hostedemail.com: domain of sorear@fastmail.com designates 66.111.4.224 as permitted sender) smtp.mailfrom=sorear@fastmail.com; dmarc=pass (policy=none) header.from=fastmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706167198; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vWNYCVEsyViu3nUft3Ms12HcBU6UW+6JtvbOuVw1J0c=; b=q8YTWoICSfmco1eoHA6VrvE1DQAcyG9UuqHpvkeOMhEA/1EwHnT2gIGsA/7TmZgeYn1PZz OTb16nPGrlj+ppJrkzrzOc2J2d0IFemDylqAvS7dCWKFoUTHYs+2rsfC3cnztDGYXIB8L/ 2lX74/idyuCYz0FnAMnDYjP4c+H0/mk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706167198; a=rsa-sha256; cv=none; b=5WwPxVRnuRAIfxscB/DV89fo9G/GkPjXvOj2bWDyWz/cX7QENLdFyketjxa1mfXD98Moj1 ztHRE7xpbC87sndrrbCFnQ4zEVsinoDECPmliULO/ybvdq0uryPILu5aMSFOpP9U+pOBZl YJvtdxwmfjKRSpIZVOD+F/d5N+tqviM= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=fastmail.com header.s=fm3 header.b=ihcT370B; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=cCuKUF7M; spf=pass (imf20.hostedemail.com: domain of sorear@fastmail.com designates 66.111.4.224 as permitted sender) smtp.mailfrom=sorear@fastmail.com; dmarc=pass (policy=none) header.from=fastmail.com Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id B3EC45813A9; Thu, 25 Jan 2024 02:19:55 -0500 (EST) Received: from imap50 ([10.202.2.100]) by compute3.internal (MEProxy); Thu, 25 Jan 2024 02:19:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1706167195; x=1706174395; bh=vWNYCVEsyV iu3nUft3Ms12HcBU6UW+6JtvbOuVw1J0c=; b=ihcT370B+njuRntc5twt82oqIv WvEyF+QhQZa3KbxhS1Vh3b75U4BZbt5PpaGUtpLdWOMVruYAqxRCiY37LNSdHW56 0t4j6dlWCu7PmtyHhZ0qyeSKWjSpzHikBrUJUHqdoT8z2IdRorn+n7Zm/HDIsUOL WYavFzm1CSp4emtFfgrCEHvih+SugQmK/Pf5VXMfuthNnqOZJJ+bCLjW/TQ+m++J 5m5YHXrKYYZHjJFiVTI2vPsex9fKp5LtmNE9SPGo9ignBJDifbDrQpns+f7vo556 RSoHKG8V+GnknxVCpEgU/BZ/XCjq0cc9ncCDz2mWjzFzijiccHDg1o3iSQ1w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1706167195; x=1706174395; bh=vWNYCVEsyViu3nUft3Ms12HcBU6U W+6JtvbOuVw1J0c=; b=cCuKUF7MdOT7mLgNSydAybFj0ppLkPstCclIddMg4APh 6P9jN+4/eljGJACE8fXUjIigtGmz/r9VoDnP+My7G+p8zuZg0o3/D2Mp26NkkAQh QIOxGweWqP8lUNPBjNQYujtEGzLyMCsmzf6X+gSx7SKUymoYA9MAeRXC7MJCmzcg +QIC12zqU7I8U3juNyMb/1N0sDhG30iEjzmgwukf5ou6NBEnHNrx1KZbEomggwoC vG7k9k134zZYxjCvEeBB3sbZxJzPcvbxL5hRTMTJJBU+bjN6e8Y5J/srhCe1UkNu SGSiTPVBe1BBPLH7gPetacZX8zcVSlxITX/Va76hiA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdelvddguddtfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefofgggkfgjfhffhffvvefutgesthdtredtreertdenucfhrhhomhepfdfu thgvfhgrnhcuqfdktfgvrghrfdcuoehsohhrvggrrhesfhgrshhtmhgrihhlrdgtohhmqe enucggtffrrghtthgvrhhnpefhtefgffelieduudekgeevueegudegueefhfehhfffiefg keffvedtuefggfehteenucffohhmrghinhepvghnthhrhidrshgspdhinhhfrhgruggvrg gurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhho mhepshhorhgvrghrsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i84414492:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id CBA0C1700093; Thu, 25 Jan 2024 02:19:52 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-119-ga8b98d1bd8-fm-20240108.001-ga8b98d1b MIME-Version: 1.0 Message-Id: <23d023c0-27cf-44fa-be0a-000d1534ef86@app.fastmail.com> In-Reply-To: <20240125062739.1339782-3-debug@rivosinc.com> References: <20240125062739.1339782-1-debug@rivosinc.com> <20240125062739.1339782-3-debug@rivosinc.com> Date: Thu, 25 Jan 2024 02:19:29 -0500 From: "Stefan O'Rear" To: debug@rivosinc.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, "kito.cheng@sifive.com" , "Kees Cook" , "Andrew Jones" , paul.walmsley@sifive.com, "Palmer Dabbelt" , "Conor Dooley" , cleger@rivosinc.com, "Atish Patra" , "Alexandre Ghiti" , =?UTF-8?Q?Bj=C3=B6rn_T=C3=B6pel?= , "Alexandre Ghiti" Cc: "Jonathan Corbet" , "Albert Ou" , oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, "Eric W. Biederman" , shuah@kernel.org, "Christian Brauner" , guoren , samitolvanen@google.com, "Evan Green" , xiao.w.wang@intel.com, "Anup Patel" , mchitale@ventanamicro.com, waylingii@gmail.com, greentime.hu@sifive.com, "Heiko Stuebner" , "Jisheng Zhang" , shikemeng@huaweicloud.com, david@redhat.com, "Charlie Jenkins" , panqinglin2020@iscas.ac.cn, willy@infradead.org, "Vincent Chen" , "Andy Chiu" , "Greg Ungerer" , jeeheng.sia@starfivetech.com, mason.huo@starfivetech.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bhe@redhat.com, chenjiahao16@huawei.com, ruscur@russell.cc, bgray@linux.ibm.com, alx@kernel.org, baruch@tkos.co.il, zhangqing@loongson.cn, "Catalin Marinas" , revest@chromium.org, josh@joshtriplett.org, joey.gouly@arm.com, shr@devkernel.io, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [RFC PATCH v1 02/28] riscv: envcfg save and restore on trap entry/exit Content-Type: text/plain X-Rspamd-Queue-Id: 1CADA1C0008 X-Rspam-User: X-Stat-Signature: xyt9ybqjybfwoyfma41ermh9tcmxogk4 X-Rspamd-Server: rspam03 X-HE-Tag: 1706167197-733983 X-HE-Meta: U2FsdGVkX19eqdhWi1QFboReoTjlJq41ddo610cuUTxbzi8LIIAS44UV2/WikzHhmYYVjp01TmZn8y9UEPQo0EjEQv5x1WDU/98zglpoIE2Scm3sPbbsI9j8rFUjTyuPOq5u8h0flO0RMb9uHAU4AVdacm7wBGnpNl34TUEjr8Z3zm/z5mTUdlsIhFggmscEmREpv/jqmyNbf+Sm0LOn0DpBqfHg0l3qB3K5YkRq/zp2J1dCWGMQXkjlJ4IN5ZOjAX0mlkasQWX5JFyG61lDm4taYHWhGBjr1Bz04S1pv907JBvsY1l4yoKOLCyE1Z2mexpGYSS09Ndxh7iC+fxRqEDYwBmLGI0pOkBxwfGlSzPrrvlJEm3eC81lZ5SWV5+m+SElF68Se9/7ioqEHcZG9ftWBXY9WkKxmZ5fA2xCrTrxpacASRdl7RIhhbf5nt6NZd/ZaXZvuLUVhDMTabY7QSY/TamCH5EfbbkEGHjEt+VlqrbJWuGO2Sc4Ptx4U3FiF1DYZ75eCAob/vZnyGE0GM6bh1kOpyLa04Euo2AaACpni+IaqSEZqFRumhxGKD8uSg0LRN0X3fcTlJCLfvUPF+6ynHUW18+jdDBwUVaPxHjPIJqye3Nj+oPS+P3WuyySrOqDO5j+4dO9aZkqPr8zoN/CBTO23Y9bxlAgCxbAEqkUiGFKSngbR3X/KGvFnd8SRBN2Wab678e4vLfoIPNjYbYYeC/L0vBdXs16iAtuPaN1j2JZ9c76vDep86p9ARLKVlDiraibyQFHmWv1BVsp+FXP1jhQhjRFAunD3+U9Eh0tp8MjoBMoDQlzMHaIOvbda3+dbAhSX+KqUZXPwA/9U6uRl9A+5V+Uxar+0ghgW5mfcBrRojbj06AXoy/JVgKXz8FM5ffc26FC7mPXt8qacFbVyaxhaxOHeZHMm6AQzqXgYc6OjQatf0xxxtDku/yFRg6t+IP55U9HC0R3gre aJkt8GOw GnNUooESQzJh9oa6ZkSspMit6f1E7+Ign856o2FJODN9Ty1vbL6OsX1i0CUA9HqN1EN7SRe1/GrITPt5fnK28Gsf4X553YYCA+sVYgzC6i8rFPV8491ngwAOlZUMrdM9GBlQPcDC5edfmXH8uzwpgxdYQDAF7MuI3g5tAX5kfDmK0ox5z7tDgU2bz34k72YGVUVuOOtPk+TE/m/E7bMQJHXUPl7AHL6TgAkNh9MIl4DHX/I4jiYiTlh3GYGGlX9kXyW7PsAQG1zMIaQOqdkLrcjwPetPH050KeYuPGId0al/NrPQUXhInc8A+xd9WD3yIRRbLGnY1WEaPcs3RB70EgM5YXSR/A6icHDMm7UXUNdQmCsMhrRlgxJ4ffajCNwqyQmymcZNNK0Wwj5WjkLeuIiNuh9wIF0yScjfg 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: On Thu, Jan 25, 2024, at 1:21 AM, debug@rivosinc.com wrote: > From: Deepak Gupta > > envcfg CSR defines enabling bits for cache management instructions and soon > will control enabling for control flow integrity and pointer masking features. > > Control flow integrity enabling for forward cfi and backward cfi is controlled > via envcfg and thus need to be enabled on per thread basis. > > This patch creates a place holder for envcfg CSR in `thread_info` and adds > logic to save and restore on trap entry and exits. Should only be "restore"? I don't see saving. > > Signed-off-by: Deepak Gupta > --- > arch/riscv/include/asm/thread_info.h | 1 + > arch/riscv/kernel/asm-offsets.c | 1 + > arch/riscv/kernel/entry.S | 4 ++++ > 3 files changed, 6 insertions(+) > > diff --git a/arch/riscv/include/asm/thread_info.h > b/arch/riscv/include/asm/thread_info.h > index 574779900bfb..320bc899a63b 100644 > --- a/arch/riscv/include/asm/thread_info.h > +++ b/arch/riscv/include/asm/thread_info.h > @@ -57,6 +57,7 @@ struct thread_info { > long user_sp; /* User stack pointer */ > int cpu; > unsigned long syscall_work; /* SYSCALL_WORK_ flags */ > + unsigned long envcfg; > #ifdef CONFIG_SHADOW_CALL_STACK > void *scs_base; > void *scs_sp; > diff --git a/arch/riscv/kernel/asm-offsets.c > b/arch/riscv/kernel/asm-offsets.c > index a03129f40c46..cdd8f095c30c 100644 > --- a/arch/riscv/kernel/asm-offsets.c > +++ b/arch/riscv/kernel/asm-offsets.c > @@ -39,6 +39,7 @@ void asm_offsets(void) > OFFSET(TASK_TI_PREEMPT_COUNT, task_struct, thread_info.preempt_count); > OFFSET(TASK_TI_KERNEL_SP, task_struct, thread_info.kernel_sp); > OFFSET(TASK_TI_USER_SP, task_struct, thread_info.user_sp); > + OFFSET(TASK_TI_ENVCFG, task_struct, thread_info.envcfg); > #ifdef CONFIG_SHADOW_CALL_STACK > OFFSET(TASK_TI_SCS_SP, task_struct, thread_info.scs_sp); > #endif > diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S > index 54ca4564a926..63c3855ba80d 100644 > --- a/arch/riscv/kernel/entry.S > +++ b/arch/riscv/kernel/entry.S > @@ -129,6 +129,10 @@ SYM_CODE_START_NOALIGN(ret_from_exception) > addi s0, sp, PT_SIZE_ON_STACK > REG_S s0, TASK_TI_KERNEL_SP(tp) > > + /* restore envcfg bits for current thread */ > + REG_L s0, TASK_TI_ENVCFG(tp) > + csrw CSR_ENVCFG, s0 > + This is redundant if we're repeatedly processing interrupts or exceptions within a single task. We should only be writing envcfg when switching between tasks or as part of the prctl. We need to use an ALTERNATIVE for this since the oldest supported hardware does not have envcfg csrs. -s > /* Save the kernel shadow call stack pointer */ > scs_save_current > > -- > 2.43.0 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv