From nobody Fri Aug 18 07:18:43 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 4RRtX41PyHz4qq2q; Fri, 18 Aug 2023 07:18:44 +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 4RRtX36NT4z4dkx; Fri, 18 Aug 2023 07:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343123; 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=bXy7fWdYTNwjarIi7BFafJMCqS4DnTPJBXylUs1pY+8=; b=KOuzIrr0VVHVVzf7w1ARchXXuMd1miYBBJ4pdQGimsL6cmnXu8rtIpDXZdj33H4lQvXb56 lkFlB6VRV9xeP80hop3F1CamhJCVXmHDwBqGHSUznTOYfW04AOeYgTNsbsgbV/wc2qGDgY nmP+jddQ035zayxKzIeqxkr24eKOu+FOzzAAZ4wNMS6Bb9GtTYTjWgTjcXRGh6q+dJmgto GMglbzOtmll+AxbZzhHyHini9lmzDVlcBPaeCXt7N66LoEtDa/LHr+6avQcqzD6SEOKOh6 N/ZrzPBIPFfo/NAp/misgKJU0bjprtWGDqiImqHkVncIiotuJJK0GPb2xi5fRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343123; 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=bXy7fWdYTNwjarIi7BFafJMCqS4DnTPJBXylUs1pY+8=; b=Q/pVk779yYWzMhzT45Zsz1MXDLCGYuDtiaMZiawSbemB5+TVmnUbKYtGcxDF95ZtMf+dGI /3+/Vaej7thMC7QXhMF1tBPmMoASRa7SE0bI0j9MAORdrcoVAAvWt5ihZjkAD53S6bs5cV XIN3B0qmzlgQ4w/IpVYlfE0b5aLJp+5uLePT6HG70Nt6/CwjbQyS67J5I12IQWZi2kOpji ZDJSEQZSlhBnLYWTke/oLiTPsdS1nzGTgLDLd0O1J2gmaNJmuLKYF12IrPXA5xDciT9hnN 69aVO3J9OUYKLcGQRT383IRQA5aO/SA6GeV0SzHAzCeCujrDDiJSZSznKOw/lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343123; a=rsa-sha256; cv=none; b=QSsnbBavWlAUVLoPZv4asYaVlYQtoLsvB22P6tSmz2ojJx0vERDxNsq65P8L9Is4cTEHCy NDoYah37XyA4GlSgyFJB3/0eg/VnOfE3a2tExOao/R+iYeVdITmyD1v+u2NY6JDf6/nzKB LW0VUXZzWV+CLgk1Uzz7mnXTutefkvcbxUh6ZqhO6tmTZ9FftBdLePED5tnh6U6jMTW0pU j083ChTMzclrv7vOi1v3HmnB37mzPvAxS1jJYX1psK3sYqU/Js10PDSIpEDfKXoCL58DN1 P/t+4l8hi71ZA+WkMt8ZTnbiZam23KFUo1lBY5eIwjy8hXhXspN2/MtqDVWj7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRtX35Rqpz16KX; Fri, 18 Aug 2023 07:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7IhvH017495; Fri, 18 Aug 2023 07:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7Ih2M017492; Fri, 18 Aug 2023 07:18:43 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:43 GMT Message-Id: <202308180718.37I7Ih2M017492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 3e520a8fc711 - stable/13 - bhyve: save/restore pir_desc 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: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3e520a8fc7115f0e5015e5c3ce4a13b6d9cf00e4 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=3e520a8fc7115f0e5015e5c3ce4a13b6d9cf00e4 commit 3e520a8fc7115f0e5015e5c3ce4a13b6d9cf00e4 Author: Vitaliy Gusev AuthorDate: 2023-05-09 08:27:29 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:25 +0000 bhyve: save/restore pir_desc Failing to preserve pir_desc can result in pending interrupts being lost on resume leading to a hung VM. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D35447 (cherry picked from commit c543e09f1f8ef98f201f7dd3f34ae023d61dfa83) --- sys/amd64/vmm/intel/vmx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 9c2672c9ae23..6d9e11972948 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -4179,6 +4179,9 @@ vmx_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) SNAPSHOT_BUF_OR_LEAVE(vcpu->guest_msrs, sizeof(vcpu->guest_msrs), meta, err, done); + SNAPSHOT_BUF_OR_LEAVE(vcpu->pir_desc, + sizeof(*vcpu->pir_desc), meta, err, done); + vmxctx = &vcpu->ctx; SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rdi, meta, err, done); SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rsi, meta, err, done);