Commit 3af84def authored by Pierre Morel's avatar Pierre Morel Committed by Christian Borntraeger
Browse files

KVM: s390: vsie: Make use of CRYCB FORMAT2 clear 



The comment preceding the shadow_crycb function is
misleading, we effectively accept FORMAT2 CRYCB in the
guest.

When using FORMAT2 in the host we do not need to or with
FORMAT1.

Signed-off-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Signed-off-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180925231641.4954-18-akrowiak@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent d6f6959a

arch/s390/kvm/vsie.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -140,7 +140,8 @@ static int prepare_cpuflags(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
 * Create a shadow copy of the crycb block and setup key wrapping, if

 * Create a shadow copy of the crycb block and setup key wrapping, if

 * requested for guest 3 and enabled for guest 2.

 * requested for guest 3 and enabled for guest 2.

 *

 *

 * We only accept format-1 (no AP in g2), but convert it into format-2

 * We accept format-1 or format-2, but we treat it as a format-1 (no AP in g2),

 * and we convert it into format-2 in the shadow CRYCB.

 * There is nothing to do for format-0.

 * There is nothing to do for format-0.

 *

 *

 * Returns: - 0 if shadowed or nothing to do

 * Returns: - 0 if shadowed or nothing to do
@@ -179,8 +180,7 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
		return set_validity_icpt(scb_s, 0x0035U);

		return set_validity_icpt(scb_s, 0x0035U);





	scb_s->ecb3 |= ecb3_flags;

	scb_s->ecb3 |= ecb3_flags;

	scb_s->crycbd = ((__u32)(__u64) &vsie_page->crycb) | CRYCB_FORMAT1 |

	scb_s->crycbd = ((__u32)(__u64) &vsie_page->crycb) | CRYCB_FORMAT2;

			CRYCB_FORMAT2;





	/* xor both blocks in one run */

	/* xor both blocks in one run */

	b1 = (unsigned long *) vsie_page->crycb.dea_wrapping_key_mask;

	b1 = (unsigned long *) vsie_page->crycb.dea_wrapping_key_mask;

CRA Git | Maintained and supported by SUSTech CRA and CCSE