mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
KVM: PPC: Book3S: Enable XIVE native capability only if OPAL has required functions
There are some POWER9 machines where the OPAL firmware does not support
the OPAL_XIVE_GET_QUEUE_STATE and OPAL_XIVE_SET_QUEUE_STATE calls.
The impact of this is that a guest using XIVE natively will not be able
to be migrated successfully. On the source side, the get_attr operation
on the KVM native device for the KVM_DEV_XIVE_GRP_EQ_CONFIG attribute
will fail; on the destination side, the set_attr operation for the same
attribute will fail.
This adds tests for the existence of the OPAL get/set queue state
functions, and if they are not supported, the XIVE-native KVM device
is not created and the KVM_CAP_PPC_IRQ_XIVE capability returns false.
Userspace can then either provide a software emulation of XIVE, or
else tell the guest that it does not have a XIVE controller available
to it.
Cc: stable@vger.kernel.org # v5.2+
Fixes: 3fab2d1058
("KVM: PPC: Book3S HV: XIVE: Activate XIVE exploitation mode")
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
This commit is contained in:
parent
d22deab696
commit
2ad7a27dea
|
@ -598,6 +598,7 @@ extern int kvmppc_xive_native_get_vp(struct kvm_vcpu *vcpu,
|
|||
union kvmppc_one_reg *val);
|
||||
extern int kvmppc_xive_native_set_vp(struct kvm_vcpu *vcpu,
|
||||
union kvmppc_one_reg *val);
|
||||
extern bool kvmppc_xive_native_supported(void);
|
||||
|
||||
#else
|
||||
static inline int kvmppc_xive_set_xive(struct kvm *kvm, u32 irq, u32 server,
|
||||
|
|
|
@ -135,6 +135,7 @@ extern int xive_native_get_queue_state(u32 vp_id, uint32_t prio, u32 *qtoggle,
|
|||
extern int xive_native_set_queue_state(u32 vp_id, uint32_t prio, u32 qtoggle,
|
||||
u32 qindex);
|
||||
extern int xive_native_get_vp_state(u32 vp_id, u64 *out_state);
|
||||
extern bool xive_native_has_queue_state_support(void);
|
||||
|
||||
#else
|
||||
|
||||
|
|
|
@ -1083,9 +1083,11 @@ static int kvmppc_book3s_init(void)
|
|||
if (xics_on_xive()) {
|
||||
kvmppc_xive_init_module();
|
||||
kvm_register_device_ops(&kvm_xive_ops, KVM_DEV_TYPE_XICS);
|
||||
if (kvmppc_xive_native_supported()) {
|
||||
kvmppc_xive_native_init_module();
|
||||
kvm_register_device_ops(&kvm_xive_native_ops,
|
||||
KVM_DEV_TYPE_XIVE);
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
kvm_register_device_ops(&kvm_xics_ops, KVM_DEV_TYPE_XICS);
|
||||
|
|
|
@ -1179,6 +1179,11 @@ int kvmppc_xive_native_set_vp(struct kvm_vcpu *vcpu, union kvmppc_one_reg *val)
|
|||
return 0;
|
||||
}
|
||||
|
||||
bool kvmppc_xive_native_supported(void)
|
||||
{
|
||||
return xive_native_has_queue_state_support();
|
||||
}
|
||||
|
||||
static int xive_native_debug_show(struct seq_file *m, void *private)
|
||||
{
|
||||
struct kvmppc_xive *xive = m->private;
|
||||
|
|
|
@ -566,7 +566,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
|
|||
* a POWER9 processor) and the PowerNV platform, as
|
||||
* nested is not yet supported.
|
||||
*/
|
||||
r = xive_enabled() && !!cpu_has_feature(CPU_FTR_HVMODE);
|
||||
r = xive_enabled() && !!cpu_has_feature(CPU_FTR_HVMODE) &&
|
||||
kvmppc_xive_native_supported();
|
||||
break;
|
||||
#endif
|
||||
|
||||
|
|
|
@ -800,6 +800,13 @@ int xive_native_set_queue_state(u32 vp_id, u32 prio, u32 qtoggle, u32 qindex)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(xive_native_set_queue_state);
|
||||
|
||||
bool xive_native_has_queue_state_support(void)
|
||||
{
|
||||
return opal_check_token(OPAL_XIVE_GET_QUEUE_STATE) &&
|
||||
opal_check_token(OPAL_XIVE_SET_QUEUE_STATE);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xive_native_has_queue_state_support);
|
||||
|
||||
int xive_native_get_vp_state(u32 vp_id, u64 *out_state)
|
||||
{
|
||||
__be64 state;
|
||||
|
|
Loading…
Reference in a new issue