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=-11.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 54068C4363D for ; Fri, 25 Sep 2020 09:59:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7F932087D for ; Fri, 25 Sep 2020 09:59:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Adf09A94" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727976AbgIYJ7I (ORCPT ); Fri, 25 Sep 2020 05:59:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46995 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727749AbgIYJ7H (ORCPT ); Fri, 25 Sep 2020 05:59:07 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601027946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=sIWorudu5DKNHzXnoue5cILqH4iEH+RSPM/BEmZzG2k=; b=Adf09A94pDj6+uX1dJNVs6FSLaoneng1y2QyP9GRgQDWjvRQXvxecGOo6i5DzWQ2LF5VO+ LvnAMITNhSV3FSgjt+oVEUAV55Uf9I9wnaZ9NuPysHla/oKM+R3W96eqwOLtmM8dFYx02x p1j+PdZ70QrmbSXu/H4a1dqP/a+3C3M= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-AIhGvrSeNnOrZnK5Bxdu-A-1; Fri, 25 Sep 2020 05:59:04 -0400 X-MC-Unique: AIhGvrSeNnOrZnK5Bxdu-A-1 Received: by mail-wm1-f72.google.com with SMTP id b20so898309wmj.1 for ; Fri, 25 Sep 2020 02:59:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=sIWorudu5DKNHzXnoue5cILqH4iEH+RSPM/BEmZzG2k=; b=MYRWlH8bsCOHzNPZfkH9Znxwx7u9KkLEfm8aUQ+qxB98vez8hEPA8FQYg4RRUFpIgV iJGj+4ryE9O2A4d4H21Ur9jcuPDwi8TcyRGolySL6sdaw/4urpIZ6JYSK1V5dhFhveie IgQGovKLID2X5ow06+QxUzgLCElhWHIoB0c/3tsdoSIwzHTOBWw58sx7cz1lBIc6G5Rd XGEqFHfNRX/cevh+IRNEXKEtekIXr3gSPCj9ohlrbVhBjYNwWwjAopII5VnU4KaqNI9H pI2hDj0xx1A5hKqB0Q1InBUGU6r+BZ0WOb41wJQyoM3opT1Kp5R92Oj7BomKxwKHICcc RSKw== X-Gm-Message-State: AOAM533TlAwzpNwgNsagwiZNkHk8Hjimw2PxZXa0bfThgOPNK3YmclHn s+Vg89RGBoEzdtQsORMVHijlSNAmmVVj4ZMhsKX75PVplb0z8c9e++WagRMuQ8meuP2gKnAiMAP KFXcNROam1iehgVxeSRZ0labY X-Received: by 2002:adf:ef4f:: with SMTP id c15mr3874318wrp.390.1601027942422; Fri, 25 Sep 2020 02:59:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVETDUosAe8jX3GP6x/0E34Oq++Rjm2SNpkUgf2wYb9c5WIOgKuqLnY9yCg+YdCgXPUTpIUg== X-Received: by 2002:adf:ef4f:: with SMTP id c15mr3874297wrp.390.1601027942199; Fri, 25 Sep 2020 02:59:02 -0700 (PDT) Received: from vitty.brq.redhat.com (g-server-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id b84sm2618107wmd.0.2020.09.25.02.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 02:59:01 -0700 (PDT) From: Vitaly Kuznetsov To: Sean Christopherson , Paolo Bonzini Cc: Sean Christopherson , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] KVM: VMX: Explicitly check for hv_remote_flush_tlb when loading pgd() In-Reply-To: <20200924180429.10016-1-sean.j.christopherson@intel.com> References: <20200924180429.10016-1-sean.j.christopherson@intel.com> Date: Fri, 25 Sep 2020 11:59:00 +0200 Message-ID: <87h7rmch3v.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sean Christopherson writes: > Explicitly check that kvm_x86_ops.tlb_remote_flush() points at Hyper-V's > implementation for PV flushing instead of assuming that a non-NULL > implementation means running on Hyper-V. Wrap the related logic in > ifdeffery as hv_remote_flush_tlb() is defined iff CONFIG_HYPERV!=n. > > Short term, the explicit check makes it more obvious why a non-NULL > tlb_remote_flush() triggers EPTP shenanigans. Long term, this will > allow TDX to define its own implementation of tlb_remote_flush() without > running afoul of Hyper-V. > > Cc: Vitaly Kuznetsov > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/vmx/vmx.c | 7 +++++-- > arch/x86/kvm/vmx/vmx.h | 2 ++ > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index 6f9a0c6d5dc5..a56fa9451b84 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -3073,14 +3073,15 @@ static void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long pgd, > eptp = construct_eptp(vcpu, pgd, pgd_level); > vmcs_write64(EPT_POINTER, eptp); > > - if (kvm_x86_ops.tlb_remote_flush) { > +#if IS_ENABLED(CONFIG_HYPERV) > + if (kvm_x86_ops.tlb_remote_flush == hv_remote_flush_tlb) { > spin_lock(&to_kvm_vmx(kvm)->ept_pointer_lock); > to_vmx(vcpu)->ept_pointer = eptp; > to_kvm_vmx(kvm)->ept_pointers_match > = EPT_POINTERS_CHECK; > spin_unlock(&to_kvm_vmx(kvm)->ept_pointer_lock); > } > - > +#endif > if (!enable_unrestricted_guest && !is_paging(vcpu)) > guest_cr3 = to_kvm_vmx(kvm)->ept_identity_map_addr; > else if (test_bit(VCPU_EXREG_CR3, (ulong *)&vcpu->arch.regs_avail)) > @@ -6956,7 +6957,9 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu) > > static int vmx_vm_init(struct kvm *kvm) > { > +#if IS_ENABLED(CONFIG_HYPERV) > spin_lock_init(&to_kvm_vmx(kvm)->ept_pointer_lock); > +#endif > > if (!ple_gap) > kvm->arch.pause_in_guest = true; > diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h > index d7ec66db5eb8..51107b7309bc 100644 > --- a/arch/x86/kvm/vmx/vmx.h > +++ b/arch/x86/kvm/vmx/vmx.h > @@ -316,8 +316,10 @@ struct kvm_vmx { > bool ept_identity_pagetable_done; > gpa_t ept_identity_map_addr; > > +#if IS_ENABLED(CONFIG_HYPERV) > enum ept_pointers_status ept_pointers_match; > spinlock_t ept_pointer_lock; > +#endif Reviewed-by: Vitaly Kuznetsov In case ept_pointers_match/ept_pointer_lock are useless for TDX we may want to find better names for them to make it clear this is a Hyper-V thingy (e.g. something like hv_tlb_ept_match/hv_tlb_ept_lock). > }; > > bool nested_vmx_allowed(struct kvm_vcpu *vcpu); -- Vitaly