| Message ID | 20210615133950.693489-5-tabba@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm64: Fixed features for protected VMs | expand |
On Tue, Jun 15, 2021 at 02:39:41PM +0100, Fuad Tabba wrote: > Refactor sys_regs.h and sys_regs.c to make it easier to reuse > common code. It will be used in nVHE in a later patch. > > No functional change intended. > > Signed-off-by: Fuad Tabba <tabba@google.com> > --- > arch/arm64/kvm/sys_regs.c | 30 +----------------------------- > arch/arm64/kvm/sys_regs.h | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 36 insertions(+), 29 deletions(-) [...] > diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h > index 9d0621417c2a..b8e2a4dd830f 100644 > --- a/arch/arm64/kvm/sys_regs.h > +++ b/arch/arm64/kvm/sys_regs.h > @@ -11,6 +11,12 @@ > #ifndef __ARM64_KVM_SYS_REGS_LOCAL_H__ > #define __ARM64_KVM_SYS_REGS_LOCAL_H__ > > +#include <linux/bsearch.h> > + > +#define reg_to_encoding(x) \ > + sys_reg((u32)(x)->Op0, (u32)(x)->Op1, \ > + (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2) > + > struct sys_reg_params { > u8 Op0; > u8 Op1; > @@ -21,6 +27,14 @@ struct sys_reg_params { > bool is_write; > }; > > +#define esr_sys64_to_params(esr) \ > + ((struct sys_reg_params){ .Op0 = ((esr) >> 20) & 3, \ > + .Op1 = ((esr) >> 14) & 0x7, \ > + .CRn = ((esr) >> 10) & 0xf, \ > + .CRm = ((esr) >> 1) & 0xf, \ > + .Op2 = ((esr) >> 17) & 0x7, \ > + .is_write = !((esr)&1) }) Formatting has gone funny here (need spaces around the '&' in that last entry). > + > struct sys_reg_desc { > /* Sysreg string for debug */ > const char *name; > @@ -152,6 +166,24 @@ static inline int cmp_sys_reg(const struct sys_reg_desc *i1, > return i1->Op2 - i2->Op2; > } > > +static inline int match_sys_reg(const void *key, const void *elt) > +{ > + const unsigned long pval = (unsigned long)key; > + const struct sys_reg_desc *r = elt; > + > + return pval - reg_to_encoding(r); > +} > + > +static inline const struct sys_reg_desc * > +find_reg(const struct sys_reg_params *params, const struct sys_reg_desc table[], > + unsigned int num) > +{ > + unsigned long pval = reg_to_encoding(params); > + > + return __inline_bsearch((void *)pval, table, num, sizeof(table[0]), > + match_sys_reg); You don't mention why you change bsearch() to __inline_bsearch(). Will
Hi Will, On Thu, Jul 1, 2021 at 2:09 PM Will Deacon <will@kernel.org> wrote: > > On Tue, Jun 15, 2021 at 02:39:41PM +0100, Fuad Tabba wrote: > > Refactor sys_regs.h and sys_regs.c to make it easier to reuse > > common code. It will be used in nVHE in a later patch. > > > > No functional change intended. > > > > Signed-off-by: Fuad Tabba <tabba@google.com> > > --- > > arch/arm64/kvm/sys_regs.c | 30 +----------------------------- > > arch/arm64/kvm/sys_regs.h | 35 +++++++++++++++++++++++++++++++++++ > > 2 files changed, 36 insertions(+), 29 deletions(-) > > [...] > > > diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h > > index 9d0621417c2a..b8e2a4dd830f 100644 > > --- a/arch/arm64/kvm/sys_regs.h > > +++ b/arch/arm64/kvm/sys_regs.h > > @@ -11,6 +11,12 @@ > > #ifndef __ARM64_KVM_SYS_REGS_LOCAL_H__ > > #define __ARM64_KVM_SYS_REGS_LOCAL_H__ > > > > +#include <linux/bsearch.h> > > + > > +#define reg_to_encoding(x) \ > > + sys_reg((u32)(x)->Op0, (u32)(x)->Op1, \ > > + (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2) > > + > > struct sys_reg_params { > > u8 Op0; > > u8 Op1; > > @@ -21,6 +27,14 @@ struct sys_reg_params { > > bool is_write; > > }; > > > > +#define esr_sys64_to_params(esr) \ > > + ((struct sys_reg_params){ .Op0 = ((esr) >> 20) & 3, \ > > + .Op1 = ((esr) >> 14) & 0x7, \ > > + .CRn = ((esr) >> 10) & 0xf, \ > > + .CRm = ((esr) >> 1) & 0xf, \ > > + .Op2 = ((esr) >> 17) & 0x7, \ > > + .is_write = !((esr)&1) }) > > Formatting has gone funny here (need spaces around the '&' in that last > entry). Will fix this. > > + > > struct sys_reg_desc { > > /* Sysreg string for debug */ > > const char *name; > > @@ -152,6 +166,24 @@ static inline int cmp_sys_reg(const struct sys_reg_desc *i1, > > return i1->Op2 - i2->Op2; > > } > > > > +static inline int match_sys_reg(const void *key, const void *elt) > > +{ > > + const unsigned long pval = (unsigned long)key; > > + const struct sys_reg_desc *r = elt; > > + > > + return pval - reg_to_encoding(r); > > +} > > + > > +static inline const struct sys_reg_desc * > > +find_reg(const struct sys_reg_params *params, const struct sys_reg_desc table[], > > + unsigned int num) > > +{ > > + unsigned long pval = reg_to_encoding(params); > > + > > + return __inline_bsearch((void *)pval, table, num, sizeof(table[0]), > > + match_sys_reg); > > You don't mention why you change bsearch() to __inline_bsearch(). It's because of linking with nvhe. Rather than copy the bsearch code for nvhe, I thought I'd use the inline version of bsearch. I'll update the comment to explain that. Thanks, /fuad > Will
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 15c247fc9f0c..826a04f27194 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -44,10 +44,6 @@ * 64bit interface. */ -#define reg_to_encoding(x) \ - sys_reg((u32)(x)->Op0, (u32)(x)->Op1, \ - (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2) - static bool read_from_write_only(struct kvm_vcpu *vcpu, struct sys_reg_params *params, const struct sys_reg_desc *r) @@ -1026,8 +1022,6 @@ static bool access_arch_timer(struct kvm_vcpu *vcpu, return true; } -#define FEATURE(x) (GENMASK_ULL(x##_SHIFT + 3, x##_SHIFT)) - /* Read a sanitised cpufeature ID register by sys_reg_desc */ static u64 read_id_reg(const struct kvm_vcpu *vcpu, struct sys_reg_desc const *r, bool raz) @@ -2082,23 +2076,6 @@ static int check_sysreg_table(const struct sys_reg_desc *table, unsigned int n, return 0; } -static int match_sys_reg(const void *key, const void *elt) -{ - const unsigned long pval = (unsigned long)key; - const struct sys_reg_desc *r = elt; - - return pval - reg_to_encoding(r); -} - -static const struct sys_reg_desc *find_reg(const struct sys_reg_params *params, - const struct sys_reg_desc table[], - unsigned int num) -{ - unsigned long pval = reg_to_encoding(params); - - return bsearch((void *)pval, table, num, sizeof(table[0]), match_sys_reg); -} - int kvm_handle_cp14_load_store(struct kvm_vcpu *vcpu) { kvm_inject_undefined(vcpu); @@ -2341,13 +2318,8 @@ int kvm_handle_sys_reg(struct kvm_vcpu *vcpu) trace_kvm_handle_sys_reg(esr); - params.Op0 = (esr >> 20) & 3; - params.Op1 = (esr >> 14) & 0x7; - params.CRn = (esr >> 10) & 0xf; - params.CRm = (esr >> 1) & 0xf; - params.Op2 = (esr >> 17) & 0x7; + params = esr_sys64_to_params(esr); params.regval = vcpu_get_reg(vcpu, Rt); - params.is_write = !(esr & 1); ret = emulate_sys_reg(vcpu, ¶ms); diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h index 9d0621417c2a..b8e2a4dd830f 100644 --- a/arch/arm64/kvm/sys_regs.h +++ b/arch/arm64/kvm/sys_regs.h @@ -11,6 +11,12 @@ #ifndef __ARM64_KVM_SYS_REGS_LOCAL_H__ #define __ARM64_KVM_SYS_REGS_LOCAL_H__ +#include <linux/bsearch.h> + +#define reg_to_encoding(x) \ + sys_reg((u32)(x)->Op0, (u32)(x)->Op1, \ + (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2) + struct sys_reg_params { u8 Op0; u8 Op1; @@ -21,6 +27,14 @@ struct sys_reg_params { bool is_write; }; +#define esr_sys64_to_params(esr) \ + ((struct sys_reg_params){ .Op0 = ((esr) >> 20) & 3, \ + .Op1 = ((esr) >> 14) & 0x7, \ + .CRn = ((esr) >> 10) & 0xf, \ + .CRm = ((esr) >> 1) & 0xf, \ + .Op2 = ((esr) >> 17) & 0x7, \ + .is_write = !((esr)&1) }) + struct sys_reg_desc { /* Sysreg string for debug */ const char *name; @@ -152,6 +166,24 @@ static inline int cmp_sys_reg(const struct sys_reg_desc *i1, return i1->Op2 - i2->Op2; } +static inline int match_sys_reg(const void *key, const void *elt) +{ + const unsigned long pval = (unsigned long)key; + const struct sys_reg_desc *r = elt; + + return pval - reg_to_encoding(r); +} + +static inline const struct sys_reg_desc * +find_reg(const struct sys_reg_params *params, const struct sys_reg_desc table[], + unsigned int num) +{ + unsigned long pval = reg_to_encoding(params); + + return __inline_bsearch((void *)pval, table, num, sizeof(table[0]), + match_sys_reg); +} + const struct sys_reg_desc *find_reg_by_id(u64 id, struct sys_reg_params *params, const struct sys_reg_desc table[], @@ -170,4 +202,7 @@ const struct sys_reg_desc *find_reg_by_id(u64 id, CRn(sys_reg_CRn(reg)), CRm(sys_reg_CRm(reg)), \ Op2(sys_reg_Op2(reg)) +/* Extract the feature specified from the feature id register. */ +#define FEATURE(x) (GENMASK_ULL(x##_SHIFT + 3, x##_SHIFT)) + #endif /* __ARM64_KVM_SYS_REGS_LOCAL_H__ */
Refactor sys_regs.h and sys_regs.c to make it easier to reuse common code. It will be used in nVHE in a later patch. No functional change intended. Signed-off-by: Fuad Tabba <tabba@google.com> --- arch/arm64/kvm/sys_regs.c | 30 +----------------------------- arch/arm64/kvm/sys_regs.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 29 deletions(-)