From nobody Tue Jan 11 14:28:05 2022 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 3AD3C19485AB; Tue, 11 Jan 2022 14:28:06 +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 4JYCj14qb5z4hWL; Tue, 11 Jan 2022 14:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 776061A862; Tue, 11 Jan 2022 14:28:05 +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 20BES5oZ092460; Tue, 11 Jan 2022 14:28:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BES5MV092459; Tue, 11 Jan 2022 14:28:05 GMT (envelope-from git) Date: Tue, 11 Jan 2022 14:28:05 GMT Message-Id: <202201111428.20BES5MV092459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: c72e914cf108 - main - vmm: vlapic resume can eat 100% CPU by vlapic_callout_handler 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c72e914cf108d3904eb5070b0999b3b5b6a4f384 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641911285; 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=M6doh5WMMp8h7AZxzsIZZo+SjuRbbeLX7v+0+0dZnN8=; b=radbgp8SPSPEYMdwtY1TEEBMoZUcuhqGIQt+FIUrW4zXOcF7M/OOUyvpJX76WEw+GtfESj T2cY8MwkCvYDg9mTWbNPsXo4B/oC4DO6CBfKj9iZ7qRjvamM3BQHi5JK242v974E2/0NUz BhSN+PZ9Pze1U+If2OfsEt2np7l1jFV/I5vXrWv3dyvumkLeifr73CMN3AqDeOF93IQkvZ lqS+BJsDteFex/nToGtJJfGkALU5ha7vlfx5tDr0xu2dQObwsycjys7fGBbZONsomVL4Rn xMdz+0kuIq8SSlthDaNOxel0Bzo48HtNgCyhL1FCJEF8bAAEUn/bXLp8EQ9RVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641911285; a=rsa-sha256; cv=none; b=weEHVj7omGyxuP/QdrXdOTJJNlEnAjBXlBKWKElsuVJ32WEAd2CHApI3YfCCNaGTA+qrr+ a/cKdgzI5qhWPnSebg3dMbwgLykk/G5AZBKyAs/cYqBI1Cdrnt4gMkcYvYIQfb9KCUpRR8 DwKE8v+yYitoZF+5C1cCb+jmYnJECrQPLi9Wh4eO/00SNJ6Yi/n1l2Ow0X7Kf9v+RWl/ne z03y+8YPN9A8gqspl3l92t/6hpZ3T+rjPhcLMynfEcgZ5Ki61O5ZojajeJqrz31+LWNSF7 0jg8j5m84IhNZ8d2S8P0jfrfYC2Ni/JpZQVSIz8az9XsrY/mTBHNOEsM4egQ0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c72e914cf108d3904eb5070b0999b3b5b6a4f384 commit c72e914cf108d3904eb5070b0999b3b5b6a4f384 Author: Vitaliy Gusev AuthorDate: 2022-01-11 14:24:41 +0000 Commit: Mark Johnston CommitDate: 2022-01-11 14:27:45 +0000 vmm: vlapic resume can eat 100% CPU by vlapic_callout_handler Suspend/Resume of Win10 leads that CPU0 is busy on handling interrupts. Win10 does not use LAPIC timer to often and in most cases, and I see it is disabled by writing 0 to Initial Count Register (for Timer). During resume, restart timer only for enabled LAPIC and enabled timer for that LAPIC. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33448 --- sys/amd64/vmm/io/vlapic.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 940e45cce458..c0ca167ef11f 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -1740,10 +1740,13 @@ vlapic_snapshot(struct vm *vm, struct vm_snapshot_meta *meta) SNAPSHOT_VAR_OR_LEAVE(ccr, meta, ret, done); - if (meta->op == VM_SNAPSHOT_RESTORE) { + if (meta->op == VM_SNAPSHOT_RESTORE && + vlapic_enabled(vlapic) && lapic->icr_timer != 0) { /* Reset the value of the 'timer_fire_bt' and the vlapic * callout based on the value of the current count - * register saved when the VM snapshot was created + * register saved when the VM snapshot was created. + * If initial count register is 0, timer is not used. + * Look at "10.5.4 APIC Timer" in Software Developer Manual. */ vlapic_reset_callout(vlapic, ccr); }