From: Cornelia Huck <cohuck@redhat.com>
To: Janosch Frank <frankja@linux.ibm.com>
Cc: kvm@vger.kernel.org, thuth@redhat.com, borntraeger@de.ibm.com,
david@redhat.com, linux-s390@vger.kernel.org
Subject: Re: [PATCH v8 4/4] selftests: KVM: testing the local IRQs resets
Date: Thu, 30 Jan 2020 11:55:43 +0100 [thread overview]
Message-ID: <20200130115543.1f06a840.cohuck@redhat.com> (raw)
In-Reply-To: <20200129200312.3200-5-frankja@linux.ibm.com>
On Wed, 29 Jan 2020 15:03:12 -0500
Janosch Frank <frankja@linux.ibm.com> wrote:
> From: Pierre Morel <pmorel@linux.ibm.com>
>
> Local IRQs are reset by a normal cpu reset. The initial cpu reset and
> the clear cpu reset, as superset of the normal reset, both clear the
> IRQs too.
>
> Let's inject an interrupt to a vCPU before calling a reset and see if
> it is gone after the reset.
>
> We choose to inject only an emergency interrupt at this point and can
> extend the test to other types of IRQs later.
>
> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
You probably should add your s-o-b here as well.
> ---
> tools/testing/selftests/kvm/s390x/resets.c | 57 ++++++++++++++++++++++
> 1 file changed, 57 insertions(+)
>
> diff --git a/tools/testing/selftests/kvm/s390x/resets.c b/tools/testing/selftests/kvm/s390x/resets.c
> index 2b2378cc9e80..299c1686f98c 100644
> --- a/tools/testing/selftests/kvm/s390x/resets.c
> +++ b/tools/testing/selftests/kvm/s390x/resets.c
> @@ -14,6 +14,9 @@
> #include "kvm_util.h"
>
> #define VCPU_ID 3
> +#define LOCAL_IRQS 32
Why 32?
> +
> +struct kvm_s390_irq buf[VCPU_ID + LOCAL_IRQS];
>
> struct kvm_vm *vm;
> struct kvm_run *run;
> @@ -52,6 +55,29 @@ static void test_one_reg(uint64_t id, uint64_t value)
> TEST_ASSERT(eval_reg == value, "value == %s", value);
> }
>
> +static void assert_noirq(void)
> +{
> + struct kvm_s390_irq_state irq_state;
> + int irqs;
> +
> + if (!(kvm_check_cap(KVM_CAP_S390_INJECT_IRQ) &&
> + kvm_check_cap(KVM_CAP_S390_IRQ_STATE)))
> + return;
Might want to do a
irq_introspection_supported = (check stuff);
once for this test? Works fine as is, of course.
> +
> + irq_state.len = sizeof(buf);
> + irq_state.buf = (unsigned long)buf;
> + irqs = _vcpu_ioctl(vm, VCPU_ID, KVM_S390_GET_IRQ_STATE, &irq_state);
> + /*
> + * irqs contains the number of retrieved interrupts, apart from the
> + * emergency call that should be cleared by the resets, there should be
> + * none.
Even if there were any, they should have been cleared by the reset,
right?
> + */
> + if (irqs < 0)
> + printf("Error by getting IRQ: errno %d\n", errno);
"Error getting pending IRQs" ?
> +
> + TEST_ASSERT(!irqs, "IRQ pending");
> +}
> +
> static void assert_clear(void)
> {
> struct kvm_sregs sregs;
> @@ -93,6 +119,31 @@ static void assert_initial(void)
> static void assert_normal(void)
> {
> test_one_reg(KVM_REG_S390_PFTOKEN, KVM_S390_PFAULT_TOKEN_INVALID);
> + assert_noirq();
> +}
> +
> +static int inject_irq(int cpu_id)
You never seem to check the return code.
> +{
> + struct kvm_s390_irq_state irq_state;
> + struct kvm_s390_irq *irq = &buf[0];
> + int irqs;
> +
> + if (!(kvm_check_cap(KVM_CAP_S390_INJECT_IRQ) &&
> + kvm_check_cap(KVM_CAP_S390_IRQ_STATE)))
> + return 0;
> +
> + /* Inject IRQ */
> + irq_state.len = sizeof(struct kvm_s390_irq);
> + irq_state.buf = (unsigned long)buf;
> + irq->type = KVM_S390_INT_EMERGENCY;
> + irq->u.emerg.code = cpu_id;
> + irqs = _vcpu_ioctl(vm, cpu_id, KVM_S390_SET_IRQ_STATE, &irq_state);
> + if (irqs < 0) {
> + printf("Error by injecting INT_EMERGENCY: errno %d\n", errno);
"Error injecting EMERGENCY IRQ" ?
> + return errno;
> + }
> +
> + return 0;
> }
>
> static void test_normal(void)
> @@ -105,6 +156,8 @@ static void test_normal(void)
>
> _vcpu_run(vm, VCPU_ID);
>
> + inject_irq(VCPU_ID);
> +
> vcpu_ioctl(vm, VCPU_ID, KVM_S390_NORMAL_RESET, 0);
> assert_normal();
> kvm_vm_free(vm);
> @@ -122,6 +175,8 @@ static int test_initial(void)
>
> rv = _vcpu_run(vm, VCPU_ID);
>
> + inject_irq(VCPU_ID);
> +
> vcpu_ioctl(vm, VCPU_ID, KVM_S390_INITIAL_RESET, 0);
> assert_normal();
> assert_initial();
> @@ -141,6 +196,8 @@ static int test_clear(void)
>
> rv = _vcpu_run(vm, VCPU_ID);
>
> + inject_irq(VCPU_ID);
> +
> vcpu_ioctl(vm, VCPU_ID, KVM_S390_CLEAR_RESET, 0);
> assert_normal();
> assert_initial();
On the whole, looks good to me.
next prev parent reply other threads:[~2020-01-30 10:55 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-29 20:03 [PATCH v8 0/4] KVM: s390: Add new reset vcpu API Janosch Frank
2020-01-29 20:03 ` [PATCH v8 1/4] " Janosch Frank
2020-01-30 8:55 ` [PATCH/FIXUP FOR STABLE BEFORE THIS SERIES] KVM: s390: do not clobber user space fpc during guest reset Christian Borntraeger
2020-01-30 9:49 ` David Hildenbrand
2020-01-30 10:39 ` Cornelia Huck
2020-01-30 10:56 ` Thomas Huth
2020-01-30 11:07 ` Christian Borntraeger
2020-01-30 11:01 ` Christian Borntraeger
2020-01-30 11:14 ` Christian Borntraeger
2020-01-30 11:20 ` David Hildenbrand
2020-01-30 11:27 ` Christian Borntraeger
2020-01-30 11:42 ` [PATCH v2] KVM: s390: do not clobber user space registers during guest reset/store status Christian Borntraeger
2020-01-30 11:44 ` Christian Borntraeger
2020-01-30 12:01 ` Christian Borntraeger
2020-01-30 12:38 ` David Hildenbrand
2020-01-30 9:00 ` [PATCH v8 1/4] KVM: s390: Add new reset vcpu API Thomas Huth
2020-01-30 9:58 ` Christian Borntraeger
2020-01-29 20:03 ` [PATCH v8 2/4] selftests: KVM: Add fpu and one reg set/get library functions Janosch Frank
2020-01-30 10:36 ` Thomas Huth
2020-01-30 13:55 ` Andrew Jones
2020-01-30 14:10 ` Janosch Frank
2020-01-30 14:30 ` Andrew Jones
2020-01-30 14:58 ` Janosch Frank
2020-01-30 15:04 ` Andrew Jones
2020-01-29 20:03 ` [PATCH v8 3/4] selftests: KVM: s390x: Add reset tests Janosch Frank
2020-01-30 10:51 ` Thomas Huth
2020-01-30 11:32 ` Janosch Frank
2020-01-30 11:36 ` Thomas Huth
2020-01-29 20:03 ` [PATCH v8 4/4] selftests: KVM: testing the local IRQs resets Janosch Frank
2020-01-30 10:55 ` Cornelia Huck [this message]
2020-01-30 11:18 ` Janosch Frank
2020-01-30 11:28 ` Cornelia Huck
2020-01-30 11:34 ` Janosch Frank
2020-01-30 11:10 ` Thomas Huth
2020-01-30 11:33 ` Janosch Frank
2020-01-30 9:10 ` [PATCH] KVM: s390: Cleanup initial cpu reset Janosch Frank
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=20200130115543.1f06a840.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=thuth@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).