From patchwork Fri Jul 26 23:51:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13743438 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 2B768C3DA4A for ; Fri, 26 Jul 2024 23:59:28 +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=XEii1g2QxUcfpOdmeEwY4J2sYQAHz7s0WQ4Z9lEf4mM=; b=x4y2UfMAgdHwCcOSWzydMX8KHi TYjVIf7PaQjrsf4SA1Y2+1LN2APjWveQ1UcXx1PqclswoRbpy3LHvafKH3HcCytCkhoUey8vbtUg1 DPse5JWHT0FLECcX6Kxe4HfzyxFVHse2VjaVfyKzfk1TOPIoXE+/oCHbPw+nupH89PNEZILCAlOg2 ka1rpwPaP+2MVVc33oYVSI+RsyTGkLQ4bu7yzE25ZOX1qjkK+l2Zh29qNC2GdmHYcv9ZuN0xP7kX9 vfjtA5miSO3cJjaj0QC3sZKLipOiI+d+5qjdiabHx46JLpd9yeRNZALe0v0JsLYYU9saVW9ce9Onp Jqbh7oCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXUqB-00000005TTK-1yyG; Fri, 26 Jul 2024 23:59:15 +0000 Received: from mail-pg1-x54a.google.com ([2607:f8b0:4864:20::54a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXUkH-00000005PUn-2bUO for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2024 23:53:11 +0000 Received: by mail-pg1-x54a.google.com with SMTP id 41be03b00d2f7-79d95667cfaso1454855a12.2 for ; Fri, 26 Jul 2024 16:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722037988; x=1722642788; 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=XEii1g2QxUcfpOdmeEwY4J2sYQAHz7s0WQ4Z9lEf4mM=; b=Vw4SOUvRPhx9UHeT2LuztaHfmzfGs7YO8zyT6KABD4iQAWZH0+tOnItfSNk+0u5MK9 pNrLAgAIvTgF3DftiER021PIWNkBUJ7sc6ZPZTBGg4F4kGddgSEM7OaqEtqfdE1Oc7oO l5Bylu3pbAqu8wOclEXEhyARtmq9XyuVRaGS263+KiWUF/ooU3sJpO+eqn8n+9qzi7ww UwmNM9B3aekqQQ6289TRwSdOgtN8GzHR1OjoG53rZRHwr2qiADGBsmpTlh3Ala+iDiXS SqY5L/3BUWa+jgvt0s+WHnaqLVJjOQNd17nhjl/Ci0Z+Vkz2uU2qX0Pa4h5sdhYF3RRY XG8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722037988; x=1722642788; 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=XEii1g2QxUcfpOdmeEwY4J2sYQAHz7s0WQ4Z9lEf4mM=; b=m2G73VNzBAXJLG/j0SXJYndkRY2EPMAoFjdR7rqqgnxFpxHloUFJhzILVo+bcS1nxm 1M5gWP2HhbyLcWq8Qu6lq5fqtiM274+pgLEjd49brma6K8VpaBvhOZRdKkjT3eWlxy4Q OVaJXVYqgU9UhsC/wmg+vf2bOvScE6K4BIPclBUPz+ubS0QTDsafMSHRh8tNfeHbZaKX 2Wl33RqAahz64R7kqP0y88cmXJybwnFZ7FEf8L2BmA1NGPUENsgrih+Q+R20mYvqASWg uwj6PnrdPrQG5MQ+/W1rxPwzconC/Uh1mb8UWkA3chr7DXZ2kwXNJSos6htA3GahJ8ZK LIVg== X-Forwarded-Encrypted: i=1; AJvYcCXaNUfM1EeFVpoHsZCq3xj0n+IvtGT3LlwzZxR3vBZjV2qQx7hsksBB/NNapfYScZ7KRrCP+HKID5aw7A1DeqkMAJDOOOyRV2g3fvFn418fx6S4E9U= X-Gm-Message-State: AOJu0YzOnOoW9DayOGYPBgZcUOx1i24vC9av6FDqhzeAZb5NmFL4yYb5 MO4PNKGiK7+RXkJNYk03Ne7o7uN4kfRRNQUlWWzaVLWZOhRXfQTsfDTo/8Dn68BemSBPwXyykWH GGQ== X-Google-Smtp-Source: AGHT+IHOguM9TV1Wqy8YwTb6CBUJl4Q4k/lDzAhV2epo/9u56TnU3ou5KRwZKpMCKdXGcBYB5FJy1Mcb3zg= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a65:6556:0:b0:710:cc3c:3916 with SMTP id 41be03b00d2f7-7ac8e0b6796mr2159a12.3.1722037987987; Fri, 26 Jul 2024 16:53:07 -0700 (PDT) Date: Fri, 26 Jul 2024 16:51:24 -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-16-seanjc@google.com> Subject: [PATCH v12 15/84] KVM: x86/mmu: Drop kvm_page_fault.hva, i.e. don't track intermediate hva 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-20240726_165309_941846_4A5DD39D X-CRM114-Status: GOOD ( 13.17 ) 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 Remove kvm_page_fault.hva as it is never read, only written. This will allow removing the @hva param from __gfn_to_pfn_memslot(). Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 5 ++--- arch/x86/kvm/mmu/mmu_internal.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index eb9ad0283fd5..e0bfbf95646c 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3248,7 +3248,6 @@ static int kvm_handle_noslot_fault(struct kvm_vcpu *vcpu, fault->slot = NULL; fault->pfn = KVM_PFN_NOSLOT; fault->map_writable = false; - fault->hva = KVM_HVA_ERR_BAD; /* * If MMIO caching is disabled, emulate immediately without @@ -4333,7 +4332,7 @@ static int __kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault fault->pfn = __gfn_to_pfn_memslot(fault->slot, fault->gfn, false, true, fault->write, &fault->map_writable, - &fault->hva); + NULL); /* * If resolving the page failed because I/O is needed to fault-in the @@ -4362,7 +4361,7 @@ static int __kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault */ fault->pfn = __gfn_to_pfn_memslot(fault->slot, fault->gfn, true, true, fault->write, &fault->map_writable, - &fault->hva); + NULL); return RET_PF_CONTINUE; } diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h index 1721d97743e9..f67396c435df 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -238,7 +238,6 @@ struct kvm_page_fault { /* Outputs of kvm_faultin_pfn. */ unsigned long mmu_seq; kvm_pfn_t pfn; - hva_t hva; bool map_writable; /* @@ -310,7 +309,6 @@ static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, .is_private = err & PFERR_PRIVATE_ACCESS, .pfn = KVM_PFN_ERR_FAULT, - .hva = KVM_HVA_ERR_BAD, }; int r;