From patchwork Thu Sep 16 18:15:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Upton X-Patchwork-Id: 12499889 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=-17.1 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, USER_AGENT_GIT 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 14FC0C433F5 for ; Thu, 16 Sep 2021 18:19:21 +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 CF9E061139 for ; Thu, 16 Sep 2021 18:19:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CF9E061139 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=hUDOXfcxWiwR2eZ7QhuaMrtBEAJG++lM5ovm6blJP2c=; b=n4G9Q0+RaWltVzbQURMFRuIuHL FLr+PX4O5A3qpJPmJ2YYR++imNHwbOzn5CFGrtW/tKEUgslLb5DQUv0sWnYJLZDdESCasSaqDUVUi 8Kk42g5Gw03cYNNMKcPWYkbhCNK5ENkEzNvPWlSkBu8HhUNeQEp9FixE29q1QL6HIVa478oLu/iEz bPCmksOiJdWvPfsV+6IpFSy9S0MqHTs20S5PViPaY+pdBY14vJtiLKSYURucuXI4++fXNGR4p1TPy wzkvEujeHOAaHXUurT6lCRxZEGiDKL/YQtzVOOLgtvKfM0JdRy6Cw23sW2Ne09F2Wl9QPJcOgkoFv DiCZr2aw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mQvwz-00C2hE-7P; Thu, 16 Sep 2021 18:17:33 +0000 Received: from mail-io1-xd4a.google.com ([2607:f8b0:4864:20::d4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mQvv2-00C1uJ-Fu for linux-arm-kernel@lists.infradead.org; Thu, 16 Sep 2021 18:15:33 +0000 Received: by mail-io1-xd4a.google.com with SMTP id z26-20020a05660200da00b005b86e36a1f4so13754130ioe.15 for ; Thu, 16 Sep 2021 11:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BVbFEb6A6+ovQK9ZEoIX753R5coZv2LaotY72yo0M9w=; b=Duaxw6Wdi+yt/FlgC80aDKbBVPAXpMQF8KpI6OQKf2suNWjt8X9L6kgb8q0LvcmszK u8MOMNwfq8+JhPlY5+TlV755nb8F/R6K0kkrOZNPQVJJGYQEpwyrC6QfwfsLVidVJcYH DIrhMhUnd0i2HV8uj2zqmBanyssDy57he+G5BSHT77y+HCxH6ESkSxo8HH4UybBf6bdf 8rbY16XYfxL+06vdlWIBQu3txdt9JVh+uuExVJfG+y0OvyBphM1K1dA9n/+M3JQv4mat 2ShobZszJNFipL0q8XFcwa/pym5HY0EzsrDsa71fSNB+ohJ5YAB+rvxBKxDIWgyyVj7+ n7ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BVbFEb6A6+ovQK9ZEoIX753R5coZv2LaotY72yo0M9w=; b=NrMYcat8HMinzoabHnk9R7vmsS/zA5/GgeqepP81LAJHZHciwZ6znEacasxtXhlsVV WpUIMhKiCVjEsBzke8fp8TvyIkDuTGB1k+bd8Gqk/c0xod4PPqHJ/IfLU57twNdzkAxf x6uBqblQDGiNPg1LWhCgrngK7BR5WTY8Et10nSy5XgiqHsfXOq75pa5VeZoGpPWv/jZH TqZ97rjN+rw+0a5KC1/k75TGuJtWqItaOMTC8AXTJqm6t/TIhhhGXLUBLekQbfQpF2WV JbGNY1XaBYfQ7yKBH4FUuf0F8hmNiwHWiB0YJWmJgIpTEZRbF9rWsJNFPYVsuLZ4G7+h dq9g== X-Gm-Message-State: AOAM533GT8QmZAVNBzEnYrhIlIbzXlseRzrcHdslwkKeEStqZJCDrrwz lE5Gms/NZhMT2jwpQQIiCpGt01dSuRc= X-Google-Smtp-Source: ABdhPJyNg0qALAw81ZPQoxY23q7Z3u2HDpDm1FTp2Br+FAAFtSr5K2bD/9X8TXlFZ8y1kQxeb0TfJQ01Wvk= X-Received: from oupton.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:404]) (user=oupton job=sendgmr) by 2002:a6b:e917:: with SMTP id u23mr5504852iof.19.1631816131056; Thu, 16 Sep 2021 11:15:31 -0700 (PDT) Date: Thu, 16 Sep 2021 18:15:09 +0000 In-Reply-To: <20210916181510.963449-1-oupton@google.com> Message-Id: <20210916181510.963449-8-oupton@google.com> Mime-Version: 1.0 References: <20210916181510.963449-1-oupton@google.com> X-Mailer: git-send-email 2.33.0.464.g1972c5931b-goog Subject: [PATCH v8 7/8] KVM: arm64: Configure timer traps in vcpu_load() for VHE From: Oliver Upton To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Cc: Paolo Bonzini , Sean Christopherson , Marc Zyngier , Peter Shier , Jim Mattson , David Matlack , Ricardo Koller , Jing Zhang , Raghavendra Rao Anata , James Morse , Alexandru Elisei , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, Andrew Jones , Will Deacon , Catalin Marinas , Oliver Upton X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210916_111532_590743_E14C5BAD X-CRM114-Status: GOOD ( 14.93 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for emulated physical counter-timer offsetting, configure traps on every vcpu_load() for VHE systems. As before, these trap settings do not affect host userspace, and are only active for the guest. Suggested-by: Marc Zyngier Signed-off-by: Oliver Upton Reviewed-by: Andrew Jones --- arch/arm64/kvm/arch_timer.c | 10 +++++++--- arch/arm64/kvm/arm.c | 4 +--- include/kvm/arm_arch_timer.h | 2 -- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c index 4bba149d140c..68fb5ddb9e7a 100644 --- a/arch/arm64/kvm/arch_timer.c +++ b/arch/arm64/kvm/arch_timer.c @@ -51,6 +51,7 @@ static void kvm_arm_timer_write(struct kvm_vcpu *vcpu, static u64 kvm_arm_timer_read(struct kvm_vcpu *vcpu, struct arch_timer_context *timer, enum kvm_arch_timer_regs treg); +static void kvm_timer_enable_traps_vhe(void); u32 timer_get_ctl(struct arch_timer_context *ctxt) { @@ -663,6 +664,9 @@ void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu) if (map.emul_ptimer) timer_emulate(map.emul_ptimer); + + if (has_vhe()) + kvm_timer_enable_traps_vhe(); } bool kvm_timer_should_notify_user(struct kvm_vcpu *vcpu) @@ -1355,12 +1359,12 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu) } /* - * On VHE system, we only need to configure the EL2 timer trap register once, - * not for every world switch. + * On VHE system, we only need to configure the EL2 timer trap register on + * vcpu_load(), but not every world switch into the guest. * The host kernel runs at EL2 with HCR_EL2.TGE == 1, * and this makes those bits have no effect for the host kernel execution. */ -void kvm_timer_init_vhe(void) +static void kvm_timer_enable_traps_vhe(void) { /* When HCR_EL2.E2H ==1, EL1PCEN and EL1PCTEN are shifted by 10 */ u32 cnthctl_shift = 10; diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index a562b36f28e2..086c9672c8ac 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1590,9 +1590,7 @@ static void cpu_hyp_reinit(void) cpu_hyp_reset(); - if (is_kernel_in_hyp_mode()) - kvm_timer_init_vhe(); - else + if (!is_kernel_in_hyp_mode()) cpu_init_hyp_mode(); cpu_set_hyp_vector(); diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index aa666373f603..d06294aa356e 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -87,8 +87,6 @@ u64 kvm_phys_timer_read(void); void kvm_timer_vcpu_load(struct kvm_vcpu *vcpu); void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu); -void kvm_timer_init_vhe(void); - bool kvm_arch_timer_get_input_level(int vintid); #define vcpu_timer(v) (&(v)->arch.timer_cpu)