From nobody Thu Sep 19 00:54:29 2024 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3C84818C327 for ; Fri, 26 Jul 2024 23:54:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722038095; cv=none; b=txT/8Z3vllxfG+1lvZvfaeHDcur1MllQ4yabZNhdcTSwugnilOhLJ9sQhSFliadlb0UxzEKEzHHIqeNDSYDHQbSB5t4qVDZPeD2mW+LImxdKC3C0OnzaQEP65uNDjRlwbIlIhTqf87fjaayC+1c+NE+fjBM5+Qtt32tE8fmp0aw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722038095; c=relaxed/simple; bh=Z7iItHoG1Un0PHfLJEkTiTxR+0KDEJBb6FOtFGyXsoU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CiuRRnnEcLGtDfKtE5rdvGP+7PTMdEy+79odBIYWGMy3KC0E0iDj7syqxBnpCNaZkYqtaDTHMiW0rJSDkIiaTIqaEXOxZHR2cc0BEmIWxj1jzYAKwfqg7E6wisJdVc/1ac5Tokp2sR+boNhTkSPAXo571RnfL0K9GVxSBGYgCrg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PwfC3Syd; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PwfC3Syd" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1fda155bc43so11485535ad.3 for ; Fri, 26 Jul 2024 16:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722038093; x=1722642893; darn=vger.kernel.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=rpwXsNxFJqP0CEr/yEQ2h0r+lN6KBTuvETCSKMoe8FQ=; b=PwfC3SydHXcotWsLNhxGsq19l+/jleIfZ2WVEAKW81LAZf7qh9C7moVxdjUBkDZy5y 5UI41ubit0OIVCLIcehBe01+lr1qpgPWltuclSpvXd8Ud11XK36DI/0bnxwwB7Apl0uZ SC7qh65/lS5Sd1plD239HFDuGcyxkgH6b8KhbjSE2gyKFZXoV0DGe/OqE2ei77l5BF/k UldDmW78Ut2208tCKxHPycrY4f/O4axRhq/eBD7EQafvYrOd5KLUM5dfDOau6hJi+A5F 2dk2AriUhjK438cpn99mIX1GZky7m+sEM+ca/53yZgudi0q35pgP3ThGqjcxP/l3NP2O jmdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722038093; x=1722642893; 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=rpwXsNxFJqP0CEr/yEQ2h0r+lN6KBTuvETCSKMoe8FQ=; b=ScfUiHYsIb+nGbAH5mQwC5/lHFGuwVBlsrziV6qimgpcPKQBxiHwRyjJ4AWRvTautD tGlDFdSGQhMC0GwQwdErEZnKiErTMU8RD3nHrvskLcCxFEDs+dBDh/CpoPUqpQz9KmMN 8fLf1ZxC1lbHlpRsQ5BhLyFktJblG0uoayYjuaiR7pvt+6CZ2mbewIWbXPELWMtmxHMg ezm3SOdsyBJ0XI4vDlHGbyir+s6rXuebWAWWdWg4zaI3hTVBdVwTgX1afapNKnHT7x06 kiftJlgzklLL2441FSo86/S6TWsFLrNVOycvvEi9bE9mqlCoOzYhhB3eslNzx/V4UbLX sV+A== X-Forwarded-Encrypted: i=1; AJvYcCUPNDH70xGsO21BTgMzWwOcPRQuOZzHXOvxSE1ahrT5qmFBTqqiMHmG8fx1pekcYQlv2JBTHMjtT1CqdPzxMAyp6edyH1WbbHkMD7sg X-Gm-Message-State: AOJu0Yy+XL0mW/PvnkBhIsyXuR06gxqJ5hA33/45YUgU/2BBe3NK9lcJ hCUUeUQFhKy4cINZ9JY+aO49PKTYUUx77NSqCSLjNzmvvUU0cLqJg/56C4FPcQ1ohViSJudbtt0 B/w== X-Google-Smtp-Source: AGHT+IEz1qMb/9xSOR6pziERGmR6RlcO2d1FpOxR3ZCse98fOqCGJ5ia3ZBUMMNkI3e0ioyh2oD8FsbOxx8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:903:2341:b0:1fd:63d7:5d34 with SMTP id d9443c01a7336-1ff04803eeamr27405ad.5.1722038092373; Fri, 26 Jul 2024 16:54:52 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 26 Jul 2024 16:52:14 -0700 In-Reply-To: <20240726235234.228822-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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-66-seanjc@google.com> Subject: [PATCH v12 65/84] KVM: LoongArch: Mark "struct page" pfns accessed only in "slow" page fault path 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Mark pages accessed only in the slow path, before dropping mmu_lock when faulting in guest memory so that LoongArch can convert to kvm_release_faultin_page() without tripping its lockdep assertion on mmu_lock being held. Signed-off-by: Sean Christopherson Reviewed-by: Bibo Mao --- arch/loongarch/kvm/mmu.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/arch/loongarch/kvm/mmu.c b/arch/loongarch/kvm/mmu.c index 364dd35e0557..52b5c16cf250 100644 --- a/arch/loongarch/kvm/mmu.c +++ b/arch/loongarch/kvm/mmu.c @@ -552,12 +552,10 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn= _range *range) static int kvm_map_page_fast(struct kvm_vcpu *vcpu, unsigned long gpa, boo= l write) { int ret =3D 0; - kvm_pfn_t pfn =3D 0; kvm_pte_t *ptep, changed, new; gfn_t gfn =3D gpa >> PAGE_SHIFT; struct kvm *kvm =3D vcpu->kvm; struct kvm_memory_slot *slot; - struct page *page; =20 spin_lock(&kvm->mmu_lock); =20 @@ -570,8 +568,6 @@ static int kvm_map_page_fast(struct kvm_vcpu *vcpu, uns= igned long gpa, bool writ =20 /* Track access to pages marked old */ new =3D kvm_pte_mkyoung(*ptep); - /* call kvm_set_pfn_accessed() after unlock */ - if (write && !kvm_pte_dirty(new)) { if (!kvm_pte_write(new)) { ret =3D -EFAULT; @@ -595,23 +591,11 @@ static int kvm_map_page_fast(struct kvm_vcpu *vcpu, u= nsigned long gpa, bool writ } =20 changed =3D new ^ (*ptep); - if (changed) { + if (changed) kvm_set_pte(ptep, new); - pfn =3D kvm_pte_pfn(new); - page =3D kvm_pfn_to_refcounted_page(pfn); - if (page) - get_page(page); - } + spin_unlock(&kvm->mmu_lock); =20 - if (changed) { - if (kvm_pte_young(changed)) - kvm_set_pfn_accessed(pfn); - - if (page) - put_page(page); - } - if (kvm_pte_dirty(changed)) mark_page_dirty(kvm, gfn); =20 --=20 2.46.0.rc1.232.g9752f9e123-goog