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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 41572C388F9 for ; Tue, 27 Oct 2020 11:09:42 +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 C029021655 for ; Tue, 27 Oct 2020 11:09:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bkeYHFPZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="RMlyud2Q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C029021655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:To:From: Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=psqc8G4unwphgGF7u76xH3Dg8e1fPjH14BE7iHKALjY=; b=bkeYHFPZaxXNIY05X+Okp2buD MRrr18yPlXZtXIJZVFhjvobh/t8Ms2ajUhn6CFuJkeuc0saFBeiA0zke9soppSEhndA2IrRXYEX8d y/bs2UzfV5XHJGxNN7bZ3e2QFJDtCIa60C5P95TBuIKYM4PIvJgmvj/LX56XCHzkh4Ts/0FrEb1S6 DX9SqXFzelciCpj8VEw9f/gKcSdv8LYgrBFysWeoifRFED0h6EpRqjdzB09siuZ3yoz5Xa20wlQ4S SjCFXdtMbzTRVQyzEcNTGesHFI3wDvjjefrocaHDZs3Ck7BLmLkd+wEN3Kw8OS0zsq9/UwiZMfjWE WjCKAzfZQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXMpx-000732-8e; Tue, 27 Oct 2020 11:08:21 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXMpu-000725-QL for linux-arm-kernel@lists.infradead.org; Tue, 27 Oct 2020 11:08:19 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8589021655; Tue, 27 Oct 2020 11:08:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603796897; bh=hN0qy1y7mET6+8oBNyv6KDyBxf+wqltkkA89flTvk2g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=RMlyud2QvQfcVq+rDgM86g3QNRieFI/7Rw11vGogACyi2THdd68p5C5TfD92/QQN6 m5OTG9uyCFeOf0korrVWCqoBEWA8zoij9zbHBkggbW922lqwYcnvafLSTHtJPZ2bH0 jO9D82+RWqGYQBV11sRc7SMMODdHYlhozByn0+74= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94) (envelope-from ) id 1kXMpr-004fCh-7M; Tue, 27 Oct 2020 11:08:15 +0000 MIME-Version: 1.0 Date: Tue, 27 Oct 2020 11:08:15 +0000 From: Marc Zyngier To: Suzuki K Poulose Subject: Re: [PATCH 03/11] KVM: arm64: Make kvm_skip_instr() and co private to HYP In-Reply-To: References: <20201026133450.73304-1-maz@kernel.org> <20201026133450.73304-4-maz@kernel.org> User-Agent: Roundcube Webmail/1.4.9 Message-ID: <3ae9d792ea381ba42874ebe5f7c08347@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: suzuki.poulose@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, ascull@google.com, will@kernel.org, qperret@google.com, dbrazdil@google.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_070818_945346_4C3AEA3D X-CRM114-Status: GOOD ( 14.82 ) 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: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Quentin Perret , kernel-team@android.com, James Morse , Andrew Scull , David Brazdil , Will Deacon , kvmarm@lists.cs.columbia.edu, Julien Thierry Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2020-10-27 10:55, Suzuki K Poulose wrote: > On 10/26/20 1:34 PM, Marc Zyngier wrote: >> In an effort to remove the vcpu PC manipulations from EL1 on nVHE >> systems, move kvm_skip_instr() to be HYP-specific. EL1's intent >> to increment PC post emulation is now signalled via a flag in the >> vcpu structure. >> >> Signed-off-by: Marc Zyngier [...] >> +static inline void kvm_skip_instr(struct kvm_vcpu *vcpu) >> +{ >> + if (vcpu_mode_is_32bit(vcpu)) { >> + kvm_skip_instr32(vcpu); >> + } else { >> + *vcpu_pc(vcpu) += 4; >> + *vcpu_cpsr(vcpu) &= ~PSR_BTYPE_MASK; >> + } >> + >> + /* advance the singlestep state machine */ >> + *vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS; >> +} >> + >> +/* >> + * Skip an instruction which has been emulated at hyp while most >> guest sysregs >> + * are live. >> + */ >> +static inline void __kvm_skip_instr(struct kvm_vcpu *vcpu) >> +{ >> + *vcpu_pc(vcpu) = read_sysreg_el2(SYS_ELR); >> + vcpu_gp_regs(vcpu)->pstate = read_sysreg_el2(SYS_SPSR); >> + >> + __kvm_skip_instr(vcpu); > > Did you mean kvm_skip_instr() instead ? Damn. How embarrassing! Yes, of course. I should have thrown my TX1 at it! Thanks, M. -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel