From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Thomas Huth <thuth@redhat.com>,
Paul Mackerras <paulus@ozlabs.org>
Subject: [PATCH 4.8 13/37] KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register
Date: Fri, 14 Oct 2016 14:26:59 +0200 [thread overview]
Message-ID: <20161014122551.573154160@linuxfoundation.org> (raw)
In-Reply-To: <20161014122549.411962735@linuxfoundation.org>
4.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Huth <thuth@redhat.com>
commit fa73c3b25bd8d0d393dc6109a1dba3c2aef0451e upstream.
The MMCR2 register is available twice, one time with number 785
(privileged access), and one time with number 769 (unprivileged,
but it can be disabled completely). In former times, the Linux
kernel was using the unprivileged register 769 only, but since
commit 8dd75ccb571f3c92c ("powerpc: Use privileged SPR number
for MMCR2"), it uses the privileged register 785 instead.
The KVM-PR code then of course also switched to use the SPR 785,
but this is causing older guest kernels to crash, since these
kernels still access 769 instead. So to support older kernels
with KVM-PR again, we have to support register 769 in KVM-PR, too.
Fixes: 8dd75ccb571f3c92c48014b3dabd3d51a115ab41
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/powerpc/include/asm/reg.h | 1 +
arch/powerpc/kvm/book3s_emulate.c | 2 ++
2 files changed, 3 insertions(+)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -737,6 +737,7 @@
#define MMCR0_FCHV 0x00000001UL /* freeze conditions in hypervisor mode */
#define SPRN_MMCR1 798
#define SPRN_MMCR2 785
+#define SPRN_UMMCR2 769
#define SPRN_MMCRA 0x312
#define MMCRA_SDSYNC 0x80000000UL /* SDAR synced with SIAR */
#define MMCRA_SDAR_DCACHE_MISS 0x40000000UL
--- a/arch/powerpc/kvm/book3s_emulate.c
+++ b/arch/powerpc/kvm/book3s_emulate.c
@@ -498,6 +498,7 @@ int kvmppc_core_emulate_mtspr_pr(struct
case SPRN_MMCR0:
case SPRN_MMCR1:
case SPRN_MMCR2:
+ case SPRN_UMMCR2:
#endif
break;
unprivileged:
@@ -640,6 +641,7 @@ int kvmppc_core_emulate_mfspr_pr(struct
case SPRN_MMCR0:
case SPRN_MMCR1:
case SPRN_MMCR2:
+ case SPRN_UMMCR2:
case SPRN_TIR:
#endif
*spr_val = 0;
next prev parent reply other threads:[~2016-10-14 12:26 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20161014122720uscas1p185a2db67245495161c918bca0cd90f23@uscas1p1.samsung.com>
2016-10-14 12:26 ` [PATCH 4.8 00/37] 4.8.2-stable review Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 01/37] usb: storage: fix runtime pm issue in usb_stor_probe2 Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 02/37] timekeeping: Fix __ktime_get_fast_ns() regression Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 03/37] usb: dwc3: fix Clear Stall EP command failure Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 04/37] phy: sun4i-usb: Use spinlock to guard phyctl register access Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 05/37] ALSA: ali5451: Fix out-of-bound position reporting Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 06/37] ALSA: usb-audio: Extend DragonFly dB scale quirk to cover other variants Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 07/37] ALSA: usb-line6: use the same declaration as definition in header for MIDI manufacturer ID Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 08/37] mfd: rtsx_usb: Avoid setting ucr->current_sg.status Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 09/37] mfd: atmel-hlcdc: Do not sleep in atomic context Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 10/37] mfd: 88pm80x: Double shifting bug in suspend/resume Greg Kroah-Hartman
2016-10-14 12:26 ` [PATCH 4.8 12/37] xen/x86: Update topology map for PV VCPUs Greg Kroah-Hartman
2016-10-14 12:26 ` Greg Kroah-Hartman [this message]
2016-10-14 12:27 ` [PATCH 4.8 15/37] KVM: arm64: Require in-kernel irqchip for PMU support Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 16/37] KVM: arm/arm64: vgic: Dont flush/sync without a working vgic Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 17/37] KVM: PPC: BookE: Fix a sanity check Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 18/37] arm64: fix dump_backtrace/unwind_frame with NULL tsk Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 19/37] x86/boot: Fix kdump, cleanup aborted E820_PRAM max_pfn manipulation Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 20/37] x86/irq: Prevent force migration of irqs which are not in the vector domain Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 21/37] x86/pkeys: Make protection keys an "eager" feature Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 22/37] x86/cpu: Rename Merrifield2 to Moorefield Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 23/37] x86/platform/intel-mid: Add Intel Penwell to ID table Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 24/37] x86/platform/intel-mid: Keep SRAM powered on at boot Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 25/37] x86/apic: Get rid of apic_version[] array Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 26/37] arch/x86: Handle non enumerated CPU after physical hotplug Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 27/37] x86/mm/pkeys: Do not skip PKRU register if debug registers are not used Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 28/37] x86/dumpstack: Fix x86_32 kernel_stack_pointer() previous stack access Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 29/37] ARM: fix delays Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 30/37] ARM: dts: mvebu: armada-390: add missing compatibility string and bracket Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 33/37] ARM: cpuidle: Fix error return code Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 34/37] Bluetooth: Add a new 04ca:3011 QCA_ROME device Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 35/37] ima: use file_dentry() Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 36/37] tpm: fix a race condition in tpm2_unseal_trusted() Greg Kroah-Hartman
2016-10-14 12:27 ` [PATCH 4.8 37/37] tpm_crb: fix crb_req_canceled behavior Greg Kroah-Hartman
2016-10-14 18:53 ` [PATCH 4.8 00/37] 4.8.2-stable review Shuah Khan
2016-10-15 11:50 ` Greg Kroah-Hartman
2016-10-14 19:16 ` Guenter Roeck
2016-10-15 11:51 ` Greg Kroah-Hartman
[not found] ` <58013af0.6106c30a.958bb.adf8@mx.google.com>
2016-10-15 11:38 ` Greg Kroah-Hartman
2016-10-17 16:43 ` Kevin Hilman
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=20161014122551.573154160@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulus@ozlabs.org \
--cc=stable@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).