From patchwork Fri Jul 26 23:51:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13743528 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6DF23C3DA4A for ; Sat, 27 Jul 2024 00:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To: From:Subject:Message-ID:References:Mime-Version:In-Reply-To:Date: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=495sZLd3sCBTMIrtoKFKEohUXAwQ30LA4hbLQQBllaM=; b=O+OgdQpGDaENHqhYdg74pojjvo i1B9hZtpWJpAtIXgWAgX5eDjx0oPyskcRRy4EunANwQ4kIL27OCFHry6MDWrt/FZpN1c6d5EIdie5 lt2msJFNR+FQYYWMr8V5KdYxljHyp3uSiIq+lmYMbHF3uWM73CohQ7AZQolx9cJpJmxKyAfJW0iKT 9Oo+R4SQ/uhwO7rspI0qKDw/Dtly79eONeZe4VbvzT+QJdTcU/E5pn++BI9CmqL18kZWdhP9NNzaz pSTy3IIdJuy348YJ5Iw4fpvqGc+EQoEmE3R2/TDffkVy7zLuGvNdeGXCQgol0VZlPUojgjEd+6773 9orNlHqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXVAO-00000005dmI-46go; Sat, 27 Jul 2024 00:20:08 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXUlX-00000005QbE-0a19 for linux-arm-kernel@bombadil.infradead.org; Fri, 26 Jul 2024 23:54:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Reply-To:Sender: Content-Transfer-Encoding:Content-ID:Content-Description; bh=495sZLd3sCBTMIrtoKFKEohUXAwQ30LA4hbLQQBllaM=; b=gvYT2LB3UECpq7W4zY5U558chG WfnbxrpjInMbqQwikYD7UDWw3WUC7Un884MG/Q4OEkQjTmYiryp7daAHNkG1QExV5CNFOW1emn1aw 43RGYRq/HocTL/X+X5WxSImTdlrt/qnPVmsxdIQoO+MOoIthrasifyvcup84jVO9/V7T5mzmOFARH 2AG+Wf/XaDZBUXiq5aI9fPLQv3NgrP0hZ1ysBRbCGT+Uvm+W4iG/6d2UflBtvOQy8rOPz4Ti025v0 ++UGDHrQc4MRBQyhNuIl9s8tC2e0LTgN5e0lGO+jxYDE6Rl0a12fYn4CqQFxmfnpmZiHD1naI0Fdp 6qxdYuWg==; Received: from mail-pf1-x44a.google.com ([2607:f8b0:4864:20::44a]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXUlU-00000004K1B-0FSq for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2024 23:54:25 +0000 Received: by mail-pf1-x44a.google.com with SMTP id d2e1a72fcca58-70d19a4137dso1423328b3a.1 for ; Fri, 26 Jul 2024 16:54:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722038061; x=1722642861; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=495sZLd3sCBTMIrtoKFKEohUXAwQ30LA4hbLQQBllaM=; b=sDvOePFAvFgC8uzSLk4jiOO2dWqP7lcelY38TFcY8u3eC3K0BWfeJXcSmrJAelD/ps scCgnPTVhWfXLxOE9Hwb5N1TA/J3gkKhceTw7e0/HfcsLcbhGNn4Sul3t8IfH2G1Uq69 WmK2EqQLL9KfYwSi4MxTSBNWL+jpuuE9so1a5EAokko1O/4zLb6L15Ro2TskUbUN8TMh npGUP8ESxShD3krMjJp2X7IS+69JtgGK3KgCzhXmw2eMM1OIcKtEsiMGuszpz3qQmwlg eqTZBipk7LWfJj8tNWknQkJzqdJzwX2OEJI7lO1BbprFFQwmqWRSackU2zvIoPw/XIFg 63/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722038061; x=1722642861; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=495sZLd3sCBTMIrtoKFKEohUXAwQ30LA4hbLQQBllaM=; b=Q1S3/aqTBZNjAUuDLsJ26lk3EBsy5KCsY04jNbVgzurN6Ox9VDyRtO6/aHQ/63r1ly 0F5SFz/RCELxMLRXgNHrfBR3vx3i7dq6cWCKtH6QXZNr6JqnzGysY2FyBgmU8ovX1Qex 4XsKRYFgpr89J5qV94XwAKVLyDx2iHHWYWqejiyxA7LUjTQ0rBWonVkEgnKvTKHfLu/P 6ImJdISNr318qjDzvr7zjPPQkD3zaN6zQfV9PH+mhUGiReyl4bz/OFH6s+I5IzjcTFl9 vBMzreRKlu5wIBFU0JP4RkWTb7He+JcRsDkfzI1dz9xhUHrWBm/VNjnRg1HdkLL74P1+ ZDbA== X-Forwarded-Encrypted: i=1; AJvYcCUtYXJL25Zq5C8Lc9cq47mxR/7F2HGq/Y2xosRVaV3owX52E4f3CwR9elMHvvH1wO4s2ZUJBiofyJScNpExL1Q0rxVzxrXYe6fESEUm2jLW6/QoCNM= X-Gm-Message-State: AOJu0YxLiuNGKf5Gziapk5mbASvyju/fILThTA46c4lPnmDu349bZNvS aucA4rqr6H32hoo2PZWC3dXfBb1nAP0pGBLX0GG+jQwLQSQld0aLW3gd8BKLPqQfSxivs+EXPFn zGw== X-Google-Smtp-Source: AGHT+IEX18wdLlkp+2aMf2anoWcNTpOtSr1c0ECGrHfjhmBCNZQh1f0vS16HR3FEGEctU7qtPLZbGkdGSSc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:6f1c:b0:70d:138a:bee8 with SMTP id d2e1a72fcca58-70ece533146mr8925b3a.0.1722038060383; Fri, 26 Jul 2024 16:54:20 -0700 (PDT) Date: Fri, 26 Jul 2024 16:51:59 -0700 In-Reply-To: <20240726235234.228822-1-seanjc@google.com> Mime-Version: 1.0 References: <20240726235234.228822-1-seanjc@google.com> X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog Message-ID: <20240726235234.228822-51-seanjc@google.com> Subject: [PATCH v12 50/84] KVM: VMX: Use __kvm_faultin_page() to get APIC access page/pfn From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Tianrui Zhao , Bibo Mao , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, David Matlack , David Stevens X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240727_005424_259991_D2836DDC X-CRM114-Status: GOOD ( 16.24 ) 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: , Reply-To: Sean Christopherson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use __kvm_faultin_page() get the APIC access page so that KVM can precisely release the refcounted page, i.e. to remove yet another user of kvm_pfn_to_refcounted_page(). While the path isn't handling a guest page fault, the semantics are effectively the same; KVM just happens to be mapping the pfn into a VMCS field instead of a secondary MMU. Signed-off-by: Sean Christopherson --- arch/x86/kvm/vmx/vmx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 30032585f7dc..b109bd282a52 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -6786,8 +6786,10 @@ void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu) struct kvm *kvm = vcpu->kvm; struct kvm_memslots *slots = kvm_memslots(kvm); struct kvm_memory_slot *slot; + struct page *refcounted_page; unsigned long mmu_seq; kvm_pfn_t pfn; + bool ign; /* Defer reload until vmcs01 is the current VMCS. */ if (is_guest_mode(vcpu)) { @@ -6823,7 +6825,7 @@ void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu) * controls the APIC-access page memslot, and only deletes the memslot * if APICv is permanently inhibited, i.e. the memslot won't reappear. */ - pfn = gfn_to_pfn_memslot(slot, gfn); + pfn = __kvm_faultin_pfn(slot, gfn, FOLL_WRITE, &ign, &refcounted_page); if (is_error_noslot_pfn(pfn)) return; @@ -6834,10 +6836,13 @@ void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu) vmcs_write64(APIC_ACCESS_ADDR, pfn_to_hpa(pfn)); /* - * Do not pin apic access page in memory, the MMU notifier - * will call us again if it is migrated or swapped out. + * Do not pin the APIC access page in memory so that it can be freely + * migrated, the MMU notifier will call us again if it is migrated or + * swapped out. KVM backs the memslot with anonymous memory, the pfn + * should always point at a refcounted page (if the pfn is valid). */ - kvm_release_pfn_clean(pfn); + if (!WARN_ON_ONCE(!refcounted_page)) + kvm_release_page_clean(refcounted_page); /* * No need for a manual TLB flush at this point, KVM has already done a