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=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 403AAC433E0 for ; Tue, 7 Jul 2020 13:20:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 06EF82063A for ; Tue, 7 Jul 2020 13:20:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="x8b8HADP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 06EF82063A 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+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=merlin.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:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EbWtn/+ZNmtFAkA/zx838T6cmZuqpJCUq+W3jkyA5tY=; b=x8b8HADPL3w69LHuJCCiZtO+G 0tCsxbo5FxvIlf+YF0CKESTxRv1S1Fh31nzKQvnkn+VRbKwS4lz9QGaZwDSE8lfjiC6dWgN6/jaGk qPl8oDsz2BYjBUg+zuuDRI2+55dzv1nRjhFM1b1eHZ3B4r65MojXbnp/S9/v3rX1U7ZW1iUJP8+us 6ncox+PWTMn1lqbcQ1sQgd7KamiDPL6XqTgRJK8xba7loQ3XYVqbrhfjGYRS9Sz5qaQxrnXkDIjAm rGFZzw6f3wwA0+gj3SvbD5VLwBNex4GUe/MzVYknmcgW/t/MMFiEEv0vTK/BJQfQwP9oLImQ1o8tZ FpiguDXTQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsnUs-0001fM-GJ; Tue, 07 Jul 2020 13:18:54 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsnUp-0001ec-CX for linux-arm-kernel@lists.infradead.org; Tue, 07 Jul 2020 13:18:52 +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 7C59AC0A; Tue, 7 Jul 2020 06:18:48 -0700 (PDT) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 513D73F71E; Tue, 7 Jul 2020 06:18:46 -0700 (PDT) Subject: Re: [PATCH v3 10/17] KVM: arm64: debug: Drop useless vpcu parameter To: Marc Zyngier , Catalin Marinas , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org References: <20200706125425.1671020-1-maz@kernel.org> <20200706125425.1671020-11-maz@kernel.org> From: Alexandru Elisei Message-ID: <9dc5698d-2782-c26e-156b-3d082fcfecf9@arm.com> Date: Tue, 7 Jul 2020 14:19:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200706125425.1671020-11-maz@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200707_091851_528719_7060FF04 X-CRM114-Status: GOOD ( 16.62 ) 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 , kernel-team@android.com, Suzuki K Poulose , Andre Przywara , Christoffer Dall , Dave Martin , George Cherian , James Morse , Andrew Scull , "Zengtao \(B\)" , Will Deacon , Jintack Lim , Julien Thierry 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 Marc, On 7/6/20 1:54 PM, Marc Zyngier wrote: > As part of the ongoing spring cleanup, remove the now useless > vcpu parameter that is passed around (host and guest contexts > give us everything we need). > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h > index 5499d6c1fd9f..0297dc63988c 100644 > --- a/arch/arm64/kvm/hyp/include/hyp/debug-sr.h > +++ b/arch/arm64/kvm/hyp/include/hyp/debug-sr.h > @@ -88,9 +88,8 @@ > default: write_debug(ptr[0], reg, 0); \ > } > > -static inline void __debug_save_state(struct kvm_vcpu *vcpu, > - struct kvm_guest_debug_arch *dbg, > - struct kvm_cpu_context *ctxt) > +static void __debug_save_state(struct kvm_guest_debug_arch *dbg, > + struct kvm_cpu_context *ctxt) > { > u64 aa64dfr0; > int brps, wrps; > @@ -107,9 +106,8 @@ static inline void __debug_save_state(struct kvm_vcpu *vcpu, > ctxt_sys_reg(ctxt, MDCCINT_EL1) = read_sysreg(mdccint_el1); > } > > -static inline void __debug_restore_state(struct kvm_vcpu *vcpu, > - struct kvm_guest_debug_arch *dbg, > - struct kvm_cpu_context *ctxt) > +static void __debug_restore_state(struct kvm_guest_debug_arch *dbg, > + struct kvm_cpu_context *ctxt) > { > u64 aa64dfr0; > int brps, wrps; > @@ -142,8 +140,8 @@ static inline void __debug_switch_to_guest_common(struct kvm_vcpu *vcpu) > host_dbg = &vcpu->arch.host_debug_state.regs; > guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); > > - __debug_save_state(vcpu, host_dbg, host_ctxt); > - __debug_restore_state(vcpu, guest_dbg, guest_ctxt); > + __debug_save_state(host_dbg, host_ctxt); > + __debug_restore_state(guest_dbg, guest_ctxt); > } > > static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) > @@ -161,8 +159,8 @@ static inline void __debug_switch_to_host_common(struct kvm_vcpu *vcpu) > host_dbg = &vcpu->arch.host_debug_state.regs; > guest_dbg = kern_hyp_va(vcpu->arch.debug_ptr); > > - __debug_save_state(vcpu, guest_dbg, guest_ctxt); > - __debug_restore_state(vcpu, host_dbg, host_ctxt); > + __debug_save_state(guest_dbg, guest_ctxt); > + __debug_restore_state(host_dbg, host_ctxt); > > vcpu->arch.flags &= ~KVM_ARM64_DEBUG_DIRTY; > } Looks fine to me. I also had a look at the other files where we started using the __vcpu_sys_reg/ctxt_sys_reg accessors, and I didn't find any functions where we could eliminate the vcpu parameter, like we did here: Reviewed-by: Alexandru Elisei Thanks, Alex _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel