On 05.02.20 13:09, Thomas Huth wrote:
> On 03/02/2020 14.19, Christian Borntraeger wrote:
>> From: Janosch Frank <frankja@xxxxxxxxxxxxx>
>>
>> STHYI data has to go through the bounce buffer.
>>
>> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
>> ---
>> arch/s390/kvm/intercept.c | 15 ++++++++++-----
>> 1 file changed, 10 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
>> index 4b1effa44e41..06d1fa83ef4c 100644
>> --- a/arch/s390/kvm/intercept.c
>> +++ b/arch/s390/kvm/intercept.c
>> @@ -392,7 +392,7 @@ int handle_sthyi(struct kvm_vcpu *vcpu)
>> goto out;
>> }
>>
>> - if (addr & ~PAGE_MASK)
>> + if (!kvm_s390_pv_is_protected(vcpu->kvm) && (addr & ~PAGE_MASK))
>> return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
>>
>> sctns = (void *)get_zeroed_page(GFP_KERNEL);
>> @@ -403,10 +403,15 @@ int handle_sthyi(struct kvm_vcpu *vcpu)
>>
>> out:
>> if (!cc) {
>> - r = write_guest(vcpu, addr, reg2, sctns, PAGE_SIZE);
>> - if (r) {
>> - free_page((unsigned long)sctns);
>> - return kvm_s390_inject_prog_cond(vcpu, r);
>> + if (kvm_s390_pv_is_protected(vcpu->kvm)) {
>> + memcpy((void *)(vcpu->arch.sie_block->sidad & PAGE_MASK), sctns,
>
> I think it would look nicer with sida_origin() here.
ack.
>
>> + PAGE_SIZE);
>> + } else {
>> + r = write_guest(vcpu, addr, reg2, sctns, PAGE_SIZE);
>> + if (r) {
>> + free_page((unsigned long)sctns);
>> + return kvm_s390_inject_prog_cond(vcpu, r);
>> + }
>> }
>> }
>>
>>
>
> Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
>
