From nobody Tue Nov 1 21:00:52 2022 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 4N22VX2f4bz4hGTW; Tue, 1 Nov 2022 21:00:52 +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 4N22VX2Dkdz3LvF; Tue, 1 Nov 2022 21:00:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667336452; 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=IC6aOS45USALfLfILnvdujUkASOUN/Y1M2J35+uOib8=; b=ojeGAxotMQEgf0QhUEY72dvzHzQokt1upkckgYotaECjv3dxKhsY69GzsS1rAOkhcxhVzf E07obXbePvMWxvb8bdsdsXjB/4C6lsPsnudTTeq9oKglGD4TNe2aiKh++omDGHg8Wl533U j5wBLmGCB7656ZfBNqbd8AhcZsqwfc12un2oJI/Oj5XodKH8bsVS4+7vlw05Zc81VsrOuT mgy1VIr6gjrl+rNH/yjWLbrVbdAi9wozN8TR8kWepRU6AjzoebMv12FFT8W6NFPsVsYj38 1LKHhoF7LH4qTAPgSjzjRquQST5pKz83pitj1ndU8DlYggBDhY1+Iwt07gCPEg== 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 4N22VX1HYqzW8y; Tue, 1 Nov 2022 21:00:52 +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 2A1L0qkf064933; Tue, 1 Nov 2022 21:00:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1L0quS064932; Tue, 1 Nov 2022 21:00:52 GMT (envelope-from git) Date: Tue, 1 Nov 2022 21:00:52 GMT Message-Id: <202211012100.2A1L0quS064932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4d447b30f7be - main - vmm: do not leak halted_cpus bit after suspension 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d447b30f7be761b0c2877513e79f484511a00a5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667336452; 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=IC6aOS45USALfLfILnvdujUkASOUN/Y1M2J35+uOib8=; b=bfPVhzaedpL+Hv8DvLoHpIA/gaNYpAy/vFIWCzfKd4GceyhBD4zxHrGrjH1LlUXfe4md30 QmyEweJHY7cP1OVFFEJntI7u6ki8FvGTzTzpgcJihqMePySwULHDZJVUkZkypuF1oegbXQ Agz0cv4Ib4jv3Uv8GoqILzf3n/rrhUQeWyX/u13smRqIXPJLzyN6IveVi2gYTiDNMQphbf zsltPt6W1KmYfsa8XyBQm8nC4xRwPQRE45bsIaq/whWRJGonVEAU0LT/bnhBWkafAxBT9+ jBT46q2jSodC5XYBsxnvssbA7Zag8taIt/GX8lccpYLHfRiWSH7S1DVP06IxQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667336452; a=rsa-sha256; cv=none; b=KDU32XeRZHr5UvJQylgH0GouPgmnIZs2aJi8W0LYH/cGif/MxxP2s8ATlCBeu1YBiO6Foe sQ4DYbsENo4y1SF99qWmK3WizgG7u2h0Zte+gVS95uuUO3z0IiB+3tMxEGZ2RTCCzf4KiV qjgCbAqy7MfOV1QP8VJ6GEpbwR8vQriCHr01K5RD6Pus4Bk+BmfdICv+YNfQUXwvhvA7eG DGLzosBTSYL1Tl1aFGtUuZWV1zyC6hIrzTrpGsg6A4Fy6OAFi7vcsNN+iCxTg4ppTENeuu 7znj3dP1hiLR18SOWP7O8Gnw8hH+5y7+3/dTyFzAN6LeGWikjCXe4tWRHDlUTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4d447b30f7be761b0c2877513e79f484511a00a5 commit 4d447b30f7be761b0c2877513e79f484511a00a5 Author: Konstantin Belousov AuthorDate: 2022-10-31 23:30:55 +0000 Commit: Konstantin Belousov CommitDate: 2022-11-01 18:44:42 +0000 vmm: do not leak halted_cpus bit after suspension Reported by: bz PR: 267468 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37227 --- sys/amd64/vmm/vmm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 8daf2ae29737..dc6e03303b44 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1424,8 +1424,13 @@ vm_handle_hlt(struct vm *vm, int vcpuid, bool intr_disabled, bool *retu) if (td_ast_pending(td, TDA_SUSPEND)) { vcpu_unlock(vcpu); error = thread_check_susp(td, false); - if (error != 0) + if (error != 0) { + if (vcpu_halted) { + CPU_CLR_ATOMIC(vcpuid, + &vm->halted_cpus); + } return (error); + } vcpu_lock(vcpu); } }