From: Oliver Upton <oliver.upton@linux.dev>
To: kvmarm@lists.linux.dev
Cc: kvm@vger.kernel.org, Marc Zyngier <maz@kernel.org>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>, Will Deacon <will@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Salil Mehta <salil.mehta@huawei.com>,
Oliver Upton <oliver.upton@linux.dev>
Subject: [PATCH kvmtool 12/21] Add helpers to pause the VM from vCPU thread
Date: Fri, 26 May 2023 22:17:03 +0000 [thread overview]
Message-ID: <20230526221712.317287-13-oliver.upton@linux.dev> (raw)
In-Reply-To: <20230526221712.317287-1-oliver.upton@linux.dev>
Pausing the VM from a vCPU thread is perilous with the current helpers,
as it waits indefinitely for a signal that never comes when invoked from
a vCPU thread. Instead, add a helper for pausing the VM from a vCPU,
working around the issue by explicitly marking the caller as paused
before proceeding.
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
---
include/kvm/kvm-cpu.h | 3 +++
kvm-cpu.c | 15 +++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/include/kvm/kvm-cpu.h b/include/kvm/kvm-cpu.h
index 0f16f8d6e872..9a4901bf94ca 100644
--- a/include/kvm/kvm-cpu.h
+++ b/include/kvm/kvm-cpu.h
@@ -29,4 +29,7 @@ void kvm_cpu__show_page_tables(struct kvm_cpu *vcpu);
void kvm_cpu__arch_nmi(struct kvm_cpu *cpu);
void kvm_cpu__run_on_all_cpus(struct kvm *kvm, struct kvm_cpu_task *task);
+void kvm_cpu__pause_vm(struct kvm_cpu *vcpu);
+void kvm_cpu__continue_vm(struct kvm_cpu *vcpu);
+
#endif /* KVM__KVM_CPU_H */
diff --git a/kvm-cpu.c b/kvm-cpu.c
index 7dec08894cd3..9eb857b859c3 100644
--- a/kvm-cpu.c
+++ b/kvm-cpu.c
@@ -141,6 +141,21 @@ void kvm_cpu__run_on_all_cpus(struct kvm *kvm, struct kvm_cpu_task *task)
mutex_unlock(&task_lock);
}
+void kvm_cpu__pause_vm(struct kvm_cpu *vcpu)
+{
+ /*
+ * Mark the calling vCPU as paused to avoid waiting indefinitely for a
+ * signal exit.
+ */
+ vcpu->paused = true;
+ kvm__pause(vcpu->kvm);
+}
+
+void kvm_cpu__continue_vm(struct kvm_cpu *vcpu)
+{
+ kvm__continue(vcpu->kvm);
+}
+
int kvm_cpu__start(struct kvm_cpu *cpu)
{
sigset_t sigset;
--
2.41.0.rc0.172.g3f132b7071-goog
next prev parent reply other threads:[~2023-05-26 22:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-26 22:16 [PATCH kvmtool 00/21] arm64: Handle PSCI calls in userspace Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 01/21] update_headers: Use a list for arch-generic headers Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 02/21] update_headers: Add missing entries to list of headers to copy Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 03/21] Copy 64-bit alignment attrtibutes from Linux 6.4-rc1 Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 04/21] Update headers with " Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 05/21] Import arm-smccc.h from " Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 06/21] aarch64: Copy cputype.h " Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 07/21] arm: Stash kvm_vcpu_init for later use Oliver Upton
2023-05-26 22:16 ` [PATCH kvmtool 08/21] arm: Add support for resetting a vCPU Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 09/21] arm: Use KVM_SET_MP_STATE ioctl to power off non-boot vCPUs Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 10/21] aarch64: Expose ARM64_CORE_REG() for general use Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 11/21] arm: Generalize execution state specific VM initialization Oliver Upton
2023-05-26 22:17 ` Oliver Upton [this message]
2023-06-09 10:59 ` [PATCH kvmtool 12/21] Add helpers to pause the VM from vCPU thread Shaoqin Huang
2023-06-15 8:59 ` Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 13/21] aarch64: Add support for finding vCPU for given MPIDR Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 14/21] aarch64: Add skeleton implementation for PSCI Oliver Upton
2023-06-13 15:10 ` Joey Gouly
2023-05-26 22:17 ` [PATCH kvmtool 15/21] aarch64: psci: Implement CPU_SUSPEND Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 16/21] aarch64: psci: Implement CPU_OFF Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 17/21] aarch64: psci: Implement CPU_ON Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 18/21] aarch64: psci: Implement AFFINITY_INFO Oliver Upton
2023-05-26 22:17 ` [PATCH kvmtool 19/21] aarch64: psci: Implement MIGRATE_INFO_TYPE Oliver Upton
2023-05-26 22:18 ` [PATCH kvmtool 20/21] aarch64: psci: Implement SYSTEM_{OFF,RESET} Oliver Upton
2023-05-26 22:19 ` [PATCH kvmtool 21/21] aarch64: smccc: Start sending PSCI to userspace Oliver Upton
2023-06-14 12:05 ` [PATCH kvmtool 00/21] arm64: Handle PSCI calls in userspace Joey Gouly
2023-06-14 16:05 ` Oliver Upton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230526221712.317287-13-oliver.upton@linux.dev \
--to=oliver.upton@linux.dev \
--cc=james.morse@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=maz@kernel.org \
--cc=salil.mehta@huawei.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.