From nobody Wed Feb 05 09:34:43 2025 X-Original-To: dev-commits-src-main@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 4Ynw781tD4z5mT8v; Wed, 05 Feb 2025 09:34:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ynw775WXWz3W20; Wed, 05 Feb 2025 09:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738748083; 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=Rg5pBFdjw1c+x/CJPDdVjmzOXteWt1Yw1n/upnmSRzs=; b=cEC2At0nMlnDvkkSgKg0zY88sGbvS1k9FAPTZtIy2MjW0iK+ZGu5xqjfWhsLsexhcGLu+A BdaNZOM7kBXqAo4kWj0THjuuIoDOZ50YvA/WZB1ZVFygkV3Y5SRrgw7Ys6fzo0flovW+zE IFwnKp9cOyvlh62CbBKhHnbBaIPfh7AJ3+pO4zkNVs0IdGBK18KdXTFGP9DSaaXea2JIo7 n6zdT4ERN6xGf5+nYbw/5yz2VLYiQIXGz11dEFKAkLo673iES71JScflktt6jdMbz60+Mu uM89Js+47e9/NgTbJDSXzP8fZOvpS9Hc/E3Ra3054tkDF9GZUqNEPh0taXCYeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738748083; 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=Rg5pBFdjw1c+x/CJPDdVjmzOXteWt1Yw1n/upnmSRzs=; b=W5XPEegSKIoDxjxZnr3n/DTYoi63UCJ0Feu06QDpTEbrpv5SPwmtDHhJPfM+HNDGityPIR kbvTTRtrvxNGPbQ24bBG1VamQuvDBjGG575gLlhkILoELK24PtvoqfRdoOXx7ljMwsZfu1 vVl7RBR0BcyUUIvueYbRdNDg8lIpjjgAcTdDthYHDk85zzYCJAWL+nVKajRb2DzYQty4C/ rBfaUCTLefY41+fLWEB7pas5/lyecBp5ljo/9VxVUfeyR4f9aJOvOu1HF7sNuXyTJ/WaDR hDg8mlS1EUeamgU1kg6+xfrlVHd0B7Mrc4f0Ey+WhVQHEtGZgkpDWSOhqGYUbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738748083; a=rsa-sha256; cv=none; b=VHM3Hbo7FPv3lTFKyToOWvyk47KkxKkSyL1bY4Mlsj3eLfr9cDkOJGtH6OcOKttGOtJtdD TTLQTO53dSdZ5UqteKT1u2zmaPByHsZkvdUTOJcJuEB7uLTPxuuGPhgiQ9xIZOmPqy6h62 3SiMeEzFRdiqo+vxJZVMBMGQEzXBR6wODEPDA6WS483f1tLZguA33ioJZHSFSrRPT2CAhw d1kXNZPMR1VEjt/+sIg/Y0/QUrj4RWFbHs96YCQzsQQ9Yz2Jks43QrPceek+S5jigm2J0s 2pWb3R/OzOarugVT0GJs/347epkyNlf9eKN5dqobMEl5yO2bG9QuGfCc+gNjwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ynw774n8Dzn3m; Wed, 05 Feb 2025 09:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5159YhO9025679; Wed, 5 Feb 2025 09:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5159Yh3V025676; Wed, 5 Feb 2025 09:34:43 GMT (envelope-from git) Date: Wed, 5 Feb 2025 09:34:43 GMT Message-Id: <202502050934.5159Yh3V025676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 48f91cacc39c - main - bhyve/riscv: clean up SBI handlers. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48f91cacc39c3d48e8dfdb804b844e2a2dbc5157 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=48f91cacc39c3d48e8dfdb804b844e2a2dbc5157 commit 48f91cacc39c3d48e8dfdb804b844e2a2dbc5157 Author: Ruslan Bukin AuthorDate: 2025-02-05 09:31:57 +0000 Commit: Ruslan Bukin CommitDate: 2025-02-05 09:32:25 +0000 bhyve/riscv: clean up SBI handlers. Similar to kernel SBI clean up patch, do clean up in userspace SBI part: - use standard SBI error codes; - remove unused function. Differential Revision: https://reviews.freebsd.org/D48829 --- usr.sbin/bhyve/riscv/vmexit.c | 63 +++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/usr.sbin/bhyve/riscv/vmexit.c b/usr.sbin/bhyve/riscv/vmexit.c index 233dba9f3c7f..3bc83b3bef4e 100644 --- a/usr.sbin/bhyve/riscv/vmexit.c +++ b/usr.sbin/bhyve/riscv/vmexit.c @@ -173,13 +173,7 @@ vmm_sbi_probe_extension(int ext_id) return (1); } -static void -vmexit_ecall_time(struct vmctx *ctx __unused, struct vm_exit *vme __unused) -{ - -} - -static void +static int vmexit_ecall_hsm(struct vmctx *ctx __unused, struct vcpu *vcpu __unused, struct vm_exit *vme) { @@ -187,15 +181,12 @@ vmexit_ecall_hsm(struct vmctx *ctx __unused, struct vcpu *vcpu __unused, uint64_t hart_id; int func_id; int error; - int ret; hart_id = vme->u.ecall.args[0]; func_id = vme->u.ecall.args[6]; - ret = -1; - if (HART_TO_CPU(hart_id) >= (uint64_t)guest_ncpus) - goto done; + return (SBI_ERR_INVALID_PARAM); newvcpu = fbsdrun_vcpu(HART_TO_CPU(hart_id)); assert(newvcpu != NULL); @@ -221,42 +212,34 @@ vmexit_ecall_hsm(struct vmctx *ctx __unused, struct vcpu *vcpu __unused, vm_resume_cpu(newvcpu); CPU_SET_ATOMIC(hart_id, &running_hartmask); - - ret = 0; break; case SBI_HSM_HART_STOP: if (!CPU_ISSET(hart_id, &running_hartmask)) break; CPU_CLR_ATOMIC(hart_id, &running_hartmask); vm_suspend_cpu(newvcpu); - ret = 0; break; case SBI_HSM_HART_STATUS: /* TODO. */ break; default: - break; + return (SBI_ERR_NOT_SUPPORTED); } -done: - error = vm_set_register(vcpu, VM_REG_GUEST_A0, ret); - assert(error == 0); + return (SBI_SUCCESS); } -static void +static int vmexit_ecall_base(struct vmctx *ctx __unused, struct vcpu *vcpu, struct vm_exit *vme) { int sbi_function_id; + uint32_t val; int ext_id; int error; - uint32_t val; - int ret; sbi_function_id = vme->u.ecall.args[6]; - ret = 0; - switch (sbi_function_id) { case SBI_BASE_GET_SPEC_VERSION: val = SBI_VERS_MAJOR << SBI_SPEC_VERS_MAJOR_OFFSET; @@ -282,20 +265,16 @@ vmexit_ecall_base(struct vmctx *ctx __unused, struct vcpu *vcpu, val = 0; break; default: - ret = 1; - break; + return (SBI_ERR_NOT_SUPPORTED); } - error = vm_set_register(vcpu, VM_REG_GUEST_A0, ret); + error = vm_set_register(vcpu, VM_REG_GUEST_A1, val); assert(error == 0); - if (ret == 0) { - error = vm_set_register(vcpu, VM_REG_GUEST_A1, val); - assert(error == 0); - } + return (SBI_SUCCESS); } -static void +static int vmexit_ecall_srst(struct vmctx *ctx, struct vm_exit *vme) { enum vm_suspend_how how; @@ -315,11 +294,14 @@ vmexit_ecall_srst(struct vmctx *ctx, struct vm_exit *vme) vm_suspend(ctx, how); break; default: - break; + return (SBI_ERR_NOT_SUPPORTED); } - default: break; + default: + return (SBI_ERR_NOT_SUPPORTED); } + + return (SBI_SUCCESS); } static int @@ -327,30 +309,33 @@ vmexit_ecall(struct vmctx *ctx, struct vcpu *vcpu, struct vm_run *vmrun) { int sbi_extension_id; struct vm_exit *vme; + int error; + int ret; vme = vmrun->vm_exit; sbi_extension_id = vme->u.ecall.args[7]; switch (sbi_extension_id) { case SBI_EXT_ID_SRST: - vmexit_ecall_srst(ctx, vme); + ret = vmexit_ecall_srst(ctx, vme); break; case SBI_EXT_ID_BASE: - vmexit_ecall_base(ctx, vcpu, vme); - break; - case SBI_EXT_ID_TIME: - vmexit_ecall_time(ctx, vme); + ret = vmexit_ecall_base(ctx, vcpu, vme); break; case SBI_EXT_ID_HSM: - vmexit_ecall_hsm(ctx, vcpu, vme); + ret = vmexit_ecall_hsm(ctx, vcpu, vme); break; case SBI_CONSOLE_PUTCHAR: case SBI_CONSOLE_GETCHAR: default: /* Unknown SBI extension. */ + ret = SBI_ERR_NOT_SUPPORTED; break; } + error = vm_set_register(vcpu, VM_REG_GUEST_A0, ret); + assert(error == 0); + return (VMEXIT_CONTINUE); }