[22.04 FEAT] [VS2103] Set KVM_CAP_S390_MEM_OP_EXTENSION capability to 211

[bugproxy]

Title:
KVM: Enable storage key checking for intercepted instruction - Set Capability 211

Description:
This patch is required on top of "Bug 193314 - LP#1933179 : [22.04 FEAT] [VS2103] KVM: Enable storage key checking for intercepted instruction" in order to set the to set the Capability number to 211

See this merge:

https://git.kernel.org/pub/scm/virt/kvm/kvm.git/commit/?h=next&id=4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284

diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index dbc550bbd9fa3..a02bbf8fd0f67 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -1140,7 +1140,8 @@ 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_PPC_AIL_MODE_3 210
+#define KVM_CAP_S390_MEM_OP_EXTENSION 211

[Frank Heimes (fheimes)]

Meanwhile this landed in 'linux-next':

$ git show 4dfc4ec2b7f5
commit 4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284
Merge: 0828824158b1 93b71801a827
Author: Paolo Bonzini <email address hidden>
Date: Thu Feb 24 08:49:56 2022 -0500

    Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18

diff --cc include/uapi/linux/kvm.h
index dbc550bbd9fa,507ee1f2aa96..a02bbf8fd0f6
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1140,7 -1134,7 +1140,8 @@@ 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_PPC_AIL_MODE_3 210
++#define KVM_CAP_S390_MEM_OP_EXTENSION 211

  #ifdef KVM_CAP_IRQ_ROUTING

[Frank Heimes (fheimes)]

@IBM Am I right assuming that the KVM_CAP_S390_MEM_OP_EXTENSION capability level needs to be set to 211 in 'include/uapi/linux/kvm.h', but also in 'tools/include/uapi/linux/kvm.h'?
(That is at least where I see other settings aligned.)

[bugproxy (bugproxy)]

------- Comment From <email address hidden> 2022-03-14 04:15 EDT-------
(In reply to comment #8)
> @IBM Am I right assuming that the KVM_CAP_S390_MEM_OP_EXTENSION capability
> level needs to be set to 211 in 'include/uapi/linux/kvm.h', but also in
> 'tools/include/uapi/linux/kvm.h'?
> (That is at least where I see other settings aligned.)

This file in synced lazily upstream for kernel tools like perf. It does does not hurt to be added there but it is not stricly necessary. So if its in there, fix it up, if its not in there no need to add it.

[Frank Heimes (fheimes)]

Thanks for the quick answer.
Ok, so in this case I'll try to keep the patch as small as possible, means only make sure it's properly in include/uapi/linux/kvm.h.

[Frank Heimes (fheimes)]

Patch request submitted to kernel team's mailing list:
https://lists.ubuntu.com/archives/kernel-team/2022-March/thread.html#128621
changing status to 'In Progress'.

[Ubuntu Kernel Bot (ubuntu-kernel-bot)]

This bug is awaiting verification that the linux-hwe-5.15/5.15.0-25.25~20.04.1 kernel in -proposed solves the problem. Please test the kernel and update this bug with the results. If the problem is solved, change the tag 'verification-needed-focal' to 'verification-done-focal'. If the problem still exists, change the tag 'verification-needed-focal' to 'verification-failed-focal'.

If verification is not done by 5 working days from today, this fix will be dropped from the source code, and this bug will be closed.

See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you!

[Frank Heimes (fheimes)]

This request targets mainly towards 22.04, hence the hwe kernel is more a fall out.
Hence updating tag to unblock the process.

[Launchpad Janitor (janitor)]

This bug was fixed in the package linux - 5.15.0-25.25

---------------
linux (5.15.0-25.25) jammy; urgency=medium

  * jammy/linux: 5.15.0-25.25 -proposed tracker (LP: #1967146)

  * Miscellaneous Ubuntu changes
    - SAUCE: Revert "scsi: core: Reallocate device's budget map on queue depth
      change"

 -- Paolo Pisati <email address hidden> Wed, 30 Mar 2022 17:28:11 +0200