From nobody Thu Feb 23 17:08:28 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 4PMzxm6g6Qz3sDr1; Thu, 23 Feb 2023 17:08:28 +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 4PMzxm60kvz3ktF; Thu, 23 Feb 2023 17:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677172108; 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=/aZCTiIMVDWC3r1ziFm7b4WAFGMIs0gHGXxKBn6am0k=; b=VRuozLgkgu5qkGLlS7PEIy8xGhY9roQExogJKh2fGcyOnGXUbhJ33AhRphtCQ7loD8EhGv vdSZtJtVvcI8sPpO6ndsoywDfSLt7hmlnaJxawnwdUpynKC5TnhwNq2cs/ySqaWHPJBOAL QMS8XLjXrAw45s94pAIKjLgFut+cBEiN5CjxI9hluKyrYOPwgosXOSl8rIote/SXjWGHHd QZHNlyUlWiOw/DjF0Mtj6+dLiJBEAS1BzPStu2Gp2vcpF9m69ZgoZDUy+9XrapjAcCXpyT 9gvoYUVcetFGfWQjXsn3ACioPL/8fufTU5zQOQFRC8dR0QSzVUx2gdAW1dqdRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677172108; 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=/aZCTiIMVDWC3r1ziFm7b4WAFGMIs0gHGXxKBn6am0k=; b=wt0D7bDyrEh3qVIcxIy9WTEyH9OXdD+dBQULcaOmJGdva47+4K73ir85EpqPjJww18wuS9 gDoHvpEBR9CTLcyi/Bhzw6kltclwDkGcnVvMS7TN6xoVU/N27GPBIIUrql77jW1RdYCEN0 dlK7P6mkUoETVx+vZBcZ4ASfta0tt4ozIvXnp9bBzefxYCVuJ5TgxMy9dg3UUeTQNsJJB8 +WZdiK4L8N3rLWVuU5ho88ik6x6PxGlDvVobgggEtlcn6ZMlBqiRIB4aGtiJFzJ8EayxCV ItQfSN4coj4uHOcU5kln3qAPo8LWzL8mcsBzAMG6U4496ja369e5DMqoBqfD6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677172108; a=rsa-sha256; cv=none; b=d66kESzMkdGvgGOlHJoGZJRmViocC1GMm3gpwu7ukuCG3WqJX9FLPeSmEPpFPSvg1r+z+W kFAeb/sPFhmlBCDdyBV8VJbWvirJSsIYdJJWkQKz9aTJQZJ/9uCBHgLTnePQsfLfcabOlW 7cduTUYguJfTcCehdF3vP/sH4yXK3axhWuIWsEm1CXi1BaMjoymMWv3bZx9nlbfm4vq348 5bHKj8icelRvOXqnKyQ0P0e8R3+MoLTHPO3jfOBstRe4O4izaLjbN+7C+aWdULMaF+i+R+ ZrtkaQZ5SaSd2cYIUEySJ2wCgFeeWyI3pzYmszdmu4Oo5Ne4Ph+cNoU6z+dt/A== 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 4PMzxm54r9zqqq; Thu, 23 Feb 2023 17:08:28 +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 31NH8SSO005686; Thu, 23 Feb 2023 17:08:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NH8SYK005685; Thu, 23 Feb 2023 17:08:28 GMT (envelope-from git) Date: Thu, 23 Feb 2023 17:08:28 GMT Message-Id: <202302231708.31NH8SYK005685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5e8827063b9f - releng/13.2 - vmm: Fix AP startup compatibility for old bhyve executables 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 5e8827063b9f565697135b33399a64ca9f000a02 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5e8827063b9f565697135b33399a64ca9f000a02 commit 5e8827063b9f565697135b33399a64ca9f000a02 Author: Mark Johnston AuthorDate: 2023-02-09 20:52:35 +0000 Commit: Mark Johnston CommitDate: 2023-02-23 17:07:47 +0000 vmm: Fix AP startup compatibility for old bhyve executables These changes unbreak AP startup when using a 13.1-RELEASE bhyve executable with a newer kernel: - Correct the destination mask for the VM_EXITCODE_IPI message generated by an INIT or STARTUP IPI in vlapic_icrlo_write_handler(). - Only initialize vlapics on active vCPUs. 13.1-RELEASE bhyve activates AP vCPUs only after the BSP starts them with an IPI, and vmm now allocates vcpu structures lazily, so the STARTUP handling in vm_handle_ipi() could trigger a page fault. - Fix an off-by-one setting the vcpuid in a VM_EXITCODE_SPINUP_AP message. Approved by: re (cperciva) Fixes: 7c326ab5bb9a ("vmm: don't lock a mtx in the icr_low write handler") Reviewed by: jhb, corvink MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38446 (cherry picked from commit b265a2e0d76422f4007e96dd7295ed0aeb846e2d) (cherry picked from commit 577a666c3c33def1d4b996575dc43f8567fdac5c) --- sys/amd64/vmm/io/vlapic.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 44641cc29035..f7370e440d66 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -1160,7 +1160,7 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic, bool *retu) vmexit->exitcode = VM_EXITCODE_IPI; vmexit->u.ipi.mode = mode; vmexit->u.ipi.vector = vec; - vmexit->u.ipi.dmask = dmask; + vmexit->u.ipi.dmask = ipimask; *retu = true; } @@ -1185,16 +1185,22 @@ vm_handle_ipi(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) *retu = true; switch (vme->u.ipi.mode) { - case APIC_DELMODE_INIT: - vm_smp_rendezvous(vcpu, *dmask, vlapic_handle_init, - NULL); + case APIC_DELMODE_INIT: { + cpuset_t active, reinit; + + active = vm_active_cpus(vcpu_vm(vcpu)); + CPU_AND(&reinit, &active, dmask); + if (!CPU_EMPTY(&reinit)) { + vm_smp_rendezvous(vcpu, reinit, vlapic_handle_init, + NULL); + } vm_await_start(vcpu_vm(vcpu), dmask); - if (!vlapic->ipi_exit) { + if (!vlapic->ipi_exit) *retu = false; - } break; + } case APIC_DELMODE_STARTUP: /* * Ignore SIPIs in any state other than wait-for-SIPI @@ -1212,13 +1218,13 @@ vm_handle_ipi(struct vcpu *vcpu, struct vm_exit *vme, bool *retu) */ if (!vlapic->ipi_exit) { vme->exitcode = VM_EXITCODE_SPINUP_AP; - vme->u.spinup_ap.vcpu = CPU_FFS(dmask); + vme->u.spinup_ap.vcpu = CPU_FFS(dmask) - 1; vme->u.spinup_ap.rip = vec << PAGE_SHIFT; } break; default: - return (1); + __assert_unreachable(); } return (0);