@@ -749,6 +749,7 @@ long kvm_vm_ioctl_mte_copy_tags(struct kvm *kvm,
void set_default_id_regs(struct kvm *kvm);
int kvm_set_id_reg_feature(struct kvm *kvm, u32 id, u8 field_shift, u8 fval);
int kvm_id_regs_check_frac_fields(const struct kvm_vcpu *vcpu);
+void kvm_vcpu_init_traps(struct kvm_vcpu *vcpu);
/* Guest/host FPSIMD coordination helpers */
int kvm_arch_vcpu_run_map_fp(struct kvm_vcpu *vcpu);
@@ -631,13 +631,16 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)
static_branch_inc(&userspace_irqchip_in_use);
}
- /*
- * Initialize traps for protected VMs.
- * NOTE: Move to run in EL2 directly, rather than via a hypercall, once
- * the code is in place for first run initialization at EL2.
- */
+ /* Initialize traps for the guest. */
if (kvm_vm_is_protected(kvm))
+ /*
+ * NOTE: Move to run in EL2 directly, rather than via a
+ * hypercall, once the code is in place for first run
+ * initialization at EL2.
+ */
kvm_call_hyp_nvhe(__pkvm_vcpu_init_traps, vcpu);
+ else
+ kvm_vcpu_init_traps(vcpu);
mutex_lock(&kvm->lock);
kvm->arch.ran_once = true;
@@ -284,6 +284,27 @@ static bool trap_raz_wi(struct kvm_vcpu *vcpu,
(cpuid_feature_extract_unsigned_field(val, ID_AA64ISAR1_GPI_SHIFT) >= \
ID_AA64ISAR1_GPI_IMP_DEF)
+/*
+ * Feature information to program configuration register to trap or disable
+ * guest's using a feature when the feature is not exposed to the guest.
+ */
+struct feature_config_ctrl {
+ /* ID register/field for the feature */
+ u32 ftr_reg; /* ID register */
+ bool ftr_signed; /* Is the feature field signed ? */
+ u8 ftr_shift; /* Field of ID register for the feature */
+ s8 ftr_min; /* Min value that indicate the feature */
+
+ /*
+ * Function to check trapping is needed. This is used when the above
+ * fields are not enough to determine if trapping is needed.
+ */
+ bool (*ftr_need_trap)(struct kvm_vcpu *vcpu);
+
+ /* Function to activate trapping the feature. */
+ void (*trap_activate)(struct kvm_vcpu *vcpu);
+};
+
/* id_reg_desc flags field values */
#define ID_DESC_REG_UNALLOC (1UL << 0)
#define ID_DESC_REG_HIDDEN (1UL << 1)
@@ -291,6 +312,9 @@ static bool trap_raz_wi(struct kvm_vcpu *vcpu,
struct id_reg_desc {
const struct sys_reg_desc reg_desc;
+ /* Sanitized system value */
+ u64 sys_val;
+
/*
* Limit value of the register for a vcpu. The value is the sanitized
* system value with bits set/cleared for unsupported features for the
@@ -335,6 +359,9 @@ struct id_reg_desc {
*/
u64 (*vcpu_mask)(const struct kvm_vcpu *vcpu,
const struct id_reg_desc *id_reg);
+
+ /* Information to trap features that are disabled for the guest */
+ const struct feature_config_ctrl *(*trap_features)[];
};
static inline struct id_reg_desc *sys_to_id_desc(const struct sys_reg_desc *r)
@@ -352,6 +379,7 @@ static void id_reg_desc_init(struct id_reg_desc *id_reg)
return;
val = read_sanitised_ftr_reg(id);
+ id_reg->sys_val = val;
id_reg->vcpu_limit_val = val;
if (id_reg->init)
id_reg->init(id_reg);
@@ -807,6 +835,24 @@ static int validate_id_reg(struct kvm_vcpu *vcpu,
return err;
}
+static inline bool feature_avail(const struct feature_config_ctrl *ctrl,
+ u64 id_val)
+{
+ int field_val = cpuid_feature_extract_field(id_val,
+ ctrl->ftr_shift, ctrl->ftr_signed);
+
+ return (field_val >= ctrl->ftr_min);
+}
+
+static inline bool vcpu_feature_is_available(struct kvm_vcpu *vcpu,
+ const struct feature_config_ctrl *ctrl)
+{
+ u64 val;
+
+ val = read_id_reg_with_encoding(vcpu, ctrl->ftr_reg);
+ return feature_avail(ctrl, val);
+}
+
/*
* ARMv8.1 mandates at least a trivial LORegion implementation, where all the
* RW registers are RES0 (which we can implement as RAZ/WI). On an ARMv8.0
@@ -1761,6 +1807,46 @@ static int reg_from_user(u64 *val, const void __user *uaddr, u64 id);
static int reg_to_user(void __user *uaddr, const u64 *val, u64 id);
static u64 sys_reg_to_index(const struct sys_reg_desc *reg);
+static void id_reg_features_trap_activate(struct kvm_vcpu *vcpu,
+ const struct id_reg_desc *id_reg)
+{
+ u64 val;
+ int i = 0;
+ const struct feature_config_ctrl **ctrlp_array, *ctrl;
+
+ if (!id_reg->trap_features)
+ /* No information to trap a feature */
+ return;
+
+ val = __read_id_reg(vcpu, id_reg);
+ if (val == id_reg->sys_val)
+ /* No feature needs to be trapped (no feature is disabled). */
+ return;
+
+ ctrlp_array = *id_reg->trap_features;
+ while ((ctrl = ctrlp_array[i++]) != NULL) {
+ if (WARN_ON_ONCE(!ctrl->trap_activate))
+ /* Shouldn't happen */
+ continue;
+
+ if (ctrl->ftr_need_trap && ctrl->ftr_need_trap(vcpu)) {
+ ctrl->trap_activate(vcpu);
+ continue;
+ }
+
+ if (!feature_avail(ctrl, id_reg->sys_val))
+ /* The feature is not supported on the host. */
+ continue;
+
+ if (feature_avail(ctrl, val))
+ /* The feature is enabled for the guest. */
+ continue;
+
+ /* The feature is supported but disabled. */
+ ctrl->trap_activate(vcpu);
+ }
+}
+
/* Visibility overrides for SVE-specific control registers */
static unsigned int sve_visibility(const struct kvm_vcpu *vcpu,
const struct sys_reg_desc *rd)
@@ -3763,6 +3849,31 @@ static void kvm_reset_id_regs(struct kvm_vcpu *vcpu)
}
}
+/*
+ * This function activates vcpu's trapping of features that are included in
+ * trap_features[] of id_reg_desc if the features are supported on the
+ * host, but are hidden from the guest (i.e. values of ID registers for
+ * the guest are modified to not show the features' availability).
+ * This function just updates values for trap configuration registers (e.g.
+ * HCR_EL2, etc) in kvm_vcpu_arch, which will be restored before switching
+ * to the guest, but doesn't update the registers themselves.
+ * This function should be called once at the first KVM_RUN (ID registers
+ * are immutable after the first KVM_RUN).
+ */
+void kvm_vcpu_init_traps(struct kvm_vcpu *vcpu)
+{
+ int i;
+ struct id_reg_desc *idr;
+
+ for (i = 0; i < ARRAY_SIZE(id_reg_desc_table); i++) {
+ idr = (struct id_reg_desc *)id_reg_desc_table[i];
+ if (!idr)
+ continue;
+
+ id_reg_features_trap_activate(vcpu, idr);
+ }
+}
+
#if IS_ENABLED(CONFIG_KVM_KUNIT_TEST)
#include "sys_regs_test.c"
#endif
When a CPU feature that is supported on the host is not exposed to its guest, emulating a real CPU's behavior (by trapping or disabling guest's using the feature) is generally a desirable behavior (when it's possible without any or little side effect). Introduce feature_config_ctrl structure, which manages feature information to program configuration register to trap or disable the feature when the feature is not exposed to the guest, and functions that uses the structure to activate the vcpu's trapping the feature. Those codes don't update trap configuration registers themselves (HCR_EL2, etc) but values for the registers in kvm_vcpu_arch at the first KVM_RUN. At present, no feature has feature_config_ctrl yet and the following patches will add the feature_config_ctrl for some features. Signed-off-by: Reiji Watanabe <reijiw@google.com> --- arch/arm64/include/asm/kvm_host.h | 1 + arch/arm64/kvm/arm.c | 13 ++-- arch/arm64/kvm/sys_regs.c | 111 ++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 5 deletions(-)