drop wrong versions of arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace...

diff --git a/queue-3.18/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch b/queue-3.18/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
deleted file mode 100644 (file)
index ef80869..0000000
--- a/queue-3.18/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2a3f93459d689d990b3ecfbe782fec89b97d3279 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <marc.zyngier@arm.com>
-Date: Thu, 27 Sep 2018 16:53:22 +0100
-Subject: arm64: KVM: Sanitize PSTATE.M when being set from userspace
-
-From: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 2a3f93459d689d990b3ecfbe782fec89b97d3279 upstream.
-
-Not all execution modes are valid for a guest, and some of them
-depend on what the HW actually supports. Let's verify that what
-userspace provides is compatible with both the VM settings and
-the HW capabilities.
-
-Cc: <stable@vger.kernel.org>
-Fixes: 0d854a60b1d7 ("arm64: KVM: enable initialization of a 32bit vcpu")
-Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
-Reviewed-by: Mark Rutland <mark.rutland@arm.com>
-Reviewed-by: Dave Martin <Dave.Martin@arm.com>
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/kvm/guest.c |   10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/arch/arm64/kvm/guest.c
-+++ b/arch/arm64/kvm/guest.c
-@@ -141,17 +141,25 @@ static int set_core_reg(struct kvm_vcpu
-       }
- 
-       if (off == KVM_REG_ARM_CORE_REG(regs.pstate)) {
--              u32 mode = (*(u32 *)valp) & COMPAT_PSR_MODE_MASK;
-+              u64 mode = (*(u64 *)valp) & COMPAT_PSR_MODE_MASK;
-               switch (mode) {
-               case COMPAT_PSR_MODE_USR:
-+                      if (!system_supports_32bit_el0())
-+                              return -EINVAL;
-+                      break;
-               case COMPAT_PSR_MODE_FIQ:
-               case COMPAT_PSR_MODE_IRQ:
-               case COMPAT_PSR_MODE_SVC:
-               case COMPAT_PSR_MODE_ABT:
-               case COMPAT_PSR_MODE_UND:
-+                      if (!vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-+                      break;
-               case PSR_MODE_EL0t:
-               case PSR_MODE_EL1t:
-               case PSR_MODE_EL1h:
-+                      if (vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-                       break;
-               default:
-                       err = -EINVAL;

diff --git a/queue-3.18/series b/queue-3.18/series
index 05826ea436543d585f90b6111a018ead6d16e64d..2d6dbf8fe1eab8520334978b70ece7b4fc18410c 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -66,4 +66,3 @@ thermal-of-thermal-disable-passive-polling-when-thermal-zone-is-disabled.patch
 e1000-check-on-netif_running-before-calling-e1000_up.patch
 e1000-ensure-to-free-old-tx-rx-rings-in-set_ringparam.patch
 hwmon-adt7475-make-adt7475_read_word-return-errors.patch
-arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch

diff --git a/queue-4.14/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch b/queue-4.14/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
deleted file mode 100644 (file)
index 3d3c89e..0000000
--- a/queue-4.14/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2a3f93459d689d990b3ecfbe782fec89b97d3279 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <marc.zyngier@arm.com>
-Date: Thu, 27 Sep 2018 16:53:22 +0100
-Subject: arm64: KVM: Sanitize PSTATE.M when being set from userspace
-
-From: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 2a3f93459d689d990b3ecfbe782fec89b97d3279 upstream.
-
-Not all execution modes are valid for a guest, and some of them
-depend on what the HW actually supports. Let's verify that what
-userspace provides is compatible with both the VM settings and
-the HW capabilities.
-
-Cc: <stable@vger.kernel.org>
-Fixes: 0d854a60b1d7 ("arm64: KVM: enable initialization of a 32bit vcpu")
-Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
-Reviewed-by: Mark Rutland <mark.rutland@arm.com>
-Reviewed-by: Dave Martin <Dave.Martin@arm.com>
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/kvm/guest.c |   10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/arch/arm64/kvm/guest.c
-+++ b/arch/arm64/kvm/guest.c
-@@ -152,17 +152,25 @@ static int set_core_reg(struct kvm_vcpu
-       }
- 
-       if (off == KVM_REG_ARM_CORE_REG(regs.pstate)) {
--              u32 mode = (*(u32 *)valp) & COMPAT_PSR_MODE_MASK;
-+              u64 mode = (*(u64 *)valp) & COMPAT_PSR_MODE_MASK;
-               switch (mode) {
-               case COMPAT_PSR_MODE_USR:
-+                      if (!system_supports_32bit_el0())
-+                              return -EINVAL;
-+                      break;
-               case COMPAT_PSR_MODE_FIQ:
-               case COMPAT_PSR_MODE_IRQ:
-               case COMPAT_PSR_MODE_SVC:
-               case COMPAT_PSR_MODE_ABT:
-               case COMPAT_PSR_MODE_UND:
-+                      if (!vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-+                      break;
-               case PSR_MODE_EL0t:
-               case PSR_MODE_EL1t:
-               case PSR_MODE_EL1h:
-+                      if (vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-                       break;
-               default:
-                       err = -EINVAL;

diff --git a/queue-4.14/series b/queue-4.14/series
index 0131c94aea871ad70f18bfab2a336003ab3cb561..2fc00959fbd0de861cded4b16e0914cacf676c6f 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -135,4 +135,3 @@ arm-arm64-smccc-1.1-make-return-values-unsigned-long.patch
 arm-arm64-smccc-1.1-handle-function-result-as-parameters.patch
 i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch
 x86-pti-fix-section-mismatch-warning-error.patch
-arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch

diff --git a/queue-4.4/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch b/queue-4.4/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
deleted file mode 100644 (file)
index c38176d..0000000
--- a/queue-4.4/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2a3f93459d689d990b3ecfbe782fec89b97d3279 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <marc.zyngier@arm.com>
-Date: Thu, 27 Sep 2018 16:53:22 +0100
-Subject: arm64: KVM: Sanitize PSTATE.M when being set from userspace
-
-From: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 2a3f93459d689d990b3ecfbe782fec89b97d3279 upstream.
-
-Not all execution modes are valid for a guest, and some of them
-depend on what the HW actually supports. Let's verify that what
-userspace provides is compatible with both the VM settings and
-the HW capabilities.
-
-Cc: <stable@vger.kernel.org>
-Fixes: 0d854a60b1d7 ("arm64: KVM: enable initialization of a 32bit vcpu")
-Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
-Reviewed-by: Mark Rutland <mark.rutland@arm.com>
-Reviewed-by: Dave Martin <Dave.Martin@arm.com>
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/kvm/guest.c |   10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/arch/arm64/kvm/guest.c
-+++ b/arch/arm64/kvm/guest.c
-@@ -143,17 +143,25 @@ static int set_core_reg(struct kvm_vcpu
-       }
- 
-       if (off == KVM_REG_ARM_CORE_REG(regs.pstate)) {
--              u32 mode = (*(u32 *)valp) & COMPAT_PSR_MODE_MASK;
-+              u64 mode = (*(u64 *)valp) & COMPAT_PSR_MODE_MASK;
-               switch (mode) {
-               case COMPAT_PSR_MODE_USR:
-+                      if (!system_supports_32bit_el0())
-+                              return -EINVAL;
-+                      break;
-               case COMPAT_PSR_MODE_FIQ:
-               case COMPAT_PSR_MODE_IRQ:
-               case COMPAT_PSR_MODE_SVC:
-               case COMPAT_PSR_MODE_ABT:
-               case COMPAT_PSR_MODE_UND:
-+                      if (!vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-+                      break;
-               case PSR_MODE_EL0t:
-               case PSR_MODE_EL1t:
-               case PSR_MODE_EL1h:
-+                      if (vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-                       break;
-               default:
-                       err = -EINVAL;

diff --git a/queue-4.4/series b/queue-4.4/series
index b9699645e157098b9aacc0af1274773564170d9d..8ab3095b9134220ba254a12c03a3458b4a06b982 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -68,4 +68,3 @@ e1000-ensure-to-free-old-tx-rx-rings-in-set_ringparam.patch
 hwmon-ina2xx-fix-sysfs-shunt-resistor-read-access.patch
 hwmon-adt7475-make-adt7475_read_word-return-errors.patch
 i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch
-arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch

diff --git a/queue-4.9/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch b/queue-4.9/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
deleted file mode 100644 (file)
index 3d3c89e..0000000
--- a/queue-4.9/arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2a3f93459d689d990b3ecfbe782fec89b97d3279 Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <marc.zyngier@arm.com>
-Date: Thu, 27 Sep 2018 16:53:22 +0100
-Subject: arm64: KVM: Sanitize PSTATE.M when being set from userspace
-
-From: Marc Zyngier <marc.zyngier@arm.com>
-
-commit 2a3f93459d689d990b3ecfbe782fec89b97d3279 upstream.
-
-Not all execution modes are valid for a guest, and some of them
-depend on what the HW actually supports. Let's verify that what
-userspace provides is compatible with both the VM settings and
-the HW capabilities.
-
-Cc: <stable@vger.kernel.org>
-Fixes: 0d854a60b1d7 ("arm64: KVM: enable initialization of a 32bit vcpu")
-Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
-Reviewed-by: Mark Rutland <mark.rutland@arm.com>
-Reviewed-by: Dave Martin <Dave.Martin@arm.com>
-Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-Signed-off-by: Will Deacon <will.deacon@arm.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/kvm/guest.c |   10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
---- a/arch/arm64/kvm/guest.c
-+++ b/arch/arm64/kvm/guest.c
-@@ -152,17 +152,25 @@ static int set_core_reg(struct kvm_vcpu
-       }
- 
-       if (off == KVM_REG_ARM_CORE_REG(regs.pstate)) {
--              u32 mode = (*(u32 *)valp) & COMPAT_PSR_MODE_MASK;
-+              u64 mode = (*(u64 *)valp) & COMPAT_PSR_MODE_MASK;
-               switch (mode) {
-               case COMPAT_PSR_MODE_USR:
-+                      if (!system_supports_32bit_el0())
-+                              return -EINVAL;
-+                      break;
-               case COMPAT_PSR_MODE_FIQ:
-               case COMPAT_PSR_MODE_IRQ:
-               case COMPAT_PSR_MODE_SVC:
-               case COMPAT_PSR_MODE_ABT:
-               case COMPAT_PSR_MODE_UND:
-+                      if (!vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-+                      break;
-               case PSR_MODE_EL0t:
-               case PSR_MODE_EL1t:
-               case PSR_MODE_EL1h:
-+                      if (vcpu_el1_is_32bit(vcpu))
-+                              return -EINVAL;
-                       break;
-               default:
-                       err = -EINVAL;

diff --git a/queue-4.9/series b/queue-4.9/series
index 4f1bf57b7f13d9efa731e827a3d58d14b1f5d44f..7a4b54e2c64f7ba8b15f2810d21c26c29b7dd863 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -92,4 +92,3 @@ drm-amdgpu-update-power-state-at-the-end-of-smu-hw_init.patch
 arm-arm64-smccc-1.1-make-return-values-unsigned-long.patch
 arm-arm64-smccc-1.1-handle-function-result-as-parameters.patch
 i2c-i801-allow-acpi-aml-access-i-o-ports-not-reserved-for-smbus.patch
-arm64-kvm-sanitize-pstate.m-when-being-set-from-userspace.patch