From: Nicholas Piggin <npiggin@gmail.com>
To: Thomas Huth <thuth@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>,
kvm@vger.kernel.org, Nicholas Piggin <npiggin@gmail.com>,
Andrew Jones <andrew.jones@linux.dev>,
Joel Stanley <joel@jms.id.au>,
Paolo Bonzini <pbonzini@redhat.com>,
linuxppc-dev@lists.ozlabs.org
Subject: [kvm-unit-tests PATCH 08/32] powerpc/sprs: Avoid taking PMU interrupts caused by register fuzzing
Date: Mon, 26 Feb 2024 20:11:54 +1000 [thread overview]
Message-ID: <20240226101218.1472843-9-npiggin@gmail.com> (raw)
In-Reply-To: <20240226101218.1472843-1-npiggin@gmail.com>
Storing certain values in MMCR0 can cause PMU interrupts when msleep
enables MSR[EE], and this crashes the test. Freeze the PMU counters
and clear any PMU exception before calling msleep.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
lib/powerpc/asm/reg.h | 4 ++++
powerpc/sprs.c | 17 +++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/lib/powerpc/asm/reg.h b/lib/powerpc/asm/reg.h
index 1f991288e..c80b32059 100644
--- a/lib/powerpc/asm/reg.h
+++ b/lib/powerpc/asm/reg.h
@@ -24,6 +24,10 @@
#define PVR_VER_POWER10 UL(0x00800000)
#define SPR_HSRR0 0x13a
#define SPR_HSRR1 0x13b
+#define SPR_MMCR0 0x31b
+#define MMCR0_FC UL(0x80000000)
+#define MMCR0_PMAE UL(0x04000000)
+#define MMCR0_PMAO UL(0x00000080)
/* Machine State Register definitions: */
#define MSR_EE_BIT 15 /* External Interrupts Enable */
diff --git a/powerpc/sprs.c b/powerpc/sprs.c
index 44edd0d7b..cb1d6c980 100644
--- a/powerpc/sprs.c
+++ b/powerpc/sprs.c
@@ -476,12 +476,7 @@ static void set_sprs(uint64_t val)
continue;
if (sprs[i].type & SPR_HARNESS)
continue;
- if (!strcmp(sprs[i].name, "MMCR0")) {
- /* XXX: could use a comment or better abstraction! */
- __mtspr(i, (val & 0xfffffffffbab3fffULL) | 0xfa0b2070);
- } else {
- __mtspr(i, val);
- }
+ __mtspr(i, val);
}
}
@@ -538,6 +533,16 @@ int main(int argc, char **argv)
if (sprs[895].name)
before[895] = mfspr(895);
} else {
+ /*
+ * msleep will enable MSR[EE] and take a decrementer
+ * interrupt. Must account for changed registers and
+ * prevent taking unhandled interrupts.
+ */
+ /* Prevent PMU interrupt */
+ mtspr(SPR_MMCR0, (mfspr(SPR_MMCR0) | MMCR0_FC) &
+ ~(MMCR0_PMAO | MMCR0_PMAE));
+ before[SPR_MMCR0] = mfspr(SPR_MMCR0);
+ before[779] = mfspr(SPR_MMCR0);
msleep(2000);
/* Reload regs changed by dec interrupt */
--
2.42.0
WARNING: multiple messages have this Message-ID (diff)
From: Nicholas Piggin <npiggin@gmail.com>
To: Thomas Huth <thuth@redhat.com>
Cc: Nicholas Piggin <npiggin@gmail.com>,
Laurent Vivier <lvivier@redhat.com>,
Andrew Jones <andrew.jones@linux.dev>,
Paolo Bonzini <pbonzini@redhat.com>,
Joel Stanley <joel@jms.id.au>,
linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org
Subject: [kvm-unit-tests PATCH 08/32] powerpc/sprs: Avoid taking PMU interrupts caused by register fuzzing
Date: Mon, 26 Feb 2024 20:11:54 +1000 [thread overview]
Message-ID: <20240226101218.1472843-9-npiggin@gmail.com> (raw)
In-Reply-To: <20240226101218.1472843-1-npiggin@gmail.com>
Storing certain values in MMCR0 can cause PMU interrupts when msleep
enables MSR[EE], and this crashes the test. Freeze the PMU counters
and clear any PMU exception before calling msleep.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
lib/powerpc/asm/reg.h | 4 ++++
powerpc/sprs.c | 17 +++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/lib/powerpc/asm/reg.h b/lib/powerpc/asm/reg.h
index 1f991288e..c80b32059 100644
--- a/lib/powerpc/asm/reg.h
+++ b/lib/powerpc/asm/reg.h
@@ -24,6 +24,10 @@
#define PVR_VER_POWER10 UL(0x00800000)
#define SPR_HSRR0 0x13a
#define SPR_HSRR1 0x13b
+#define SPR_MMCR0 0x31b
+#define MMCR0_FC UL(0x80000000)
+#define MMCR0_PMAE UL(0x04000000)
+#define MMCR0_PMAO UL(0x00000080)
/* Machine State Register definitions: */
#define MSR_EE_BIT 15 /* External Interrupts Enable */
diff --git a/powerpc/sprs.c b/powerpc/sprs.c
index 44edd0d7b..cb1d6c980 100644
--- a/powerpc/sprs.c
+++ b/powerpc/sprs.c
@@ -476,12 +476,7 @@ static void set_sprs(uint64_t val)
continue;
if (sprs[i].type & SPR_HARNESS)
continue;
- if (!strcmp(sprs[i].name, "MMCR0")) {
- /* XXX: could use a comment or better abstraction! */
- __mtspr(i, (val & 0xfffffffffbab3fffULL) | 0xfa0b2070);
- } else {
- __mtspr(i, val);
- }
+ __mtspr(i, val);
}
}
@@ -538,6 +533,16 @@ int main(int argc, char **argv)
if (sprs[895].name)
before[895] = mfspr(895);
} else {
+ /*
+ * msleep will enable MSR[EE] and take a decrementer
+ * interrupt. Must account for changed registers and
+ * prevent taking unhandled interrupts.
+ */
+ /* Prevent PMU interrupt */
+ mtspr(SPR_MMCR0, (mfspr(SPR_MMCR0) | MMCR0_FC) &
+ ~(MMCR0_PMAO | MMCR0_PMAE));
+ before[SPR_MMCR0] = mfspr(SPR_MMCR0);
+ before[779] = mfspr(SPR_MMCR0);
msleep(2000);
/* Reload regs changed by dec interrupt */
--
2.42.0
next prev parent reply other threads:[~2024-02-26 10:19 UTC|newest]
Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 10:11 [kvm-unit-tests PATCH 00/32] powerpc improvements Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-26 10:11 ` [kvm-unit-tests PATCH 01/32] powerpc: Fix KVM caps on POWER9 hosts Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-26 11:33 ` Thomas Huth
2024-02-26 11:33 ` Thomas Huth
2024-02-26 10:11 ` [kvm-unit-tests PATCH 02/32] powerpc: Fix pseries getchar return value Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-26 11:35 ` Thomas Huth
2024-02-26 11:35 ` Thomas Huth
2024-02-26 10:11 ` [kvm-unit-tests PATCH 03/32] powerpc: Fix stack backtrace termination Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-27 8:50 ` Thomas Huth
2024-02-27 8:50 ` Thomas Huth
2024-03-01 9:45 ` Thomas Huth
2024-03-01 9:45 ` Thomas Huth
2024-03-05 2:08 ` Nicholas Piggin
2024-03-05 2:08 ` Nicholas Piggin
2024-03-05 6:29 ` Nicholas Piggin
2024-03-05 6:29 ` Nicholas Piggin
2024-03-05 6:59 ` Thomas Huth
2024-03-05 6:59 ` Thomas Huth
2024-02-26 10:11 ` [kvm-unit-tests PATCH 04/32] powerpc: interrupt stack backtracing Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-28 11:46 ` Andrew Jones
2024-02-28 11:46 ` Andrew Jones
2024-02-29 3:50 ` Nicholas Piggin
2024-02-29 3:50 ` Nicholas Piggin
2024-03-01 9:53 ` Thomas Huth
2024-03-01 9:53 ` Thomas Huth
2024-03-05 2:12 ` Nicholas Piggin
2024-03-05 2:12 ` Nicholas Piggin
2024-02-26 10:11 ` [kvm-unit-tests PATCH 05/32] powerpc: Cleanup SPR and MSR definitions Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-03-01 11:11 ` Thomas Huth
2024-03-01 11:11 ` Thomas Huth
2024-02-26 10:11 ` [kvm-unit-tests PATCH 06/32] powerpc/sprs: Specify SPRs with data rather than code Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-26 10:11 ` [kvm-unit-tests PATCH 07/32] powerpc/sprs: Don't fail changed SPRs that are used by the test harness Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-03-01 11:15 ` Thomas Huth
2024-03-01 11:15 ` Thomas Huth
2024-03-05 2:14 ` Nicholas Piggin
2024-03-05 2:14 ` Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin [this message]
2024-02-26 10:11 ` [kvm-unit-tests PATCH 08/32] powerpc/sprs: Avoid taking PMU interrupts caused by register fuzzing Nicholas Piggin
2024-03-01 11:25 ` Thomas Huth
2024-03-01 11:25 ` Thomas Huth
2024-02-26 10:11 ` [kvm-unit-tests PATCH 09/32] scripts: allow machine option to be specified in unittests.cfg Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-28 11:47 ` Andrew Jones
2024-02-28 11:47 ` Andrew Jones
2024-02-29 3:52 ` Nicholas Piggin
2024-02-29 3:52 ` Nicholas Piggin
2024-02-26 10:11 ` [kvm-unit-tests PATCH 10/32] scripts: Accommodate powerpc powernv machine differences Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-28 11:52 ` Andrew Jones
2024-02-28 11:52 ` Andrew Jones
2024-02-26 10:11 ` [kvm-unit-tests PATCH 11/32] powerpc: Support powernv machine with QEMU TCG Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-26 10:11 ` [kvm-unit-tests PATCH 12/32] powerpc: Fix emulator illegal instruction test for powernv Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-03-01 11:50 ` Thomas Huth
2024-03-01 11:50 ` Thomas Huth
2024-03-05 2:14 ` Nicholas Piggin
2024-03-05 2:14 ` Nicholas Piggin
2024-02-26 10:11 ` [kvm-unit-tests PATCH 13/32] powerpc/sprs: Test hypervisor registers on powernv machine Nicholas Piggin
2024-02-26 10:11 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 14/32] powerpc: general interrupt tests Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-03-01 12:41 ` Thomas Huth
2024-03-01 12:41 ` Thomas Huth
2024-03-01 13:45 ` Andrew Jones
2024-03-01 13:45 ` Andrew Jones
2024-03-01 13:57 ` Thomas Huth
2024-03-01 13:57 ` Thomas Huth
2024-03-01 14:14 ` Andrew Jones
2024-03-01 14:14 ` Andrew Jones
2024-03-05 2:35 ` Nicholas Piggin
2024-03-05 2:35 ` Nicholas Piggin
2024-03-05 2:30 ` Nicholas Piggin
2024-03-05 2:30 ` Nicholas Piggin
2024-03-05 6:18 ` Thomas Huth
2024-03-05 6:18 ` Thomas Huth
2024-03-05 2:19 ` Nicholas Piggin
2024-03-05 2:19 ` Nicholas Piggin
2024-03-05 6:26 ` Thomas Huth
2024-03-05 6:26 ` Thomas Huth
2024-03-05 12:12 ` Andrew Jones
2024-03-05 12:12 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 15/32] powerpc: Add rtas stop-self support Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 16/32] powerpc: Remove broken SMP exception stack setup Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 17/32] arch-run: Fix handling multiple exit status messages Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-28 11:51 ` Andrew Jones
2024-02-28 11:51 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 18/32] powerpc: add SMP and IPI support Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 19/32] powerpc: Permit ACCEL=tcg,thread=single Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 20/32] powerpc: Avoid using larx/stcx. in spinlocks when only one CPU is running Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 21/32] powerpc: Add atomics tests Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 22/32] powerpc: Add timebase tests Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 23/32] powerpc: Add MMU support Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-28 12:01 ` Andrew Jones
2024-02-28 12:01 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 24/32] common/sieve: Use vmalloc.h for setup_mmu definition Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-28 12:03 ` Andrew Jones
2024-02-28 12:03 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 25/32] common/sieve: Support machines without MMU Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-28 12:04 ` Andrew Jones
2024-02-28 12:04 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 26/32] powerpc: Add sieve.c common test Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 27/32] powerpc: add usermode support Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 28/32] powerpc: add pmu tests Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 29/32] configure: Fail on unknown arch Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-28 12:08 ` Andrew Jones
2024-02-28 12:08 ` Andrew Jones
2024-02-28 12:08 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 30/32] configure: Make arch_libdir a first-class entity Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-28 12:13 ` Andrew Jones
2024-02-28 12:13 ` Andrew Jones
2024-02-28 12:13 ` Andrew Jones
2024-02-26 10:12 ` [kvm-unit-tests PATCH 31/32] powerpc: Remove remnants of ppc64 directory and build structure Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-26 10:12 ` [kvm-unit-tests PATCH 32/32] powerpc: gitlab CI update Nicholas Piggin
2024-02-26 10:12 ` Nicholas Piggin
2024-02-28 12:16 ` Andrew Jones
2024-02-28 12:16 ` Andrew Jones
2024-02-29 3:55 ` Nicholas Piggin
2024-02-29 3:55 ` Nicholas Piggin
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=20240226101218.1472843-9-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=andrew.jones@linux.dev \
--cc=joel@jms.id.au \
--cc=kvm@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--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 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.