From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 227F8265CA7 for ; Wed, 9 Apr 2025 14:26:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744208778; cv=none; b=X+V1CPT26l1JEt1YWXEGWNMnT0xzqelD3ICBi7cVRWI1+5NdBwX26wsIb7tGFFUJOMg+kt7wQGKOD/7KqRBEPS0eUq0TARpgKvsS0z95o0Sw1MfmotGa/rRPrJ/sGeNRWG2H42I1eSD5boA5/rOpWgu5PGAyd9mp6l46j7RcVHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744208778; c=relaxed/simple; bh=XzrQ0mp7WLZBCaR1QiDf7RGSn7Hx8B/2cG3auHEmO9A=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=VLxnlJlzapHBwgVmOP1Io6FH1i6nY4ufLquGKNKsA6DG3a2co98kp1jq2TfrBENXQDilP6q1qVR9hvLF2F4ErRySHZ2xiRsQS+90Ds8Dl1iX4rM0JQRVK0IseY4spyrM9g3pMfFnRwasUs6TI+1WFsv7HQLXSl+x9xpzm2kq2TY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=umQqvzTV; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="umQqvzTV" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-736b34a71a1so8011893b3a.0 for ; Wed, 09 Apr 2025 07:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1744208774; x=1744813574; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=VWCFSwSJdWVyuiq1FZlofUemWkrK3y3F0Kcxx42yGpc=; b=umQqvzTVILzhPynzAwi5LSrvh4hAJ6dAjyd8WMlFATXucc4vGYSGANwv1sIoGsv9Ag QxpMMWyRhT1lbu7asOtH7joFr8NY0vj0RGMAWyNztZMKNdY3sSLYSaz/JFGFY6UYG+vo 6G4tZadO83UvhefAdvC+nDbItDx9Uv0NQx6rqOxvAxuTWUHaBuz0/JdQet30IEpFqqh7 HrLAbiCLj+nJHnoYaTGkwdM5DedcPbDHsEhXNZslw7gpU64Y9LinYhCQz1+VkIlXBkpn DPQNEoVV/yts7C3SPaJYmHRvuFjaTWKRR/zPcvTTniYNkdiMGtFTwQkg+xHpf9RdXHC8 2L9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744208774; x=1744813574; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VWCFSwSJdWVyuiq1FZlofUemWkrK3y3F0Kcxx42yGpc=; b=GnN9UNyY4P1chhW2jwE24Kn3zx2aP5ImKP3MxwqzzijiDoXe9a1pm+VNdFPPA2R7Zh kDrzQfyQDtBUbSSosf4+3duhEjpvPGzA8M+wBmy39lwLhtngplEkEaAc+R7iJf2XAvBc SbFE+2Cz6gFKhk/pvqhBFWxWfhw7T4B9uMFwZNL97gwY86NUkV0d302JxeNQEXCpQVFd UoLyig0n/hyIAilXNo2nPJxGm9G0IpJuvyVaVdGb2BblOiwGHCaupxD7GHp/sCXgi6pk PT1dghi+J7JI2ORt7dNE1jJ21xnQUtU8Ebn6yCW0F5XQGexGStSQg0YmP/iOfwYlV/ap XnmA== X-Forwarded-Encrypted: i=1; AJvYcCVtkw8XQRLkMRAJDFdKb/nRTYyFh2icABygVY5qfHxUXJalzUxnPIbiN54TTS8C2iQhAbk7HiY99wwNi1oTIKk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2sXDPofSwL7JX3RC4xsaGlNG5PvDoGc3X03K4Wp8u8/6T0Q3V ehJkbG+7wZNbkM3m7oc17AiVK2LeVThFyLhYGL6DIl15sNlCy2hLeWoNP7z02E4= X-Gm-Gg: ASbGnctsKrv3xwhZ79SncRiGX/ew7VSI9IMxFSr3+IsAMeyM47SM70JBaRsMWMred4t LaN7/4cr+pPpsy5EHUMhjOKDMlA3/KxJBwa8r70gARyxjP5WfiuPlVeTQ+i04O7GuuIUMWY97JB yxNWWwKB9BZWpCOpccINamXzuz8mOcGZ02y9d+zozlQOGE+QpOhJ8iIcAGAQGoXjflaK4zh+2GU QgzerIidzUhF+aFD2NU9c6bxKFFTZ9/fNyDk2cfWVNdsDD5eJwhUGol9nyxn3dBraIKY7eiq8QP G9VXpzTniyFvgP2zgqEeiOheSfV16/WDfI4MBHo1Q1FQNDFkGxA= X-Google-Smtp-Source: AGHT+IHFFMUtgc5GdaqhKowOEcwpQuVaNNQv/0+QvYg71I8MlHsNAHS1sjVjRx/1bLRC7yOHjj+PuA== X-Received: by 2002:a05:6a00:e12:b0:736:a973:748 with SMTP id d2e1a72fcca58-73bafd6a4a1mr3511930b3a.22.1744208774241; Wed, 09 Apr 2025 07:26:14 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bb1d2b108sm1426136b3a.19.2025.04.09.07.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 07:26:13 -0700 (PDT) Date: Wed, 9 Apr 2025 07:26:10 -0700 From: Deepak Gupta To: Alexandre Ghiti Cc: 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 , 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 Subject: Re: [PATCH v12 13/28] prctl: arch-agnostic prctl for indirect branch tracking Message-ID: References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> <20250314-v5_user_cfi_series-v12-13-e51202b53138@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: On Wed, Apr 09, 2025 at 10:03:05AM +0200, Alexandre Ghiti wrote: >On 14/03/2025 22:39, Deepak Gupta wrote: >>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) > > >Are we missing PR_INDIR_BR_LP_DISABLE definition here? PR_SET_INDIR_BR_LP_STATUS with parameter's bit0 clear will disable branch tracking. This is what arm and riscv settled on for shadow stack enable and disable as well. > > >>+ >>+/* >>+ * 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; >>