From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1150723A9AC; Thu, 13 Feb 2025 14:37:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457428; cv=none; b=nzkwp8Qi/HSgLvoNIK+TV8m3pFVDeKLFMXWjyjbnMxl7yR/Q5g+UEfXEqpC/mmG3DevJn0G763vDl/ya9dCgK6oUKcXAn+mzQPDKJmzR1z6coQWcG/ZjXoDTGo8gW2F/0Z2cE7KVB5HddP2xtA8qUIBEsEXu0zhYl2GDAbY01sc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739457428; c=relaxed/simple; bh=OoUcl5+6HlUN9ULBeokhokwPZci/aks8NgG5LfD0WUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bs3J2fnZiz6SPX9P0b5GSV/3p0oYnQPLkh7NiXNnY2nUqQPTSUihi1BwuqNZriix60gtUl5EMJOhPx3J62jG6lkFFXscQgAQRqmxkblkkI8XfY8t7vUkUsLW+B/q63Gh3vroa2zOW5z7zMmrUv+gwlT04DPdJLWVOjLCih7eVao= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1cr649Qn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1cr649Qn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11B76C4CED1; Thu, 13 Feb 2025 14:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739457427; bh=OoUcl5+6HlUN9ULBeokhokwPZci/aks8NgG5LfD0WUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1cr649QnrDvVPcAcaighgFc6qhU2+FUHKcDTf8hAnYmB9HRBMX57Z4BY0dAQFG1QT z5qzlJIiTihrbdU0wdFPNzwtGKIteupqESVUxJLpjvCifsZtKIBLQ0p/hUhOUrXsQ8 wjfOHWK87bUiJ+sNQ3Lfa/S/3BS+nSxDqNCY7jFY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sean Christopherson , Dmitry Osipenko , Paolo Bonzini , Sasha Levin Subject: [PATCH 6.12 090/422] KVM: PPC: e500: Mark "struct page" pfn accessed before dropping mmu_lock Date: Thu, 13 Feb 2025 15:23:59 +0100 Message-ID: <20250213142440.026389062@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213142436.408121546@linuxfoundation.org> References: <20250213142436.408121546@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sean Christopherson [ Upstream commit 84cf78dcd9d65c45ab73998d4ad50f433d53fb93 ] Mark pages accessed before dropping mmu_lock when faulting in guest memory so that shadow_map() can convert to kvm_release_faultin_page() without tripping its lockdep assertion on mmu_lock being held. Marking pages accessed outside of mmu_lock is ok (not great, but safe), but marking pages _dirty_ outside of mmu_lock can make filesystems unhappy. Signed-off-by: Sean Christopherson Tested-by: Dmitry Osipenko Signed-off-by: Paolo Bonzini Message-ID: <20241010182427.1434605-54-seanjc@google.com> Stable-dep-of: 87ecfdbc699c ("KVM: e500: always restore irqs") Signed-off-by: Sasha Levin --- arch/powerpc/kvm/e500_mmu_host.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c index 5c2adfd19e123..334dd96f80814 100644 --- a/arch/powerpc/kvm/e500_mmu_host.c +++ b/arch/powerpc/kvm/e500_mmu_host.c @@ -498,11 +498,9 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, kvmppc_mmu_flush_icache(pfn); out: - spin_unlock(&kvm->mmu_lock); - /* Drop refcount on page, so that mmu notifiers can clear it */ kvm_release_pfn_clean(pfn); - + spin_unlock(&kvm->mmu_lock); return ret; } -- 2.39.5