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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CB4AE9271A for ; Thu, 5 Oct 2023 16:03:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237012AbjJEQDE (ORCPT ); Thu, 5 Oct 2023 12:03:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237055AbjJEQB6 (ORCPT ); Thu, 5 Oct 2023 12:01:58 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F61630E4 for ; Thu, 5 Oct 2023 06:51:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696513872; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/v0adbAqkr0AOlDohQDmkNPQwTJI1a9Z/VKG7A0hBWA=; b=CZTx2MCtISyDso3gr5Kp9dmFbh45sFoPNxH79YqqfTPJG0kafSAcL2T3EZmPWev/NXhEb0 hyvsJ3nYEUoaW6D/ALMJuLXpAmsduyGnf7AuZJbMQoe+oxtDynS/YkcXqSqW98HEDDRL7w Sz3i1z8KseCOMUyUJEbQXUE637NGvrw= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-678-hLfsCnG-MyW1CLcPToFCdA-1; Thu, 05 Oct 2023 08:50:19 -0400 X-MC-Unique: hLfsCnG-MyW1CLcPToFCdA-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-9b65d7079faso73200266b.1 for ; Thu, 05 Oct 2023 05:50:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696510218; x=1697115018; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/v0adbAqkr0AOlDohQDmkNPQwTJI1a9Z/VKG7A0hBWA=; b=r75jAiZGI0PgxKw87g+Uj2nG5bMgmDX+zaBVae52R/Ue50YqDZoXXdyXoOdGafKxoA wljd3rpV5GQBewYSGVdpIsm2ZImvssHsRccJrX3TZbHHyiWhql46LyLWof6p75KXaxye tErvKQv6fcNw8rMxkzzJO2i9eRSxFj4d9JqxMbuDP03KhL33LDBKMA8d9HyPSFnvCIfe sJNd8UhnbslQ1CBPegNnCcOySreOxFtm/VNF4/UpcNpa9N4r8qRpFh/SvUtfLYc1Uv1O XPHzF46V25I45cIVG8tKtnce2hak2z2D6ukg/NoRoFP8JUExlsYazfyI027H5M78bovu oqXA== X-Gm-Message-State: AOJu0YwXuDAtaFXTjWZufZtnPWoAOVaAZ0mb590nMJZ7jtUE8Y24OKgZ TBBQn/yHtlKqr3FO+Rpa3gyW/IdnZZ8kq5bD715MKwaW1C/pIow5ZCx+duDnRk9ryzudFPU4lG4 MGcrg+nKviZCUDQLzYYXk+yH2Kb17OZcN X-Received: by 2002:a17:906:7695:b0:9a9:f042:dec0 with SMTP id o21-20020a170906769500b009a9f042dec0mr5192576ejm.38.1696510218090; Thu, 05 Oct 2023 05:50:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2efrRPPi83JP91rlrZljdGCEsxo2DgTBNLkMExdPWWdkcKxpdXsDYMgxNAP+P4MsbasM+Fg== X-Received: by 2002:a17:906:7695:b0:9a9:f042:dec0 with SMTP id o21-20020a170906769500b009a9f042dec0mr5192565ejm.38.1696510217875; Thu, 05 Oct 2023 05:50:17 -0700 (PDT) Received: from starship ([89.237.100.246]) by smtp.gmail.com with ESMTPSA id i2-20020a05600c290200b004063d8b43e7sm3701061wmd.48.2023.10.05.05.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 05:50:17 -0700 (PDT) Message-ID: Subject: Re: [PATCH 04/10] KVM: SVM: Add helper to deduplicate code for getting AVIC backing page From: Maxim Levitsky To: Sean Christopherson , Paolo Bonzini , Joerg Roedel Cc: kvm@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org Date: Thu, 05 Oct 2023 15:50:15 +0300 In-Reply-To: <20230815213533.548732-5-seanjc@google.com> References: <20230815213533.548732-1-seanjc@google.com> <20230815213533.548732-5-seanjc@google.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org У вт, 2023-08-15 у 14:35 -0700, Sean Christopherson пише: > Add a helper to get the physical address of the AVIC backing page, both > to deduplicate code and to prepare for getting the address directly from > apic->regs, at which point it won't be all that obvious that the address > in question is what SVM calls the AVIC backing page. > > No functional change intended. > > Signed-off-by: Sean Christopherson > --- > arch/x86/kvm/svm/avic.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c > index b8313f2d88fa..954bdb45033b 100644 > --- a/arch/x86/kvm/svm/avic.c > +++ b/arch/x86/kvm/svm/avic.c > @@ -241,14 +241,18 @@ int avic_vm_init(struct kvm *kvm) > return err; > } > > +static phys_addr_t avic_get_backing_page_address(struct vcpu_svm *svm) > +{ > + return __sme_set(page_to_phys(svm->avic_backing_page)); > +} > + > void avic_init_vmcb(struct vcpu_svm *svm, struct vmcb *vmcb) > { > struct kvm_svm *kvm_svm = to_kvm_svm(svm->vcpu.kvm); > - phys_addr_t bpa = __sme_set(page_to_phys(svm->avic_backing_page)); > phys_addr_t lpa = __sme_set(page_to_phys(kvm_svm->avic_logical_id_table_page)); > phys_addr_t ppa = __sme_set(page_to_phys(kvm_svm->avic_physical_id_table_page)); > > - vmcb->control.avic_backing_page = bpa; > + vmcb->control.avic_backing_page = avic_get_backing_page_address(svm); > vmcb->control.avic_logical_id = lpa; > vmcb->control.avic_physical_id = ppa; > vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE; > @@ -308,7 +312,7 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu) > if (!entry) > return -EINVAL; > > - new_entry = __sme_set(page_to_phys(svm->avic_backing_page)) | > + new_entry = avic_get_backing_page_address(svm) | > AVIC_PHYSICAL_ID_ENTRY_VALID_MASK; > WRITE_ONCE(*entry, new_entry); > > @@ -859,7 +863,7 @@ get_pi_vcpu_info(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, > pr_debug("SVM: %s: use GA mode for irq %u\n", __func__, > irq.vector); > *svm = to_svm(vcpu); > - vcpu_info->pi_desc_addr = __sme_set(page_to_phys((*svm)->avic_backing_page)); > + vcpu_info->pi_desc_addr = avic_get_backing_page_address(*svm); > vcpu_info->vector = irq.vector; > > return 0; > @@ -917,7 +921,7 @@ int avic_pi_update_irte(struct kvm *kvm, unsigned int host_irq, > struct amd_iommu_pi_data pi; > > /* Try to enable guest_mode in IRTE */ > - pi.base = __sme_set(page_to_phys(svm->avic_backing_page)); > + pi.base = avic_get_backing_page_address(svm); > pi.ga_tag = AVIC_GATAG(to_kvm_svm(kvm)->avic_vm_id, > svm->vcpu.vcpu_id); > pi.is_guest_mode = true; Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky