From nobody Thu Jan 26 22:35:01 2023 X-Original-To: dev-commits-src-branches@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 4P2wWV3GmGz3cCSr; Thu, 26 Jan 2023 22:35:02 +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 4P2wWV1r7Vz4DWm; Thu, 26 Jan 2023 22:35:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674772502; 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=x2c1yjWTkjIEVlZrvUi6OQ/r4VHboVJKnMFsdvSPv8k=; b=TFPkwZKULGE0qy6JZFEVqpvljuN28UisQOediGk2pLkLrogMIIVmNA3jHB1E2Vha9ubmQg s7OuNQPwckOx9lKFRsN7qDzpPrajxfkr7oibUHEc0CZtDnDp2SPn/F4JsSPGTmxHXkQIIl mP6Fr7On+hseAjhbna62DBcTdVysmxTkIAafLUMZw0SRpBjnne+civ6t+Dj7dKU4DVNull LWXsTeMNorbN+3V6v6V6WvkbwW2cwBSMl9i9d+n4eerQORzU5P+Vc/JUSmTvADANq9eL5V hoQkH1ScF+u71k+q41X9sSAFVM8f8AQUE51F5qGkRDF77KQscbnKyJL6ZDIqeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674772502; 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=x2c1yjWTkjIEVlZrvUi6OQ/r4VHboVJKnMFsdvSPv8k=; b=MozbkRYYpepWW6Jt9Aod/L7qU3KRnRkjCkETXF7fWo4OIic/xPxQHS4RKoJupXIwnaMTln Y2THY6psZ5EepRGu9Gx8peuLXbicLhpj/kvwAN6yIR7tpYCp3Yg/Rng4MHrxdQFaffdL1L Rhk4bm1E3hAmp8NWMauHk+9QtQJpHSjW2VxlLrJvAAjbWxZbM/6HRWI4qFQoQgorTSMR8H /8+dRx/ozgDEReECh0E8N2cv3UNPpXnUJ210VPYYMUC1bdwsn7Q8jXHjYlbtDVlmqRSIZg QfIvxVZrBHHElSstIeaJJrb2aTsJkvQjkyKh0zmcQwPro9/CLuNxZsUrZehuQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674772502; a=rsa-sha256; cv=none; b=bC+TRQv07UgBT045f9JTBEW9KZlpplSOylLMforPxFZGR6zN0DbbJi+vIjuwhkXCGRWJ1Z wgMHhb2JmMwvxEzn8ITOgaenG110aKVNaCkEvK0vgS5nUum3TGDDLwBhgueHGbyznTykhb YNLw5VNf7EeIbB/y7fLJ0iMIZn9dd4zRMPlcWsK1668jFyZNCsYGlWiDtKuHue63FOXvd8 vw2xL6vD6luFLMwOcpyN+nFSXXdrYarTmogQTnp+l7nQVizMcHudZYFcuxh53VpJvKn3Fg fpUdHRQQS1MDgQGcUx9LnUuOJjiltFCtJfwPFxVg6uCSFSt3LkaZVeJV7nAImQ== 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 4P2wWV0GrlzmYh; Thu, 26 Jan 2023 22:35:02 +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 30QMZ1TS051562; Thu, 26 Jan 2023 22:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMZ1Wg051561; Thu, 26 Jan 2023 22:35:01 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:35:01 GMT Message-Id: <202301262235.30QMZ1Wg051561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 41badad786f9 - stable/13 - bhyve: Allocate struct vm_exit on the stack in vm_loop. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 41badad786f9f7576bead7e35d6265ce95e9b005 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=41badad786f9f7576bead7e35d6265ce95e9b005 commit 41badad786f9f7576bead7e35d6265ce95e9b005 Author: John Baldwin AuthorDate: 2022-12-21 18:32:45 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:18:00 +0000 bhyve: Allocate struct vm_exit on the stack in vm_loop. The global vmexit[] array is no longer needed to smuggle the rip value from fbsdrun_addcpu() to vm_loop(). Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37644 (cherry picked from commit a20c00c60e1c022f77a7bc638f29d3d6d9456953) --- usr.sbin/bhyve/bhyverun.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index e40229e79828..31cb7c2ceaf3 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -196,8 +196,6 @@ static cpuset_t cpumask; static void vm_loop(struct vmctx *ctx, int vcpu); -static struct vm_exit *vmexit; - static struct bhyvestats { uint64_t vmexit_bogus; uint64_t vmexit_reqidle; @@ -619,7 +617,7 @@ vmexit_inout(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu) fprintf(stderr, "Unhandled %s%c 0x%04x at 0x%lx\n", in ? "in" : "out", bytes == 1 ? 'b' : (bytes == 2 ? 'w' : 'l'), - port, vmexit->rip); + port, vme->rip); return (VMEXIT_ABORT); } else { return (VMEXIT_CONTINUE); @@ -968,6 +966,7 @@ static vmexit_handler_t handler[VM_EXITCODE_MAX] = { static void vm_loop(struct vmctx *ctx, int vcpu) { + struct vm_exit vme; int error, rc; enum vm_exitcode exitcode; cpuset_t active_cpus; @@ -982,18 +981,18 @@ vm_loop(struct vmctx *ctx, int vcpu) assert(CPU_ISSET(vcpu, &active_cpus)); while (1) { - error = vm_run(ctx, vcpu, &vmexit[vcpu]); + error = vm_run(ctx, vcpu, &vme); if (error != 0) break; - exitcode = vmexit[vcpu].exitcode; + exitcode = vme.exitcode; if (exitcode >= VM_EXITCODE_MAX || handler[exitcode] == NULL) { fprintf(stderr, "vm_loop: unexpected exitcode 0x%x\n", exitcode); exit(4); } - rc = (*handler[exitcode])(ctx, &vmexit[vcpu], &vcpu); + rc = (*handler[exitcode])(ctx, &vme, &vcpu); switch (rc) { case VMEXIT_CONTINUE: @@ -1582,7 +1581,6 @@ main(int argc, char *argv[]) #endif /* Allocate per-VCPU resources. */ - vmexit = calloc(guest_ncpus, sizeof(*vmexit)); mt_vmm_info = calloc(guest_ncpus, sizeof(*mt_vmm_info)); /*