From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A64FC07E95 for ; Tue, 20 Jul 2021 14:05:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BFE316113A for ; Tue, 20 Jul 2021 14:05:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFE316113A Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Tp45shIXDjZG7wS1ikQOlucZGSCjpjnPGZ0FB/wUVKo=; b=dfrEMcI3vOptrL UVL5b1qkYDt/hppoY7vWjJzRxgvVwTAspeQCCR9m5FX3bDnHDcJAtXRTVH8mJsF+NGAPSd9sldsJB Ms+ckltSbMxoQS06WoZlK83u8ek5L2RehbRwCH3hWc/KWR2aRPRZFc/0bWV3D1zQRtmL7gUMixZvk vnP18tzi+O4yREMfrYvnxcOuXksLhvjkPll0L563slcL4GBAQiTGLSpZjmxY490OUHf6udu2uvvPP M/+JR9qroKRDqSBJpFH+r887ApbMrj6tRK/Z4d9AJNTYSXoGU/dOZgR6oEWeuJE1fcK5hVo9iF3Gb m4Jl1zuS34Kt2vgEQ+Iw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5qLj-00D5Ey-Rf; Tue, 20 Jul 2021 14:03:56 +0000 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5qLe-00D5Dl-K2 for linux-arm-kernel@lists.infradead.org; Tue, 20 Jul 2021 14:03:52 +0000 Received: by mail-oi1-x22a.google.com with SMTP id h9so24618025oih.4 for ; Tue, 20 Jul 2021 07:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3pAi2IUwv7EdpJAk0boQH8aQmdEiZAI8a1a0cHarpI4=; b=tOwo8JvOI333zTSShr7G1VQA9f36JvMMNfNy1R4+AFu6wyd+zUTDRc3727tpBO3PTO CollJtLxZ1ie8UmiMdFJ2EwmFnHL7LVTZ1MwOUnb0/9VJ40wFwvdA4u4VoYw3xKLcRq+ j3BiNhWmklGXaozYmLVL87ARe8dSQ+G0O6BuuPS+1jkZHknx87nIzCb0U5wh5fb1Pj9k z6Rj9DPISr0X2Wc9vqLTM4EmCRb4uz0xKXGaqCwwLg5xN811WE56OjyoHuKePwn7UC+F 9sCfaWQsLxa5QsFKDhwvoDHoKWtadr3X89+6EWT/j+Lj1Dmv0luQacJyQiqYXxY2Nf23 FpJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=3pAi2IUwv7EdpJAk0boQH8aQmdEiZAI8a1a0cHarpI4=; b=stC217nFVsT3VqnieDgHL6OG5WScp1jRH3J81hY5rsAqMoWBPvkaXvr/zAqT5K7iJg g08s9gBM9xHCnYa0UCT/6ACCgoguJ8JUkPq8AI99GTgG1dCkCL0jZuWV59BVOYACSE2x Tl+WSoGiJkBoodVs7iJifz2Jh5mBDmA1eXdxrSiVd2/yxNUIzclejqaYKvOndi4rwIOO aA6kCOYfe7SK6w1Icguz8/o0v7g7xgKMW+7avbOKzWdVoaL7QwWtEs8jmPi/YJWBbToJ y/Qk4FHgOWe2XecRaYNypa2kYezBdtXXrEygrfUPudpJ1TsfKGA6tGyulHvsi9e28wlz 40+A== X-Gm-Message-State: AOAM533jg97uQm8MZmFeoqWQmwX7jAA/iUvvg2y8hS9xkrM+RGfL7MQD WzOvryY6l5Uj8ArHTc2VLWtyCqU1sOEUKrSswhHi5Q== X-Google-Smtp-Source: ABdhPJy67+4yt2CQ9gqDe2NPUt44b6Ljx8YHSPr8w0AM4pzGQ7GWeDm6CdAiYnsIJo8vfqE2nz3OKjDc0mNnw3K+NQk= X-Received: by 2002:a05:6808:5a:: with SMTP id v26mr12146167oic.90.1626789829100; Tue, 20 Jul 2021 07:03:49 -0700 (PDT) MIME-Version: 1.0 References: <20210719160346.609914-1-tabba@google.com> <20210719160346.609914-6-tabba@google.com> <20210720133810.7q4k2yde57okgvmm@gator> In-Reply-To: <20210720133810.7q4k2yde57okgvmm@gator> From: Fuad Tabba Date: Tue, 20 Jul 2021 15:03:12 +0100 Message-ID: Subject: Re: [PATCH v3 05/15] KVM: arm64: Refactor sys_regs.h, c for nVHE reuse To: Andrew Jones Cc: kvmarm@lists.cs.columbia.edu, maz@kernel.org, will@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, pbonzini@redhat.com, qperret@google.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210720_070350_744250_2497A9DA X-CRM114-Status: GOOD ( 31.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Tue, Jul 20, 2021 at 2:38 PM Andrew Jones wrote: > > On Mon, Jul 19, 2021 at 05:03:36PM +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. > > > > Note that the refactored code uses __inline_bsearch for find_reg > > instead of bsearch to avoid copying the bsearch code for nVHE. > > > > No functional change intended. > > > > Signed-off-by: Fuad Tabba > > --- > > arch/arm64/include/asm/sysreg.h | 3 +++ > > arch/arm64/kvm/sys_regs.c | 30 +----------------------------- > > arch/arm64/kvm/sys_regs.h | 31 +++++++++++++++++++++++++++++++ > > 3 files changed, 35 insertions(+), 29 deletions(-) > > > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > > index 7b9c3acba684..326f49e7bd42 100644 > > --- a/arch/arm64/include/asm/sysreg.h > > +++ b/arch/arm64/include/asm/sysreg.h > > @@ -1153,6 +1153,9 @@ > > #define ICH_VTR_A3V_SHIFT 21 > > #define ICH_VTR_A3V_MASK (1 << ICH_VTR_A3V_SHIFT) > > > > +/* Extract the feature specified from the feature id register. */ > > +#define FEATURE(x) (GENMASK_ULL(x##_SHIFT + 3, x##_SHIFT)) > > I think the comment would be better as > > Create a mask for the feature bits of the specified feature. I agree. I'll use this instead. > And, I think a more specific name than FEATURE would be better. Maybe > FEATURE_MASK or even ARM64_FEATURE_MASK ? I think so too. ARM64_FEATURE_MASK is more descriptive than just FEATURE. Thanks, /fuad > > + > > #ifdef __ASSEMBLY__ > > > > .irp num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > > index 80a6e41cadad..1a939c464858 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) > > @@ -2106,23 +2100,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); > > @@ -2365,13 +2342,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..cc0cc95a0280 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 > > + > > +#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,23 @@ 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[], > > -- > > 2.32.0.402.g57bb445576-goog > > > > Otherwise > > Reviewed-by: Andrew Jones > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel