Skip to contentSkip to conversation

cpu: vmexit: KVM_RUN ioctl error handling fixes

PATCH In review Aneesh Kumar K.V (Arm) 3 participants 11 messages Apr 28, 2025 – Jun 10, 2025 KVM

lore
Share & tools
lore
#0 lore raw

v3 cover cpu: vmexit: KVM_RUN ioctl error handling fixes

Changes from v2:
* Fix smp boot failure on x86.

Aneesh Kumar K.V (Arm) (3):
cpu: vmexit: Handle KVM_EXIT_MEMORY_FAULT in KVM_RUN ioctl return
cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN
cpu: vmexit: Handle KVM_EXIT_UNKNOWN exit reason correctly

 include/kvm/kvm-cpu.h |  2 +-
 kvm-cpu.c             | 30 ++++++++++++++++++++++++------
 kvm.c                 |  1 +
 3 files changed, 26 insertions(+), 7 deletions(-)

base-commit: d410d9a16f91458ae2b912cc088015396f22dfad

Signature · 1 line
2.43.0
#1 lore raw

PATCH v3 1/3 cpu: vmexit: Handle KVM_EXIT_MEMORY_FAULT in KVM_RUN ioctl return

Linux kernel documentation states:

"Note! KVM_EXIT_MEMORY_FAULT is unique among all KVM exit reasons in that it accompanies a return code of '-1', not '0'! errno will always be set to EFAULT or EHWPOISON when KVM exits with KVM_EXIT_MEMORY_FAULT, userspace should assume kvm_run.exit_reason is stale/undefined for all other error numbers." "

Update KVM_RUN ioctl error handling to correctly handle KVM_EXIT_MEMORY_FAULT. This enables the memory fault exit handlers in the kernel to return -EFAULT as the return value. VMM support is still required to handle these memory fault exits, but that is not included in this change

---
 kvm-cpu.c | 15 +++++++++++++--
 kvm.c     |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)
kvm-cpu.c +13 -2
index 7362f2e99261..40041a22b3fe 100644
@@ -43,8 +43,19 @@ void kvm_cpu__run(struct kvm_cpu *vcpu)
 		return;
 
 	err = ioctl(vcpu->vcpu_fd, KVM_RUN, 0);
-	if (err < 0 && (errno != EINTR && errno != EAGAIN))
-		die_perror("KVM_RUN failed");
+	if (err < 0) {
+		switch (errno) {
+		case EINTR:
+		case EAGAIN:
+			return;
+		case EFAULT:
+			if (vcpu->kvm_run->exit_reason == KVM_EXIT_MEMORY_FAULT)
+				return;
+			/* fallthrough */
+		default:
+			die_perror("KVM_RUN failed");
+		}
+	}
 }
 
 static void kvm_cpu_signal_handler(int signum)
kvm.c +1 -0
index 07089cf1b332..b6375a114d11 100644
@@ -55,6 +55,7 @@ const char *kvm_exit_reasons[] = {
 #ifdef CONFIG_PPC64
 	DEFINE_KVM_EXIT_REASON(KVM_EXIT_PAPR_HCALL),
 #endif
+	DEFINE_KVM_EXIT_REASON(KVM_EXIT_MEMORY_FAULT),
 };
 
 static int pause_event;
Signature · 1 line
2.43.0
#3 lore raw

PATCH v3 2/3 cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN

In reply to Aneesh Kumar K.V (Arm)

When KVM_RUN fails with EINTR or EAGAIN, we should retry the ioctl without checking kvm_run->exit_reason. These errors don't indicate a valid VM exit, hence exit_reason may contain stale or undefined values.

---
 include/kvm/kvm-cpu.h |  2 +-
 kvm-cpu.c             | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)
include/kvm/kvm-cpu.h +1 -1
index 8f76f8a1123a..72cbb86e6cef 100644
@@ -16,7 +16,7 @@ void kvm_cpu__delete(struct kvm_cpu *vcpu);
 void kvm_cpu__reset_vcpu(struct kvm_cpu *vcpu);
 void kvm_cpu__setup_cpuid(struct kvm_cpu *vcpu);
 void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu);
-void kvm_cpu__run(struct kvm_cpu *vcpu);
+int kvm_cpu__run(struct kvm_cpu *vcpu);
 int kvm_cpu__start(struct kvm_cpu *cpu);
 bool kvm_cpu__handle_exit(struct kvm_cpu *vcpu);
 int kvm_cpu__get_endianness(struct kvm_cpu *vcpu);
kvm-cpu.c +12 -5
index 40041a22b3fe..7abbdcebf075 100644
@@ -35,27 +35,32 @@ void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu)
 		pr_warning("KVM_SET_GUEST_DEBUG failed");
 }
 
-void kvm_cpu__run(struct kvm_cpu *vcpu)
+/*
+ * return value -1 if we need to call the kvm_cpu__run again without checking
+ * exit_reason. return value 0 results in taking action based on exit_reason.
+ */
+int kvm_cpu__run(struct kvm_cpu *vcpu)
 {
 	int err;
 
 	if (!vcpu->is_running)
-		return;
+		return -1;
 
 	err = ioctl(vcpu->vcpu_fd, KVM_RUN, 0);
 	if (err < 0) {
 		switch (errno) {
 		case EINTR:
 		case EAGAIN:
-			return;
+			return -1;
 		case EFAULT:
 			if (vcpu->kvm_run->exit_reason == KVM_EXIT_MEMORY_FAULT)
-				return;
+				return 0;
 			/* fallthrough */
 		default:
 			die_perror("KVM_RUN failed");
 		}
 	}
+	return 0;
 }
 
 static void kvm_cpu_signal_handler(int signum)
@@ -179,7 +184,9 @@ int kvm_cpu__start(struct kvm_cpu *cpu)
 		if (cpu->task)
 			kvm_cpu__run_task(cpu);
 
-		kvm_cpu__run(cpu);
+		if (kvm_cpu__run(cpu) == -1)
+			/* retry without an exit_reason check */
+			continue;
 
 		switch (cpu->kvm_run->exit_reason) {
 		case KVM_EXIT_UNKNOWN:
Signature · 1 line
2.43.0
#9 lore raw

PATCH v3 3/3 cpu: vmexit: Handle KVM_EXIT_UNKNOWN exit reason correctly

In reply to Aneesh Kumar K.V (Arm)

The return value for kernel VM exit handlers is confusing and has led to errors in different kernel exit handlers. A return value of 0 indicates a return to the VMM, whereas a return value of 1 indicates resuming execution in the guest. Some handlers mistakenly return 0 to force a return to the guest.

This worked in kvmtool because the exit_reason defaulted to 0 (KVM_EXIT_UNKNOWN), and kvmtool did not error out on an unknown exit reason. However, forcing a VMM exit with error on KVM_EXIT_UNKNOWN exit_reson would help catch these bugs early.

---
 kvm-cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kvm-cpu.c +1 -1
index 7abbdcebf075..a76dfee561ec 100644
@@ -190,7 +190,7 @@ int kvm_cpu__start(struct kvm_cpu *cpu)
 
 		switch (cpu->kvm_run->exit_reason) {
 		case KVM_EXIT_UNKNOWN:
-			break;
+			goto panic_kvm;
 		case KVM_EXIT_DEBUG:
 			kvm_cpu__show_registers(cpu);
 			kvm_cpu__show_code(cpu);
Signature · 1 line
2.43.0
#4 lore raw

Re: [PATCH kvmtool v3 2/3] cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN

In reply to Aneesh Kumar K.V (Arm)

Hi Aneesh

Quoted 28 lines · Aneesh Kumar K.V (Arm)

When KVM_RUN fails with EINTR or EAGAIN, we should retry the ioctl without checking kvm_run->exit_reason. These errors don't indicate a valid VM exit, hence exit_reason may contain stale or undefined values.

---
  include/kvm/kvm-cpu.h |  2 +-
  kvm-cpu.c             | 17 ++++++++++++-----
  2 files changed, 13 insertions(+), 6 deletions(-)
include/kvm/kvm-cpu.h +1 -1
index 8f76f8a1123a..72cbb86e6cef 100644
@@ -16,7 +16,7 @@ void kvm_cpu__delete(struct kvm_cpu *vcpu);
  void kvm_cpu__reset_vcpu(struct kvm_cpu *vcpu);
  void kvm_cpu__setup_cpuid(struct kvm_cpu *vcpu);
  void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu);
-void kvm_cpu__run(struct kvm_cpu *vcpu);
+int kvm_cpu__run(struct kvm_cpu *vcpu);
  int kvm_cpu__start(struct kvm_cpu *cpu);
  bool kvm_cpu__handle_exit(struct kvm_cpu *vcpu);
  int kvm_cpu__get_endianness(struct kvm_cpu *vcpu);
kvm-cpu.c +0 -0
index 40041a22b3fe..7abbdcebf075 100644

kvm-cpu.c void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu) · line 41

Quoted 8 lines
kvm-cpu.c +4 -1
@@ -35,27 +35,32 @@ void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu)
  		pr_warning("KVM_SET_GUEST_DEBUG failed");
  }
 
-void kvm_cpu__run(struct kvm_cpu *vcpu)
+/*
+ * return value -1 if we need to call the kvm_cpu__run again without checking
+ * exit_reason. return value 0 results in taking action based on exit_reason.
+ */

minor nit: Should we make the return value meaningful, say -EAGAIN instead of -1 ?

Quoted 29 lines
kvm-cpu.c +5 -3
+int kvm_cpu__run(struct kvm_cpu *vcpu)
  {
  	int err;
 
  	if (!vcpu->is_running)
-		return;
+		return -1;
 
  	err = ioctl(vcpu->vcpu_fd, KVM_RUN, 0);
  	if (err < 0) {
  		switch (errno) {
  		case EINTR:
  		case EAGAIN:
-			return;
+			return -1;
  		case EFAULT:
  			if (vcpu->kvm_run->exit_reason == KVM_EXIT_MEMORY_FAULT)
-				return;
+				return 0;
  			/* fallthrough */
  		default:
  			die_perror("KVM_RUN failed");
  		}
  	}
+	return 0;
  }
 
  static void kvm_cpu_signal_handler(int signum)

kvm-cpu.c int kvm_cpu__start(struct kvm_cpu *cpu) · line 187

Quoted 5 lines
kvm-cpu.c +1 -1
@@ -179,7 +184,9 @@ int kvm_cpu__start(struct kvm_cpu *cpu)
  		if (cpu->task)
  			kvm_cpu__run_task(cpu);
 
-		kvm_cpu__run(cpu);
+		if (kvm_cpu__run(cpu) == -1)

and this could be :

		if (kvm_cpu__run(cpu) == -EAGAIN)

kvm-cpu.c int kvm_cpu__start(struct kvm_cpu *cpu) · line 192

Quoted 5 lines
kvm-cpu.c +2 -0
+			/* retry without an exit_reason check */
+			continue;
 
  		switch (cpu->kvm_run->exit_reason) {
  		case KVM_EXIT_UNKNOWN:

Suzuki

#6 lore raw

Re: [PATCH kvmtool v3 2/3] cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN

In reply to Aneesh Kumar K.V (Arm)

Hi Aneesh,

Is this to fix Will's report that the series breaks boot on x86?

Quoted 3 lines · Aneesh Kumar K.V (Arm)

When KVM_RUN fails with EINTR or EAGAIN, we should retry the ioctl without checking kvm_run->exit_reason. These errors don't indicate a valid VM exit, hence exit_reason may contain stale or undefined values.

EAGAIN is not documented in Documentation/virt/kvm/api.rst. So I'm going to assume it's this code path that is causing the -EAGAIN return value [1].

If that's the case, how does retrying KVM_RUN solve the issue? Just trying to get to the bottom of it, because there's not much detail in the docs.

[1] https://elixir.bootlin.com/linux/v6.15-rc3/source/arch/x86/kvm/x86.c#L11532

Thanks,
Alex

Quoted 76 lines
---
 include/kvm/kvm-cpu.h |  2 +-
 kvm-cpu.c             | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)
include/kvm/kvm-cpu.h +1 -1
index 8f76f8a1123a..72cbb86e6cef 100644
@@ -16,7 +16,7 @@ void kvm_cpu__delete(struct kvm_cpu *vcpu);
 void kvm_cpu__reset_vcpu(struct kvm_cpu *vcpu);
 void kvm_cpu__setup_cpuid(struct kvm_cpu *vcpu);
 void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu);
-void kvm_cpu__run(struct kvm_cpu *vcpu);
+int kvm_cpu__run(struct kvm_cpu *vcpu);
 int kvm_cpu__start(struct kvm_cpu *cpu);
 bool kvm_cpu__handle_exit(struct kvm_cpu *vcpu);
 int kvm_cpu__get_endianness(struct kvm_cpu *vcpu);
kvm-cpu.c +12 -5
index 40041a22b3fe..7abbdcebf075 100644
@@ -35,27 +35,32 @@ void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu)
 		pr_warning("KVM_SET_GUEST_DEBUG failed");
 }
 
-void kvm_cpu__run(struct kvm_cpu *vcpu)
+/*
+ * return value -1 if we need to call the kvm_cpu__run again without checking
+ * exit_reason. return value 0 results in taking action based on exit_reason.
+ */
+int kvm_cpu__run(struct kvm_cpu *vcpu)
 {
 	int err;
 
 	if (!vcpu->is_running)
-		return;
+		return -1;
 
 	err = ioctl(vcpu->vcpu_fd, KVM_RUN, 0);
 	if (err < 0) {
 		switch (errno) {
 		case EINTR:
 		case EAGAIN:
-			return;
+			return -1;
 		case EFAULT:
 			if (vcpu->kvm_run->exit_reason == KVM_EXIT_MEMORY_FAULT)
-				return;
+				return 0;
 			/* fallthrough */
 		default:
 			die_perror("KVM_RUN failed");
 		}
 	}
+	return 0;
 }
 
 static void kvm_cpu_signal_handler(int signum)
@@ -179,7 +184,9 @@ int kvm_cpu__start(struct kvm_cpu *cpu)
 		if (cpu->task)
 			kvm_cpu__run_task(cpu);
 
-		kvm_cpu__run(cpu);
+		if (kvm_cpu__run(cpu) == -1)
+			/* retry without an exit_reason check */
+			continue;
 
 		switch (cpu->kvm_run->exit_reason) {
 		case KVM_EXIT_UNKNOWN:
Signature · 1 line
2.43.0
#5 lore raw

Re: [PATCH kvmtool v3 2/3] cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN

In reply to Suzuki K Poulose
Quoted 34 lines · Suzuki K Poulose

Hi Aneesh

Quoted 31 lines · Aneesh Kumar K.V (Arm)

When KVM_RUN fails with EINTR or EAGAIN, we should retry the ioctl without checking kvm_run->exit_reason. These errors don't indicate a valid VM exit, hence exit_reason may contain stale or undefined values.

---
  include/kvm/kvm-cpu.h |  2 +-
  kvm-cpu.c             | 17 ++++++++++++-----
  2 files changed, 13 insertions(+), 6 deletions(-)
include/kvm/kvm-cpu.h +1 -1
index 8f76f8a1123a..72cbb86e6cef 100644
@@ -16,7 +16,7 @@ void kvm_cpu__delete(struct kvm_cpu *vcpu);
  void kvm_cpu__reset_vcpu(struct kvm_cpu *vcpu);
  void kvm_cpu__setup_cpuid(struct kvm_cpu *vcpu);
  void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu);
-void kvm_cpu__run(struct kvm_cpu *vcpu);
+int kvm_cpu__run(struct kvm_cpu *vcpu);
  int kvm_cpu__start(struct kvm_cpu *cpu);
  bool kvm_cpu__handle_exit(struct kvm_cpu *vcpu);
  int kvm_cpu__get_endianness(struct kvm_cpu *vcpu);
kvm-cpu.c +0 -0
index 40041a22b3fe..7abbdcebf075 100644
@@ -35,27 +35,32 @@ void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu)
  		pr_warning("KVM_SET_GUEST_DEBUG failed");
  }
 
Quoted 9 lines

kvm-cpu.c void kvm_cpu__enable_singlestep(struct kvm_cpu *vcpu) · line 41

Quoted 5 lines
kvm-cpu.c +4 -1
-void kvm_cpu__run(struct kvm_cpu *vcpu)
+/*
+ * return value -1 if we need to call the kvm_cpu__run again without checking
+ * exit_reason. return value 0 results in taking action based on exit_reason.
+ */

minor nit: Should we make the return value meaningful, say -EAGAIN instead of -1 ?

I was not sure. Having both EINTR and EAGAIN map to just EAGAIN is confusing IMHO. Instead having a proper return value (-1) which is documented to imply a retry is better?

Quoted 46 lines
Quoted 29 lines
kvm-cpu.c +5 -3
+int kvm_cpu__run(struct kvm_cpu *vcpu)
  {
  	int err;
 
  	if (!vcpu->is_running)
-		return;
+		return -1;
 
  	err = ioctl(vcpu->vcpu_fd, KVM_RUN, 0);
  	if (err < 0) {
  		switch (errno) {
  		case EINTR:
  		case EAGAIN:
-			return;
+			return -1;
  		case EFAULT:
  			if (vcpu->kvm_run->exit_reason == KVM_EXIT_MEMORY_FAULT)
-				return;
+				return 0;
  			/* fallthrough */
  		default:
  			die_perror("KVM_RUN failed");
  		}
  	}
+	return 0;
  }
 
  static void kvm_cpu_signal_handler(int signum)

kvm-cpu.c int kvm_cpu__start(struct kvm_cpu *cpu) · line 187

Quoted 5 lines
kvm-cpu.c +1 -1
@@ -179,7 +184,9 @@ int kvm_cpu__start(struct kvm_cpu *cpu)
  		if (cpu->task)
  			kvm_cpu__run_task(cpu);
 
-		kvm_cpu__run(cpu);
+		if (kvm_cpu__run(cpu) == -1)

and this could be :

		if (kvm_cpu__run(cpu) == -EAGAIN)

kvm-cpu.c int kvm_cpu__start(struct kvm_cpu *cpu) · line 192

Quoted 5 lines
kvm-cpu.c +2 -0
+			/* retry without an exit_reason check */
+			continue;
 
  		switch (cpu->kvm_run->exit_reason) {
  		case KVM_EXIT_UNKNOWN:

Suzuki

#7 lore raw

Re: [PATCH kvmtool v3 2/3] cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN

In reply to Alexandru Elisei
Quoted 4 lines · Alexandru Elisei

Hi Aneesh,

Is this to fix Will's report that the series breaks boot on x86?

Yes.

Quoted 8 lines · Aneesh Kumar K.V (Arm)
Quoted 3 lines

When KVM_RUN fails with EINTR or EAGAIN, we should retry the ioctl without checking kvm_run->exit_reason. These errors don't indicate a valid VM exit, hence exit_reason may contain stale or undefined values.

EAGAIN is not documented in Documentation/virt/kvm/api.rst. So I'm going to assume it's this code path that is causing the -EAGAIN return value [1].

IIUC, EAGAIN and EINTR are syscall return errno that indicates a system call need to be retried. Documentation/virt/kvm/api.rst do mention that exit_reason is value only with return value 0.

	__u32 exit_reason;

When KVM_RUN has returned successfully (return value 0), this informs application code why KVM_RUN has returned.

Quoted 7 lines

If that's the case, how does retrying KVM_RUN solve the issue? Just trying to get to the bottom of it, because there's not much detail in the docs.

[1] https://elixir.bootlin.com/linux/v6.15-rc3/source/arch/x86/kvm/x86.c#L11532

So in that code path vcpu will be in kvm_vcpu_block(vcpu) waiting for the IPI. On IPI kvm_apic_accept_events() will return 0 after setting the vcpu->arch.mp_state. Hence a KVM_RUN ioctl again will find the mp_state correctly updated.

-aneesh

#8 lore raw

Re: [PATCH kvmtool v3 2/3] cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN

Hi Anessh,

Quoted 18 lines · Aneesh Kumar K.V
Quoted 4 lines · Alexandru Elisei

Hi Aneesh,

Is this to fix Will's report that the series breaks boot on x86?

Yes.

Quoted 8 lines · Aneesh Kumar K.V (Arm)
Quoted 3 lines

When KVM_RUN fails with EINTR or EAGAIN, we should retry the ioctl without checking kvm_run->exit_reason. These errors don't indicate a valid VM exit, hence exit_reason may contain stale or undefined values.

EAGAIN is not documented in Documentation/virt/kvm/api.rst. So I'm going to assume it's this code path that is causing the -EAGAIN return value [1].

Quoted 8 lines

IIUC, EAGAIN and EINTR are syscall return errno that indicates a system call need to be retried. Documentation/virt/kvm/api.rst do mention that exit_reason is value only with return value 0.

	__u32 exit_reason;

When KVM_RUN has returned successfully (return value 0), this informs application code why KVM_RUN has returned.

Yeah, that makes sense. api.rst is a bit weird, because it doesn't document all of the error codes, and they are documented in different places, like -EFAULT which is under KVM_EXIT_MEMORY_FAULT, not under KVM_RUN.

Thanks for the explanation!

Quoted 5 lines
Quoted 5 lines

If that's the case, how does retrying KVM_RUN solve the issue? Just trying to get to the bottom of it, because there's not much detail in the docs.

Quoted 8 lines
Quoted 3 lines

[1] https://elixir.bootlin.com/linux/v6.15-rc3/source/arch/x86/kvm/x86.c#L11532

So in that code path vcpu will be in kvm_vcpu_block(vcpu) waiting for the IPI. On IPI kvm_apic_accept_events() will return 0 after setting the vcpu->arch.mp_state. Hence a KVM_RUN ioctl again will find the mp_state correctly updated.

I think that would be useful to have in the commit message.

Thanks,
Alex

Quoted 2 lines

-aneesh

#2 lore raw

Re: [PATCH kvmtool v3 1/3] cpu: vmexit: Handle KVM_EXIT_MEMORY_FAULT in KVM_RUN ioctl return

In reply to Aneesh Kumar K.V (Arm)
Quoted 27 lines · Aneesh Kumar K.V (Arm)

Linux kernel documentation states:

"Note! KVM_EXIT_MEMORY_FAULT is unique among all KVM exit reasons in that it accompanies a return code of '-1', not '0'! errno will always be set to EFAULT or EHWPOISON when KVM exits with KVM_EXIT_MEMORY_FAULT, userspace should assume kvm_run.exit_reason is stale/undefined for all other error numbers." "

Update KVM_RUN ioctl error handling to correctly handle KVM_EXIT_MEMORY_FAULT. This enables the memory fault exit handlers in the kernel to return -EFAULT as the return value. VMM support is still required to handle these memory fault exits, but that is not included in this change

---
  kvm-cpu.c | 15 +++++++++++++--
  kvm.c     |  1 +
  2 files changed, 14 insertions(+), 2 deletions(-)
kvm-cpu.c +0 -0
index 7362f2e99261..40041a22b3fe 100644
@@ -43,8 +43,19 @@ void kvm_cpu__run(struct kvm_cpu *vcpu)
  		return;

kvm-cpu.c void kvm_cpu__run(struct kvm_cpu *vcpu) · line 51

Quoted 10 lines
kvm-cpu.c +6 -2
 
  	err = ioctl(vcpu->vcpu_fd, KVM_RUN, 0);
-	if (err < 0 && (errno != EINTR && errno != EAGAIN))
-		die_perror("KVM_RUN failed");
+	if (err < 0) {
+		switch (errno) {
+		case EINTR:
+		case EAGAIN:
+			return;
+		case EFAULT:

Do we need to handle EHWPOISON too, as per the API ?

Suzuki

Quoted 24 lines
kvm-cpu.c +7 -0
+			if (vcpu->kvm_run->exit_reason == KVM_EXIT_MEMORY_FAULT)
+				return;
+			/* fallthrough */
+		default:
+			die_perror("KVM_RUN failed");
 
 
+		}
+	}
  }

static void kvm_cpu_signal_handler(int signum)

kvm.c +1 -0
index 07089cf1b332..b6375a114d11 100644
@@ -55,6 +55,7 @@ const char *kvm_exit_reasons[] = {
  #ifdef CONFIG_PPC64
  	DEFINE_KVM_EXIT_REASON(KVM_EXIT_PAPR_HCALL),
  #endif
+	DEFINE_KVM_EXIT_REASON(KVM_EXIT_MEMORY_FAULT),
  };
 
  static int pause_event;
#10 lore raw
In reply to Aneesh Kumar K.V (Arm)
Quoted 8 lines · Aneesh Kumar K.V (Arm)

Changes from v2:
* Fix smp boot failure on x86.

Aneesh Kumar K.V (Arm) (3):
cpu: vmexit: Handle KVM_EXIT_MEMORY_FAULT in KVM_RUN ioctl return
cpu: vmexit: Retry KVM_RUN ioctl on EINTR and EAGAIN
cpu: vmexit: Handle KVM_EXIT_UNKNOWN exit reason correctly

Quoted 7 lines
 include/kvm/kvm-cpu.h |  2 +-
 kvm-cpu.c             | 30 ++++++++++++++++++++++++------
 kvm.c                 |  1 +
 3 files changed, 26 insertions(+), 7 deletions(-)

base-commit: d410d9a16f91458ae2b912cc088015396f22dfad

Any feedback on this?

-aneesh