From nobody Mon Nov 16 19:00:34 2026 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 4jSxyV6rD4z70bYJ for ; Mon, 16 Nov 2026 19:00:34 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSxyV6JDYz4WPb for ; Mon, 16 Nov 2026 19:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794855634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIuIQdHR1eoTyMEfUkEN8cWP+mYTmlgNqPc+ZVjmPVY=; b=Nu4Ar21s2PdhwOw9+Plwa+hSuqhYYxoMZo/AEXD041qzcOJhFyndIKhMXtS7PWl4HPA96P jpKWTr6c6czDBr+4HhodZpmC78VT46rPkG7qYMzLDRXDHskPqXWK4mpz7ouEhVfsyRIEGn FLt1zX86vXDMbIfTdyeeYOv6Ug6jx6fKjsFqPF3+WsYn9zgRk7QnZYbe6McVG4uq3UmPzx KSxIlROlzXTiQZEypwjLtf9aMAvKVFJaLoCaVK+BrruuvMI+Jd/Ns2QgCQ4atVmLLsIO0O We8m0WxIoeJPtxqIhCUpJElzVKkYG97W4FsrMONGO2mjR8mpK5eIHvww3GWbSg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794855634; b=ZvILzgXSDXh+Y8ig4F5KmMGSDUs90i0/6kRg0xcIfgxwHbhlrJiniF8Ek88fYACI93rKux kiiu3cO3bt7DkO3j80zjVW71TNAoPLM2vS3IF5cc8LztuvoaPQxVm947/xbcw6Zic7sorD 6BX1p7JsmXsMhuBI8TW/MtiJTsflbeTF1h0n5lAJ6yOhdAxhty0yFy3RUn/sqqtIoU+4mR PBg11NdkQnwspXLQ2cBCPJJMsf6dDVa3WcLIE/f14ILKYCkA5Fgt/l6JKG3wfJIleV4+Xz Vv+7WHTGrS559rqbhkx0P4ieM/JdMLWwkffc2wxZpUsGpGjLn5EjnSpLieALaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794855634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wIuIQdHR1eoTyMEfUkEN8cWP+mYTmlgNqPc+ZVjmPVY=; b=AGVLioy9aXReCmlbWmyVuGtM1tUWGBesqtHvF8w3GVMcaIRIKr9PMzK+8nsJ+XpLxNg2TP D8qrRB1IECNAPEA+8/8Yrrdczc1QJzlzvGuvrGaQFS24Hks5qhkadUZj/dHqFgCIhacZVo nMn7Vn+OFeKWQplOrc+jdhOWvmfOYKhvBANCkDB79T1k7Drrj2ydK1LWKiIwL8q2MKre87 zfyTDAAgiv+4207+ba/L/9JJgx1cly35pBe7pe9yMo2bShXggsW55SgspYqNseVMsX+VdS gTKX03EJVXcocawVFpW4GEaCxbxlFcHOPoRBm2ZqNhg+wh1V3uOcQJ+LBw3BeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSxyV5zkKz16Md for ; Mon, 16 Nov 2026 19:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a7f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 19:00:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Wanpeng Qian From: John Baldwin Subject: git: 125b88f5aa91 - main - vmm: release the lock when vrtc_snapshot() fails List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 125b88f5aa91e524acbf00411aa993677857ad2d Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 19:00:34 +0000 Message-Id: <6afb52d2.1a7f2.5db2dcd5@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=125b88f5aa91e524acbf00411aa993677857ad2d commit 125b88f5aa91e524acbf00411aa993677857ad2d Author: Wanpeng Qian AuthorDate: 2026-11-16 19:00:17 +0000 Commit: John Baldwin CommitDate: 2026-11-16 19:00:17 +0000 vmm: release the lock when vrtc_snapshot() fails The error path of the SNAPSHOT_*_OR_LEAVE() macros jumped past VRTC_UNLOCK() and returned with the vrtc lock held. Signed-off-by: Wanpeng Qian Reviewed by: bnovkov, markj, jhb Sponsored by: keelos.dev Differential Revision: https://reviews.freebsd.org/D60232 --- sys/amd64/vmm/io/vrtc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/amd64/vmm/io/vrtc.c b/sys/amd64/vmm/io/vrtc.c index a56c77b7bf73..c2f579c30c84 100644 --- a/sys/amd64/vmm/io/vrtc.c +++ b/sys/amd64/vmm/io/vrtc.c @@ -1056,9 +1056,8 @@ vrtc_snapshot(struct vrtc *vrtc, struct vm_snapshot_meta *meta) vrtc_callout_reset(vrtc, vrtc_freq(vrtc)); - VRTC_UNLOCK(vrtc); - done: + VRTC_UNLOCK(vrtc); return (ret); } #endif