From patchwork Fri Feb 21 05:39:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suleiman Souhlal X-Patchwork-Id: 13984838 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 368B51FC0F0 for ; Fri, 21 Feb 2025 05:43:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740116624; cv=none; b=oITttCsP8EOAgFvBFGwwB060l+YXTguZu628CCr/ju0vSchcxALpDcj/1X9bJKZYhHvuShEREAaOqApHLrzBCGC7LPn8z5AShqR5PIoo+Ep1QmEO9175Xg0hl54CDgvrfRXOWuxvkgUYaNcejriKjZOlCNyWESagZmA8LsumcDU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740116624; c=relaxed/simple; bh=1a8ijpCYc6RmVjTqi7drawTGlzgmOc63SH03Xi08U2s=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=ua5YusoyPzhe4gYg9UnYSMSRdMLhjxkCL01Hr4WaXEQbC1hw/SLU3nM5kq8O9y6lsq17lgv5KwtINlepnW2Sou8Tz3q+1wEzeht8xyo3H7SfUEQV89Ao5KEHhDNYuxLTVGuQcVvHSfYpGm8pWJBCxdO3kUopPEFhrDhOKi/EuVQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--suleiman.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=a6dPec//; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--suleiman.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="a6dPec//" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2210121ac27so37191695ad.1 for ; Thu, 20 Feb 2025 21:43:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740116622; x=1740721422; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Udbv9b6jdKxC3izwrmuI5snJMV9vCpcArcbYsxBnyHI=; b=a6dPec//qB6IEhMf0ZhX5kHD25xGPhE00jELOmiIozUiWvy1RC0sKS4xYTy8r1/dYQ RrLz24dJQBp8Gkb2gxvVfjXKk24fZExSOr3EWAqfS/3fLzrAscDYK6G4xegtZnS9BIQ4 5B3E2GpjEn4cEiLJukzJjL312yKTAr7DTQFeDZWVKtaAFdTTht2xVheAA+t9bzSznIrM II8vlghDkCOTzpb80vPgYNMtDBOvPyHi15hD9Jt5VNPRTob5KtL8x9ByoYPHgtcBAuj3 UK/8lFSRVD86uuoFtp74/+INjrDsVpOUe/kxQKl7RZBXQCcOCrMzewQLUJ3t9Yzg9F0B FNdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740116622; x=1740721422; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Udbv9b6jdKxC3izwrmuI5snJMV9vCpcArcbYsxBnyHI=; b=hEyLhASGM5r307FqhbzfSBqRi910TJw/AMbeR10xrBsXAcqjNwfDAywjWqDgea4umU reKZgJ+1qG1qLW2mEr9q1Y6zIJovnaP/rkF0tTYrmH4V4oOYEQJsISQeHdM0OUC0lupf XxUb/fFopq1v97BVsQOw3ioFQx+R6xkn7UvdZ94j4BdV8kHtyCT0wG99MJQ5ljfRcY5o LDsTjIOifHC+FnIXs/yTnHkUQhUCZ9Dau38RCGu6g9kHUGOV4UD8IeXpzARBniAKixER ONWN+GLi34rhYb3tPcNEOsP4+g+xGz6h8zZzVdpcMi0jJWyL3zwuOWOHu1RHgp1A1Qqd nf6g== X-Forwarded-Encrypted: i=1; AJvYcCWVbWh+f/x214O/+xo/UnAxsNs4b4fqW65Fed2WvJZBRu4EN4FJMpX0pCqcMdHgx8E0bZk=@vger.kernel.org X-Gm-Message-State: AOJu0YzG4iCPDIieAm9wYkcuR0/psOCxM+ZiaGqX44LO2JxH5iJCtmyd m0WS5JUdQ2hcYzPK+5DtUGIi5ahtgRmTujawoH0rWKt/WLRi22f8XCFshMwXfcU7QoO8hkBFTbs 8SuIjgaQonA== X-Google-Smtp-Source: AGHT+IHMoc9h+uPEnyZwMQWn8CzNzAyDDl2T1OAcnERx4Ce7JVL+Csh6R44GQLlYoTpR1L9zhIJjNNB278WFDA== X-Received: from suleiman1.tok.corp.google.com ([2401:fa00:8f:203:62aa:45ca:6f53:8c2a]) (user=suleiman job=sendgmr) by 2002:a17:902:d0c1:b0:21f:449e:8995 with SMTP id d9443c01a7336-2219ff50decmr12925ad.3.1740116622506; Thu, 20 Feb 2025 21:43:42 -0800 (PST) Date: Fri, 21 Feb 2025 14:39:26 +0900 In-Reply-To: <20250221053927.486476-1-suleiman@google.com> Message-Id: <20250221053927.486476-2-suleiman@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250221053927.486476-1-suleiman@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Subject: [PATCH v4 1/2] KVM: x86: Advance guest TSC after deep suspend. From: Suleiman Souhlal To: Paolo Bonzini , Sean Christopherson Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Chao Gao , David Woodhouse , Sergey Senozhatsky , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, ssouhlal@freebsd.org, Suleiman Souhlal Advance guest TSC to current time after suspend when the host TSCs went backwards. This makes the behavior consistent between suspends where host TSC resets and suspends where it doesn't, such as suspend-to-idle, where in the former case if the host TSC resets, the guests' would previously be "frozen" due to KVM's backwards TSC prevention, while in the latter case they would advance. Suggested-by: Sean Christopherson Signed-off-by: Suleiman Souhlal --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 0b7af5902ff757..452dd0204609af 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1398,6 +1398,7 @@ struct kvm_arch { u64 cur_tsc_offset; u64 cur_tsc_generation; int nr_vcpus_matched_tsc; + bool host_was_suspended; u32 default_tsc_khz; bool user_set_tsc; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 02159c967d29e5..06464ec0d1c8d2 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4971,7 +4971,37 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) /* Apply any externally detected TSC adjustments (due to suspend) */ if (unlikely(vcpu->arch.tsc_offset_adjustment)) { - adjust_tsc_offset_host(vcpu, vcpu->arch.tsc_offset_adjustment); + unsigned long flags; + struct kvm *kvm; + bool advance; + u64 kernel_ns, l1_tsc, offset, tsc_now; + + kvm = vcpu->kvm; + advance = kvm_get_time_and_clockread(&kernel_ns, + &tsc_now); + raw_spin_lock_irqsave(&kvm->arch.tsc_write_lock, flags); + /* + * Advance the guest's TSC to current time instead of only + * preventing it from going backwards, while making sure + * all the vCPUs use the same offset. + */ + if (kvm->arch.host_was_suspended && advance) { + l1_tsc = nsec_to_cycles(vcpu, + vcpu->kvm->arch.kvmclock_offset + + kernel_ns); + offset = kvm_compute_l1_tsc_offset(vcpu, + l1_tsc); + kvm->arch.cur_tsc_offset = offset; + kvm_vcpu_write_tsc_offset(vcpu, offset); + } else if (advance) + kvm_vcpu_write_tsc_offset(vcpu, + vcpu->kvm->arch.cur_tsc_offset); + else + adjust_tsc_offset_host(vcpu, + vcpu->arch.tsc_offset_adjustment); + kvm->arch.host_was_suspended = 0; + raw_spin_unlock_irqrestore(&kvm->arch.tsc_write_lock, + flags); vcpu->arch.tsc_offset_adjustment = 0; kvm_make_request(KVM_REQ_CLOCK_UPDATE, vcpu); } @@ -12638,6 +12668,7 @@ int kvm_arch_enable_virtualization_cpu(void) kvm_make_request(KVM_REQ_MASTERCLOCK_UPDATE, vcpu); } + kvm->arch.host_was_suspended = 1; /* * We have to disable TSC offset matching.. if you were * booting a VM while issuing an S4 host suspend.... From patchwork Fri Feb 21 05:39:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suleiman Souhlal X-Patchwork-Id: 13984839 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D1A61FCD1A for ; Fri, 21 Feb 2025 05:43:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740116629; cv=none; b=bW6WKRoqn8KyLaNCo6lgyz9qe3csAFfU4yKZWX895TaDpsjerdYNUfGcqEtCoXoTVpALn6fGRoDCBrbWUbyyQMbZpbtYvsOOpFNdzPr+JUNEPHx9PnMDsLPK1CIu4FzVttama0nCIy9Ts2XrfubmP2fLaPbvHyKlfTJKwFDuzOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740116629; c=relaxed/simple; bh=9td+5QAFlDQ4gS9R+li+mHECumkPC5BadWWw5yxsMOg=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Cc:Content-Type; b=OOF1/FaSYDEr1YEBPH/7HFNHIVGiAEysIWicx+ez4S8c7HlXd6vsBoPHAj16hhjU7zLsjfftWf8jJGZc8EWPsLaihKJKh/Hqo9iMGUj/G+MppHXhomGH7EWq2FjxDiRD86aC9HjUzHTf0UmkcE2CW6r35XUOLu2TwsIyMLGXw18= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--suleiman.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ek1+WTmp; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--suleiman.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ek1+WTmp" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6fb44dbccbaso17796527b3.1 for ; Thu, 20 Feb 2025 21:43:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740116626; x=1740721426; darn=vger.kernel.org; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nSP5h6VjVASnPaTv8FDkwmXUQfe0K3qH38hMzi1K7BE=; b=ek1+WTmpSxjjdNW+oiLG9PA+gcJm/TjUca6AF910W0mY20rYG7QiXptOJf7uuew6ML 1WqdijCyJ4SJ3t6IbRtJtWZTZBldW4mkhz3JulsEpFOOdaAdNU8Ep7m1ROox3dqJ+as8 LZ5fMiijaLexV/aABjdUjOju/uqf9KC9oW17j8tGR9pmZ+URKsJQxYjpOqUJpKUmXZp6 7md1cfNHcUm2M93QO5XnPMd6geWuv1z0f6xw/WlND/iM2jTKS2GiAg1h2NX0S4zVDdOm 2PL3JRnRHEWMzG9FbLMW6So4D95hWwOTpo31CfWtpF2cwJld6UWovQLC8FdULZ7zjOCg 3zOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740116626; x=1740721426; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nSP5h6VjVASnPaTv8FDkwmXUQfe0K3qH38hMzi1K7BE=; b=F2irYEkukQD9d97gNHophP05wC9QfnJblUZClOWYkC2GAa9PIoNF6Q77CiPWdLoUum bQ7K0vrQXuNeU6Z+AoP/Ee7QTuL+hEhC6D75yTsrTC22IFc5lWAB9uVjgoFM+39qL++K qV1oeEwvJ5i0pB3kJpz1AyN1bparxzSNs6b4ya5vXWa3n/Svh4RjoSw0LWVnpzbiDmqP 3Cw2f26t90PR1OYJp/qr6P3zfavMekaCymyq7S6RyE1k9yG3IPoFchxYZAA/4tHIB3tz odb7fGcFkkrvj3tiuxwdrLtlaie35AkoDMUINF32OpKRLvWt9ch4DFI7qS/acUjprRTK 760A== X-Forwarded-Encrypted: i=1; AJvYcCUalwe3s2FUy7aXy5aJorSAihB4RFyMqr4vbJ6NbjPjsX5PfNnbcVTjr92K4k6subbmsTQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yw9eAq+2CiEDSVvdx4DgjVIarDDmh/LP5p0oLEsbqLx3pMESD20 qdoehvYw7/vDHQzH6Z/G7VnymfbYMezkuQA5qZ5nBKqUThKssiCw0kvbqGtDuEw+qD2vFLrjE4L 94o+e8tlBrg== X-Google-Smtp-Source: AGHT+IH41sWcdZJzGHIKN+Pi59JJZfBB57XJubRsl3TsNOq0mHwvuiN0Jgu/0NLERFKNmalTV7pevEwHAss34w== X-Received: from suleiman1.tok.corp.google.com ([2401:fa00:8f:203:62aa:45ca:6f53:8c2a]) (user=suleiman job=sendgmr) by 2002:a0d:d383:0:b0:6eb:ac7:b4bc with SMTP id 00721157ae682-6fbcc1f8586mr2147317b3.2.1740116626397; Thu, 20 Feb 2025 21:43:46 -0800 (PST) Date: Fri, 21 Feb 2025 14:39:27 +0900 In-Reply-To: <20250221053927.486476-1-suleiman@google.com> Message-Id: <20250221053927.486476-3-suleiman@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250221053927.486476-1-suleiman@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Subject: [PATCH v4 2/2] KVM: x86: Include host suspended time in steal time From: Suleiman Souhlal To: Paolo Bonzini , Sean Christopherson Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Chao Gao , David Woodhouse , Sergey Senozhatsky , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, ssouhlal@freebsd.org, Suleiman Souhlal When the host resumes from a suspend, the guest thinks any task that was running during the suspend ran for a long time, even though the effective run time was much shorter, which can end up having negative effects with scheduling. To mitigate this issue, the time that the host was suspended is included in steal time, which lets the guest can subtract the duration from the tasks' runtime. In order to implement this behavior, once the suspend notifier fires, vCPUs trying to run block until the resume notifier finishes. This is because the freezing of userspace tasks happens between these two points, which means that vCPUs could otherwise run and get their suspend steal time misaccounted, particularly if a vCPU would run after resume before the resume notifier. Incidentally, doing this also addresses a potential race with the suspend notifier setting PVCLOCK_GUEST_STOPPED, which could then get cleared before the suspend actually happened. One potential caveat is that in the case of a suspend happening during a VM migration, the suspend time might not be accounted. A workaround would be for the VMM to ensure that the guest is entered with KVM_RUN after resuming from suspend. Signed-off-by: Suleiman Souhlal --- Documentation/virt/kvm/x86/msr.rst | 10 ++++-- arch/x86/include/asm/kvm_host.h | 6 ++++ arch/x86/kvm/x86.c | 51 ++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/Documentation/virt/kvm/x86/msr.rst b/Documentation/virt/kvm/x86/msr.rst index 3aecf2a70e7b43..48f2a8ca519548 100644 --- a/Documentation/virt/kvm/x86/msr.rst +++ b/Documentation/virt/kvm/x86/msr.rst @@ -294,8 +294,14 @@ data: steal: the amount of time in which this vCPU did not run, in - nanoseconds. Time during which the vcpu is idle, will not be - reported as steal time. + nanoseconds. This includes the time during which the host is + suspended. Time during which the vcpu is idle, might not be + reported as steal time. The case where the host suspends + during a VM migration might not be accounted if VCPUs aren't + entered post-resume, because KVM does not currently support + suspend/resuming the associated metadata. A workaround would + be for the VMM to ensure that the guest is entered with + KVM_RUN after resuming from suspend. preempted: indicate the vCPU who owns this struct is running or diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 452dd0204609af..007656ceac9a71 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -124,6 +124,7 @@ #define KVM_REQ_HV_TLB_FLUSH \ KVM_ARCH_REQ_FLAGS(32, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) #define KVM_REQ_UPDATE_PROTECTED_GUEST_STATE KVM_ARCH_REQ(34) +#define KVM_REQ_WAIT_FOR_RESUME KVM_ARCH_REQ(35) #define CR0_RESERVED_BITS \ (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \ @@ -916,8 +917,13 @@ struct kvm_vcpu_arch { struct { u8 preempted; + bool host_suspended; u64 msr_val; u64 last_steal; + u64 last_suspend; + u64 suspend_ns; + u64 last_suspend_ns; + wait_queue_head_t resume_waitq; struct gfn_to_hva_cache cache; } st; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 06464ec0d1c8d2..f34edcf77cca0a 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3717,6 +3717,8 @@ static void record_steal_time(struct kvm_vcpu *vcpu) steal += current->sched_info.run_delay - vcpu->arch.st.last_steal; vcpu->arch.st.last_steal = current->sched_info.run_delay; + steal += vcpu->arch.st.suspend_ns - vcpu->arch.st.last_suspend_ns; + vcpu->arch.st.last_suspend_ns = vcpu->arch.st.suspend_ns; unsafe_put_user(steal, &st->steal, out); version += 1; @@ -6930,6 +6932,19 @@ long kvm_arch_vm_compat_ioctl(struct file *filp, unsigned int ioctl, } #endif +static void wait_for_resume(struct kvm_vcpu *vcpu) +{ + wait_event_interruptible(vcpu->arch.st.resume_waitq, + vcpu->arch.st.host_suspended == 0); + + /* + * This might happen if we blocked here before the freezing of tasks + * and we get woken up by the freezer. + */ + if (vcpu->arch.st.host_suspended) + kvm_make_request(KVM_REQ_WAIT_FOR_RESUME, vcpu); +} + #ifdef CONFIG_HAVE_KVM_PM_NOTIFIER static int kvm_arch_suspend_notifier(struct kvm *kvm) { @@ -6939,6 +6954,19 @@ static int kvm_arch_suspend_notifier(struct kvm *kvm) mutex_lock(&kvm->lock); kvm_for_each_vcpu(i, vcpu, kvm) { + vcpu->arch.st.last_suspend = ktime_get_boottime_ns(); + /* + * Tasks get thawed before the resume notifier has been called + * so we need to block vCPUs until the resume notifier has run. + * Otherwise, suspend steal time might get applied too late, + * and get accounted to the wrong guest task. + * This also ensures that the guest paused bit set below + * doesn't get checked and cleared before the host actually + * suspends. + */ + vcpu->arch.st.host_suspended = 1; + kvm_make_request(KVM_REQ_WAIT_FOR_RESUME, vcpu); + if (!vcpu->arch.pv_time.active) continue; @@ -6954,12 +6982,32 @@ static int kvm_arch_suspend_notifier(struct kvm *kvm) return ret ? NOTIFY_BAD : NOTIFY_DONE; } +static int kvm_arch_resume_notifier(struct kvm *kvm) +{ + struct kvm_vcpu *vcpu; + unsigned long i; + + mutex_lock(&kvm->lock); + kvm_for_each_vcpu(i, vcpu, kvm) { + vcpu->arch.st.host_suspended = 0; + vcpu->arch.st.suspend_ns += ktime_get_boottime_ns() - + vcpu->arch.st.last_suspend; + wake_up_interruptible(&vcpu->arch.st.resume_waitq); + } + mutex_unlock(&kvm->lock); + + return NOTIFY_DONE; +} + int kvm_arch_pm_notifier(struct kvm *kvm, unsigned long state) { switch (state) { case PM_HIBERNATION_PREPARE: case PM_SUSPEND_PREPARE: return kvm_arch_suspend_notifier(kvm); + case PM_POST_HIBERNATION: + case PM_POST_SUSPEND: + return kvm_arch_resume_notifier(kvm); } return NOTIFY_DONE; @@ -10813,6 +10861,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) r = 1; goto out; } + if (kvm_check_request(KVM_REQ_WAIT_FOR_RESUME, vcpu)) + wait_for_resume(vcpu); if (kvm_check_request(KVM_REQ_STEAL_UPDATE, vcpu)) record_steal_time(vcpu); if (kvm_check_request(KVM_REQ_PMU, vcpu)) @@ -12341,6 +12391,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) if (r) goto free_guest_fpu; + init_waitqueue_head(&vcpu->arch.st.resume_waitq); kvm_xen_init_vcpu(vcpu); vcpu_load(vcpu); kvm_vcpu_after_set_cpuid(vcpu);