From patchwork Fri Jul 26 23:52:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13743568 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 AC896C3DA4A for ; Sat, 27 Jul 2024 00:29:44 +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=y+Ar7T6On16alzy9M8c5sPTmukkBuZuZUdMs6MViY54=; b=htVbGAD1WBGqYrafxqAJHDYReR XPC71e1XQcZaVqP6l7AYMnzA+3oCVmogl9SzseDON5RIwE2PyOCILuxtfeWYjBKOO5glFzlnS8KOY x7oUgIH196f9kzYp0YfEnDDAN+wxJy+ksiYRFSMqQpbJUoYVC49Db4vfYhIt0ePO9CWlVlaFmZ6r4 +oln1XzZ41JyKTOI0j+3gRmMYCK6ghtTLkIIx7vOY17ien9Uy7uPYyu0DSkVKFkS6zZgkObCx4vMH IOKM3JgRfa1d01qmzIW7W9ZIUofmCQjwzAIUspgnOdccAptLZh++Drd+q4W/kzTAqeqco+LeKX/+v ay448iog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sXVJW-00000005iRV-1rLS; Sat, 27 Jul 2024 00:29:34 +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 1sXUm8-00000005R8R-3ab9 for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2024 23:55:09 +0000 Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-778702b9f8fso980516a12.1 for ; Fri, 26 Jul 2024 16:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722038104; x=1722642904; 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=y+Ar7T6On16alzy9M8c5sPTmukkBuZuZUdMs6MViY54=; b=Xp+oKq+tgSaakiE6sOy9CxG4QRN4uS+QNzJ7kjMpUAoSZEvNxAIqL3C7BpprX+d2uC RFINH9qvnLQKAqjISIMjX2bTo6sNEJvt/qbmcOaEWtUeBjgf41gNttkPymXMZfdblf3x 1szZThDQwNIBLjqYRRKu7mfuxeqPEwGVcVjB0W1BiwDkOXDAIMtQA+Rx59uiAR+Vvm6w ag5YebQynXSLGIE4LnXxB2gaIbqDPu1m4qIHGAzeYVCip9/Vx5GD/EzUg6OU0fYULCbS aPXaPCuGzbB7Z0rcTvCbb3cbi9pWE95kgnSf/Z73WYEv7no++f2TF3g0awk3EpAojYx1 xj3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722038104; x=1722642904; 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=y+Ar7T6On16alzy9M8c5sPTmukkBuZuZUdMs6MViY54=; b=AuQbpaJzZ9459adHSVj9N9EEx+nG0OAl7CzqLl8A3mCkEyTnrwc29AHf/usLadFGKe iu4un6KsXdh8PoT3J85Uaqo1ZQfkDRXPiGM1JVOz+L9hzCkFn/hRYhdWG+U30n9bzrfU +q6cs7C/UL368qZb8uu8qdZ5EP9EXYDflCiWjQLuRI0KmFhVvspexxpIDR4xXP90Sy3D jRkYguVC8dCYR/Da2zzaoW5R35A0Oq4Odlf1gW78RQ9rcmvZsKEO2zTVq2bvUyICZ9+0 hh4RWx/uca8ZZSeqLfNGhkdu83wlh1/UJVbLzvOo+rS9hu+QtEUOkEmZkrxcI3xt3Xhl wzzg== X-Forwarded-Encrypted: i=1; AJvYcCXAWmehj0nmMAB5XBy9tLi/dfQwQRpqXrs0tdl91HZi2CMuPXF72RaiBxQAJ77KJxNE+srX+e6gYspQsurLhicGlw7M4Nm1EFe+N8eqc8rS1sA00OQ= X-Gm-Message-State: AOJu0Ywml88SJqu4doZ8F67NWVcCut5s9XFZ2cwtQfN/byjZVcrGBpPU noQ0zzrT5ZoWk6/slee6FpTSejJ5fs4biWvG1sf8PLLmjflVM7venX2564Cd583+UI0QVXLhDpy +tA== X-Google-Smtp-Source: AGHT+IFnr9ua4KoyN+kf9dgXRrvt4SVsbQldBEs2PtVQEhle6Kqivs/NJk7PeSFySHT1lFiCWuBu3lKqAis= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a02:50a:b0:740:2b12:8780 with SMTP id 41be03b00d2f7-7ac8fd30684mr3158a12.5.1722038103410; Fri, 26 Jul 2024 16:55:03 -0700 (PDT) Date: Fri, 26 Jul 2024 16:52:19 -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-71-seanjc@google.com> Subject: [PATCH v12 70/84] KVM: MIPS: Mark "struct page" pfns accessed prior to dropping mmu_lock 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_165505_208848_92A93254 X-CRM114-Status: GOOD ( 10.20 ) 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 Mark pages accessed before dropping mmu_lock when faulting in guest memory so that MIPS can convert to kvm_release_faultin_page() without tripping its lockdep assertion on mmu_lock being held. Signed-off-by: Sean Christopherson --- arch/mips/kvm/mmu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/mips/kvm/mmu.c b/arch/mips/kvm/mmu.c index f1e4b618ec6d..69463ab24d97 100644 --- a/arch/mips/kvm/mmu.c +++ b/arch/mips/kvm/mmu.c @@ -634,10 +634,9 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, if (writeable) kvm_set_pfn_dirty(pfn); - - spin_unlock(&kvm->mmu_lock); kvm_release_pfn_clean(pfn); - kvm_set_pfn_accessed(pfn); + + spin_unlock(&kvm->mmu_lock); out: srcu_read_unlock(&kvm->srcu, srcu_idx); return err;