From: "André Przywara" <andre.przywara@arm.com> To: Christoffer Dall <christoffer.dall@arm.com> Cc: Marc Zyngier <marc.zyngier@arm.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Subject: Re: [PATCH 09/14] KVM: arm64: Reuse sys_reg() macro when searching the trap table Date: Wed, 30 Jan 2019 08:57:29 +0000 [thread overview] Message-ID: <2e9c6d4b-6645-e4e1-91cb-a50a26befec4@arm.com> (raw) In-Reply-To: <20190124140032.8588-10-christoffer.dall@arm.com> On Thu, 24 Jan 2019 15:00:27 +0100 Christoffer Dall <christoffer.dall@arm.com> wrote: Hi, > From: Marc Zyngier <marc.zyngier@arm.com> > > Instead of having an open-coded macro, reuse the sys_reg() macro > that does the exact same thing. It's not the exact same thing, is it? It looks like being off by 5 bit to me. I think the patch is still fine, but maybe mention in the commit message that this difference is OK since it's only used as a key for comparing register indices? Cheers, Andre. > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > Acked-by: Christoffer Dall <christoffer.dall@arm.com> > --- > arch/arm64/kvm/sys_regs.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index e3e37228ae4e..1a5bea4285e4 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -965,6 +965,10 @@ static bool access_pmuserenr(struct kvm_vcpu > *vcpu, struct sys_reg_params *p, return true; > } > > +#define > reg_to_encoding(x) \ > + sys_reg((u32)(x)->Op0, > (u32)(x)->Op1, \ > + (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2); > + > /* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in > one go */ #define > DBG_BCR_BVR_WCR_WVR_EL1(n) \ > { SYS_DESC(SYS_DBGBVRn_EL1(n)), > \ @@ -1820,30 +1824,19 @@ static const struct sys_reg_desc > *get_target_table(unsigned target, } } > > -#define > reg_to_match_value(x) \ > - > ({ \ > - unsigned long > val; \ > - val = (x)->Op0 << > 14; \ > - val |= (x)->Op1 << > 11; \ > - val |= (x)->CRn << > 7; \ > - val |= (x)->CRm << > 3; \ > - val |= > (x)->Op2; \ > - > val; \ > - }) > - > 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_match_value(r); > + 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_match_value(params); > + unsigned long pval = reg_to_encoding(params); > > return bsearch((void *)pval, table, num, sizeof(table[0]), > match_sys_reg); }
WARNING: multiple messages have this Message-ID (diff)
From: "André Przywara" <andre.przywara@arm.com> To: Christoffer Dall <christoffer.dall@arm.com> Cc: Marc Zyngier <marc.zyngier@arm.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Subject: Re: [PATCH 09/14] KVM: arm64: Reuse sys_reg() macro when searching the trap table Date: Wed, 30 Jan 2019 08:57:29 +0000 [thread overview] Message-ID: <2e9c6d4b-6645-e4e1-91cb-a50a26befec4@arm.com> (raw) In-Reply-To: <20190124140032.8588-10-christoffer.dall@arm.com> On Thu, 24 Jan 2019 15:00:27 +0100 Christoffer Dall <christoffer.dall@arm.com> wrote: Hi, > From: Marc Zyngier <marc.zyngier@arm.com> > > Instead of having an open-coded macro, reuse the sys_reg() macro > that does the exact same thing. It's not the exact same thing, is it? It looks like being off by 5 bit to me. I think the patch is still fine, but maybe mention in the commit message that this difference is OK since it's only used as a key for comparing register indices? Cheers, Andre. > Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> > Acked-by: Christoffer Dall <christoffer.dall@arm.com> > --- > arch/arm64/kvm/sys_regs.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index e3e37228ae4e..1a5bea4285e4 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -965,6 +965,10 @@ static bool access_pmuserenr(struct kvm_vcpu > *vcpu, struct sys_reg_params *p, return true; > } > > +#define > reg_to_encoding(x) \ > + sys_reg((u32)(x)->Op0, > (u32)(x)->Op1, \ > + (u32)(x)->CRn, (u32)(x)->CRm, (u32)(x)->Op2); > + > /* Silly macro to expand the DBG{BCR,BVR,WVR,WCR}n_EL1 registers in > one go */ #define > DBG_BCR_BVR_WCR_WVR_EL1(n) \ > { SYS_DESC(SYS_DBGBVRn_EL1(n)), > \ @@ -1820,30 +1824,19 @@ static const struct sys_reg_desc > *get_target_table(unsigned target, } } > > -#define > reg_to_match_value(x) \ > - > ({ \ > - unsigned long > val; \ > - val = (x)->Op0 << > 14; \ > - val |= (x)->Op1 << > 11; \ > - val |= (x)->CRn << > 7; \ > - val |= (x)->CRm << > 3; \ > - val |= > (x)->Op2; \ > - > val; \ > - }) > - > 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_match_value(r); > + 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_match_value(params); > + unsigned long pval = reg_to_encoding(params); > > return bsearch((void *)pval, table, num, sizeof(table[0]), > match_sys_reg); } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-01-30 8:57 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-24 14:00 [PATCH 00/14] KVM: arm/arm64: Various rework in preparation of nested virt support Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 01/14] arm/arm64: KVM: Introduce kvm_call_hyp_ret() Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 02/14] arm64: KVM: Allow for direct call of HYP functions when using VHE Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 03/14] arm64: KVM: Drop VHE-specific HYP call stub Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 04/14] ARM: KVM: Teach some form of type-safety to kvm_call_hyp Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 05/14] arm/arm64: KVM: Statically configure the host's view of MPIDR Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 06/14] KVM: arm/arm64: Factor out VMID into struct kvm_vmid Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 19:01 ` James Morse 2019-01-24 19:01 ` James Morse 2019-01-25 10:09 ` Marc Zyngier 2019-01-25 10:09 ` Marc Zyngier 2019-01-25 11:05 ` Julien Thierry 2019-01-25 11:05 ` Julien Thierry 2019-01-31 13:01 ` Marc Zyngier 2019-01-31 13:01 ` Marc Zyngier 2019-02-21 11:02 ` Julien Grall 2019-02-21 11:02 ` Julien Grall 2019-02-22 9:18 ` Marc Zyngier 2019-02-22 9:18 ` Marc Zyngier 2019-02-22 11:42 ` Julien Grall 2019-02-22 11:42 ` Julien Grall 2019-02-22 12:14 ` Marc Zyngier 2019-02-22 12:14 ` Marc Zyngier 2019-01-24 14:00 ` [PATCH 07/14] KVM: arm/arm64: Simplify bg_timer programming Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 08/14] KVM: arm64: Fix ICH_ELRSR_EL2 sysreg naming Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 09/14] KVM: arm64: Reuse sys_reg() macro when searching the trap table Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-30 8:57 ` André Przywara [this message] 2019-01-30 8:57 ` André Przywara 2019-01-24 14:00 ` [PATCH 10/14] KVM: arm/arm64: consolidate arch timer trap handlers Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-25 12:33 ` Julien Thierry 2019-01-25 12:33 ` Julien Thierry 2019-01-30 17:38 ` Marc Zyngier 2019-01-30 17:38 ` Marc Zyngier 2019-01-24 14:00 ` [PATCH 11/14] KVM: arm/arm64: timer: Rework data structures for multiple timers Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-02-18 15:10 ` André Przywara 2019-02-18 15:10 ` André Przywara 2019-02-19 12:27 ` Christoffer Dall 2019-02-19 12:27 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 12/14] KVM: arm/arm64: arch_timer: Assign the phys timer on VHE systems Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-02-18 15:10 ` André Przywara 2019-02-18 15:10 ` André Przywara 2019-02-19 12:43 ` Christoffer Dall 2019-02-19 12:43 ` Christoffer Dall 2019-02-20 17:58 ` Andre Przywara 2019-02-19 11:39 ` Alexandru Elisei 2019-02-19 11:39 ` Alexandru Elisei 2019-02-19 13:03 ` Christoffer Dall 2019-02-19 13:03 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 13/14] KVM: arm/arm64: Rework the timer code to use a timer_map Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall 2019-01-24 14:00 ` [PATCH 14/14] KVM: arm/arm64: Move kvm_is_write_fault to header file Christoffer Dall 2019-01-24 14:00 ` Christoffer Dall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2e9c6d4b-6645-e4e1-91cb-a50a26befec4@arm.com \ --to=andre.przywara@arm.com \ --cc=christoffer.dall@arm.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.