From nobody Mon May 08 08:25:33 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 4QFDrF61wGz49Z8N; Mon, 8 May 2023 08:25:33 +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 4QFDrF5YTzz3lYd; Mon, 8 May 2023 08:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534333; 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=/yXBniBrR4gU4CoArDD3fXPg9/6BhJd8nUf3Xzs5uzg=; b=tmKWfe3ZKLDzccOf9EVCblvAWeKZo9qKnyG3xqeJwBziwJ9CXbftUm6vZo4jQz0kDQdmKS XKOJvjsmmnc2YPrgl+Gi0KwTsmRo24kskgQkcjLVBTnMASanXg+mIAxkMlSXLoRJkAl4zf NxZTc7nHK84N8eAJ+Nx/DJnZ8nunofODF6cL39sbfeIcyTW68HK0ZXn5xG0Lyf9S8QbZI/ IVgtpa7Hg25+58iNBeJbs5qFYaxw9I/zuHeGoOfRfAU4o2A2CQ13CTYaKwy/ey5ALFsztb eatVVVZb3/q8fLJf8TBPh7UuRvPG1WQGzYd+a0I0aS5lL8ZSRLUsK3SEivXRCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534333; 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=/yXBniBrR4gU4CoArDD3fXPg9/6BhJd8nUf3Xzs5uzg=; b=Vxq21aw6Ytyuk7lcDN87uCIyDTIf1N9qWhxAnDCpiz0DYyoWrZkxYlYdKW2tMuYt/Qr/xt RicMbFR1PZysYJusyfES5b/i/rSWewVGbiP+vCRZpTgJfQPykQ80ho7DVO7cL4RI/rSF9F tEa3EtG8Cpjkx9z6C59JUyoeG/uZ592OqJkE0PbPThiRR5RzjeZbfvGlGFHSK3qbsMdcd6 gWQomDPCBtrwrO02xgrMZl38WfDorjdDOhSChWPt08AZbN2aKfSjqxZDmUCTZXXIRVtx5V N60aBfnKgHZq3KwvtfcpnbsVG/oh0EjCg8t9gZVeJ6yvFDnHt9D8lBadLOotNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534333; a=rsa-sha256; cv=none; b=kt/JxF04MAdF8g8oOvanRpyngQLxQSqgK7g8vJk8l+4Qxbj3el52jmLz6X6kd8aXJlEhDl hTA25c9lANiaD1GnOeSw1PgM9LgF1G7+wZLr6ulNMYLI5LXN9baIiFKJoNsLsrSZXyAqbT KcirollvFTJFWPZOw36QdlD2IEm0j0leJpl3nc1qP8nn1Z1LUvwsHxrFUkBNAi/TtG1dub v3fNiQpVq8PaLqmPXOgXQ+9oq9QadsI2YdzyqBgFsHI5LWOlVSa1bdE2jZSijt9PVXQxRi C/ixMKqF3Au0d8iQjZuq59lv987leLzbS+/+lB3xxVaj4QAd+ozRYaBH/AUAog== 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 4QFDrF4fmkztJ3; Mon, 8 May 2023 08:25:33 +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 3488PXcx050483; Mon, 8 May 2023 08:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PXx6050482; Mon, 8 May 2023 08:25:33 GMT (envelope-from git) Date: Mon, 8 May 2023 08:25:33 GMT Message-Id: <202305080825.3488PXx6050482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 743938876959 - stable/13 - vmm: fix HLT loop while vcpu has requested virtual interrupts 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74393887695971d59e108b950e27d21b3070e1fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=74393887695971d59e108b950e27d21b3070e1fc commit 74393887695971d59e108b950e27d21b3070e1fc Author: Vitaliy Gusev AuthorDate: 2023-04-26 08:17:50 +0000 Commit: Corvin Köhne CommitDate: 2023-05-08 08:21:32 +0000 vmm: fix HLT loop while vcpu has requested virtual interrupts This fixes the detection of pending interrupts when pirval is 0 and the pending bit is set More information how this situation occurs, can be found here: https://github.com/freebsd/freebsd-src/blob/c5b5f2d8086f540fefe4826da013dd31d4e45fe8/sys/amd64/vmm/intel/vmx.c#L4016-L4031 Reviewed by: corvink, markj Fixes: 02cc877968bbcd57695035c67114a67427f54549 ("Recognize a pending virtual interrupt while emulating the halt instruction.") MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D39620 (cherry picked from commit 0912408a281f203c43d0b3f73c38117336588342) --- sys/amd64/vmm/intel/vmx.c | 44 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 91406f0614ce..32e53de4e8ee 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -3763,7 +3763,8 @@ vmx_pending_intr(struct vlapic *vlapic, int *vecptr) struct pir_desc *pir_desc; struct LAPIC *lapic; uint64_t pending, pirval; - uint32_t ppr, vpr; + uint8_t ppr, vpr, rvi; + struct vm_exit *vmexit; int i; /* @@ -3774,31 +3775,26 @@ vmx_pending_intr(struct vlapic *vlapic, int *vecptr) vlapic_vtx = (struct vlapic_vtx *)vlapic; pir_desc = vlapic_vtx->pir_desc; + lapic = vlapic->apic_page; - pending = atomic_load_acq_long(&pir_desc->pending); - if (!pending) { - /* - * While a virtual interrupt may have already been - * processed the actual delivery maybe pending the - * interruptibility of the guest. Recognize a pending - * interrupt by reevaluating virtual interrupts - * following Section 29.2.1 in the Intel SDM Volume 3. - */ - struct vm_exit *vmexit; - uint8_t rvi, ppr; - - vmexit = vm_exitinfo(vlapic->vcpu); - KASSERT(vmexit->exitcode == VM_EXITCODE_HLT, - ("vmx_pending_intr: exitcode not 'HLT'")); - rvi = vmexit->u.hlt.intr_status & APIC_TPR_INT; - lapic = vlapic->apic_page; - ppr = lapic->ppr & APIC_TPR_INT; - if (rvi > ppr) { - return (1); - } + /* + * While a virtual interrupt may have already been + * processed the actual delivery maybe pending the + * interruptibility of the guest. Recognize a pending + * interrupt by reevaluating virtual interrupts + * following Section 30.2.1 in the Intel SDM Volume 3. + */ + vmexit = vm_exitinfo(vlapic->vcpu); + KASSERT(vmexit->exitcode == VM_EXITCODE_HLT, + ("vmx_pending_intr: exitcode not 'HLT'")); + rvi = vmexit->u.hlt.intr_status & APIC_TPR_INT; + ppr = lapic->ppr & APIC_TPR_INT; + if (rvi > ppr) + return (1); + pending = atomic_load_acq_long(&pir_desc->pending); + if (!pending) return (0); - } /* * If there is an interrupt pending then it will be recognized only @@ -3807,8 +3803,6 @@ vmx_pending_intr(struct vlapic *vlapic, int *vecptr) * Special case: if the processor priority is zero then any pending * interrupt will be recognized. */ - lapic = vlapic->apic_page; - ppr = lapic->ppr & APIC_TPR_INT; if (ppr == 0) return (1);