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=-5.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 E5482C433E0 for ; Tue, 26 May 2020 16:29:01 +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 B958E20787 for ; Tue, 26 May 2020 16:29:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rYdBcCH2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B958E20787 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:To:Subject:From:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bLt33E8iK/NjHhJON4IviFM00wybwkAHs+j2p/MooZA=; b=rYdBcCH2CM5wlS EoTEuyEKmgZbbxKTbnG4QEBGcXe9fuxqbpGKh5BZjeUaBj0pwf2lPI/LuOltlTBVSWWbNUEZ+eYFj MhRse6gbFweKyOf+Pt7ZCAJGhrlS9kpZnqnLYKc78U20NTd+bibyxQ/7DgmAfDODmbdIsSn0MYgD5 ET1oFpCTjTDZT2P3bnWAfa3/rieEKryBUj0Y+p3c5wHWWU/u0NlItTbhUA6BqOnPNakCEEJymHkKs nCvD+m+8Xt9IgeK4/8mxY+6iy4FckZZY0ntfWNcHQ/TX5JKmzAyBMP4dJvLf2cCU0EX/d9MftxAWz V2SyPBHGvZ+oEXMxtwig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdcRp-0006SV-CJ; Tue, 26 May 2020 16:29:01 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jdcRm-0006Rx-IZ for linux-arm-kernel@lists.infradead.org; Tue, 26 May 2020 16:29:00 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C079730E; Tue, 26 May 2020 09:28:57 -0700 (PDT) Received: from [192.168.0.14] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BE2CF3F52E; Tue, 26 May 2020 09:28:55 -0700 (PDT) From: James Morse Subject: Re: [PATCH 10/26] KVM: arm64: Refactor vcpu_{read,write}_sys_reg To: Marc Zyngier References: <20200422120050.3693593-1-maz@kernel.org> <20200422120050.3693593-11-maz@kernel.org> Message-ID: <09da829c-1640-40fe-313f-df021759fb34@arm.com> Date: Tue, 26 May 2020 17:28:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20200422120050.3693593-11-maz@kernel.org> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200526_092858_654149_8B9900AD X-CRM114-Status: GOOD ( 14.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , kvm@vger.kernel.org, Suzuki K Poulose , Jintack Lim , Andre Przywara , Christoffer Dall , kvmarm@lists.cs.columbia.edu, Will Deacon , George Cherian , Julien Thierry , "Zengtao \(B\)" , Catalin Marinas , Alexandru Elisei , Dave Martin , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Marc, On 22/04/2020 13:00, Marc Zyngier wrote: > Extract the direct HW accessors for later reuse. > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index 51db934702b64..46f218982df8c 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > +u64 vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, int reg) > +{ > + u64 val = 0x8badf00d8badf00d; > + > + if (!vcpu->arch.sysregs_loaded_on_cpu) { > + goto memory_read; > } > > -immediate_write: > + if (__vcpu_read_sys_reg_from_cpu(reg, &val)) > + return val; > + > +memory_read: > + return __vcpu_sys_reg(vcpu, reg); > +} The goto here is a bit odd, is it just an artefact of how we got here? Is this easier on the eye?: | u64 vcpu_read_sys_reg(const struct kvm_vcpu *vcpu, int reg) | { | u64 val = 0x8badf00d8badf00d; | | if (vcpu->arch.sysregs_loaded_on_cpu && | __vcpu_read_sys_reg_from_cpu(reg, &val)) | return val; | | return __vcpu_sys_reg(vcpu, reg); | } > +void vcpu_write_sys_reg(struct kvm_vcpu *vcpu, u64 val, int reg) > +{ > + if (!vcpu->arch.sysregs_loaded_on_cpu) > + goto memory_write; > + > + if (__vcpu_write_sys_reg_to_cpu(val, reg)) > + return; > + > +memory_write: > __vcpu_sys_reg(vcpu, reg) = val; > } Again I think its clearer without the goto.... Regardless: Reviewed-by: James Morse Thanks, James _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel