diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_asm.S b/sys/cddl/dev/dtrace/riscv/dtrace_asm.S
index eeaf64061675..98c22a2aedfd 100644
--- a/sys/cddl/dev/dtrace/riscv/dtrace_asm.S
+++ b/sys/cddl/dev/dtrace/riscv/dtrace_asm.S
@@ -1,177 +1,191 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License, Version 1.0 only
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  *
  * Portions Copyright 2016 Ruslan Bukin <br@bsdpad.com>
  *
  * $FreeBSD$
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #define _ASM
 #define _LOCORE
 
 #include <sys/cpuvar_defs.h>
 #include <sys/dtrace.h>
 
 #include <machine/riscvreg.h>
 #include <machine/asm.h>
 
 #include "assym.inc"
 
 /*
 void dtrace_membar_producer(void)
 */
 ENTRY(dtrace_membar_producer)
 	RET
 END(dtrace_membar_producer)
 
 /*
 void dtrace_membar_consumer(void)
 */
 ENTRY(dtrace_membar_consumer)
 	RET
 END(dtrace_membar_consumer)
 
 /*
 dtrace_icookie_t dtrace_interrupt_disable(void)
 */
 ENTRY(dtrace_interrupt_disable)
 	csrrci	a0, sstatus, (SSTATUS_SIE)
 	andi	a0, a0, (SSTATUS_SIE)
 	RET
 END(dtrace_interrupt_disable)
 
 /*
 void dtrace_interrupt_enable(dtrace_icookie_t cookie)
 */
 ENTRY(dtrace_interrupt_enable)
 	csrs	sstatus, a0
 	RET
 END(dtrace_interrupt_enable)
 /*
 uint8_t
 dtrace_fuword8_nocheck(void *addr)
 */
 ENTRY(dtrace_fuword8_nocheck)
+	ENTER_USER_ACCESS(t0)
 	lb	a0, 0(a0)
+	EXIT_USER_ACCESS(t0)
 	RET
 END(dtrace_fuword8_nocheck)
 
 /*
 uint16_t
 dtrace_fuword16_nocheck(void *addr)
 */
 ENTRY(dtrace_fuword16_nocheck)
+	ENTER_USER_ACCESS(t0)
 	lh	a0, 0(a0)
+	EXIT_USER_ACCESS(t0)
 	RET
 END(dtrace_fuword16_nocheck)
 
 /*
 uint32_t
 dtrace_fuword32_nocheck(void *addr)
 */
 ENTRY(dtrace_fuword32_nocheck)
+	ENTER_USER_ACCESS(t0)
 	lw	a0, 0(a0)
+	EXIT_USER_ACCESS(t0)
 	RET
 END(dtrace_fuword32_nocheck)
 
 /*
 uint64_t
 dtrace_fuword64_nocheck(void *addr)
 */
 ENTRY(dtrace_fuword64_nocheck)
+	ENTER_USER_ACCESS(t0)
 	ld	a0, 0(a0)
+	EXIT_USER_ACCESS(t0)
 	RET
 END(dtrace_fuword64_nocheck)
 
 /*
 void
 dtrace_copy(uintptr_t uaddr, uintptr_t kaddr, size_t size)
 */
 ENTRY(dtrace_copy)
 	beqz	a2, 2f		/* If len == 0 then skip loop */
+	ENTER_USER_ACCESS(t0)
 1:
 	lb	a4, 0(a0)	/* Load from uaddr */
 	addi	a0, a0, 1
 	sb	a4, 0(a1)	/* Store in kaddr */
 	addi	a1, a1, 1
 	addi	a2, a2, -1	/* len-- */
 	bnez	a2, 1b
+	EXIT_USER_ACCESS(t0)
 2:
 	RET
 END(dtrace_copy)
 
 /*
 void
 dtrace_copystr(uintptr_t uaddr, uintptr_t kaddr, size_t size,
     volatile uint16_t *flags)
 XXX: Check for flags?
 */
 ENTRY(dtrace_copystr)
-	beqz	a2, 2f		/* If len == 0 then skip loop */
+	beqz	a2, 3f		/* If len == 0 then skip loop */
+	ENTER_USER_ACCESS(t0)
+1:
 	lb	a4, 0(a0)	/* Load from uaddr */
 	addi	a0, a0, 1
 	sb	a4, 0(a1)	/* Store in kaddr */
 	addi	a1, a1, 1
 	beqz	a4, 2f		/* If == 0 then break */
 	addi	a2, a2, -1	/* len-- */
 	bnez	a2, 1b
 2:
+	EXIT_USER_ACCESS(t0)
+3:
 	RET
 END(dtrace_copystr)
 
 /*
 uintptr_t
 dtrace_caller(int aframes)
 */
 ENTRY(dtrace_caller)
 	li	a0, -1
 	RET
 END(dtrace_caller)
 
 /*
 uint32_t
 dtrace_cas32(uint32_t *target, uint32_t cmp, uint32_t new)
 */
 ENTRY(dtrace_cas32)
 1:	lr.w	a3, 0(a0)	/* Load target */
 	bne	a3, a1, 2f	/* *target != cmp ? return */
 	sc.w	a4, a2, 0(a0)	/* Store new to target */
 	bnez	a4, 1b		/* Try again if store not succeed */
 2:	mv	a0, a3		/* Return the value loaded from target */
 	RET
 END(dtrace_cas32)
 
 /*
 void *
 dtrace_casptr(volatile void *target, volatile void *cmp, volatile void *new)
 */
 ENTRY(dtrace_casptr)
 1:	lr.d	a3, 0(a0)	/* Load target */
 	bne	a3, a1, 2f	/* *target != cmp ? return */
 	sc.d	a4, a2, 0(a0)	/* Store new to target */
 	bnez	a4, 1b		/* Try again if store not succeed */
 2:	mv	a0, a3		/* Return the value loaded from target */
 	RET
 END(dtrace_casptr)