From patchwork Fri Jul 26 23:52:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13743577 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 5F28BC3DA49 for ; Sat, 27 Jul 2024 00:29:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID :References:Mime-Version:In-Reply-To:Date:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tP7ndF5zQg9DYuPKDd93/VCp5s+0eoNzCgI26CxUICo=; b=TJ9eN/MSi6lhDp y1o2q2ZWjvsaWOD1HeSRb4DfctsXVEYcVcuboN7DWuqe+CbPRg+vW/zANHRu9PwWftrjCNg+ZAt+s B5hOOv8WSgr9KJrQMnGM9DVGqOM57LFEBlSyo1OfOm/nJuVtQXbTead5L1/Yd2Jq5NHFSUrJmuhr0 FuBb4KsIukrUt2KcI3iFqzWteg8GqxXa5LeHpf5yOYhKx6Awi1oB0lQAg0H1pv5uRWO4+wAfFIawS 81+NZyYwU39588Swa1rVguTM+EAvXXl65L7/tISEmXErt1egT81sapVR13aSqYcgdSYytc1b6RCzh E/ewyKCZof/mBQvPhW0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXVJb-00000005iUv-3t0M; Sat, 27 Jul 2024 00:29:39 +0000 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXUmC-00000005RAv-1LR5 for linux-riscv@lists.infradead.org; Fri, 26 Jul 2024 23:55:11 +0000 Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-79d95667cfaso1456203a12.2 for ; Fri, 26 Jul 2024 16:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722038106; x=1722642906; 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=M9eYn37tam32k4Zpbs9VqSvLY6wlhZ916YFlgyF6peA=; b=0mUCZzofIWQ65fvVtTZosKMgZWk4/RNi7hfuoCJW3vxaipoSXSvRE0nhYudZ6FZ8QC rK5Lf8RgLE5lqa/kBRJBkx7XbVjIfdbueUkQ6iggjrocwvmjHl1NGt+NtCTLyVSeBD2u bIyxWrH+X861laQp/x9BNB9+SiU0sRXisVl/zA5f37eRVqI0HUUDVECOzfgouSWjfNk9 5vEDFWbh+Uv3MeHEIkivHaaaZtNtCxyTSQuBpibX/6UrP0IgOMCMtdZalqjaDrps6AO1 OkzksdQf6wdlgfq1ni7X6GNITiRYLYTaKqPKrKZ7jYaBu9bJ9U25NnVmo1bd1L1DZjU8 QJgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722038106; x=1722642906; 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=M9eYn37tam32k4Zpbs9VqSvLY6wlhZ916YFlgyF6peA=; b=B1oOE279wOy3TtaxMSlEoMEGaCsufCQ/rnTDmZkctER2uj0WcSYOVazrYd/sF5vNQh SILXWLZw7QG1HbSO91MP8YAd5iA8WVfuMuPXUcUUwX13Ox9MB0oWY4seOQxOgqqP5nCN Dp+Dp9LesNF8jRib0UEQfuNxzvePRAgj/w3ygZA3QdMtPfNM1eTm9wug0VjfBvCk1Iq1 e9EGQW6tGhwgiV501Qu68H5tCHKAmr3pPyOXGjtf8PHiLJOAZ4M1NxankMgWBpFjdRNa 07DCf+L8Crg0N0e2Z1M2SqtUUxBZpN6/1Gm5VZP5oUitpNPxqKRnlDhERVxs77llfIkK J9fA== X-Forwarded-Encrypted: i=1; AJvYcCVXVRKxyTOeFKjynFF/2z+1bOUABG+JOL3sWTrmgzRYxljmMkmWZXC2OMwCBAjEuBkjiWfo48wHfcO36sQByRyF46QNI2d8AFNn1dmBDA8X X-Gm-Message-State: AOJu0YyN2L69s3iVvzI56HxEm3Wt65CZJq2bCCNk1rUpB3L01TAtrp+d 2bT+IDF0Kgoz/JnH6j/ixcQB6IbcAHr8KJNYl3w8CrE0eTLVbTRxvilpGzREr3wh7Vt3flam6Aj W1w== X-Google-Smtp-Source: AGHT+IG8TH3qPrjAadwsmfbGVL51l5vDfwJrWL4CCM6knLIepOGyFeiwzAiBROJulbOiIHONd5UuXBO9hTI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a02:526:b0:6e3:e0bc:a332 with SMTP id 41be03b00d2f7-7ac8dbc497emr2439a12.2.1722038105187; Fri, 26 Jul 2024 16:55:05 -0700 (PDT) Date: Fri, 26 Jul 2024 16:52:20 -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-72-seanjc@google.com> Subject: [PATCH v12 71/84] KVM: MIPS: Use kvm_faultin_pfn() to map pfns into the guest 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_165508_737324_7AD07A2D X-CRM114-Status: GOOD ( 12.33 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Convert MIPS to kvm_faultin_pfn()+kvm_release_faultin_page(), which are new APIs to consolidate arch code and provide consistent behavior across all KVM architectures. Signed-off-by: Sean Christopherson --- arch/mips/kvm/mmu.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c index 69463ab24d97..d2c3b6b41f18 100644 --- a/arch/mips/kvm/mmu.c +++ b/arch/mips/kvm/mmu.c @@ -557,6 +557,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, bool writeable; unsigned long prot_bits; unsigned long mmu_seq; + struct page *page; /* Try the fast path to handle old / clean pages */ srcu_idx = srcu_read_lock(&kvm->srcu); @@ -578,7 +579,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, mmu_seq = kvm->mmu_invalidate_seq; /* * Ensure the read of mmu_invalidate_seq isn't reordered with PTE reads - * in gfn_to_pfn_prot() (which calls get_user_pages()), so that we don't + * in kvm_faultin_pfn() (which calls get_user_pages()), so that we don't * risk the page we get a reference to getting unmapped before we have a * chance to grab the mmu_lock without mmu_invalidate_retry() noticing. * @@ -590,7 +591,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, smp_rmb(); /* Slow path - ask KVM core whether we can access this GPA */ - pfn = gfn_to_pfn_prot(kvm, gfn, write_fault, &writeable); + pfn = kvm_faultin_pfn(vcpu, gfn, write_fault, &writeable, &page); if (is_error_noslot_pfn(pfn)) { err = -EFAULT; goto out; @@ -602,10 +603,10 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, /* * This can happen when mappings are changed asynchronously, but * also synchronously if a COW is triggered by - * gfn_to_pfn_prot(). + * kvm_faultin_pfn(). */ spin_unlock(&kvm->mmu_lock); - kvm_release_pfn_clean(pfn); + kvm_release_page_unused(page); goto retry; } @@ -632,10 +633,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, if (out_buddy) *out_buddy = *ptep_buddy(ptep); - if (writeable) - kvm_set_pfn_dirty(pfn); - kvm_release_pfn_clean(pfn); - + kvm_release_faultin_page(kvm, page, false, writeable); spin_unlock(&kvm->mmu_lock); out: srcu_read_unlock(&kvm->srcu, srcu_idx);