Commit 17a00056 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/visibility-cleanups into kvmarm-master/next 



* kvm-arm64/visibility-cleanups:
  : .
  : Remove REG_HIDDEN_USER from the sysreg infrastructure, making things
  : a little more simple. From the cover letter:
  :
  : "Since 4d4f5205 ("KVM: arm64: nv: Drop EL12 register traps that are
  : redirected to VNCR") and the admission that KVM would never be supporting
  : the original FEAT_NV, REG_HIDDEN_USER only had a few users, all of which
  : could either be replaced by a more ad-hoc mechanism, or removed altogether."
  : .
  KVM: arm64: Get rid of REG_HIDDEN_USER visibility qualifier
  KVM: arm64: Simplify visibility handling of AArch32 SPSR_*
  KVM: arm64: Simplify handling of CNTKCTL_EL12

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents f6254690 0746096f

arch/arm64/kvm/sys_regs.c

+20 −32
Original line number Diff line number Diff line
@@ -2094,26 +2094,6 @@ static bool bad_redir_trap(struct kvm_vcpu *vcpu, 
#define EL2_REG_VNCR(name, rst, v)	EL2_REG(name, bad_vncr_trap, rst, v)

#define EL2_REG_REDIR(name, rst, v)	EL2_REG(name, bad_redir_trap, rst, v)



/*

 * EL{0,1}2 registers are the EL2 view on an EL0 or EL1 register when

 * HCR_EL2.E2H==1, and only in the sysreg table for convenience of

 * handling traps. Given that, they are always hidden from userspace.

 */

static unsigned int hidden_user_visibility(const struct kvm_vcpu *vcpu,

					   const struct sys_reg_desc *rd)

{

	return REG_HIDDEN_USER;

}



#define EL12_REG(name, acc, rst, v) {		\

	SYS_DESC(SYS_##name##_EL12),		\

	.access = acc,				\

	.reset = rst,				\

	.reg = name##_EL1,			\

	.val = v,				\

	.visibility = hidden_user_visibility,	\

}



/*

 * Since reset() callback and field val are not used for idregs, they will be

 * used for specific purposes for idregs.
@@ -2221,6 +2201,18 @@ static bool access_spsr(struct kvm_vcpu *vcpu, 
	return true;

}



static bool access_cntkctl_el12(struct kvm_vcpu *vcpu,

				struct sys_reg_params *p,

				const struct sys_reg_desc *r)

{

	if (p->is_write)

		__vcpu_sys_reg(vcpu, CNTKCTL_EL1) = p->regval;

	else

		p->regval = __vcpu_sys_reg(vcpu, CNTKCTL_EL1);



	return true;

}



static u64 reset_hcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r)

{

	u64 val = r->val;
@@ -2792,14 +2784,10 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	{ SYS_DESC(SYS_SP_EL1), access_sp_el1},



	/* AArch32 SPSR_* are RES0 if trapped from a NV guest */

	{ SYS_DESC(SYS_SPSR_irq), .access = trap_raz_wi,

	  .visibility = hidden_user_visibility },

	{ SYS_DESC(SYS_SPSR_abt), .access = trap_raz_wi,

	  .visibility = hidden_user_visibility },

	{ SYS_DESC(SYS_SPSR_und), .access = trap_raz_wi,

	  .visibility = hidden_user_visibility },

	{ SYS_DESC(SYS_SPSR_fiq), .access = trap_raz_wi,

	  .visibility = hidden_user_visibility },

	{ SYS_DESC(SYS_SPSR_irq), .access = trap_raz_wi },

	{ SYS_DESC(SYS_SPSR_abt), .access = trap_raz_wi },

	{ SYS_DESC(SYS_SPSR_und), .access = trap_raz_wi },

	{ SYS_DESC(SYS_SPSR_fiq), .access = trap_raz_wi },



	{ SYS_DESC(SYS_IFSR32_EL2), undef_access, reset_unknown, IFSR32_EL2 },

	EL2_REG(AFSR0_EL2, access_rw, reset_val, 0),
@@ -2825,7 +2813,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { 
	EL2_REG_VNCR(CNTVOFF_EL2, reset_val, 0),

	EL2_REG(CNTHCTL_EL2, access_rw, reset_val, 0),



	EL12_REG(CNTKCTL, access_rw, reset_val, 0),

	{ SYS_DESC(SYS_CNTKCTL_EL12), access_cntkctl_el12 },



	EL2_REG(SP_EL2, NULL, reset_unknown, 0),

};
@@ -4365,7 +4353,7 @@ int kvm_sys_reg_get_user(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg, 
	int ret;



	r = id_to_sys_reg_desc(vcpu, reg->id, table, num);

	if (!r || sysreg_hidden_user(vcpu, r))

	if (!r || sysreg_hidden(vcpu, r))

		return -ENOENT;



	if (r->get_user) {
@@ -4409,7 +4397,7 @@ int kvm_sys_reg_set_user(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg, 
		return -EFAULT;



	r = id_to_sys_reg_desc(vcpu, reg->id, table, num);

	if (!r || sysreg_hidden_user(vcpu, r))

	if (!r || sysreg_hidden(vcpu, r))

		return -ENOENT;



	if (sysreg_user_write_ignore(vcpu, r))
@@ -4495,7 +4483,7 @@ static int walk_one_sys_reg(const struct kvm_vcpu *vcpu, 
	if (!(rd->reg || rd->get_user))

		return 0;



	if (sysreg_hidden_user(vcpu, rd))

	if (sysreg_hidden(vcpu, rd))

		return 0;



	if (!copy_reg_to_user(rd, uind))

arch/arm64/kvm/sys_regs.h

+2 −12
Original line number Diff line number Diff line
@@ -95,9 +95,8 @@ struct sys_reg_desc { 
};



#define REG_HIDDEN		(1 << 0) /* hidden from userspace and guest */

#define REG_HIDDEN_USER		(1 << 1) /* hidden from userspace only */

#define REG_RAZ			(1 << 2) /* RAZ from userspace and guest */

#define REG_USER_WI		(1 << 3) /* WI from userspace only */

#define REG_RAZ			(1 << 1) /* RAZ from userspace and guest */

#define REG_USER_WI		(1 << 2) /* WI from userspace only */



static __printf(2, 3)

inline void print_sys_reg_msg(const struct sys_reg_params *p,
@@ -165,15 +164,6 @@ static inline bool sysreg_hidden(const struct kvm_vcpu *vcpu, 
	return sysreg_visibility(vcpu, r) & REG_HIDDEN;

}



static inline bool sysreg_hidden_user(const struct kvm_vcpu *vcpu,

				      const struct sys_reg_desc *r)

{

	if (likely(!r->visibility))

		return false;



	return r->visibility(vcpu, r) & (REG_HIDDEN | REG_HIDDEN_USER);

}



static inline bool sysreg_visible_as_raz(const struct kvm_vcpu *vcpu,

					 const struct sys_reg_desc *r)

{