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=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS 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 50FD0C43460 for ; Thu, 6 May 2021 17:19:09 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 AF719610D2 for ; Thu, 6 May 2021 17:19:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF719610D2 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Subject:Cc:To: From:Message-ID:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Eum/zysIvhxqbr/Nz3zslt33xh5Mrsw2VDsTBCnYKwQ=; b=MBKjewwMcEEmbs06ExS00Am/5 YS2myh8cZPtCQpjyADOrjFEPdHBDVXK9JVlC32rRRln4Fc5VUNjGR8i82rB5xT52T/b2SBde+sbEp GtYOO3yjXPxgZ8GqZ8V74pWGsFh2iIVcf6Cb0BrrbrfAfUwOeWFFJcevFGKqbuEH4VlBWgWQoiD7M 550VE8A0zfLDytBMIIbH+CVA7EJIw0F1X0gpCL1rYvbOGX1PxV0hHrSCvLyKWrnkRJrjXSrU7VHRg KUZZ8UOskYtLrhS5CJ8iwRqahMligYlh1Gxn1qx/O8IC4PllTtwTdNVcQUJ2fMgGq4eCNtvbDHp1q 8auc+ZB6Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lehcm-004ul1-4I; Thu, 06 May 2021 17:17:20 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lehcj-004ukU-Km for linux-arm-kernel@desiato.infradead.org; Thu, 06 May 2021 17:17:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:MIME-Version:References: In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=KmgHvb+zx1vXviZuMhG5MjALNP4sgKkzoEY4wgK42c4=; b=aFfMSGHrXzrap4Aai3n3f20VOO wkWPMI7mpvntTidRywHoNZL5iSJOo5zYBIvMJyAQdqGx7jjVUSXtQ3y7KTvNc0U92m0LFvzZ4pWwZ cQ+e/eCWK+Nz8k017r9hWC/dG21gtoyGc8JaE0GCREW41wcfH+eOixKeH1pWklgXjtoFk0rvBgso/ ZDHcnFcwVf2aEVSWKrbh6tFzLa/poBi79VS4RCluPt5homcKL7saRYVobAW3Rq2YOk1nvASQmFp3d WrBjxrzwU+dsNhq5IBxigfiVVO2n9q2GvD2lDVBzipASyOzmzFajqk4Oocrs23gPboLReb+BTgh6C +cdBCJ7g==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lehcg-006FQj-Sp for linux-arm-kernel@lists.infradead.org; Thu, 06 May 2021 17:17:16 +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 D5C67610A7; Thu, 6 May 2021 17:17:13 +0000 (UTC) Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1lehcd-00BItA-H8; Thu, 06 May 2021 18:17:11 +0100 Date: Thu, 06 May 2021 18:17:10 +0100 Message-ID: <87lf8rrdd5.wl-maz@kernel.org> From: Marc Zyngier To: Zenghui Yu Cc: , , , , Will Deacon , James Morse , Julien Thierry , Suzuki K Poulose , Andrew Scull , Mark Rutland , Quentin Perret , David Brazdil Subject: Re: [PATCH v2 03/11] KVM: arm64: Make kvm_skip_instr() and co private to HYP In-Reply-To: References: <20201102164045.264512-1-maz@kernel.org> <20201102164045.264512-4-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: yuzenghui@huawei.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, kernel-team@android.com, will@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, ascull@google.com, mark.rutland@arm.com, qperret@google.com, dbrazdil@google.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-20210506_101715_040153_C7ED23A2 X-CRM114-Status: GOOD ( 22.84 ) 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 On Wed, 05 May 2021 15:23:02 +0100, Zenghui Yu wrote: > > Hi Marc, > > On 2020/11/3 0:40, 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 > > [...] > > > @@ -133,6 +134,8 @@ static int __kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu) > > __load_guest_stage2(vcpu->arch.hw_mmu); > > __activate_traps(vcpu); > > + __adjust_pc(vcpu); > > If the INCREMENT_PC flag was set (e.g., for WFx emulation) while we're > handling PSCI CPU_ON call targetting this VCPU, the *target_pc* (aka > entry point address, normally provided by the primary VCPU) will be > unexpectedly incremented here. That's pretty bad, I think. > > This was noticed with a latest guest kernel, at least with commit > dccc9da22ded ("arm64: Improve parking of stopped CPUs"), which put the > stopped VCPUs in the WFx loop. The guest kernel shouted at me that > > "CPU: CPUs started in inconsistent modes" > > *after* rebooting. The problem is that the secondary entry point was > corrupted by KVM as explained above. All of the secondary processors > started from set_cpu_boot_mode_flag(), with w0=0. Oh well... FWIW, I've pushed out a test branch[1] with two patches that sit on top of Linus' current tree. I'll rebase and post it as soon as -rc1 appears, but I'd appreciate if you could have a look in the meantime. Thanks, M. [1] https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git/log/?h=kvm-arm64/pc-fixes -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel