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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 C9F72CFC5EC for ; Thu, 10 Oct 2024 18:29:27 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4XPdVy1V6qz3cG5; Fri, 11 Oct 2024 05:26:18 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2607:f8b0:4864:20::449" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1728584778; cv=none; b=BWr2ZX87rO2s9vrP5+X1aJR9kYerdb/NZrLDAdheBTiXQzRzpqjXFMeICoeOYI75D5AGx/s+0rvbBg/iZlesMON2vrEq5As6jv+pab55D6KqU3ZbkAltGg11wZ1cNhe+yT8qdhamGWNsdGUd1UXoRhvQhmi84JopZojAWYiMZ8LixKXBlpoq5lXZ9H9IeVS2JIUoI9CC59GmztrzZnvXpG3wGFGuE/Y9F0jHkvM4iZl2bjnEIdugvlZZU1uY375kg3crKvaPfd3qXDXWQoIsR8074ix9cTsFScfevT19cTFaKwp2tLnSpidF4KxYUOfSyEpDlkRNdPHBsZsOrI/2oA== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1728584778; c=relaxed/relaxed; bh=GAJaAoo95YXsHy4joQlb4gblEl3cKLpcYsG4EH0XckI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=VQJvSnXd7Nn7p1LvBqHef+W0MB2Fpsd9Ttwlfvl/bs7JRmBf5vKe41TPYt5Sec0a848iiNc99I/gTCDmHg+iTeZ5jUlSQzpbdZ8XVgs2KZn9R5ltJx/rT1fvrAsUMc5gK9rTLodw7dB8/Y3FHCTTJoMt+yL4Ls2xYhCRDDqsH5MzOi5pkqq5p27oIWcBPfkZfwwl40F41ghe8L1S4ZMGkvwv2wHscNkYBLIWKc1nbjh+aM+1KCkwm97Hc3WBGaEgaPIsoL8mojDRbi2tEsyV58JbR+K6+SuE9SjKt0NaDKMj8amFB5fIL79b44BTRzeULvXXw36AQyJTyPEaF1DMYA== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=L/lwYQxo; dkim-atps=neutral; spf=pass (client-ip=2607:f8b0:4864:20::449; helo=mail-pf1-x449.google.com; envelope-from=3rxwizwykdn4seanjcgoogle.comlinuxppc-devlists.ozlabs.org@flex--seanjc.bounces.google.com; receiver=lists.ozlabs.org) smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20230601 header.b=L/lwYQxo; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=flex--seanjc.bounces.google.com (client-ip=2607:f8b0:4864:20::449; helo=mail-pf1-x449.google.com; envelope-from=3rxwizwykdn4seanjcgoogle.comlinuxppc-devlists.ozlabs.org@flex--seanjc.bounces.google.com; receiver=lists.ozlabs.org) Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4XPdVx2N8Jz3bkL for ; Fri, 11 Oct 2024 05:26:17 +1100 (AEDT) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-71e019ab268so1589047b3a.2 for ; Thu, 10 Oct 2024 11:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1728584776; x=1729189576; darn=lists.ozlabs.org; h=content-transfer-encoding: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=GAJaAoo95YXsHy4joQlb4gblEl3cKLpcYsG4EH0XckI=; b=L/lwYQxoQqP9/LJ/JAJPbKAO1bgrHV2ujPTu3gOjNS7XBC3G6Ua/Ds8D4A6oMHwtKe GnU7sYUHMT37DbXzpTRSkFH3c2qrkL2I82gmsHvf6McV8W1Dbinx6PZTgsxHWT4Mmrxa dnPlUfZ0BXFXFrut8RILQOjUTYGUVnPsD6UvIXihrREsTO0cdaFGHBWsFf9Sz6/dfX34 0Rg+uhtbj0THU0OVwC1IKu5Z99QKO2L8W0gP3m5sxKTUmvUw+nnS15ePFiTH9NuwN1qL tbtpDyDxSZ+3Zbpo5g13QuHbG0qBgWUxZc8Nxj7SDtrVNKm2M5Wm7JmUcb1yN2hcTfNG 7lDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728584776; x=1729189576; h=content-transfer-encoding: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=GAJaAoo95YXsHy4joQlb4gblEl3cKLpcYsG4EH0XckI=; b=TH7l9LeJBw9Veiy9hrj5RdDG60PVNZiXNjhKSU6CBw3ccuW9NaP+LDmyxZfFm7ctan YlfoMcn1Y1m2t8X5U2T3huXivxhmbYmIikEtXR2aTRxEAmYzrKanPc5jnylDdYnFh7RO ahCtdbZGXo/pCgVmSm3j5UgcYK4e87252y+4Pe04M59bRZIDH9RnMdR8ppA+f6TVlfZX ZrGNGXoYOAhwkfNO5ecrK4dKGn90BHETOerEbzhZnOAIWq7Glw3+FSHp+KXqWScd5g3B S6JSVK/71OhOoZmwOoRMZuGt8GmbmM+s5zX2Ul6NQ8/qhnOA6frTfbbpaS5iO+nVejQO DEEg== X-Forwarded-Encrypted: i=1; AJvYcCVU0iJZOqX4/QC24CM0Bf8WCnlEiT7gzLcLuAvCJf/v9YzmJfRYCObt4OgDaTHv+GjpldomNlkQ6/vToac=@lists.ozlabs.org X-Gm-Message-State: AOJu0YyJsXZaB9aTW3PMeV70ORpMnT+rEObeqNjYafajL9MsWjFRk2Cn jEOWNe7NWJYK1enYWevlTEbJLZeVi9DDvwx7o2iRhHP58g/V04VUB2jGKbfCDK7fIwoduqmXJVE vSQ== X-Google-Smtp-Source: AGHT+IEXxr/4vsCtgUsUHHkctm5xGRqb6tsNipBtkL7vgMjj75AzVZauqGsQqnffIf336Hhi8e9e6vZrhMQ= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:9d:3983:ac13:c240]) (user=seanjc job=sendgmr) by 2002:aa7:9184:0:b0:71d:f7c9:8cb3 with SMTP id d2e1a72fcca58-71e1dbf1ab5mr7792b3a.5.1728584775458; Thu, 10 Oct 2024 11:26:15 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 10 Oct 2024 11:23:42 -0700 In-Reply-To: <20241010182427.1434605-1-seanjc@google.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Post: List-Subscribe: , , List-Unsubscribe: Mime-Version: 1.0 References: <20241010182427.1434605-1-seanjc@google.com> X-Mailer: git-send-email 2.47.0.rc1.288.g06298d1525-goog Message-ID: <20241010182427.1434605-41-seanjc@google.com> Subject: [PATCH v13 40/85] KVM: x86/mmu: Add helper to "finish" handling a guest page fault 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, "=?UTF-8?q?Alex=20Benn=C3=A9e?=" , Yan Zhao , David Matlack , David Stevens , Andrew Jones Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Add a helper to finish/complete the handling of a guest page, e.g. to mark the pages accessed and put any held references. In the near future, this will allow improving the logic without having to copy+paste changes into all page fault paths. And in the less near future, will allow sharing the "finish" API across all architectures. No functional change intended. Tested-by: Alex Benn=C3=A9e Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 12 +++++++++--- arch/x86/kvm/mmu/paging_tmpl.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 65d3a602eb2c..31a6ae41a6f4 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4357,6 +4357,12 @@ static u8 kvm_max_private_mapping_level(struct kvm *= kvm, kvm_pfn_t pfn, return max_level; } =20 +static void kvm_mmu_finish_page_fault(struct kvm_vcpu *vcpu, + struct kvm_page_fault *fault, int r) +{ + kvm_release_pfn_clean(fault->pfn); +} + static int kvm_mmu_faultin_pfn_private(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) { @@ -4522,7 +4528,7 @@ static int kvm_mmu_faultin_pfn(struct kvm_vcpu *vcpu, * mmu_lock is acquired. */ if (mmu_invalidate_retry_gfn_unsafe(vcpu->kvm, fault->mmu_seq, fault->gfn= )) { - kvm_release_pfn_clean(fault->pfn); + kvm_mmu_finish_page_fault(vcpu, fault, RET_PF_RETRY); return RET_PF_RETRY; } =20 @@ -4598,8 +4604,8 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, s= truct kvm_page_fault *fault r =3D direct_map(vcpu, fault); =20 out_unlock: + kvm_mmu_finish_page_fault(vcpu, fault, r); write_unlock(&vcpu->kvm->mmu_lock); - kvm_release_pfn_clean(fault->pfn); return r; } =20 @@ -4685,8 +4691,8 @@ static int kvm_tdp_mmu_page_fault(struct kvm_vcpu *vc= pu, r =3D kvm_tdp_mmu_map(vcpu, fault); =20 out_unlock: + kvm_mmu_finish_page_fault(vcpu, fault, r); read_unlock(&vcpu->kvm->mmu_lock); - kvm_release_pfn_clean(fault->pfn); return r; } #endif diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.= h index a476a5428017..35d0c3f1a789 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -836,8 +836,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, str= uct kvm_page_fault *fault r =3D FNAME(fetch)(vcpu, fault, &walker); =20 out_unlock: + kvm_mmu_finish_page_fault(vcpu, fault, r); write_unlock(&vcpu->kvm->mmu_lock); - kvm_release_pfn_clean(fault->pfn); return r; } =20 --=20 2.47.0.rc1.288.g06298d1525-goog