* [PATCH 1/6] qemu,kvm: Enable NMI support for user space irqchip
@ 2010-12-09 6:58 ` Lai Jiangshan
0 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-09 6:58 UTC (permalink / raw)
To: Jan Kiszka, Avi Kivity, qemu-devel, kvm
Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
user space APIC emulation or some other source raised them.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7dfc357..c4ebe28 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1417,6 +1417,14 @@ int kvm_arch_get_registers(CPUState *env)
int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
{
+#ifdef KVM_CAP_USER_NMI
+ if (env->interrupt_request & CPU_INTERRUPT_NMI) {
+ env->interrupt_request &= ~CPU_INTERRUPT_NMI;
+ DPRINTF("injected NMI\n");
+ kvm_vcpu_ioctl(env, KVM_NMI);
+ }
+#endif
+
/* Try to inject an interrupt if the guest can accept it */
if (run->ready_for_interrupt_injection &&
(env->interrupt_request & CPU_INTERRUPT_HARD) &&
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Qemu-devel] [PATCH 1/6] qemu, kvm: Enable NMI support for user space irqchip
@ 2010-12-09 6:58 ` Lai Jiangshan
0 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-09 6:58 UTC (permalink / raw)
To: Jan Kiszka, Avi Kivity, qemu-devel, kvm
Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
user space APIC emulation or some other source raised them.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7dfc357..c4ebe28 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1417,6 +1417,14 @@ int kvm_arch_get_registers(CPUState *env)
int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
{
+#ifdef KVM_CAP_USER_NMI
+ if (env->interrupt_request & CPU_INTERRUPT_NMI) {
+ env->interrupt_request &= ~CPU_INTERRUPT_NMI;
+ DPRINTF("injected NMI\n");
+ kvm_vcpu_ioctl(env, KVM_NMI);
+ }
+#endif
+
/* Try to inject an interrupt if the guest can accept it */
if (run->ready_for_interrupt_injection &&
(env->interrupt_request & CPU_INTERRUPT_HARD) &&
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/6] qemu,kvm: Enable NMI support for user space irqchip
2010-12-09 6:58 ` [Qemu-devel] [PATCH 1/6] qemu, kvm: " Lai Jiangshan
@ 2010-12-09 7:25 ` Jan Kiszka
-1 siblings, 0 replies; 16+ messages in thread
From: Jan Kiszka @ 2010-12-09 7:25 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Avi Kivity, qemu-devel, kvm
Am 09.12.2010 07:58, Lai Jiangshan wrote:
>
> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
> user space APIC emulation or some other source raised them.
In that light, the subject is not absolutely correct.
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 7dfc357..c4ebe28 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -1417,6 +1417,14 @@ int kvm_arch_get_registers(CPUState *env)
>
> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
> {
> +#ifdef KVM_CAP_USER_NMI
> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
> + DPRINTF("injected NMI\n");
> + kvm_vcpu_ioctl(env, KVM_NMI);
> + }
> +#endif
> +
> /* Try to inject an interrupt if the guest can accept it */
> if (run->ready_for_interrupt_injection &&
> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
Actually, we already depend on KVM_CAP_DESTROY_MEMORY_REGION_WORKS which
was introduced with 2.6.29 as well. I would suggest to simply extend the
static configure check and avoid new #ifdefs in the code.
Thanks for pushing this! Was obviously so trivial that it was forgotten...
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Qemu-devel] Re: [PATCH 1/6] qemu, kvm: Enable NMI support for user space irqchip
@ 2010-12-09 7:25 ` Jan Kiszka
0 siblings, 0 replies; 16+ messages in thread
From: Jan Kiszka @ 2010-12-09 7:25 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Avi Kivity, kvm, qemu-devel
Am 09.12.2010 07:58, Lai Jiangshan wrote:
>
> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
> user space APIC emulation or some other source raised them.
In that light, the subject is not absolutely correct.
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 7dfc357..c4ebe28 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -1417,6 +1417,14 @@ int kvm_arch_get_registers(CPUState *env)
>
> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
> {
> +#ifdef KVM_CAP_USER_NMI
> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
> + DPRINTF("injected NMI\n");
> + kvm_vcpu_ioctl(env, KVM_NMI);
> + }
> +#endif
> +
> /* Try to inject an interrupt if the guest can accept it */
> if (run->ready_for_interrupt_injection &&
> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
Actually, we already depend on KVM_CAP_DESTROY_MEMORY_REGION_WORKS which
was introduced with 2.6.29 as well. I would suggest to simply extend the
static configure check and avoid new #ifdefs in the code.
Thanks for pushing this! Was obviously so trivial that it was forgotten...
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 1/6] qemu,kvm: Enable NMI support for user space irqchip
2010-12-09 7:25 ` [Qemu-devel] Re: [PATCH 1/6] qemu, kvm: " Jan Kiszka
@ 2010-12-10 3:17 ` Lai Jiangshan
-1 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-10 3:17 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, qemu-devel, kvm
On 12/09/2010 03:25 PM, Jan Kiszka wrote:
> Am 09.12.2010 07:58, Lai Jiangshan wrote:
>>
>> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
>> user space APIC emulation or some other source raised them.
>
> In that light, the subject is not absolutely correct.
>
[...]
>
> Actually, we already depend on KVM_CAP_DESTROY_MEMORY_REGION_WORKS which
> was introduced with 2.6.29 as well. I would suggest to simply extend the
> static configure check and avoid new #ifdefs in the code.
>
> Thanks for pushing this! Was obviously so trivial that it was forgotten...
>
Thanks. We want to inject nmi to kvm guest via qemu monitor,
that's this path's purpose.
But I can't get you means, what I should do to fix this patch?
Just remove the #ifdefs OR use kvm_check_extension(KVM_CAP_USER_NMI) ?
+ static int can_user_nmi = -1;
+
+ if (can_user_nmi == -1)
+ can_user_nmi = kvm_check_extension(kvm_state, KVM_CAP_USER_NMI);
+
+ if (can_user_nmi > 0 && env->interrupt_request & CPU_INTERRUPT_NMI) {
+ env->interrupt_request &= ~CPU_INTERRUPT_NMI;
+ DPRINTF("injected NMI\n");
+ kvm_vcpu_ioctl(env, KVM_NMI);
+ }
Thanks,
Lai
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Qemu-devel] Re: [PATCH 1/6] qemu, kvm: Enable NMI support for user space irqchip
@ 2010-12-10 3:17 ` Lai Jiangshan
0 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-10 3:17 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, kvm, qemu-devel
On 12/09/2010 03:25 PM, Jan Kiszka wrote:
> Am 09.12.2010 07:58, Lai Jiangshan wrote:
>>
>> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
>> user space APIC emulation or some other source raised them.
>
> In that light, the subject is not absolutely correct.
>
[...]
>
> Actually, we already depend on KVM_CAP_DESTROY_MEMORY_REGION_WORKS which
> was introduced with 2.6.29 as well. I would suggest to simply extend the
> static configure check and avoid new #ifdefs in the code.
>
> Thanks for pushing this! Was obviously so trivial that it was forgotten...
>
Thanks. We want to inject nmi to kvm guest via qemu monitor,
that's this path's purpose.
But I can't get you means, what I should do to fix this patch?
Just remove the #ifdefs OR use kvm_check_extension(KVM_CAP_USER_NMI) ?
+ static int can_user_nmi = -1;
+
+ if (can_user_nmi == -1)
+ can_user_nmi = kvm_check_extension(kvm_state, KVM_CAP_USER_NMI);
+
+ if (can_user_nmi > 0 && env->interrupt_request & CPU_INTERRUPT_NMI) {
+ env->interrupt_request &= ~CPU_INTERRUPT_NMI;
+ DPRINTF("injected NMI\n");
+ kvm_vcpu_ioctl(env, KVM_NMI);
+ }
Thanks,
Lai
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH V2] qemu,kvm: Enable user space NMI injection for kvm guest
2010-12-09 7:25 ` [Qemu-devel] Re: [PATCH 1/6] qemu, kvm: " Jan Kiszka
@ 2010-12-10 7:42 ` Lai Jiangshan
-1 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-10 7:42 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, qemu-devel, kvm
Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
user space raised them. (example: qemu monitor's "nmi" command)
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/configure b/configure
index 2917874..f6f9362 100755
--- a/configure
+++ b/configure
@@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
#if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
#error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
#endif
+#if !defined(KVM_CAP_USER_NMI)
+#error Missing KVM capability KVM_CAP_USER_NMI
+#endif
int main(void) { return 0; }
EOF
if test "$kerneldir" != "" ; then
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7dfc357..755f8c9 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
{
+ /* Inject NMI */
+ if (env->interrupt_request & CPU_INTERRUPT_NMI) {
+ env->interrupt_request &= ~CPU_INTERRUPT_NMI;
+ DPRINTF("injected NMI\n");
+ kvm_vcpu_ioctl(env, KVM_NMI);
+ }
+
/* Try to inject an interrupt if the guest can accept it */
if (run->ready_for_interrupt_injection &&
(env->interrupt_request & CPU_INTERRUPT_HARD) &&
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Qemu-devel] [PATCH V2] qemu, kvm: Enable user space NMI injection for kvm guest
@ 2010-12-10 7:42 ` Lai Jiangshan
0 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-10 7:42 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, kvm, qemu-devel
Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
user space raised them. (example: qemu monitor's "nmi" command)
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/configure b/configure
index 2917874..f6f9362 100755
--- a/configure
+++ b/configure
@@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
#if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
#error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
#endif
+#if !defined(KVM_CAP_USER_NMI)
+#error Missing KVM capability KVM_CAP_USER_NMI
+#endif
int main(void) { return 0; }
EOF
if test "$kerneldir" != "" ; then
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 7dfc357..755f8c9 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
{
+ /* Inject NMI */
+ if (env->interrupt_request & CPU_INTERRUPT_NMI) {
+ env->interrupt_request &= ~CPU_INTERRUPT_NMI;
+ DPRINTF("injected NMI\n");
+ kvm_vcpu_ioctl(env, KVM_NMI);
+ }
+
/* Try to inject an interrupt if the guest can accept it */
if (run->ready_for_interrupt_injection &&
(env->interrupt_request & CPU_INTERRUPT_HARD) &&
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH V2] qemu,kvm: Enable user space NMI injection for kvm guest
2010-12-10 7:42 ` [Qemu-devel] [PATCH V2] qemu, kvm: " Lai Jiangshan
@ 2010-12-10 8:41 ` Jan Kiszka
-1 siblings, 0 replies; 16+ messages in thread
From: Jan Kiszka @ 2010-12-10 8:41 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Avi Kivity, qemu-devel, kvm
Am 10.12.2010 08:42, Lai Jiangshan wrote:
>
> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
> user space raised them. (example: qemu monitor's "nmi" command)
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> diff --git a/configure b/configure
> index 2917874..f6f9362 100755
> --- a/configure
> +++ b/configure
> @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
> #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
> #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
> #endif
> +#if !defined(KVM_CAP_USER_NMI)
> +#error Missing KVM capability KVM_CAP_USER_NMI
> +#endif
> int main(void) { return 0; }
> EOF
> if test "$kerneldir" != "" ; then
That's what I meant.
We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on
kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be
overkill. So...
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 7dfc357..755f8c9 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
>
> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
> {
> + /* Inject NMI */
> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
> + DPRINTF("injected NMI\n");
> + kvm_vcpu_ioctl(env, KVM_NMI);
> + }
> +
> /* Try to inject an interrupt if the guest can accept it */
> if (run->ready_for_interrupt_injection &&
> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Qemu-devel] Re: [PATCH V2] qemu, kvm: Enable user space NMI injection for kvm guest
@ 2010-12-10 8:41 ` Jan Kiszka
0 siblings, 0 replies; 16+ messages in thread
From: Jan Kiszka @ 2010-12-10 8:41 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Avi Kivity, kvm, qemu-devel
Am 10.12.2010 08:42, Lai Jiangshan wrote:
>
> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
> user space raised them. (example: qemu monitor's "nmi" command)
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> diff --git a/configure b/configure
> index 2917874..f6f9362 100755
> --- a/configure
> +++ b/configure
> @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
> #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
> #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
> #endif
> +#if !defined(KVM_CAP_USER_NMI)
> +#error Missing KVM capability KVM_CAP_USER_NMI
> +#endif
> int main(void) { return 0; }
> EOF
> if test "$kerneldir" != "" ; then
That's what I meant.
We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on
kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be
overkill. So...
> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
> index 7dfc357..755f8c9 100644
> --- a/target-i386/kvm.c
> +++ b/target-i386/kvm.c
> @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
>
> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
> {
> + /* Inject NMI */
> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
> + DPRINTF("injected NMI\n");
> + kvm_vcpu_ioctl(env, KVM_NMI);
> + }
> +
> /* Try to inject an interrupt if the guest can accept it */
> if (run->ready_for_interrupt_injection &&
> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2] qemu,kvm: Enable user space NMI injection for kvm guest
2010-12-10 8:41 ` [Qemu-devel] Re: [PATCH V2] qemu, kvm: " Jan Kiszka
@ 2010-12-13 8:43 ` Lai Jiangshan
-1 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-13 8:43 UTC (permalink / raw)
To: Avi Kivity; +Cc: Jan Kiszka, qemu-devel, kvm
On 12/10/2010 04:41 PM, Jan Kiszka wrote:
> Am 10.12.2010 08:42, Lai Jiangshan wrote:
>>
>> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
>> user space raised them. (example: qemu monitor's "nmi" command)
>>
>> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
>> ---
>> diff --git a/configure b/configure
>> index 2917874..f6f9362 100755
>> --- a/configure
>> +++ b/configure
>> @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
>> #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
>> #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
>> #endif
>> +#if !defined(KVM_CAP_USER_NMI)
>> +#error Missing KVM capability KVM_CAP_USER_NMI
>> +#endif
>> int main(void) { return 0; }
>> EOF
>> if test "$kerneldir" != "" ; then
>
> That's what I meant.
>
> We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on
> kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be
> overkill. So...
>
>> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
>> index 7dfc357..755f8c9 100644
>> --- a/target-i386/kvm.c
>> +++ b/target-i386/kvm.c
>> @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
>>
>> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
>> {
>> + /* Inject NMI */
>> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
>> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
>> + DPRINTF("injected NMI\n");
>> + kvm_vcpu_ioctl(env, KVM_NMI);
>> + }
>> +
>> /* Try to inject an interrupt if the guest can accept it */
>> if (run->ready_for_interrupt_injection &&
>> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
>
> Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
>
Hi, Avi
Could you apply this patch or give me any comments/suggest?
Thanks,
Lai
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Qemu-devel] Re: [PATCH V2] qemu, kvm: Enable user space NMI injection for kvm guest
@ 2010-12-13 8:43 ` Lai Jiangshan
0 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-13 8:43 UTC (permalink / raw)
To: Avi Kivity; +Cc: Jan Kiszka, qemu-devel, kvm
On 12/10/2010 04:41 PM, Jan Kiszka wrote:
> Am 10.12.2010 08:42, Lai Jiangshan wrote:
>>
>> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
>> user space raised them. (example: qemu monitor's "nmi" command)
>>
>> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
>> ---
>> diff --git a/configure b/configure
>> index 2917874..f6f9362 100755
>> --- a/configure
>> +++ b/configure
>> @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
>> #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
>> #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
>> #endif
>> +#if !defined(KVM_CAP_USER_NMI)
>> +#error Missing KVM capability KVM_CAP_USER_NMI
>> +#endif
>> int main(void) { return 0; }
>> EOF
>> if test "$kerneldir" != "" ; then
>
> That's what I meant.
>
> We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on
> kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be
> overkill. So...
>
>> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
>> index 7dfc357..755f8c9 100644
>> --- a/target-i386/kvm.c
>> +++ b/target-i386/kvm.c
>> @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
>>
>> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
>> {
>> + /* Inject NMI */
>> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
>> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
>> + DPRINTF("injected NMI\n");
>> + kvm_vcpu_ioctl(env, KVM_NMI);
>> + }
>> +
>> /* Try to inject an interrupt if the guest can accept it */
>> if (run->ready_for_interrupt_injection &&
>> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
>
> Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
>
Hi, Avi
Could you apply this patch or give me any comments/suggest?
Thanks,
Lai
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2] qemu,kvm: Enable user space NMI injection for kvm guest
2010-12-10 8:41 ` [Qemu-devel] Re: [PATCH V2] qemu, kvm: " Jan Kiszka
@ 2010-12-20 2:41 ` Lai Jiangshan
-1 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-20 2:41 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, qemu-devel, kvm
On 12/10/2010 04:41 PM, Jan Kiszka wrote:
> Am 10.12.2010 08:42, Lai Jiangshan wrote:
>>
>> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
>> user space raised them. (example: qemu monitor's "nmi" command)
>>
>> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
>> ---
>> diff --git a/configure b/configure
>> index 2917874..f6f9362 100755
>> --- a/configure
>> +++ b/configure
>> @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
>> #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
>> #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
>> #endif
>> +#if !defined(KVM_CAP_USER_NMI)
>> +#error Missing KVM capability KVM_CAP_USER_NMI
>> +#endif
>> int main(void) { return 0; }
>> EOF
>> if test "$kerneldir" != "" ; then
>
> That's what I meant.
>
> We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on
> kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be
> overkill. So...
>
>> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
>> index 7dfc357..755f8c9 100644
>> --- a/target-i386/kvm.c
>> +++ b/target-i386/kvm.c
>> @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
>>
>> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
>> {
>> + /* Inject NMI */
>> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
>> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
>> + DPRINTF("injected NMI\n");
>> + kvm_vcpu_ioctl(env, KVM_NMI);
>> + }
>> +
>> /* Try to inject an interrupt if the guest can accept it */
>> if (run->ready_for_interrupt_injection &&
>> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
>
> Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
>
> Jan
>
Hi, Avi,
Could you apply this patch?
Thanks,
Lai
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Qemu-devel] Re: [PATCH V2] qemu, kvm: Enable user space NMI injection for kvm guest
@ 2010-12-20 2:41 ` Lai Jiangshan
0 siblings, 0 replies; 16+ messages in thread
From: Lai Jiangshan @ 2010-12-20 2:41 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Avi Kivity, kvm, qemu-devel
On 12/10/2010 04:41 PM, Jan Kiszka wrote:
> Am 10.12.2010 08:42, Lai Jiangshan wrote:
>>
>> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
>> user space raised them. (example: qemu monitor's "nmi" command)
>>
>> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
>> ---
>> diff --git a/configure b/configure
>> index 2917874..f6f9362 100755
>> --- a/configure
>> +++ b/configure
>> @@ -1646,6 +1646,9 @@ if test "$kvm" != "no" ; then
>> #if !defined(KVM_CAP_DESTROY_MEMORY_REGION_WORKS)
>> #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS
>> #endif
>> +#if !defined(KVM_CAP_USER_NMI)
>> +#error Missing KVM capability KVM_CAP_USER_NMI
>> +#endif
>> int main(void) { return 0; }
>> EOF
>> if test "$kerneldir" != "" ; then
>
> That's what I meant.
>
> We also have a runtime check for KVM_CAP_DESTROY_MEMORY_REGION_WORKS on
> kvm init, but IMHO adding the same for KVM_CAP_USER_NMI would be
> overkill. So...
>
>> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
>> index 7dfc357..755f8c9 100644
>> --- a/target-i386/kvm.c
>> +++ b/target-i386/kvm.c
>> @@ -1417,6 +1417,13 @@ int kvm_arch_get_registers(CPUState *env)
>>
>> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run)
>> {
>> + /* Inject NMI */
>> + if (env->interrupt_request & CPU_INTERRUPT_NMI) {
>> + env->interrupt_request &= ~CPU_INTERRUPT_NMI;
>> + DPRINTF("injected NMI\n");
>> + kvm_vcpu_ioctl(env, KVM_NMI);
>> + }
>> +
>> /* Try to inject an interrupt if the guest can accept it */
>> if (run->ready_for_interrupt_injection &&
>> (env->interrupt_request & CPU_INTERRUPT_HARD) &&
>
> Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
>
> Jan
>
Hi, Avi,
Could you apply this patch?
Thanks,
Lai
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2] qemu,kvm: Enable user space NMI injection for kvm guest
2010-12-10 7:42 ` [Qemu-devel] [PATCH V2] qemu, kvm: " Lai Jiangshan
@ 2010-12-20 10:35 ` Marcelo Tosatti
-1 siblings, 0 replies; 16+ messages in thread
From: Marcelo Tosatti @ 2010-12-20 10:35 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Jan Kiszka, Avi Kivity, qemu-devel, kvm
On Fri, Dec 10, 2010 at 03:42:53PM +0800, Lai Jiangshan wrote:
>
> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
> user space raised them. (example: qemu monitor's "nmi" command)
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Applied to uq/master, thanks.
^ permalink raw reply [flat|nested] 16+ messages in thread
* [Qemu-devel] Re: [PATCH V2] qemu, kvm: Enable user space NMI injection for kvm guest
@ 2010-12-20 10:35 ` Marcelo Tosatti
0 siblings, 0 replies; 16+ messages in thread
From: Marcelo Tosatti @ 2010-12-20 10:35 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: Jan Kiszka, Avi Kivity, kvm, qemu-devel
On Fri, Dec 10, 2010 at 03:42:53PM +0800, Lai Jiangshan wrote:
>
> Make use of the new KVM_NMI IOCTL to send NMIs into the KVM guest if the
> user space raised them. (example: qemu monitor's "nmi" command)
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Applied to uq/master, thanks.
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2010-12-20 10:36 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-09 6:58 [PATCH 1/6] qemu,kvm: Enable NMI support for user space irqchip Lai Jiangshan
2010-12-09 6:58 ` [Qemu-devel] [PATCH 1/6] qemu, kvm: " Lai Jiangshan
2010-12-09 7:25 ` [PATCH 1/6] qemu,kvm: " Jan Kiszka
2010-12-09 7:25 ` [Qemu-devel] Re: [PATCH 1/6] qemu, kvm: " Jan Kiszka
2010-12-10 3:17 ` [PATCH 1/6] qemu,kvm: " Lai Jiangshan
2010-12-10 3:17 ` [Qemu-devel] Re: [PATCH 1/6] qemu, kvm: " Lai Jiangshan
2010-12-10 7:42 ` [PATCH V2] qemu,kvm: Enable user space NMI injection for kvm guest Lai Jiangshan
2010-12-10 7:42 ` [Qemu-devel] [PATCH V2] qemu, kvm: " Lai Jiangshan
2010-12-10 8:41 ` [PATCH V2] qemu,kvm: " Jan Kiszka
2010-12-10 8:41 ` [Qemu-devel] Re: [PATCH V2] qemu, kvm: " Jan Kiszka
2010-12-13 8:43 ` [PATCH V2] qemu,kvm: " Lai Jiangshan
2010-12-13 8:43 ` [Qemu-devel] Re: [PATCH V2] qemu, kvm: " Lai Jiangshan
2010-12-20 2:41 ` [PATCH V2] qemu,kvm: " Lai Jiangshan
2010-12-20 2:41 ` [Qemu-devel] Re: [PATCH V2] qemu, kvm: " Lai Jiangshan
2010-12-20 10:35 ` [PATCH V2] qemu,kvm: " Marcelo Tosatti
2010-12-20 10:35 ` [Qemu-devel] Re: [PATCH V2] qemu, kvm: " Marcelo Tosatti
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.