From nobody Mon Feb 6 19:28:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9brk4JGxz3n5Zb; Mon, 6 Feb 2023 19:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9brk3phYz3lhr; Mon, 6 Feb 2023 19:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675711686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0nhQ4SN5y5wWVKej4bRzeeOdYkYlsuBTXlPoVO8HUVg=; b=KqHIGIvcNKBHijsEQkSAoln793Vik0c2Xety/cRcDfzmOv0wpsHdBgdKT7bDSdTUIsnJ0D EaLuKwa7e0396fpAINISUbPaA15vUosFpkN/v7uGyQAjTQDZV3qpeAW3clozh5IAVxJS8e jqotTduNRb/7+2Zk47l3v+ndyu/TcvpPWCPgC6fI/W3Dyrva22RfG1PU51ZeQXYsnbGV1E 8wd+/b51gPCQbF33odYw7qkjOb3OKlHiiIXwe+ntIf9urV+jxIgX+5bfVoc1bPkFjSixi9 y7ZVl2I4ClXXSp4pzF8P2Kfxgaq471R+dZ6gv+IG8pF4NMf4iZsCOIxRZs5kMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675711686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0nhQ4SN5y5wWVKej4bRzeeOdYkYlsuBTXlPoVO8HUVg=; b=gDhmB+HOXX8oPKj9154TXcsjMngCsXfyE2XE/zfzQtz6HiFE42Q2hgRJHKR8JB6qDFo8Lp IlSNga6JLFliFbfrrqfXrXdfIAp87573NU3kM7DdoT4El62CSHJyeuwJIw6DOwwKWbZzlw xWXjKE1A33ItBXdHsZsMIuR+N0XCk6YkMR3GoQ8hDbwn08kVWu2zid8SQVCXUztXU6Pra0 t98TY/MFV/Em69vJAm9AwwXADetGWuD8enYLL7iwoj1OZPFr3p6l/G2X3SnoxP+x4sMa5Z WHHR9AEvFWFP4ZbaeAST19cvo7OVFdJA2dfN1MGQ116vhxG/5fRw3deadS1hZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675711686; a=rsa-sha256; cv=none; b=SVts1AsJ03HDLVrAvkfRG+XW4MNgzs5TE3+6iRPOGQCbg414DuTKDLEAvgLdWi4SChxSvO 089kf1Hb8XEospy0iyTBznpD2GYM+1xSJjyi81j+MUeT0eG0p/6qG8P+3uVPgrefU4DFoI VyzlwBgJnLwZtFlum0Q+afhQGwY7dpIYwiAe5BBniDq8AUrbuX0SZJJ5vsjp8pJP2m7T/I RFk8ElYIPpOH7T74uYNOzU7s3zcBqJNmVxyae7mMkyRf5a59I858jOAiWsOmjJmVvYj71g O6pmqiAQErbvVOXcMeSrUZha5E0qPqdbYh/JcjN0dbGVZy2UPUaCfUmV/FCfHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9brk2sWpzmBJ; Mon, 6 Feb 2023 19:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316JS6DW006419; Mon, 6 Feb 2023 19:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316JS6FR006418; Mon, 6 Feb 2023 19:28:06 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:28:06 GMT Message-Id: <202302061928.316JS6FR006418@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 0e563bde48b1 - main - dtrace_asm.S: properly enter/exit user access List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e563bde48b1af6bd472e940f04a8d76315749ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0e563bde48b1af6bd472e940f04a8d76315749ab commit 0e563bde48b1af6bd472e940f04a8d76315749ab Author: Mitchell Horne AuthorDate: 2023-02-06 18:04:21 +0000 Commit: Mitchell Horne CommitDate: 2023-02-06 19:26:53 +0000 dtrace_asm.S: properly enter/exit user access In order to read or write userspace memory without generating an access fault, we must first enable the SUM bit in the sstatus CSR. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38298 --- sys/cddl/dev/dtrace/riscv/dtrace_asm.S | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 @@ -74,7 +74,9 @@ 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) @@ -83,7 +85,9 @@ 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) @@ -92,7 +96,9 @@ 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) @@ -101,7 +107,9 @@ 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) @@ -111,6 +119,7 @@ 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 @@ -118,6 +127,7 @@ ENTRY(dtrace_copy) addi a1, a1, 1 addi a2, a2, -1 /* len-- */ bnez a2, 1b + EXIT_USER_ACCESS(t0) 2: RET END(dtrace_copy) @@ -129,7 +139,9 @@ dtrace_copystr(uintptr_t uaddr, uintptr_t kaddr, size_t size, 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 */ @@ -138,6 +150,8 @@ ENTRY(dtrace_copystr) addi a2, a2, -1 /* len-- */ bnez a2, 1b 2: + EXIT_USER_ACCESS(t0) +3: RET END(dtrace_copystr)