From patchwork Thu Jan 25 06:21:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13530090 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 097BBC47258 for ; Thu, 25 Jan 2024 06:30:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48C1F8D000B; Thu, 25 Jan 2024 01:30:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3EF718D0001; Thu, 25 Jan 2024 01:30:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B417A8D000B; Thu, 25 Jan 2024 01:30:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9ABEA8D0001 for ; Thu, 25 Jan 2024 01:30:13 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 64ADDC07D1 for ; Thu, 25 Jan 2024 06:30:13 +0000 (UTC) X-FDA: 81716858706.26.DA91B72 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by imf09.hostedemail.com (Postfix) with ESMTP id A1AD714001F for ; Thu, 25 Jan 2024 06:30:11 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=O22TfsCk; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706164211; a=rsa-sha256; cv=none; b=sbUiiOgHXi4NdULF6w07cI7ej9rLFyIVCN32OC4qfN9aeM4PVXszSAVbdXCA+C2GXYaNwe L8gvFFe2vdzpNVViQocFTn/iMr7RnoGkJO/4fh7U7Cx8764i8Iu6tQppP1yMMDvRBuhjHE qIYhdPwXnwNUUvrZaNspahaQtLRkmnE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=O22TfsCk; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.167.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=1706164211; 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=aZQZJuD25Dv4YRroK4zFhzWBRez2vp1MS493EB8S7EM=; b=Bbjo9K8DADf51H12UfZv2x/f82CGCHN0QhYzpuzr+Q1S6uPUvv2ocUSffqF6bh/SETyGz5 L/YKML7gIwFftKS2jyxzFKjcS91DQgkmWD2W6cwcmcOnI0dE6HBUeqCzrU5mFFUkyV5d67 2/U2YMzuWV5mV4WlwEQlS3mWckJmxN4= Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3bd67e9d6ceso3979892b6e.3 for ; Wed, 24 Jan 2024 22:30:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1706164211; x=1706769011; 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=aZQZJuD25Dv4YRroK4zFhzWBRez2vp1MS493EB8S7EM=; b=O22TfsCkNhwpcwXSSmp8p19JSbHl6fmJ6WVT4xHMXCnwicXY/9tWFE38QjmDunrPWU 349TTIBj5PZI1rM+R6uiG9eEBhvzPy5n9NMVOnBEsr1DQvZ+g/ZvWn6kwiApW7D6N001 1T891c01kF3x6niJATtrYFsoylKquCS1cJeg7itDtlNZWythfEZNgCI31CYmmb4M25gK PedrmlJzsh0E6gDBUGjdU6cLgvj0+xTZ+nXQX9GId11q8W8rD3PLeO0gtmIDYvLzQ3Qj tnWI7Ht61CuOzQUQbxUhI8ttcUs0KsXvvCFUYqPdkD9058Nj1x/xk9Fv8JzFty6Gqpb4 Os0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706164211; x=1706769011; 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=aZQZJuD25Dv4YRroK4zFhzWBRez2vp1MS493EB8S7EM=; b=orGdZX6w7ftmnjkwvt+ToXI2Yo6KgpY9FmW+g1dMTlZflts4zruseqwttAN232cAhb 1LxwVFWjXWx6+y8LymZnWlT+9r4a5qp12wC1amX3MilsLSeVuTbhTitz/z1FmaGH2+Ix ghRb1vch2XTwRBu/UaaUA58XGW+fOQFlKxG2uQn3gADgocRtENESr+7fsOegZWI0Zx6n EhAwOTEhGXhBWhVkwQu7L7btMR2VHi9WlFxjzjV8rRytVicXdBNFU6Wr/0yFyUKhpoWR 0GrMuCnUfKWdn40YRN4J4icP2+ORQdqBUfF/0LLzek0+Q/xLJZKdk3+bAr8gBCR3WGfE Wn6A== X-Gm-Message-State: AOJu0YwoUZDL6CHwGJVHxC+7c4JojIcdjgvMxJcbJFqX8PM8Ccckpz2j 7eVmjKGumgZAzJzaMFi3dplWJoJJDbL9QVOQ+14CuHM499msRcQKi0I4EuzKZJI= X-Google-Smtp-Source: AGHT+IEILiG8nfheUeEY3dgaOhbjObj6SeloQjQPpcALaC4ZkHtiDf7mRG4/M+Lq5WuyhX+48/5Osw== X-Received: by 2002:a05:6808:d51:b0:3bd:bf47:d635 with SMTP id w17-20020a0568080d5100b003bdbf47d635mr590089oik.41.1706164210775; Wed, 24 Jan 2024 22:30:10 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id t19-20020a056a00139300b006dd870b51b8sm3201139pfg.126.2024.01.24.22.30.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 22:30:10 -0800 (PST) From: debug@rivosinc.com To: rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, paul.walmsley@sifive.com, palmer@dabbelt.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com Cc: corbet@lwn.net, aou@eecs.berkeley.edu, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, guoren@kernel.org, samitolvanen@google.com, evan@rivosinc.com, xiao.w.wang@intel.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, waylingii@gmail.com, greentime.hu@sifive.com, heiko@sntech.de, jszhang@kernel.org, shikemeng@huaweicloud.com, david@redhat.com, charlie@rivosinc.com, panqinglin2020@iscas.ac.cn, willy@infradead.org, vincent.chen@sifive.com, andy.chiu@sifive.com, gerg@kernel.org, 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@arm.com, 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: [RFC PATCH v1 20/28] riscv: Implements arch argnostic indirect branch tracking prctls Date: Wed, 24 Jan 2024 22:21:45 -0800 Message-ID: <20240125062739.1339782-21-debug@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125062739.1339782-1-debug@rivosinc.com> References: <20240125062739.1339782-1-debug@rivosinc.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A1AD714001F X-Stat-Signature: j3whenc4a5bbfckcz3ikjowwenqe3xan X-HE-Tag: 1706164211-905115 X-HE-Meta: U2FsdGVkX1/qhm1HecVoyhewEqKXcLgYdTT8cDhXpzhUg49Tyf+2YibONLygm273f4YJItBwViXS2nuVxbt+XUUS2YEVcBz0SgmP/eSSRiYMhJMXor7zabQlxiuAO9baAGACPzQNJ3SWxEi6qnG5wz126Fg7avKCg5C3PhgEHhxgH2hXX62cwObAELaxK9OAJNkxSfXlL/eRMsbTuleRlZBpOEaDaki5W2IxI1B3eghuktfhN2+XJN+GRDwjoSqiFFwo7mbC5FfqONBDu6Rfah5q2fBfojwoqZVKNEzw0DICS0t56MCNgPaN238PmUhYwm6x1JuacOOLMlgCSd7etg2njujkr4r/bJXOFeuZ1gvz6RLOpGBjnqTOYfM3ul7mBVS3HmRLifjg3szhmTg4ygqOXtnQzxM39ch8jI2gXimTNXWjVLQppr2DVgD/Cvzf/rpWnfMJMFIS0tIJ5wTxye2LCSKnboSzg8MxdsFJ9rn/Jdu1nMWrNxUf1XFWbKYy5fkN/e+YUG/FM4MQy8cU9cpl43U4leV+UbNhUDD8LhBG7quYGEHaHvnY4nqCv06CpsBBnILfcH/AqIQEVgtfXjIFGaDbJGondu/oisN/ix2Fi759HxH72Wf77F2u+ezg0bPVRtWx4+7uca/LL5ltRZ2rz1/cl9UhV3U8N62DGkn1VyL69PXna80jGpkOVkhgMy9329oXZKSplRL+oaqBHkOA9lRqWvEvEciSqf6MQmVa0guRyFb45qhsp9krCof5rWyvWU/ocyQoWgfVQ9ocxcG9LinMAIYskhWpNL5W7dY8N2SE6AfeT1Ail7vF4zmWoeJQEyh1jdsZg9z6Osjx4BU5GuUKKK2nIi9+0bDW8VPgKIIxnFyCTvTAgpcTh3QZWhB36Y1wT87r97qA77ucKDPci1u94YL/5MW2pA6eB1Tom6CHudDIuMbbRT3eYozFI9/EFDfwWl69yvs4ilf diMS9e5l VzSc6PvNz/vz14W/1HwgTsewdnd3mwihKHBBKn02ova65o6ms+dTLLmS+tW160Occ8qWHsK3fPWyX+12jmA3Vhgxwrb3n+lY4mEkqr4b0tqSbfDtHbVlOGR38ZHvM7ApjwaqHwttlmVZylMD/Xh+tFcV9u6B1N0M1L9pOWgcXstdVki/ozDQhqPRMP/sTifOqSWUsWd79JsFuiP1iMfH8OdHlQ06eFIYi5gUzlV1JE9m6n1MTyUKuYRAAwfwwOa93ZfhVlqAd3EkdZ9aOgSKOMaf6uOONv1GU3ZUH2CJV2X8Ur59sgIy6fkVXMe0H3t4l0kXLxNbjdvAGOrseMf4lFB9mOufzYlUJMMkKO58FNheI2K7TY2kSknfB3KgDIrIGRe4zyVnvM8QtMGgvObFHwdyK0KDGNiTP1wjCYfw7caRgt673w98+H80RSTX6fxnZH+xC 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: Deepak Gupta 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 | 17 +++++++- arch/riscv/kernel/usercfi.c | 74 ++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index 72bcfa773752..4bd10dcd48aa 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 */ @@ -29,6 +31,8 @@ void set_shstk_base(struct task_struct *task, unsigned long shstk_addr, unsigned 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_indir_lp_enabled(struct task_struct *task); +bool is_indir_lp_locked(struct task_struct *task); #define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) @@ -66,6 +70,17 @@ static inline bool is_shstk_locked(struct task_struct *task) return false; } +static inline bool is_indir_lp_enabled(struct task_struct *task) +{ + return false; +} + +static inline bool is_indir_lp_locked(struct task_struct *task) + +{ + return false; +} + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index be3a071272d8..af8cc8f4616c 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -67,6 +67,30 @@ void set_shstk_lock(struct task_struct *task) task->thread_info.user_cfi_state.ubcfi_locked = 1; } +bool is_indir_lp_enabled(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_en ? true : false; +} + +bool is_indir_lp_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_locked ? true : false; +} + +void set_indir_lp_status(struct task_struct *task, bool enable) +{ + task->thread_info.user_cfi_state.ufcfi_en = enable ? 1 : 0; + + if (enable) + task->thread_info.envcfg |= ENVCFG_LPE; + else + task->thread_info.envcfg &= ~ENVCFG_LPE; +} + +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 @@ -374,3 +398,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)) + return -EINVAL; + + set_indir_lp_lock(task); + + return 0; +}