[PATCH v2 09/24] linux-user/riscv: implement indirect branch tracking prctls

Deepak Gupta posted 24 patches 3 months, 3 weeks ago
There is a newer version of this series
[PATCH v2 09/24] linux-user/riscv: implement indirect branch tracking prctls
Posted by Deepak Gupta 3 months, 3 weeks ago
Implements indirect branch tracking prctls for riscv. Setting and clearing
branch tracking prctl simply turns on/off `ufcfien` field in `env`.
tb flush is needed because branch tracking itself leverages tb creation
logic.

locking branch tracking (forward cfi) is not implemented yet (no need yet)
but added for completeness (kernel patches have this prctl)

Signed-off-by: Deepak Gupta <debug@rivosinc.com>
Co-developed-by: Jesse Huang <jesse.huang@sifive.com>
Co-developed-by: Jim Shu <jim.shu@sifive.com>
Co-developed-by: Andy Chiu <andy.chiu@sifive.com>
---
 linux-user/riscv/target_prctl.h | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/linux-user/riscv/target_prctl.h b/linux-user/riscv/target_prctl.h
index eb53b31ad5..d7f9f954c9 100644
--- a/linux-user/riscv/target_prctl.h
+++ b/linux-user/riscv/target_prctl.h
@@ -1 +1,44 @@
 /* No special prctl support required. */
+#ifndef RISCV_TARGET_PRCTL_H
+#define RISCV_TARGET_PRCTL_H
+
+/*
+ * -TARGET_EINVAL: Unsupported/Invalid flag for this architecture
+ * -TARGET_EACCES: try to set an already set CFI feature
+ * -TARGET_ENOENT: CFI feature is not supported by CPU
+ */
+static abi_long do_prctl_cfi(CPUArchState *env,
+                                 abi_long option, abi_long flag)
+{
+    if (env_archcpu(env)->cfg.ext_zicfilp) {
+
+        switch (option) {
+        case PR_GET_INDIR_BR_LP_STATUS:
+            abi_ulong fcfi_status = 0;
+            /* indirect branch tracking is enabled on the task or not */
+            fcfi_status |= (env->ufcfien ? PR_INDIR_BR_LP_ENABLE : 0);
+            return copy_to_user(flag, &fcfi_status, sizeof(fcfi_status)) ? \
+                   -EFAULT : 0;
+
+        case PR_SET_INDIR_BR_LP_STATUS:
+            /* if any other bit is set, its invalid param */
+            if (flag & ~PR_INDIR_BR_LP_ENABLE) {
+                return -TARGET_EINVAL;
+            }
+            /* set or clear branch tracking */
+            env->ufcfien = (flag & PR_INDIR_BR_LP_ENABLE);
+            tb_flush(env_cpu(env));
+            return 0;
+
+        /* locking not implemented (also not needed for qemu-user) yet */
+        case PR_LOCK_INDIR_BR_LP_STATUS:
+            return -TARGET_EINVAL;
+        }
+    }
+
+    return -TARGET_ENOENT;
+}
+
+#define do_prctl_cfi do_prctl_cfi
+
+#endif
-- 
2.44.0
Re: [PATCH v2 09/24] linux-user/riscv: implement indirect branch tracking prctls
Posted by Richard Henderson 3 months, 3 weeks ago
On 7/30/24 03:53, Deepak Gupta wrote:
> +            /* set or clear branch tracking */
> +            env->ufcfien = (flag & PR_INDIR_BR_LP_ENABLE);
> +            tb_flush(env_cpu(env));

tb_flush is not required when you track enable properly in patch 5.


r~
Re: [PATCH v2 09/24] linux-user/riscv: implement indirect branch tracking prctls
Posted by Deepak Gupta 3 months, 3 weeks ago
On Mon, Jul 29, 2024 at 11:27 PM Richard Henderson
<richard.henderson@linaro.org> wrote:
>
> On 7/30/24 03:53, Deepak Gupta wrote:
> > +            /* set or clear branch tracking */
> > +            env->ufcfien = (flag & PR_INDIR_BR_LP_ENABLE);
> > +            tb_flush(env_cpu(env));
>
> tb_flush is not required when you track enable properly in patch 5.

ok. will fix it.

>
>
> r~
>