diff options
author | Christian Borntraeger <borntraeger@de.ibm.com> | 2008-03-25 13:47:23 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-04-27 05:00:43 -0400 |
commit | 8f2abe6a1e525e878bdf58f68ccd146d543fde84 (patch) | |
tree | 5f52959474a16847c740fb8668ebd9d6cbc75d07 /include | |
parent | b0c632db637d68ad39d9f97f452ce176253f5f4e (diff) |
KVM: s390: sie intercept handling
This path introduces handling of sie intercepts in three flavors: Intercepts
are either handled completely in-kernel by kvm_handle_sie_intercept(),
or passed to userspace with corresponding data in struct kvm_run in case
kvm_handle_sie_intercept() returns -ENOTSUPP.
In case of partial execution in kernel with the need of userspace support,
kvm_handle_sie_intercept() may choose to set up struct kvm_run and return
-EREMOTE.
The trivial intercept reasons are handled in this patch:
handle_noop() just does nothing for intercepts that don't require our support
at all
handle_stop() is called when a cpu enters stopped state, and it drops out to
userland after updating our vcpu state
handle_validity() faults in the cpu lowcore if needed, or passes the request
to userland
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-s390/kvm_host.h | 4 | ||||
-rw-r--r-- | include/linux/kvm.h | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-s390/kvm_host.h b/include/asm-s390/kvm_host.h index c9d653333106..8965b38d0a32 100644 --- a/include/asm-s390/kvm_host.h +++ b/include/asm-s390/kvm_host.h | |||
@@ -101,6 +101,10 @@ struct sie_block { | |||
101 | 101 | ||
102 | struct kvm_vcpu_stat { | 102 | struct kvm_vcpu_stat { |
103 | u32 exit_userspace; | 103 | u32 exit_userspace; |
104 | u32 exit_external_request; | ||
105 | u32 exit_external_interrupt; | ||
106 | u32 exit_stop_request; | ||
107 | u32 exit_validity; | ||
104 | }; | 108 | }; |
105 | 109 | ||
106 | struct kvm_vcpu_arch { | 110 | struct kvm_vcpu_arch { |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 2367ff0c5dd0..f2acd6b9ab4d 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -74,6 +74,7 @@ struct kvm_irqchip { | |||
74 | #define KVM_EXIT_INTR 10 | 74 | #define KVM_EXIT_INTR 10 |
75 | #define KVM_EXIT_SET_TPR 11 | 75 | #define KVM_EXIT_SET_TPR 11 |
76 | #define KVM_EXIT_TPR_ACCESS 12 | 76 | #define KVM_EXIT_TPR_ACCESS 12 |
77 | #define KVM_EXIT_S390_SIEIC 13 | ||
77 | 78 | ||
78 | /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ | 79 | /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ |
79 | struct kvm_run { | 80 | struct kvm_run { |
@@ -138,6 +139,14 @@ struct kvm_run { | |||
138 | __u32 is_write; | 139 | __u32 is_write; |
139 | __u32 pad; | 140 | __u32 pad; |
140 | } tpr_access; | 141 | } tpr_access; |
142 | /* KVM_EXIT_S390_SIEIC */ | ||
143 | struct { | ||
144 | __u8 icptcode; | ||
145 | __u64 mask; /* psw upper half */ | ||
146 | __u64 addr; /* psw lower half */ | ||
147 | __u16 ipa; | ||
148 | __u32 ipb; | ||
149 | } s390_sieic; | ||
141 | /* Fix the size of the union. */ | 150 | /* Fix the size of the union. */ |
142 | char padding[256]; | 151 | char padding[256]; |
143 | }; | 152 | }; |