diff mbox series

[J,1/1] UBUNTU: SAUCE: Set KVM_CAP_S390_MEM_OP_EXTENSION capability to 211

Message ID 20220314112417.1599846-2-frank.heimes@canonical.com
State New
Headers show
Series Set KVM_CAP_S390_MEM_OP_EXTENSION capability to 211 (LP: 1963901) | expand

Commit Message

Frank Heimes March 14, 2022, 11:24 a.m. UTC 
From: Frank Heimes <frank.heimes@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1963901

Setting KVM_CAP_S390_MEM_OP_EXTENSION capability to 211 is required
to enable storage key checking for intercepted instruction and
to ensure compatibility with upstream.
The upstream merge request
"Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18."
https://git.kernel.org/pub/scm/virt/kvm/kvm.git/commit/?h=next&id=4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284
is referenced in LP: 1963901, but it includes and pulls in more changes
than needed - even changes for ppc64el and at the API doc
that are not relevant for s390x.
Hence this UBUNTU SAUCE patch, that limits the modification to the bare
minimum (a single line).

[Avoiding backport of "Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18.",
 upstream commit 4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284,
 and limiting change to the bare minimum.]
Signed-off-by: Frank Heimes <frank.heimes@canonical.com>
---
 include/uapi/linux/kvm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Krzysztof Kozlowski March 15, 2022, 7:51 a.m. UTC | #1 
On 14/03/2022 12:24, frank.heimes@canonical.com wrote:
> From: Frank Heimes <frank.heimes@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1963901
> 
> Setting KVM_CAP_S390_MEM_OP_EXTENSION capability to 211 is required
> to enable storage key checking for intercepted instruction and
> to ensure compatibility with upstream.
> The upstream merge request
> "Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18."
> https://git.kernel.org/pub/scm/virt/kvm/kvm.git/commit/?h=next&id=4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284
> is referenced in LP: 1963901, but it includes and pulls in more changes
> than needed - even changes for ppc64el and at the API doc
> that are not relevant for s390x.
> Hence this UBUNTU SAUCE patch, that limits the modification to the bare
> minimum (a single line).
> 


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>


Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index f261bb900bd0..0d47e07f4781 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1122,7 +1122,7 @@  struct kvm_ppc_resize_hpt {
 #define KVM_CAP_VM_GPA_BITS 207
 #define KVM_CAP_XSAVE2 208
 #define KVM_CAP_SYS_ATTRIBUTES 209
-#define KVM_CAP_S390_MEM_OP_EXTENSION 210
+#define KVM_CAP_S390_MEM_OP_EXTENSION 211
 
 #ifdef KVM_CAP_IRQ_ROUTING