From nobody Tue Feb 28 12:38:38 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 4PQxk66S7Bz3vPls; Tue, 28 Feb 2023 12:38:38 +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 4PQxk65bSjz43vK; Tue, 28 Feb 2023 12:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587918; 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=SEmaIyNO4l3tEoa7ZVpBaLdXcy6Mw8hJXsg0ubnn4Yo=; b=wtAzazHQEXOzTwJ4aYoGgsuqH+FG2Qa0YVSS+d7TZkH5N/LxkxToLRdOia6WcrHUNCZmI4 uWSChDtmZPrnbAmoq20M3hitrvVkV0I3ATyVtNJrBdI58PJn2pK+Q/Vqw3RSPrbTQUXxdK BNLT6dMB4kE+KMtVK4yhxjzQ3BCm51tM0hBsJELpYfFQoqp7e8Q3QZljRbvcuIfwxB0m2T EVJf6D0p++sBsVQ/67q04RMjpOtBMfxwuLOIuu/TOPiQneZSnX616j1Y4itId+7p/VSyVn 9yr8qo4+VK/9IbNOwHpSNVloG4lF9DxSZ5AlbiYDVt7MlONDJhW3st7+zsCg6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677587918; 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=SEmaIyNO4l3tEoa7ZVpBaLdXcy6Mw8hJXsg0ubnn4Yo=; b=cullla1RadsuYC+SJeY3Z5U7cmEH+meY21Vcj0O7QQzSswqBy02UR9Jigj33z7z/448HS/ gU3NaXXym3rZFVGDoj/wEWXSGKMrgO7LPH0sME6Czip5S/3f197+El0pZmYp48jV9bn/NO NGbBqAfKOg1bcYhA98HDo8MhN4x3rW4DFJLakm7PZaIEeANEoWypIPL5R1YPfEYNJe415I qYG/tl/WDNsf01TU3IzRkFrIqRZxM7vTZcywZCH9N6FMM15+bMuvMUEoMP3YZIJwwh0YYG RwydqnmashMVd/9Glv22RlYkRNBPmyTvJA76TI5vWqgwqADCJJTfIkl984XsXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677587918; a=rsa-sha256; cv=none; b=ovxgoP2BgjZwu9h9ds6G/zfySst/9ujSdSqqT60+ONRWkCj4lXGIQc4ZDGRJITb1fnraEr xOhjNNLnwf4x6+pZcCyCHEyS2/d4IhZr/duEmNpVdPo9uvngnhMTHGqOzwt1zQugKfCiEv Fpmy+N5wLB0VAEUHS29iCdUL+UOs+OWNTYUVENuXEBdjH24OO7kmJtDoML8Y7nLGp5cJun gOEF6ZqXrbDn319qz7ANDOIFRcELG7/k9kJyuRv4fbFBZ7BJ8TzhCoWof5jQ67wg7eABIn zzG0ZyxiYEroBCOmHuPOBGhdRnBqJii01fpSGRV7EMctX09sJN2uF4MeHCkRvw== 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 4PQxk64b9Nz16kb; Tue, 28 Feb 2023 12:38:38 +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 31SCcc14043050; Tue, 28 Feb 2023 12:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SCccX7043049; Tue, 28 Feb 2023 12:38:38 GMT (envelope-from git) Date: Tue, 28 Feb 2023 12:38:38 GMT Message-Id: <202302281238.31SCccX7043049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 281b496f22d1 - main - vmm: fix restore of TSC offset 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/main X-Git-Reftype: branch X-Git-Commit: 281b496f22d1d666b2ef1e54985432627ec434a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=281b496f22d1d666b2ef1e54985432627ec434a4 commit 281b496f22d1d666b2ef1e54985432627ec434a4 Author: Vitaliy Gusev AuthorDate: 2023-02-28 11:16:35 +0000 Commit: Corvin Köhne CommitDate: 2023-02-28 12:37:44 +0000 vmm: fix restore of TSC offset After suspend/resume Ubuntu 20.04 and 22.04 installer can hang if tsc-early clocksource has a big skew. Reviewed by: corvink, jhb Fixes: a7db532e3a6f83067b342f569b56076d011f8a1e ("vmm: Simplify saving of absolute TSC values in snapshots.") MFC after: 2 weeks Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38474 --- sys/amd64/vmm/vmm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 9f5fc124f4ff..794ec5ab6597 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -2859,6 +2859,8 @@ vm_snapshot_vcpus(struct vm *vm, struct vm_snapshot_meta *meta) */ tsc = now + vcpu->tsc_offset; SNAPSHOT_VAR_OR_LEAVE(tsc, meta, ret, done); + if (meta->op == VM_SNAPSHOT_RESTORE) + vcpu->tsc_offset = tsc; } done: