From nobody Fri Nov 18 18:26:25 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 4NDQGV0s5xz4d7sy; Fri, 18 Nov 2022 18:26:26 +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 4NDQGV04Myz4HPB; Fri, 18 Nov 2022 18:26:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795986; 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=R7cXA4YwcrHEvIVce8BicSwKSybEnDBJuiPjkFtyMzk=; b=uPG7JMsiI8x4fS7q1WPZqEA9pX3F/Ekz1sn0socIPg+x3ar9TSpuUv2b+XhKdLaT7AHNn+ XsWBEhogFIkFtuvV+e1g7WNpqjr3DWFH3T67HlqkDv7YDxrHvx16jEBcWOYZN0OM84iAg8 QI9p/lYO/weJoVstrwang+LRv4StZbmo4FgJte/1ehkXKSJX504xkpjFrQFXX8teUu6U9P hBh1MVuA2POvHg8g+tDMbUaRbcsywJBMxbgWbcDaBQQeaggCVk0gzd/lptYb/EtXul4W1Z 9r1dSq1gP9SDMRn0EVA26ycnImT2rHQbxqng3GubTL1U0YX0+vTJP5Rfd4Lw1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668795986; 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=R7cXA4YwcrHEvIVce8BicSwKSybEnDBJuiPjkFtyMzk=; b=RjW/Kp3bGbtQuD7OKjQB/Hi3onxOfjuJSnBK5/Dim4oJtoGr3sY/kwDdDGrW45aCf6FQFf A3DirAquLGhxNvZ5c9wgahqJdFhx33hqWPzCyaFLySq1MNAT7KANv8AQ+qhJ0zua72RtUq VZShhBelikVFbpzs/86bP3xlx2MsZC/PkiPAEFmvqdEEXA5g0UH07Xj5rgkuTGIwBjuU3W ioCQ8xT8gRc3p33AqpanjX3t0dI8lELYWA0eiq/+jp6xPAFx/unFjOhk94QgVhzsC8EijQ aRehVnNfSZBQKGxzUj6eKhU2QYBCeeavO/ihkYkpUnaYTkeSkgAjgQjY8bl/yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668795986; a=rsa-sha256; cv=none; b=PbJtW6DprrDvDPtTs+u0M7H3cabrPavGWIr1zRLn+UU7naccfySn9ySdPX0QGfmxjxIc1p NGX6vT7HPQupdsfqOVCh+od1/sNW9Ky3ECkboGPxoEnhw0XTR57t1ZZYb3boaEmTyPLyql zNqiBrpnaaf7czj24aD9xX5Dv721iYe06LhDT3f2+/qgu6nrq3ii2gay9IXV5goru6KrJx +7w9lRnqhXDAUJREXoNfxbW6JnLeTw2zDAMmJw8LYligfD+ByGEIF6KGP1zMzZq4wM5sTZ hRrZZi67EQ9NVluAbwzcMQFgcXfau6iR2qJKiFn+hh6OyF6MuSpA3qwdEVdCvg== 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 4NDQGT6HkzzGHD; Fri, 18 Nov 2022 18:26:25 +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 2AIIQPG1029963; Fri, 18 Nov 2022 18:26:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIIQPKU029962; Fri, 18 Nov 2022 18:26:25 GMT (envelope-from git) Date: Fri, 18 Nov 2022 18:26:25 GMT Message-Id: <202211181826.2AIIQPKU029962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 19b9dd2e08ed - main - vmm svm: Mark all VMCB state caches dirty on vCPU restore. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19b9dd2e08eda491ab1c181ca5a3659f7e7628fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=19b9dd2e08eda491ab1c181ca5a3659f7e7628fc commit 19b9dd2e08eda491ab1c181ca5a3659f7e7628fc Author: John Baldwin AuthorDate: 2022-11-18 17:58:22 +0000 Commit: John Baldwin CommitDate: 2022-11-18 18:25:35 +0000 vmm svm: Mark all VMCB state caches dirty on vCPU restore. Mark Johnston noticed that this was missing VMCB_CACHE_LBR. Just set all the bits as is done in svm_run() rather than trying to clear individual bits. Reported by: markj Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37259 --- sys/amd64/vmm/amd/svm.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index 0db1e45594fa..d6502e331278 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -2478,17 +2478,8 @@ svm_snapshot(void *arg, struct vm_snapshot_meta *meta) SNAPSHOT_VAR_OR_LEAVE(vcpu->asid.num, meta, ret, done); /* Set all caches dirty */ - if (meta->op == VM_SNAPSHOT_RESTORE) { - svm_set_dirty(sc, i, VMCB_CACHE_ASID); - svm_set_dirty(sc, i, VMCB_CACHE_IOPM); - svm_set_dirty(sc, i, VMCB_CACHE_I); - svm_set_dirty(sc, i, VMCB_CACHE_TPR); - svm_set_dirty(sc, i, VMCB_CACHE_CR2); - svm_set_dirty(sc, i, VMCB_CACHE_CR); - svm_set_dirty(sc, i, VMCB_CACHE_DT); - svm_set_dirty(sc, i, VMCB_CACHE_SEG); - svm_set_dirty(sc, i, VMCB_CACHE_NP); - } + if (meta->op == VM_SNAPSHOT_RESTORE) + svm_set_dirty(sc, i, 0xffffffff); } if (meta->op == VM_SNAPSHOT_RESTORE)