[DTrace-devel] [PATCH 10/12] Add support for copyin() subroutine
Kris Van Hees
kris.van.hees at oracle.com
Wed Jul 13 19:17:58 UTC 2022
The copyin() subroutine makes use of the alloca() subroutine to allocate
the needed scratch space to copy data to.
Signed-off-by: Kris Van Hees <kris.van.hees at oracle.com>
---
libdtrace/dt_cg.c | 82 +++++++++++++++++--
.../unittest/funcs/copyin/err.D_ALLOCA_SIZE.d | 26 ++++++
.../copyin/err.D_PROTO_ARG.non_scalar_arg1.d | 24 ++++++
.../copyin/err.D_PROTO_ARG.non_scalar_arg2.d | 24 ++++++
.../copyin/err.D_PROTO_LEN.missing_arg.d | 24 ++++++
.../copyin/err.D_PROTO_LEN.too_few_args.d | 24 ++++++
.../copyin/err.D_PROTO_LEN.too_many_args.d | 24 ++++++
test/unittest/funcs/copyin/err.badaddr.d | 24 ++++++
test/unittest/funcs/copyin/err.badaddr.r | 6 ++
test/unittest/funcs/copyin/err.badsize.d | 27 ++++++
test/unittest/funcs/copyin/err.null_arg1.d | 24 ++++++
test/unittest/funcs/copyin/err.null_arg1.r | 6 ++
test/unittest/funcs/copyin/tst.copyin.d | 24 ++++++
test/unittest/funcs/tst.copyin.d | 34 --------
14 files changed, 331 insertions(+), 42 deletions(-)
create mode 100644 test/unittest/funcs/copyin/err.D_ALLOCA_SIZE.d
create mode 100644 test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg1.d
create mode 100644 test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg2.d
create mode 100644 test/unittest/funcs/copyin/err.D_PROTO_LEN.missing_arg.d
create mode 100644 test/unittest/funcs/copyin/err.D_PROTO_LEN.too_few_args.d
create mode 100644 test/unittest/funcs/copyin/err.D_PROTO_LEN.too_many_args.d
create mode 100644 test/unittest/funcs/copyin/err.badaddr.d
create mode 100644 test/unittest/funcs/copyin/err.badaddr.r
create mode 100644 test/unittest/funcs/copyin/err.badsize.d
create mode 100644 test/unittest/funcs/copyin/err.null_arg1.d
create mode 100644 test/unittest/funcs/copyin/err.null_arg1.r
create mode 100644 test/unittest/funcs/copyin/tst.copyin.d
delete mode 100644 test/unittest/funcs/tst.copyin.d
diff --git a/libdtrace/dt_cg.c b/libdtrace/dt_cg.c
index be1db4b1..9a4a80d0 100644
--- a/libdtrace/dt_cg.c
+++ b/libdtrace/dt_cg.c
@@ -4131,17 +4131,15 @@ dt_cg_subr_speculation(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
}
static void
-dt_cg_subr_alloca(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
+dt_cg_subr_alloca_impl(dt_node_t *dnp, dt_node_t *size, dt_irlist_t *dlp,
+ dt_regset_t *drp)
{
- dt_node_t *size = dnp->dn_args;
uint_t lbl_ok = dt_irlist_label(dlp);
uint_t lbl_err = dt_irlist_label(dlp);
int opt_scratchsize = yypcb->pcb_hdl->dt_options[DTRACEOPT_SCRATCHSIZE];
int mst, next;
- TRACE_REGSET(" subr-alloca:Begin");
-
- dt_cg_node(size, dlp, drp);
+ TRACE_REGSET(" subr-alloca-impl:Begin");
/*
* Compile-error out if the size is too large even absent other
@@ -4159,8 +4157,7 @@ dt_cg_subr_alloca(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
(unsigned long) size->dn_value,
(unsigned long) opt_scratchsize - 8);
- if (((dnp->dn_reg = dt_regset_alloc(drp)) == -1) ||
- ((mst = dt_regset_alloc(drp)) == -1) ||
+ if (((mst = dt_regset_alloc(drp)) == -1) ||
((next = dt_regset_alloc(drp)) == -1))
longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
@@ -4188,6 +4185,24 @@ dt_cg_subr_alloca(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
dt_regset_free(drp, mst);
dt_regset_free(drp, next);
+
+ TRACE_REGSET(" subr-alloca-impl:End ");
+}
+
+static void
+dt_cg_subr_alloca(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
+{
+ dt_node_t *size = dnp->dn_args;
+
+ TRACE_REGSET(" subr-alloca:Begin");
+
+ dt_cg_node(size, dlp, drp);
+
+ if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
+ longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+
+ dt_cg_subr_alloca_impl(dnp, size, dlp, drp);
+
dt_regset_free(drp, size->dn_reg);
TRACE_REGSET(" subr-alloca:End ");
@@ -4259,6 +4274,57 @@ dt_cg_subr_bcopy(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
TRACE_REGSET(" subr-bcopy:End ");
}
+static void
+dt_cg_subr_copyin(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
+{
+ dtrace_hdl_t *dtp = yypcb->pcb_hdl;
+ dt_node_t *src = dnp->dn_args;
+ dt_node_t *size = src->dn_list;
+ int maxsize = dtp->dt_options[DTRACEOPT_SCRATCHSIZE] - 8;
+ uint_t lbl_ok = dt_irlist_label(dlp);
+ uint_t lbl_badsize = dt_irlist_label(dlp);
+
+ TRACE_REGSET(" subr-copyin:Begin");
+
+ /* Validate the size for the copy operation. */
+ dt_cg_node(size, dlp, drp);
+
+ emit(dlp, BPF_BRANCH_IMM(BPF_JSLT, size->dn_reg, 0, lbl_badsize));
+ emit(dlp, BPF_BRANCH_IMM(BPF_JGT, size->dn_reg, maxsize, lbl_badsize));
+
+ if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
+ longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+
+ /* Allocate scratch space. */
+ dt_cg_subr_alloca_impl(dnp, size, dlp, drp);
+ dt_cg_alloca_ptr(dlp, drp, dnp->dn_reg, dnp->dn_reg);
+
+ dt_cg_node(src, dlp, drp);
+
+ if (dt_regset_xalloc_args(drp) == -1)
+ longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
+
+ emit(dlp, BPF_MOV_REG(BPF_REG_1, dnp->dn_reg));
+ emit(dlp, BPF_MOV_REG(BPF_REG_2, size->dn_reg));
+ emit(dlp, BPF_MOV_REG(BPF_REG_3, src->dn_reg));
+ dt_regset_xalloc(drp, BPF_REG_0);
+ emit(dlp, BPF_CALL_HELPER(dtp->dt_bpfhelper[BPF_FUNC_probe_read_user]));
+ dt_regset_free_args(drp);
+ emit(dlp, BPF_BRANCH_IMM(BPF_JEQ, BPF_REG_0, 0, lbl_ok));
+ dt_cg_probe_error(yypcb, DTRACEFLT_BADADDR, DT_ISREG, src->dn_reg);
+ emitl(dlp, lbl_badsize,
+ BPF_NOP());
+ dt_cg_probe_error(yypcb, DTRACEFLT_BADSIZE, DT_ISREG, size->dn_reg);
+ emitl(dlp, lbl_ok,
+ BPF_NOP());
+ dt_regset_free(drp, BPF_REG_0);
+
+ dt_regset_free(drp, src->dn_reg);
+ dt_regset_free(drp, size->dn_reg);
+
+ TRACE_REGSET(" subr-copyin:End ");
+}
+
static void
dt_cg_subr_strchr(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
{
@@ -4730,7 +4796,7 @@ static dt_cg_subr_f *_dt_cg_subr[DIF_SUBR_MAX + 1] = {
[DIF_SUBR_RW_READ_HELD] = &dt_cg_subr_rw_read_held,
[DIF_SUBR_RW_WRITE_HELD] = &dt_cg_subr_rw_write_held,
[DIF_SUBR_RW_ISWRITER] = &dt_cg_subr_rw_iswriter,
- [DIF_SUBR_COPYIN] = NULL,
+ [DIF_SUBR_COPYIN] = &dt_cg_subr_copyin,
[DIF_SUBR_COPYINSTR] = NULL,
[DIF_SUBR_SPECULATION] = &dt_cg_subr_speculation,
[DIF_SUBR_PROGENYOF] = &dt_cg_subr_progenyof,
diff --git a/test/unittest/funcs/copyin/err.D_ALLOCA_SIZE.d b/test/unittest/funcs/copyin/err.D_ALLOCA_SIZE.d
new file mode 100644
index 00000000..a329e870
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.D_ALLOCA_SIZE.d
@@ -0,0 +1,26 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: The copyin() size must not exceed the (adjusted) scratchsize.
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+#pragma D option scratchsize=64
+
+BEGIN
+{
+ copyin(0, 65);
+ exit(0);
+}
+
+ERROR
+{
+ exit(1);
+}
diff --git a/test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg1.d b/test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg1.d
new file mode 100644
index 00000000..0ab89c10
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg1.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Argument 1 for copyin() must be a scalar.
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+BEGIN
+{
+ copyin("1", 2);
+ exit(1);
+}
+
+ERROR
+{
+ exit(0);
+}
diff --git a/test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg2.d b/test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg2.d
new file mode 100644
index 00000000..d25c75d3
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.D_PROTO_ARG.non_scalar_arg2.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Argument 2 for copyin() must be a scalar.
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+BEGIN
+{
+ copyin(1, "2");
+ exit(1);
+}
+
+ERROR
+{
+ exit(0);
+}
diff --git a/test/unittest/funcs/copyin/err.D_PROTO_LEN.missing_arg.d b/test/unittest/funcs/copyin/err.D_PROTO_LEN.missing_arg.d
new file mode 100644
index 00000000..c6c58e31
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.D_PROTO_LEN.missing_arg.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Arguments are required for copyin().
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+BEGIN
+{
+ copyin();
+ exit(1);
+}
+
+ERROR
+{
+ exit(0);
+}
diff --git a/test/unittest/funcs/copyin/err.D_PROTO_LEN.too_few_args.d b/test/unittest/funcs/copyin/err.D_PROTO_LEN.too_few_args.d
new file mode 100644
index 00000000..bb76b26e
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.D_PROTO_LEN.too_few_args.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Two arguments are required for copyin().
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+BEGIN
+{
+ copyin(1);
+ exit(1);
+}
+
+ERROR
+{
+ exit(0);
+}
diff --git a/test/unittest/funcs/copyin/err.D_PROTO_LEN.too_many_args.d b/test/unittest/funcs/copyin/err.D_PROTO_LEN.too_many_args.d
new file mode 100644
index 00000000..7ac153e0
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.D_PROTO_LEN.too_many_args.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Exactly two Arguments are required for copyin().
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+BEGIN
+{
+ copyin(1, 2, 3);
+ exit(1);
+}
+
+ERROR
+{
+ exit(0);
+}
diff --git a/test/unittest/funcs/copyin/err.badaddr.d b/test/unittest/funcs/copyin/err.badaddr.d
new file mode 100644
index 00000000..a324d37d
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.badaddr.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Using copyin() with an invalid source address reports a fault.
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+BEGIN
+{
+ copyin(0x1234, 8);
+ exit(0);
+}
+
+ERROR
+{
+ exit(1);
+}
diff --git a/test/unittest/funcs/copyin/err.badaddr.r b/test/unittest/funcs/copyin/err.badaddr.r
new file mode 100644
index 00000000..ba4a4695
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.badaddr.r
@@ -0,0 +1,6 @@
+ FUNCTION:NAME
+ :ERROR
+
+-- @@stderr --
+dtrace: script 'test/unittest/funcs/copyin/err.badaddr.d' matched 2 probes
+dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN
diff --git a/test/unittest/funcs/copyin/err.badsize.d b/test/unittest/funcs/copyin/err.badsize.d
new file mode 100644
index 00000000..6c80b513
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.badsize.d
@@ -0,0 +1,27 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: The copyin() size must not exceed the (adjusted) scratchsize.
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+#pragma D option scratchsize=64
+
+BEGIN
+{
+ sz = 65;
+ copyin(0, sz);
+ exit(0);
+}
+
+ERROR
+{
+ exit(1);
+}
diff --git a/test/unittest/funcs/copyin/err.null_arg1.d b/test/unittest/funcs/copyin/err.null_arg1.d
new file mode 100644
index 00000000..cd152e80
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.null_arg1.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: Using copyin() with a NULL source address reports a fault.
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr()
+ */
+
+BEGIN
+{
+ copyin(0, 8);
+ exit(0);
+}
+
+ERROR
+{
+ exit(1);
+}
diff --git a/test/unittest/funcs/copyin/err.null_arg1.r b/test/unittest/funcs/copyin/err.null_arg1.r
new file mode 100644
index 00000000..a806d107
--- /dev/null
+++ b/test/unittest/funcs/copyin/err.null_arg1.r
@@ -0,0 +1,6 @@
+ FUNCTION:NAME
+ :ERROR
+
+-- @@stderr --
+dtrace: script 'test/unittest/funcs/copyin/err.null_arg1.d' matched 2 probes
+dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN
diff --git a/test/unittest/funcs/copyin/tst.copyin.d b/test/unittest/funcs/copyin/tst.copyin.d
new file mode 100644
index 00000000..52531cea
--- /dev/null
+++ b/test/unittest/funcs/copyin/tst.copyin.d
@@ -0,0 +1,24 @@
+/*
+ * Oracle Linux DTrace.
+ * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Licensed under the Universal Permissive License v 1.0 as shown at
+ * http://oss.oracle.com/licenses/upl.
+ */
+
+/*
+ * ASSERTION: It is possible to read data from the envp[] userspace area.
+ *
+ * SECTION: Actions and Subroutines/copyin()
+ * User Process Tracing/copyin() and copyinstr() Subroutines
+ */
+
+BEGIN
+{
+ printf("envp[0] = \"%s\"", (string)copyin(curthread->mm->env_start, 256));
+ exit(0);
+}
+
+ERROR
+{
+ exit(1);
+}
diff --git a/test/unittest/funcs/tst.copyin.d b/test/unittest/funcs/tst.copyin.d
deleted file mode 100644
index a707eedd..00000000
--- a/test/unittest/funcs/tst.copyin.d
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Oracle Linux DTrace.
- * Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
- * Licensed under the Universal Permissive License v 1.0 as shown at
- * http://oss.oracle.com/licenses/upl.
- */
-/* @@xfail: dtv2 */
-
-/*
- * ASSERTION:
- * This D ditty tests the ability to perform both copyin and copyinstr. We
- * grab the value or pr_envp, read the first pointer from the user stack,
- * and then copyinstr the first environment variable and print it.
- *
- * SECTION: Actions and Subroutines/copyin();
- * Actions and Subroutines/copyinstr();
- * User Process Tracing/copyin() and copyinstr()
- */
-
-BEGIN
-/curpsinfo->pr_dmodel == PR_MODEL_ILP32/
-{
- envp = *(uint32_t *)copyin(curpsinfo->pr_envp, sizeof(uint32_t));
- printf("envp[0] = \"%s\"", copyinstr(envp));
- exit(0);
-}
-
-BEGIN
-/curpsinfo->pr_dmodel == PR_MODEL_LP64/
-{
- envp = *(uint64_t *)copyin(curpsinfo->pr_envp, sizeof(uint64_t));
- printf("envp[0] = \"%s\"", copyinstr(envp));
- exit(0);
-}
--
2.34.1
More information about the DTrace-devel
mailing list