KVM: s390: implements the kvm_arch_vcpu_in_kernel()

Longpeng(Mike) · bonzini · commit 0546c63d988d · 2017-08-08T10:57:43.000+02:00
This implements kvm_arch_vcpu_in_kernel() for s390.  DIAG is a privileged
operation, so it cannot be called from problem state (user mode).

Signed-off-by: Longpeng(Mike) &lt;longpeng2@huawei.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
@@ -150,7 +150,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)
 {
 	VCPU_EVENT(vcpu, 5, "%s", "diag time slice end");
 	vcpu->stat.diagnose_44++;
-	kvm_vcpu_on_spin(vcpu, false);
+	kvm_vcpu_on_spin(vcpu, true);
 	return 0;
 }
 
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
@@ -2449,7 +2449,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
 
 bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu)
 {
-	return false;
+	return !(vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE);
 }
 
 void kvm_s390_vcpu_block(struct kvm_vcpu *vcpu)

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu)`
`150`	`150`	`{`
`151`	`151`	`VCPU_EVENT(vcpu, 5, "%s", "diag time slice end");`
`152`	`152`	`vcpu->stat.diagnose_44++;`
`153`		`- kvm_vcpu_on_spin(vcpu, false);`
	`153`	`+ kvm_vcpu_on_spin(vcpu, true);`
`154`	`154`	`return 0;`
`155`	`155`	`}`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -2449,7 +2449,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)`
`2449`	`2449`
`2450`	`2450`	`bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu)`
`2451`	`2451`	`{`
`2452`		`- return false;`
	`2452`	`+ return !(vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE);`
`2453`	`2453`	`}`
`2454`	`2454`
`2455`	`2455`	`void kvm_s390_vcpu_block(struct kvm_vcpu *vcpu)`