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=-16.8 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,USER_AGENT_GIT 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 11BFBC433E0 for ; Wed, 3 Mar 2021 18:27:44 +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 13B0864EEF for ; Wed, 3 Mar 2021 18:27:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13B0864EEF 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:From:Subject:References:Mime-Version: Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/jM+N60xCx+X5CQ8U0/QkoTPm76I6oa9sBdHtH4+4wk=; b=ftiDwuvV+zgxCH 2CoOEahsFNOS7ouly5kagUv7BK80GFn+K2MkftoS99bl5MGeHNzdQOc8fKw1sjpPBgUwoBKwtnkyP mA54NUzUBe3FEIIozUuq9tH0VZOdJqNO0Ky8A5yYxZrylH1+hgAMoKXfquuqdbipE6mQ/EoLrGmvp 6IqT+7g8vgNoNZtl7F86ADsPTFsIKluSRZBUQrsyQxdiK2WoHsEuYRRMv3u/0ypJ0n9Xrq3gvDzel 3gdwT7Iw7azYisLMwIkZDsls9nVZOFMo7u9CAVhwSTY6fQKZhgE1eG2h+tpnJ+BbY756O+n1VFw3v znPRPresxUe5Zkl+n0SA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHWBJ-0060Yr-TF; Wed, 03 Mar 2021 18:25:10 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHT0K-005GyP-Hv for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 15:01:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=4oxp+YpplIoIB69u+tbsX2FMX4bca6h5fwiDtQ6/a1E=; b=d/RybOtIPy8Rwmy6OPt4X2RboO im3HqX5kSBlS72usv680/Ag/5ZBfVS/FAbQBacLO1fJkfw0m40bl/o9+gygnNe9Ymr3TkYRTwVPTD p86tUVkyvvhnxbzvVeM49aFC4i8BvlaCv52hBDdUBc6uK7jOKLwkNuI+VOTrziD8oHYDsJS68XQEs 1V93L6tHrzs5akd1C0nS2QAZuTQGa0Pe0315eAF+vRCikD7eSL4tWs+yy/Y1182IZvjvVywSTQXQH bJMJNKm714k+MxvGvAEzTi90N5bhxtF6PVkGxhlX8j5cPssJGSKLA+X1Z9j3Bl9Uz1Stkr8kN+uE7 VQW3Wi/w==; Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lH6XN-00HJKv-AB for linux-arm-kernel@lists.infradead.org; Tue, 02 Mar 2021 15:02:16 +0000 Received: by mail-wr1-x44a.google.com with SMTP id y5so776422wrp.2 for ; Tue, 02 Mar 2021 07:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=4oxp+YpplIoIB69u+tbsX2FMX4bca6h5fwiDtQ6/a1E=; b=DVwV4PEk1sNj/JtjY53/uNRLb44IFXbqnfCgK0gXSCwMPvjRNvm9Fcb1TcjqwrCfku euCCdmLYqJP39qBt+5Bew9C6jJ+Q/bGJwemVcfgXRh3nQXn8NkcDAuaezl/nhpgkNrDK f94J8Xjfqwl7DDHczcWMPaseBthcz2iTf0vYl5mo3WKmn0nIsdDOVisnf0UEOT7gqpCd Bx4inz0gG/xCu+KGf1nv2v5uR5Hk3FOUX9Hn8r4v/5ujdvnBCU7lrahHnPK/nXuRosk1 W9lQkbXQttUHawOFtS1GUul9l6p1xAhGprMNslTZTrXUK43WU14pnWI770t3Dfmxfred +t5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=4oxp+YpplIoIB69u+tbsX2FMX4bca6h5fwiDtQ6/a1E=; b=AGoCCPdcePToGm1/VWgTYbfqFXprZm2KNsXJVdqhle4R7tQIw9uEOkxEaUAvArbV8y uEMd8fV07/nuPD+Q4oiNuBfdyV7yC6GZI0hNtyBsgSItzGo6WaE7LlAxQuZngWaMveB3 344gcKP9B8vOW9H7UNaVgb5L0OX2gbWK7RUrid2d1v+3clpL6ZMDbRFvmPckkMIiruJL 4QMONzCIdA9maBkFWjfrlEqOo/BiC9BN56MliM8AbkYUJrUFBA7RPEkvZoLbBT1Lkzrk OvG43gubjvdNPmMD+Fakw5HqPA5YiHKzzO+PBgyI1cvmxP1z+chMQe5zS7Wqgcpe3JIx gdWg== X-Gm-Message-State: AOAM532bX6sfuACTDLp7vk1mSEzbnMwG+4PG7A3tN0lBr4r5ux+WV7Iz i2HEBCn4nU4RCJXjDczwKWItmXURRom1 X-Google-Smtp-Source: ABdhPJwfPjt5pFKOfHuPj31XXVqR4/+bIz9+vX0UnJf2kL9ZXviOPHu8S3WCnbrQ6ZUfzWMvmubTRIE+eq90 X-Received: from r2d2-qp.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:1652]) (user=qperret job=sendgmr) by 2002:a1c:b6d7:: with SMTP id g206mr4471661wmf.123.1614697253532; Tue, 02 Mar 2021 07:00:53 -0800 (PST) Date: Tue, 2 Mar 2021 14:59:51 +0000 In-Reply-To: <20210302150002.3685113-1-qperret@google.com> Message-Id: <20210302150002.3685113-22-qperret@google.com> Mime-Version: 1.0 References: <20210302150002.3685113-1-qperret@google.com> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog Subject: [PATCH v3 21/32] KVM: arm64: Refactor __load_guest_stage2() From: Quentin Perret To: catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com Cc: android-kvm@google.com, linux-kernel@vger.kernel.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, tabba@google.com, mark.rutland@arm.com, dbrazdil@google.com, mate.toth-pal@arm.com, seanjc@google.com, qperret@google.com, robh+dt@kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_150216_499141_8FE88704 X-CRM114-Status: UNSURE ( 9.84 ) X-CRM114-Notice: Please train this message. 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 Refactor __load_guest_stage2() to introduce __load_stage2() which will be re-used when loading the host stage 2. Acked-by: Will Deacon Signed-off-by: Quentin Perret --- arch/arm64/include/asm/kvm_mmu.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 6f743e20cb06..9d64fa73ee67 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -270,9 +270,9 @@ static __always_inline u64 kvm_get_vttbr(struct kvm_s2_mmu *mmu) * Must be called from hyp code running at EL2 with an updated VTTBR * and interrupts disabled. */ -static __always_inline void __load_guest_stage2(struct kvm_s2_mmu *mmu) +static __always_inline void __load_stage2(struct kvm_s2_mmu *mmu, unsigned long vtcr) { - write_sysreg(kern_hyp_va(mmu->arch)->vtcr, vtcr_el2); + write_sysreg(vtcr, vtcr_el2); write_sysreg(kvm_get_vttbr(mmu), vttbr_el2); /* @@ -283,6 +283,11 @@ static __always_inline void __load_guest_stage2(struct kvm_s2_mmu *mmu) asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT)); } +static __always_inline void __load_guest_stage2(struct kvm_s2_mmu *mmu) +{ + __load_stage2(mmu, kern_hyp_va(mmu->arch)->vtcr); +} + static inline struct kvm *kvm_s2_mmu_to_kvm(struct kvm_s2_mmu *mmu) { return container_of(mmu->arch, struct kvm, arch); -- 2.30.1.766.gb4fecdf3b7-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel