Comment 12 for bug 1787405

Revision history for this message
bugproxy (bugproxy) wrote : Comment bridged from LTC Bugzilla

------- Comment From <email address hidden> 2018-10-08 09:18 EDT-------
For reference, for the kernel on top of v4.18 the following commits are necessary:

9ea597286570 KVM: s390: vsie: simulate VCPU SIE entry/exit
3194cdb71190 KVM: s390: introduce and use KVM_REQ_VSIE_RESTART
e585b24aeb44 KVM: s390: refactor crypto initialization
1fde573413b5 s390: vfio-ap: base implementation of VFIO AP device driver
65f06713d3fa s390: vfio-ap: register matrix device with VFIO mdev framework
96d152bdc987 s390: vfio-ap: sysfs interfaces to configure adapters
3211da0c0b54 s390: vfio-ap: sysfs interfaces to configure domains
3b1eab7fb9da s390: vfio-ap: sysfs interfaces to configure control domains
81b2b4b76a73 s390: vfio-ap: sysfs interface to view matrix mdev matrix
42104598ef2e KVM: s390: interface to clear CRYCB masks
258287c994de s390: vfio-ap: implement mediated device open callback
e06670c5fe3b s390: vfio-ap: implement VFIO_DEVICE_GET_INFO ioctl
46a7263d4746 s390: vfio-ap: zeroize the AP queues
cd8a377e3b40 s390: vfio-ap: implement VFIO_DEVICE_RESET ioctl
6cc571b1b1e8 KVM: s390: Clear Crypto Control Block when using vSIE
d6f6959ac587 KVM: s390: vsie: Do the CRYCB validation first
3af84def9cbf KVM: s390: vsie: Make use of CRYCB FORMAT2 clear
56019f9aca22 KVM: s390: vsie: Allow CRYCB FORMAT-2
19fd83a64718 KVM: s390: vsie: allow CRYCB FORMAT-1
6ee74098201b KVM: s390: vsie: allow CRYCB FORMAT-0
c9ba8c2cd210 KVM: s390: vsie: allow guest FORMAT-0 CRYCB on host FORMAT-1
6b79de4b056e KVM: s390: vsie: allow guest FORMAT-1 CRYCB on host FORMAT-2
9ee71f20cb8d KVM: s390: vsie: allow guest FORMAT-0 CRYCB on host FORMAT-2
37940fb0b6a2 KVM: s390: device attrs to enable/disable AP interpretation
112c24d4dc48 KVM: s390: CPU model support for AP virtualization
492a6be197c0 s390: doc: detailed specifications for AP virtualization
<-- till here in kvm next (https://git.kernel.org/pub/scm/virt/kvm/kvm.git/)

8e41bd54317b KVM: s390: fix locking for crypto setting error path
0e237e446994 KVM: s390: Tracing APCB changes
76c7829f5b8c s390: vfio-ap: setup APCB mask using KVM dedicated function

<-- til here in kvms390/next
(https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git/)

In addition to that some prereqs for the ap/crypto driver are necessary

ea3c4185efb3 s390/zcrypt: Add ZAPQ inline function.
df80c0383133 s390/zcrypt: Review inline assembler constraints.
f1b0a4343c41 s390/zcrypt: Integrate ap_asm.h into include/asm/ap.h.
2395103b3fbf s390/zcrypt: fix ap_instructions_available() returncodes
7e0bdbe5c21c s390/zcrypt: AP bus support for alternate driver(s)
3d8f60d38e24 s390/zcrypt: hex string mask improvements for apmask and aqmask.
fa108f95c676 (tag: s390-4.19-3) s390/zcrypt: remove VLA usage from the AP bus

So the git commands for 4.18 would be:

$ git cherry-pick 9ea597286570 3194cdb71190 e585b24aeb44 1fde573413b5 \
65f06713d3fa 96d152bdc987 3211da0c0b54 3b1eab7fb9da 81b2b4b76a73 42104598ef2e \
258287c994de e06670c5fe3b 46a7263d4746 cd8a377e3b40 6cc571b1b1e8 d6f6959ac587 \
3af84def9cbf 56019f9aca22 19fd83a64718 6ee74098201b c9ba8c2cd210 6b79de4b056e \
9ee71f20cb8d 37940fb0b6a2 112c24d4dc48 492a6be197c0 # kvm/next

(112c24d... KVM: s390: CPU model support for AP virtualization has a trivial merge conflict with the etoken patch)

$ git cherry-pick 8e41bd54317b 0e237e446994 76c7829f5b8c # kvms390/next

$ git cherry-pick ea3c4185efb3 df80c0383133 f1b0a4343c41 2395103b3fbf \
7e0bdbe5c21c 3d8f60d38e24 fa108f95c676 # ap and zcrypt