Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On Tue, Mar 05, 2024 at 07:26:18AM +0100, Thomas Huth wrote: > On 05/03/2024 03.19, Nicholas Piggin wrote: > > On Fri Mar 1, 2024 at 10:41 PM AEST, Thomas Huth wrote: > > > On 26/02/2024 11.12, Nicholas Piggin wrote: > > > > Add basic testing of various kinds of interrupts, machine check, > > > > page fault, illegal, decrementer, trace, syscall, etc. > > > > > > > > This has a known failure on QEMU TCG pseries machines where MSR[ME] > > > > can be incorrectly set to 0. > > > > > > Two questions out of curiosity: > > > > > > Any chance that this could be fixed easily in QEMU? > > > > Yes I have a fix on the mailing list. It should get into 9.0 and > > probably stable. > > Ok, then it's IMHO not worth the effort to make the k-u-t work around this > bug in older QEMU versions. > > > > Or is there a way to detect TCG from within the test? (for example, we > > > have > > > a host_is_tcg() function for s390x so we can e.g. use report_xfail() for > > > tests that are known to fail on TCG there) > > > > I do have a half-done patch which adds exactly this. > > > > One (minor) annoyance is that it doesn't seem possible to detect QEMU > > version to add workarounds. E.g., we would like to test the fixed > > functionality, but older qemu should not. Maybe that's going too much > > into a rabbit hole. We *could* put a QEMU version into device tree > > to deal with this though... > > No, let's better not do this - hardwired version checks are often a bad > idea, e.g. when a bug is in QEMU 8.0.0 and 8.1.0, it could be fixed in 8.0.1 > and then it could get really messy with the version checks... > We've tried to address this type of issue (but for KVM, so kernel versions instead of QEMU versions) in the past by inventing the errata framework, which is based on environment variables. Instead of checking for versions, we check for a hash (which is just the commit hash of the fix). While we do guess that the fix is present by version number, it can always be manually set as present as well. In any case, the test is simply skipped when the errata environment variable isn't present, so in the worst case we lose some coverage we could have had, but the rest of the tests still complete and we don't get the same failures over and over. An example of its use is in arm/psci.c. Look for the ERRATA() calls. We could extend the errata framework for QEMU/TCG. We just need to add another bit of data to the errata.txt file for it to know it should check QEMU versions instead of kernel versions for those errata. We can also ignore the errata framework and just create the errata environment variable which would by 'n' by default now and later, after distros have fixes, it could be changed to 'y'. Thanks, drew
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On 05/03/2024 03.19, Nicholas Piggin wrote: On Fri Mar 1, 2024 at 10:41 PM AEST, Thomas Huth wrote: On 26/02/2024 11.12, Nicholas Piggin wrote: Add basic testing of various kinds of interrupts, machine check, page fault, illegal, decrementer, trace, syscall, etc. This has a known failure on QEMU TCG pseries machines where MSR[ME] can be incorrectly set to 0. Two questions out of curiosity: Any chance that this could be fixed easily in QEMU? Yes I have a fix on the mailing list. It should get into 9.0 and probably stable. Ok, then it's IMHO not worth the effort to make the k-u-t work around this bug in older QEMU versions. Or is there a way to detect TCG from within the test? (for example, we have a host_is_tcg() function for s390x so we can e.g. use report_xfail() for tests that are known to fail on TCG there) I do have a half-done patch which adds exactly this. One (minor) annoyance is that it doesn't seem possible to detect QEMU version to add workarounds. E.g., we would like to test the fixed functionality, but older qemu should not. Maybe that's going too much into a rabbit hole. We *could* put a QEMU version into device tree to deal with this though... No, let's better not do this - hardwired version checks are often a bad idea, e.g. when a bug is in QEMU 8.0.0 and 8.1.0, it could be fixed in 8.0.1 and then it could get really messy with the version checks... Thomas
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On 05/03/2024 03.30, Nicholas Piggin wrote: On Fri Mar 1, 2024 at 11:45 PM AEST, Andrew Jones wrote: On Fri, Mar 01, 2024 at 01:41:22PM +0100, Thomas Huth wrote: On 26/02/2024 11.12, Nicholas Piggin wrote: Add basic testing of various kinds of interrupts, machine check, page fault, illegal, decrementer, trace, syscall, etc. This has a known failure on QEMU TCG pseries machines where MSR[ME] can be incorrectly set to 0. Two questions out of curiosity: Any chance that this could be fixed easily in QEMU? Or is there a way to detect TCG from within the test? (for example, we have a host_is_tcg() function for s390x so we can e.g. use report_xfail() for tests that are known to fail on TCG there) If there's nothing better, then it should be possible to check the QEMU_ACCEL environment variable which will be there with the default environ. @@ -0,0 +1,415 @@ +/* + * Test interrupts + * + * Copyright 2024 Nicholas Piggin, IBM Corp. + * + * This work is licensed under the terms of the GNU LGPL, version 2. I know, we're using this line in a lot of source files ... but maybe we should do better for new files at least: "LGPL, version 2" is a little bit ambiguous: Does it mean the "Library GPL version 2.0" or the "Lesser GPL version 2.1"? Maybe you could clarify by additionally providing a SPDX identifier here, or by explicitly writing 2.0 or 2.1. Let's only add SPDX identifiers to new files. +1 Speaking of which, a bunch of these just got inherited from the file that was copied to begin with (I tried not to remove copyright notices unless there was really nothing of the original remaining). So for new code/files, is there any particular preference for the license to use? I don't much mind between the *GPL*. Looks like almost all the SPDX code use GPL 2.0 only, but that could be just from coming from Linux. I might just go with that. k-u-t were originally licensed under the LGPL, but in the course of time, code has been copied from the Linux kernel here and there, so we updated the license to GPL 2. So yes, for code that might have been copied from the kernel, we have to use GPL 2. For other code, it's up to the author to chose. (IIRC we once discussed that LGPL would be nice for the files in the lib/ directory, while GPL is fine for the other folders, but my memory might fail here and it was never written in stone anyway) Thomas
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On Sat Mar 2, 2024 at 12:14 AM AEST, Andrew Jones wrote:
> On Fri, Mar 01, 2024 at 02:57:04PM +0100, Thomas Huth wrote:
> > On 01/03/2024 14.45, Andrew Jones wrote:
> > > On Fri, Mar 01, 2024 at 01:41:22PM +0100, Thomas Huth wrote:
> > > > On 26/02/2024 11.12, Nicholas Piggin wrote:
> > > > > Add basic testing of various kinds of interrupts, machine check,
> > > > > page fault, illegal, decrementer, trace, syscall, etc.
> > > > >
> > > > > This has a known failure on QEMU TCG pseries machines where MSR[ME]
> > > > > can be incorrectly set to 0.
> > > >
> > > > Two questions out of curiosity:
> > > >
> > > > Any chance that this could be fixed easily in QEMU?
> > > >
> > > > Or is there a way to detect TCG from within the test? (for example, we
> > > > have
> > > > a host_is_tcg() function for s390x so we can e.g. use report_xfail() for
> > > > tests that are known to fail on TCG there)
> > >
> > > If there's nothing better, then it should be possible to check the
> > > QEMU_ACCEL environment variable which will be there with the default
> > > environ.
> >
> > Well, but that's only available from the host side, not within the test
> > (i.e. the guest). So that does not help much with report_xfail...
>
> powerpc has had environment variables in guests since commit f266c3e8ef15
> ("powerpc: enable environ"). QEMU_ACCEL is one of the environment
> variables given to unit tests by default when ENVIRON_DEFAULT is 'yes', as
> is the default set in configure. But...
>
> > I was rather thinking of something like checking the device tree, e.g. for
> > the compatible property in /hypervisor to see whether it's KVM or TCG...?
>
> ...while QEMU_ACCEL will work when the environ is present, DT will always
> be present, so checking the hypervisor node sounds better to me.
Yeah I got that.
One issue with xfail I noted when looking at this earlier, is that it
*always* expects a fail, and fails if it succeeds. So if you fix a QEMU
bug then you introduce a fail to kvm-unit-tests. So we really want a
report_known_bug(cond, "SPRs look sane", "QEMU TCG before v9.0 and
POWER9 DD2.0 is known to fail..."); and that could report a maybe-fail
that doesn't make the test group fail.
Thanks,
Nick
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On Fri Mar 1, 2024 at 11:45 PM AEST, Andrew Jones wrote: > On Fri, Mar 01, 2024 at 01:41:22PM +0100, Thomas Huth wrote: > > On 26/02/2024 11.12, Nicholas Piggin wrote: > > > Add basic testing of various kinds of interrupts, machine check, > > > page fault, illegal, decrementer, trace, syscall, etc. > > > > > > This has a known failure on QEMU TCG pseries machines where MSR[ME] > > > can be incorrectly set to 0. > > > > Two questions out of curiosity: > > > > Any chance that this could be fixed easily in QEMU? > > > > Or is there a way to detect TCG from within the test? (for example, we have > > a host_is_tcg() function for s390x so we can e.g. use report_xfail() for > > tests that are known to fail on TCG there) > > If there's nothing better, then it should be possible to check the > QEMU_ACCEL environment variable which will be there with the default > environ. > > > > > > @@ -0,0 +1,415 @@ > > > +/* > > > + * Test interrupts > > > + * > > > + * Copyright 2024 Nicholas Piggin, IBM Corp. > > > + * > > > + * This work is licensed under the terms of the GNU LGPL, version 2. > > > > I know, we're using this line in a lot of source files ... but maybe we > > should do better for new files at least: "LGPL, version 2" is a little bit > > ambiguous: Does it mean the "Library GPL version 2.0" or the "Lesser GPL > > version 2.1"? Maybe you could clarify by additionally providing a SPDX > > identifier here, or by explicitly writing 2.0 or 2.1. > > Let's only add SPDX identifiers to new files. +1 Speaking of which, a bunch of these just got inherited from the file that was copied to begin with (I tried not to remove copyright notices unless there was really nothing of the original remaining). So for new code/files, is there any particular preference for the license to use? I don't much mind between the *GPL*. Looks like almost all the SPDX code use GPL 2.0 only, but that could be just from coming from Linux. I might just go with that. Thanks, Nick
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On Fri Mar 1, 2024 at 10:41 PM AEST, Thomas Huth wrote:
> On 26/02/2024 11.12, Nicholas Piggin wrote:
> > Add basic testing of various kinds of interrupts, machine check,
> > page fault, illegal, decrementer, trace, syscall, etc.
> >
> > This has a known failure on QEMU TCG pseries machines where MSR[ME]
> > can be incorrectly set to 0.
>
> Two questions out of curiosity:
>
> Any chance that this could be fixed easily in QEMU?
Yes I have a fix on the mailing list. It should get into 9.0 and
probably stable.
> Or is there a way to detect TCG from within the test? (for example, we have
> a host_is_tcg() function for s390x so we can e.g. use report_xfail() for
> tests that are known to fail on TCG there)
I do have a half-done patch which adds exactly this.
One (minor) annoyance is that it doesn't seem possible to detect QEMU
version to add workarounds. E.g., we would like to test the fixed
functionality, but older qemu should not. Maybe that's going too much
into a rabbit hole. We *could* put a QEMU version into device tree
to deal with this though...
Thanks,
Nick
>
> > Signed-off-by: Nicholas Piggin
> > ---
> > lib/powerpc/asm/processor.h | 4 +
> > lib/powerpc/asm/reg.h | 17 ++
> > lib/powerpc/setup.c | 11 +
> > lib/ppc64/asm/ptrace.h | 16 ++
> > powerpc/Makefile.common | 3 +-
> > powerpc/interrupts.c| 415
> > powerpc/unittests.cfg | 3 +
> > 7 files changed, 468 insertions(+), 1 deletion(-)
> > create mode 100644 powerpc/interrupts.c
> >
> > diff --git a/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h
> > index cf1b9d8ff..eed37d1f4 100644
> > --- a/lib/powerpc/asm/processor.h
> > +++ b/lib/powerpc/asm/processor.h
> > @@ -11,7 +11,11 @@ void do_handle_exception(struct pt_regs *regs);
> > #endif /* __ASSEMBLY__ */
> >
> > extern bool cpu_has_hv;
> > +extern bool cpu_has_power_mce;
> > +extern bool cpu_has_siar;
> > extern bool cpu_has_heai;
> > +extern bool cpu_has_prefix;
> > +extern bool cpu_has_sc_lev;
> >
> > static inline uint64_t mfspr(int nr)
> > {
> > diff --git a/lib/powerpc/asm/reg.h b/lib/powerpc/asm/reg.h
> > index 782e75527..d6097f48f 100644
> > --- a/lib/powerpc/asm/reg.h
> > +++ b/lib/powerpc/asm/reg.h
> > @@ -5,8 +5,15 @@
> >
> > #define UL(x) _AC(x, UL)
> >
> > +#define SPR_DSISR 0x012
> > +#define SPR_DAR0x013
> > +#define SPR_DEC0x016
> > #define SPR_SRR0 0x01a
> > #define SPR_SRR1 0x01b
> > +#define SRR1_PREFIX UL(0x2000)
> > +#define SPR_FSCR 0x099
> > +#define FSCR_PREFIX UL(0x2000)
> > +#define SPR_HFSCR 0x0be
> > #define SPR_TB0x10c
> > #define SPR_SPRG0 0x110
> > #define SPR_SPRG1 0x111
> > @@ -22,12 +29,17 @@
> > #define PVR_VER_POWER8 UL(0x004d)
> > #define PVR_VER_POWER9 UL(0x004e)
> > #define PVR_VER_POWER10 UL(0x0080)
> > +#define SPR_HDEC 0x136
> > #define SPR_HSRR0 0x13a
> > #define SPR_HSRR1 0x13b
> > +#define SPR_LPCR 0x13e
> > +#define LPCR_HDICE UL(0x1)
> > +#define SPR_HEIR 0x153
> > #define SPR_MMCR0 0x31b
> > #define MMCR0_FCUL(0x8000)
> > #define MMCR0_PMAE UL(0x0400)
> > #define MMCR0_PMAO UL(0x0080)
> > +#define SPR_SIAR 0x31c
> >
> > /* Machine State Register definitions: */
> > #define MSR_LE_BIT0
> > @@ -35,6 +47,11 @@
> > #define MSR_HV_BIT60 /* Hypervisor mode */
> > #define MSR_SF_BIT63 /* 64-bit mode */
> >
> > +#define MSR_DR UL(0x0010)
> > +#define MSR_IR UL(0x0020)
> > +#define MSR_BE UL(0x0200) /* Branch Trace Enable
> > */
> > +#define MSR_SE UL(0x0400) /* Single Step Enable */
> > +#define MSR_EE UL(0x8000)
> > #define MSR_MEUL(0x1000)
> >
> > #endif
> > diff --git a/lib/powerpc/setup.c b/lib/powerpc/setup.c
> > index 3c81aee9e..9b665f59c 100644
> > --- a/lib/powerpc/setup.c
> > +++ b/lib/powerpc/setup.c
> > @@ -87,7 +87,11 @@ static void cpu_set(int fdtnode, u64 regval, void *info)
> > }
> >
> > bool cpu_has_hv;
> > +bool cpu_has_power_mce; /* POWER CPU machine checks */
> > +bool cpu_has_siar;
> > bool cpu_has_heai;
> > +bool cpu_has_prefix;
> > +bool cpu_has_sc_lev; /* sc interrupt has LEV field in SRR1 */
> >
> > static void cpu_init(void)
> > {
> > @@ -112,15 +116,22 @@ static void cpu_init(void)
> >
> > switch (mfspr(SPR_PVR) & PVR_VERSION_MASK) {
> > case PVR_VER_POWER10:
> > + cpu_has_prefix = true;
> > + cpu_has_sc_lev = true;
> > case PVR_VER_POWER9:
> > case PVR_VER_POWER8E:
> > case PVR_VER_POWER8NVL:
> > case PVR_VER_POWER8:
> > + cpu_has_power_mce = true;
> > cpu_has_heai = true;
> > + cpu_has_siar = true;
> >
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On Fri, Mar 01, 2024 at 02:57:04PM +0100, Thomas Huth wrote:
> On 01/03/2024 14.45, Andrew Jones wrote:
> > On Fri, Mar 01, 2024 at 01:41:22PM +0100, Thomas Huth wrote:
> > > On 26/02/2024 11.12, Nicholas Piggin wrote:
> > > > Add basic testing of various kinds of interrupts, machine check,
> > > > page fault, illegal, decrementer, trace, syscall, etc.
> > > >
> > > > This has a known failure on QEMU TCG pseries machines where MSR[ME]
> > > > can be incorrectly set to 0.
> > >
> > > Two questions out of curiosity:
> > >
> > > Any chance that this could be fixed easily in QEMU?
> > >
> > > Or is there a way to detect TCG from within the test? (for example, we
> > > have
> > > a host_is_tcg() function for s390x so we can e.g. use report_xfail() for
> > > tests that are known to fail on TCG there)
> >
> > If there's nothing better, then it should be possible to check the
> > QEMU_ACCEL environment variable which will be there with the default
> > environ.
>
> Well, but that's only available from the host side, not within the test
> (i.e. the guest). So that does not help much with report_xfail...
powerpc has had environment variables in guests since commit f266c3e8ef15
("powerpc: enable environ"). QEMU_ACCEL is one of the environment
variables given to unit tests by default when ENVIRON_DEFAULT is 'yes', as
is the default set in configure. But...
> I was rather thinking of something like checking the device tree, e.g. for
> the compatible property in /hypervisor to see whether it's KVM or TCG...?
...while QEMU_ACCEL will work when the environ is present, DT will always
be present, so checking the hypervisor node sounds better to me.
Thanks,
drew
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On 01/03/2024 14.45, Andrew Jones wrote: On Fri, Mar 01, 2024 at 01:41:22PM +0100, Thomas Huth wrote: On 26/02/2024 11.12, Nicholas Piggin wrote: Add basic testing of various kinds of interrupts, machine check, page fault, illegal, decrementer, trace, syscall, etc. This has a known failure on QEMU TCG pseries machines where MSR[ME] can be incorrectly set to 0. Two questions out of curiosity: Any chance that this could be fixed easily in QEMU? Or is there a way to detect TCG from within the test? (for example, we have a host_is_tcg() function for s390x so we can e.g. use report_xfail() for tests that are known to fail on TCG there) If there's nothing better, then it should be possible to check the QEMU_ACCEL environment variable which will be there with the default environ. Well, but that's only available from the host side, not within the test (i.e. the guest). So that does not help much with report_xfail... I was rather thinking of something like checking the device tree, e.g. for the compatible property in /hypervisor to see whether it's KVM or TCG...? Thomas
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On Fri, Mar 01, 2024 at 01:41:22PM +0100, Thomas Huth wrote: > On 26/02/2024 11.12, Nicholas Piggin wrote: > > Add basic testing of various kinds of interrupts, machine check, > > page fault, illegal, decrementer, trace, syscall, etc. > > > > This has a known failure on QEMU TCG pseries machines where MSR[ME] > > can be incorrectly set to 0. > > Two questions out of curiosity: > > Any chance that this could be fixed easily in QEMU? > > Or is there a way to detect TCG from within the test? (for example, we have > a host_is_tcg() function for s390x so we can e.g. use report_xfail() for > tests that are known to fail on TCG there) If there's nothing better, then it should be possible to check the QEMU_ACCEL environment variable which will be there with the default environ. > > > @@ -0,0 +1,415 @@ > > +/* > > + * Test interrupts > > + * > > + * Copyright 2024 Nicholas Piggin, IBM Corp. > > + * > > + * This work is licensed under the terms of the GNU LGPL, version 2. > > I know, we're using this line in a lot of source files ... but maybe we > should do better for new files at least: "LGPL, version 2" is a little bit > ambiguous: Does it mean the "Library GPL version 2.0" or the "Lesser GPL > version 2.1"? Maybe you could clarify by additionally providing a SPDX > identifier here, or by explicitly writing 2.0 or 2.1. Let's only add SPDX identifiers to new files. Thanks, drew
Re: [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
On 26/02/2024 11.12, Nicholas Piggin wrote:
Add basic testing of various kinds of interrupts, machine check,
page fault, illegal, decrementer, trace, syscall, etc.
This has a known failure on QEMU TCG pseries machines where MSR[ME]
can be incorrectly set to 0.
Two questions out of curiosity:
Any chance that this could be fixed easily in QEMU?
Or is there a way to detect TCG from within the test? (for example, we have
a host_is_tcg() function for s390x so we can e.g. use report_xfail() for
tests that are known to fail on TCG there)
Signed-off-by: Nicholas Piggin
---
lib/powerpc/asm/processor.h | 4 +
lib/powerpc/asm/reg.h | 17 ++
lib/powerpc/setup.c | 11 +
lib/ppc64/asm/ptrace.h | 16 ++
powerpc/Makefile.common | 3 +-
powerpc/interrupts.c| 415
powerpc/unittests.cfg | 3 +
7 files changed, 468 insertions(+), 1 deletion(-)
create mode 100644 powerpc/interrupts.c
diff --git a/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h
index cf1b9d8ff..eed37d1f4 100644
--- a/lib/powerpc/asm/processor.h
+++ b/lib/powerpc/asm/processor.h
@@ -11,7 +11,11 @@ void do_handle_exception(struct pt_regs *regs);
#endif /* __ASSEMBLY__ */
extern bool cpu_has_hv;
+extern bool cpu_has_power_mce;
+extern bool cpu_has_siar;
extern bool cpu_has_heai;
+extern bool cpu_has_prefix;
+extern bool cpu_has_sc_lev;
static inline uint64_t mfspr(int nr)
{
diff --git a/lib/powerpc/asm/reg.h b/lib/powerpc/asm/reg.h
index 782e75527..d6097f48f 100644
--- a/lib/powerpc/asm/reg.h
+++ b/lib/powerpc/asm/reg.h
@@ -5,8 +5,15 @@
#define UL(x) _AC(x, UL)
+#define SPR_DSISR 0x012
+#define SPR_DAR0x013
+#define SPR_DEC0x016
#define SPR_SRR0 0x01a
#define SPR_SRR1 0x01b
+#define SRR1_PREFIX UL(0x2000)
+#define SPR_FSCR 0x099
+#define FSCR_PREFIX UL(0x2000)
+#define SPR_HFSCR 0x0be
#define SPR_TB0x10c
#define SPR_SPRG0 0x110
#define SPR_SPRG1 0x111
@@ -22,12 +29,17 @@
#define PVR_VER_POWER8 UL(0x004d)
#define PVR_VER_POWER9 UL(0x004e)
#define PVR_VER_POWER10 UL(0x0080)
+#define SPR_HDEC 0x136
#define SPR_HSRR0 0x13a
#define SPR_HSRR1 0x13b
+#define SPR_LPCR 0x13e
+#define LPCR_HDICE UL(0x1)
+#define SPR_HEIR 0x153
#define SPR_MMCR0 0x31b
#define MMCR0_FCUL(0x8000)
#define MMCR0_PMAE UL(0x0400)
#define MMCR0_PMAO UL(0x0080)
+#define SPR_SIAR 0x31c
/* Machine State Register definitions: */
#define MSR_LE_BIT0
@@ -35,6 +47,11 @@
#define MSR_HV_BIT60 /* Hypervisor mode */
#define MSR_SF_BIT63 /* 64-bit mode */
+#define MSR_DR UL(0x0010)
+#define MSR_IR UL(0x0020)
+#define MSR_BE UL(0x0200) /* Branch Trace Enable */
+#define MSR_SE UL(0x0400) /* Single Step Enable */
+#define MSR_EE UL(0x8000)
#define MSR_MEUL(0x1000)
#endif
diff --git a/lib/powerpc/setup.c b/lib/powerpc/setup.c
index 3c81aee9e..9b665f59c 100644
--- a/lib/powerpc/setup.c
+++ b/lib/powerpc/setup.c
@@ -87,7 +87,11 @@ static void cpu_set(int fdtnode, u64 regval, void *info)
}
bool cpu_has_hv;
+bool cpu_has_power_mce; /* POWER CPU machine checks */
+bool cpu_has_siar;
bool cpu_has_heai;
+bool cpu_has_prefix;
+bool cpu_has_sc_lev; /* sc interrupt has LEV field in SRR1 */
static void cpu_init(void)
{
@@ -112,15 +116,22 @@ static void cpu_init(void)
switch (mfspr(SPR_PVR) & PVR_VERSION_MASK) {
case PVR_VER_POWER10:
+ cpu_has_prefix = true;
+ cpu_has_sc_lev = true;
case PVR_VER_POWER9:
case PVR_VER_POWER8E:
case PVR_VER_POWER8NVL:
case PVR_VER_POWER8:
+ cpu_has_power_mce = true;
cpu_has_heai = true;
+ cpu_has_siar = true;
break;
default:
break;
}
+
+ if (!cpu_has_hv) /* HEIR is HV register */
+ cpu_has_heai = false;
}
static void mem_init(phys_addr_t freemem_start)
diff --git a/lib/ppc64/asm/ptrace.h b/lib/ppc64/asm/ptrace.h
index 12de7499b..db263a59e 100644
--- a/lib/ppc64/asm/ptrace.h
+++ b/lib/ppc64/asm/ptrace.h
@@ -5,6 +5,9 @@
#define STACK_FRAME_OVERHEAD112 /* size of minimum stack frame */
#ifndef __ASSEMBLY__
+
+#include
+
struct pt_regs {
unsigned long gpr[32];
unsigned long nip;
@@ -17,6 +20,19 @@ struct pt_regs {
unsigned long _pad; /* stack must be 16-byte aligned */
};
+static inline bool regs_is_prefix(volatile struct pt_regs *regs)
+{
+ return regs->msr & SRR1_PREFIX;
+}
+
+static inline void regs_advance_insn(struct pt_regs *regs)
+{
+ if (regs_is_prefix(regs))
+
[kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests
Add basic testing of various kinds of interrupts, machine check,
page fault, illegal, decrementer, trace, syscall, etc.
This has a known failure on QEMU TCG pseries machines where MSR[ME]
can be incorrectly set to 0.
Signed-off-by: Nicholas Piggin
---
lib/powerpc/asm/processor.h | 4 +
lib/powerpc/asm/reg.h | 17 ++
lib/powerpc/setup.c | 11 +
lib/ppc64/asm/ptrace.h | 16 ++
powerpc/Makefile.common | 3 +-
powerpc/interrupts.c| 415
powerpc/unittests.cfg | 3 +
7 files changed, 468 insertions(+), 1 deletion(-)
create mode 100644 powerpc/interrupts.c
diff --git a/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h
index cf1b9d8ff..eed37d1f4 100644
--- a/lib/powerpc/asm/processor.h
+++ b/lib/powerpc/asm/processor.h
@@ -11,7 +11,11 @@ void do_handle_exception(struct pt_regs *regs);
#endif /* __ASSEMBLY__ */
extern bool cpu_has_hv;
+extern bool cpu_has_power_mce;
+extern bool cpu_has_siar;
extern bool cpu_has_heai;
+extern bool cpu_has_prefix;
+extern bool cpu_has_sc_lev;
static inline uint64_t mfspr(int nr)
{
diff --git a/lib/powerpc/asm/reg.h b/lib/powerpc/asm/reg.h
index 782e75527..d6097f48f 100644
--- a/lib/powerpc/asm/reg.h
+++ b/lib/powerpc/asm/reg.h
@@ -5,8 +5,15 @@
#define UL(x) _AC(x, UL)
+#define SPR_DSISR 0x012
+#define SPR_DAR0x013
+#define SPR_DEC0x016
#define SPR_SRR0 0x01a
#define SPR_SRR1 0x01b
+#define SRR1_PREFIX UL(0x2000)
+#define SPR_FSCR 0x099
+#define FSCR_PREFIX UL(0x2000)
+#define SPR_HFSCR 0x0be
#define SPR_TB 0x10c
#define SPR_SPRG0 0x110
#define SPR_SPRG1 0x111
@@ -22,12 +29,17 @@
#define PVR_VER_POWER8 UL(0x004d)
#define PVR_VER_POWER9 UL(0x004e)
#define PVR_VER_POWER10 UL(0x0080)
+#define SPR_HDEC 0x136
#define SPR_HSRR0 0x13a
#define SPR_HSRR1 0x13b
+#define SPR_LPCR 0x13e
+#define LPCR_HDICE UL(0x1)
+#define SPR_HEIR 0x153
#define SPR_MMCR0 0x31b
#define MMCR0_FC UL(0x8000)
#define MMCR0_PMAE UL(0x0400)
#define MMCR0_PMAO UL(0x0080)
+#define SPR_SIAR 0x31c
/* Machine State Register definitions: */
#define MSR_LE_BIT 0
@@ -35,6 +47,11 @@
#define MSR_HV_BIT 60 /* Hypervisor mode */
#define MSR_SF_BIT 63 /* 64-bit mode */
+#define MSR_DR UL(0x0010)
+#define MSR_IR UL(0x0020)
+#define MSR_BE UL(0x0200) /* Branch Trace Enable */
+#define MSR_SE UL(0x0400) /* Single Step Enable */
+#define MSR_EE UL(0x8000)
#define MSR_ME UL(0x1000)
#endif
diff --git a/lib/powerpc/setup.c b/lib/powerpc/setup.c
index 3c81aee9e..9b665f59c 100644
--- a/lib/powerpc/setup.c
+++ b/lib/powerpc/setup.c
@@ -87,7 +87,11 @@ static void cpu_set(int fdtnode, u64 regval, void *info)
}
bool cpu_has_hv;
+bool cpu_has_power_mce; /* POWER CPU machine checks */
+bool cpu_has_siar;
bool cpu_has_heai;
+bool cpu_has_prefix;
+bool cpu_has_sc_lev; /* sc interrupt has LEV field in SRR1 */
static void cpu_init(void)
{
@@ -112,15 +116,22 @@ static void cpu_init(void)
switch (mfspr(SPR_PVR) & PVR_VERSION_MASK) {
case PVR_VER_POWER10:
+ cpu_has_prefix = true;
+ cpu_has_sc_lev = true;
case PVR_VER_POWER9:
case PVR_VER_POWER8E:
case PVR_VER_POWER8NVL:
case PVR_VER_POWER8:
+ cpu_has_power_mce = true;
cpu_has_heai = true;
+ cpu_has_siar = true;
break;
default:
break;
}
+
+ if (!cpu_has_hv) /* HEIR is HV register */
+ cpu_has_heai = false;
}
static void mem_init(phys_addr_t freemem_start)
diff --git a/lib/ppc64/asm/ptrace.h b/lib/ppc64/asm/ptrace.h
index 12de7499b..db263a59e 100644
--- a/lib/ppc64/asm/ptrace.h
+++ b/lib/ppc64/asm/ptrace.h
@@ -5,6 +5,9 @@
#define STACK_FRAME_OVERHEAD112 /* size of minimum stack frame */
#ifndef __ASSEMBLY__
+
+#include
+
struct pt_regs {
unsigned long gpr[32];
unsigned long nip;
@@ -17,6 +20,19 @@ struct pt_regs {
unsigned long _pad; /* stack must be 16-byte aligned */
};
+static inline bool regs_is_prefix(volatile struct pt_regs *regs)
+{
+ return regs->msr & SRR1_PREFIX;
+}
+
+static inline void regs_advance_insn(struct pt_regs *regs)
+{
+ if (regs_is_prefix(regs))
+ regs->nip += 8;
+ else
+ regs->nip += 4;
+}
+
#define STACK_INT_FRAME_SIZE(sizeof(struct pt_regs) + \
STACK_FRAME_OVERHEAD + KERNEL_REDZONE_SIZE)
diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
index 1e181da69..68165fc25 100644
--- a/powerpc/Makefile.common
+++ b/powerpc/Makefile.common
@@ -12,7 +12,8 @@
