From nobody Tue Jan 25 14:55:26 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 AD334196B46A; Tue, 25 Jan 2022 14:55: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 4Jjqf646Snz53TM; Tue, 25 Jan 2022 14:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643122526; 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=PHzKclKo2L6vvJOb5yMZrXqfhp4BQ4pkVZHtnrqUWkY=; b=BqBco9eNheeIDf55ZynjCrUl7l8sC3uNEvc4mVYzbeTUdrm+QW+w5U6BtMzRn4sXjSM+0u Lut/TTdt/2GzDkzoOd6PpxO8UzEqg942U99P4/lwmBS/HRjD7g3o0vfTe8K7nHotXpSdLE DkSW9AE0yZXAoT7XX/H/FggmlvjSOhC5l2dAAUooiFqb0chjJBPNW+ac2UY59PKQ7oO/Cm uxm+KsUITcBrK/DM8Y5w39Uqv3Re4wsxRmO3vXSfIinytU528v1jrjek28mOMUTTwzCkLt U8CrdosV1v4ABTSmUA78mMX0EyC4Fgj+mtS2Rpw0JOC621urDRHI4xpt6S4lKA== 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 6B75737AC; Tue, 25 Jan 2022 14:55:26 +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 20PEtQX4013242; Tue, 25 Jan 2022 14:55:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20PEtQjS013241; Tue, 25 Jan 2022 14:55:26 GMT (envelope-from git) Date: Tue, 25 Jan 2022 14:55:26 GMT Message-Id: <202201251455.20PEtQjS013241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b1ced97e75a0 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: b1ced97e75a0ec004119088842ce017ff4dd5393 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643122526; 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=PHzKclKo2L6vvJOb5yMZrXqfhp4BQ4pkVZHtnrqUWkY=; b=lC74AXNp8ZAhOWTprmvUJU13ZicMmA5R3n9/ezL4maEvNUSHQLMmj7ehU2ryihEUj1yAAz 3dAOYwgeWj7FIq74AK26m2NiBh9TYEZajOOoWm9wAudI3BbWHrU2UWjl9wXDAYI3WAo+Lw U7m60MddsiUOnACQK4wejqr+ebzdTBBBk6FCbjM415eaVGg4jddW0ZWV8jKBq9soiGhJ8Q KgzQuI8NpdXRHf1hdz47/JZ/s6homOZ3RPYIvJMz3YihvEGst4cxuosDnFW6lgwh/sJnOy xuM2flGv/PpOoLe6fj6karqvZI8qf9hRIG6svelbNhV03e11rmYmvsGXGowIbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643122526; a=rsa-sha256; cv=none; b=yP/F/YbdygKxY/om3/3i9cAq4nK5Ik0tl/ziPUbaq5Ye59Uu/LCheHTXqCDz05G49mvmeL hdRcktH9nTsEpY4m3cpzxCoh+c2LV9pAQDyhY+RXybEF9EqCzHbAZgj6xbMQr5FbJclEeW evi3HtsZv8ASK7xfb30jGZjibYsE9+/Bl9Oir+SrR4vf6eVM0puSXt2rzUmQR5lbYrOhQZ 9Ho6P3Hw/gdCHc5t2Zz4cltZUag9g1qj3bNZBSOuKdKq6PlhDS64dJ0VHMbS28MXSpOGgU Z/tsohltJC2bQgSO0z1EQRHWNJz733ETWDvvpokZOEBW+t+RggScHsXu6b/FuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b1ced97e75a0ec004119088842ce017ff4dd5393 commit b1ced97e75a0ec004119088842ce017ff4dd5393 Author: Vitaliy Gusev AuthorDate: 2022-01-11 14:24:41 +0000 Commit: Mark Johnston CommitDate: 2022-01-25 14:55:09 +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 (cherry picked from commit c72e914cf108d3904eb5070b0999b3b5b6a4f384) --- 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); }