From patchwork Wed May 29 18:05:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Houghton X-Patchwork-Id: 13679368 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50877C27C44 for ; Wed, 29 May 2024 18:05:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EB236B00A4; Wed, 29 May 2024 14:05:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 472DF6B00A5; Wed, 29 May 2024 14:05:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29F4B6B00A6; Wed, 29 May 2024 14:05:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0AE9C6B00A4 for ; Wed, 29 May 2024 14:05:25 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B3388160D9C for ; Wed, 29 May 2024 18:05:24 +0000 (UTC) X-FDA: 82172210568.12.BAF7D2F Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf07.hostedemail.com (Postfix) with ESMTP id E195440008 for ; Wed, 29 May 2024 18:05:22 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=DeZ51roL; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3YW5XZgoKCNQ9J7EK67JED6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3YW5XZgoKCNQ9J7EK67JED6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jthoughton.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717005922; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Bhng0mHOZ4irF/CjBRL9b9lRPnBOuiSl+dtfP+mXSOo=; b=5p/ZW1pzw3cQPS53k2lxAzlmIBEVZebD7V/Kq1hW+KwiyG6+JJpKsbW3iftPOcn0yzW2fU vq35leIeP1G47gAAIyL/SNF10WC+McKfHBWmIkE9jqxa0sCGVPT4bp+dpudsx0/1v4xWl7 pxUvUMa0QCtd+SKsIOcurYdngio1dQs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717005922; a=rsa-sha256; cv=none; b=WXhGU5XR1sXC5pxKtUVZluFxBRl2GFftCY+uN0gxXMXTxxoSy6T2h8WNfXJ2HMDeFkzdSQ ag5jzZVsxFV/UuWLLesUCBVd3PuH2zBu42WE5LvBV181ZjMr0HnG9AlNW9YWUjVLZfOjvE JqA3n0xjkrsPDF/WstDWst+hwGycDms= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=DeZ51roL; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf07.hostedemail.com: domain of 3YW5XZgoKCNQ9J7EK67JED6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jthoughton.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3YW5XZgoKCNQ9J7EK67JED6EE6B4.2ECB8DKN-CCAL02A.EH6@flex--jthoughton.bounces.google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-df773f9471fso4026033276.3 for ; Wed, 29 May 2024 11:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1717005922; x=1717610722; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Bhng0mHOZ4irF/CjBRL9b9lRPnBOuiSl+dtfP+mXSOo=; b=DeZ51roLUw1Zn4rgtsoNjo65GAxviSlB41+GEuF8ZSFefhznIKDmRzCRLSpwRo+E6q Ew744cnjqmHw4Pi5tLbRCfMo8w+M0jcvzioHLXy3tq/dBpNpeiUDmJrDf1GMw13ubZ09 grroiCCLMsFnpA+uqQgjsFkdT5ISZTVUxF+/XRFciEX0D9sjVTSxacSTufCKHEDI8Hg4 pOZ2Bgqvy7s+tOVkvc7ddfXpfuwBB224UHn7wSfUO4KciwR1xPscQZ5bkRFXb9tjUGkR YdraDZrpjxIr+qXmYiZJvWgnj52qT7qIiC9X7/Bv4itck9BsS9/7uk6qNFYIJx+NsbCf M9zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717005922; x=1717610722; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Bhng0mHOZ4irF/CjBRL9b9lRPnBOuiSl+dtfP+mXSOo=; b=M9XPbQQ5zu5sdxUCpZf8cU7YpgFZ4QXJvS9nnyEkhrL2HBAZZxbext5NOhyF0nU6EY nh1IRdLARGCDYWpTv/U8jhBFaNuM4S9T6cep7Hjh+1Ge9EoYvjL5Lfwe3ebiD6tVNuGO ti5hez1ZBmOwtiPm6AGNFhLdNWZAlxAX6NhSYoFoap6k+9Njdy5bc03MsB/qdkUNGauB aGV6KXdYCtCYc3WsrAqmHc+Oza8ThwBvQWqoX8uCVBbCCanMaDOwFezrVgiS8UbgU2ce pMJWFtmc6dBUKQdO4Vsbw/S6FjbnBZO32leJSTjcJD+duJngFzCi2SPgkmm5yYI4JDlJ G65A== X-Forwarded-Encrypted: i=1; AJvYcCUusfYXxk5O7d8GH9s+VoFCC2YqiCuQJryI7YGGmgnWEfAlsPpz2Iwvl82DzfzT4+nBjavhXb/iOZBexP/ZG8Mlsx8= X-Gm-Message-State: AOJu0YwYi4CpBQYW600LeG7t8LRd02Xd0YRs9B+GeTCjo/6c1LrXMwTy GCk18ij78nXun/xTZ/SMohLhnFqCAoEF8+spxjFbXAEqL0b9Ee3dKZffg2HbDrVLTyFMdzrEn8V XXTJJ7ZNbArGm2+m2WA== X-Google-Smtp-Source: AGHT+IFl5lukvkJapjmD8BrK9XgC8y+z1iCBS2V0LEPnDYbEA7FDCv/+pHP9QoDJj8/gGxgiQnMalGajsFFn6V8U X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a05:6902:72d:b0:dee:60e9:69f4 with SMTP id 3f1490d57ef6-df77239930emr4274727276.10.1717005921915; Wed, 29 May 2024 11:05:21 -0700 (PDT) Date: Wed, 29 May 2024 18:05:08 +0000 In-Reply-To: <20240529180510.2295118-1-jthoughton@google.com> Mime-Version: 1.0 References: <20240529180510.2295118-1-jthoughton@google.com> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog Message-ID: <20240529180510.2295118-6-jthoughton@google.com> Subject: [PATCH v4 5/7] KVM: x86: Relax locking for kvm_test_age_gfn and kvm_age_gfn From: James Houghton To: Andrew Morton , Paolo Bonzini Cc: Albert Ou , Ankit Agrawal , Anup Patel , Atish Patra , Axel Rasmussen , Bibo Mao , Catalin Marinas , David Matlack , David Rientjes , Huacai Chen , James Houghton , James Morse , Jonathan Corbet , Marc Zyngier , Michael Ellerman , Nicholas Piggin , Oliver Upton , Palmer Dabbelt , Paul Walmsley , Raghavendra Rao Ananta , Ryan Roberts , Sean Christopherson , Shaoqin Huang , Shuah Khan , Suzuki K Poulose , Tianrui Zhao , Will Deacon , Yu Zhao , Zenghui Yu , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev X-Stat-Signature: gr5bbzbqb39krtzas4cn9bzu6cea151u X-Rspamd-Queue-Id: E195440008 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1717005922-699307 X-HE-Meta: U2FsdGVkX19JJylgH3fyRDkLkyyigx7UBUp54XrO7FVULbknOr015t0E7zaP5K0KM/mmsYGKJx6zjn5h782CBPhHFAhuwm1la0AKfOldyWab9s1MRzsbjLRYdCGIM6PjRXieh9luLSyOR07SkVUC9vElkv+63/14xZrrvrF4j5NkI1CZDuuaQN5dZ/lPw3UPYMxoKFICJUCcjNviP8fa3b+CDdEHGMDCtyw1RlWXVxyrw0qc8OhWxfYaTiL2axzWWKD9lx5Lw+EamPYJ7qnyDNkGjEynM/lKQXlugaxP4AcAK2rVJokagTFfiEr04YgCWCaC5lbpat5xy2gO0hREybAIti79n9e74ZhU+WfpZtuTFAewBjxaspHA0PWrlIbHk4Tm7p1CJ4iNDSGP8IFIrpkqVkPID2aDaVAU6+cjp8Q0XxHMVfdQEDk9ufzd6n6m9cHHlsqdVHUfMKIC3szSwe8vDMpB7ASjzewM88J4UaUSF2e/xQ2DGFrxz+CjOewrKbwDDAOOlbotO+Q+m8aRS0MQou5yQkq78XJ9z8qGhoR1CsSAoMsBZ+ELe5q+T0sxUcAp/B7qAaf6+1/uA+SM0ShbLDG7WLImAavhIxPWXPxnGfhX4SYlIQebSZwBTSbz/CxFTPm4HAvbmp2Jad/89tgo+j02Z04yzZi0AP5HynQdQUCdRihv2VjXuIAx5bCEm2hBs8gDPVJJB+nnX9SCF9ht5yLidSg1qjUlHuafSY/SVLfq/MgLesaAivBtx+UQq8QDQmXYs7pBZ3F+9Y/NVxv19ga4PIPR99bvn5U4xpwiBoynlWk30cwX10VMJsx7hcULXXJtF4E/4G+UHYS2p39nwazEOCqezAJZSEPrPWp4Zy+GjVScO5xfnzXaRplRNH1d1qGWa1a8aOU+m9Sew1h1lSS4HvlP+YPAxvoE/54Nu7S1Ell+chX7mvg7qw0Q1X5xV9UjpHpL7oMSP54 49+jM/eS AfihrxY6sQbJTV0a3KFFOwVK1q4pXgjY3R+arEu3ftHAq2cT9M9HE6SdfcW1CI4wGa/iLq/zAV7+9VR1MjQiNCS4dvg2pgH5W0naczBt1UNyeW+FM+KGAuyPST3w/VttFK0KYS9GsFsf1vZafIA8cQA0WnagAmKoqDg6/ui1Jwk8LOLLnIL83/sf63PPiiakmNJ7+asqHYYr4IVmrv5z/fYgcxUwvvMVEFKgGwTRllERTMRpZ4OncqPH5ZKhhZtJbq2qYRI6NoX8X2pcMWDqNeiJD3dpanRC2nKlhlen2K9Nq9cfDdzs87lH9PB7prEam6mLmsubd40E4ALpXUGF+b9pPIcFQpkUtF7LAOGYaLVDmCdfi1AX/PajLyDLwTum9/ESZwBB0bFx3M+p2l4UrmKI/c1ONTGdpR5Dgxb885aSIsvn6SwKboI9v0F0ixn5qK+ZDNthE/5kwCrl7x6XXRHNZMOS6NhrKNCG/FFEXVFXhLQ3CsIjZiRe2ztPzs/c1XzNr0F0Dd1Mo5pHTBBAumvDq5FEmpZiJvKNKdPNX+o9PsX+Npp76z2D4IBJ7Cqfywb9jgMr98l8IWh6/A5C454EMud5xZM98+MIQ1yrgj+WwXSM95X9kOOv07LKWSBt/zrKSOQoT79uHA3PLiRWvX+MeDdASYmYaSGkI16UA5juEbJw6Iy5i78F1jlOt+t7d4dMCyZJsXJDLfb+7qagH9lRPEA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Walk the TDP MMU in an RCU read-side critical section. This requires a way to do RCU-safe walking of the tdp_mmu_roots; do this with a new macro. The PTE modifications are now done atomically, and kvm_tdp_mmu_spte_need_atomic_write() has been updated to account for the fact that kvm_age_gfn can now lockless update the accessed bit and the R/X bits). If the cmpxchg for marking the spte for access tracking fails, we simply retry if the spte is still a leaf PTE. If it isn't, we return false to continue the walk. Harvesting age information from the shadow MMU is still done while holding the MMU write lock. Suggested-by: Yu Zhao Signed-off-by: James Houghton --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/mmu/mmu.c | 18 ++++----- arch/x86/kvm/mmu/tdp_iter.h | 27 +++++++------ arch/x86/kvm/mmu/tdp_mmu.c | 67 +++++++++++++++++++++++++-------- 4 files changed, 76 insertions(+), 37 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index ece45b3f6f20..48fb29bb782f 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1438,6 +1438,7 @@ struct kvm_arch { * tdp_mmu_page set. * * For reads, this list is protected by: + * RCU alone or * the MMU lock in read mode + RCU or * the MMU lock in write mode * diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 6a2a557c2c31..956834da8a0e 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1630,16 +1630,15 @@ bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) { bool young = false; - write_lock(&kvm->mmu_lock); - - if (kvm_memslots_have_rmaps(kvm)) + if (kvm_memslots_have_rmaps(kvm)) { + write_lock(&kvm->mmu_lock); young = kvm_handle_gfn_range(kvm, range, kvm_age_rmap); + write_unlock(&kvm->mmu_lock); + } if (tdp_mmu_enabled) young |= kvm_tdp_mmu_age_gfn_range(kvm, range); - write_unlock(&kvm->mmu_lock); - return young; } @@ -1647,16 +1646,15 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) { bool young = false; - write_lock(&kvm->mmu_lock); - - if (kvm_memslots_have_rmaps(kvm)) + if (kvm_memslots_have_rmaps(kvm)) { + write_lock(&kvm->mmu_lock); young = kvm_handle_gfn_range(kvm, range, kvm_test_age_rmap); + write_unlock(&kvm->mmu_lock); + } if (tdp_mmu_enabled) young |= kvm_tdp_mmu_test_age_gfn(kvm, range); - write_unlock(&kvm->mmu_lock); - return young; } diff --git a/arch/x86/kvm/mmu/tdp_iter.h b/arch/x86/kvm/mmu/tdp_iter.h index fae559559a80..f558ae9054af 100644 --- a/arch/x86/kvm/mmu/tdp_iter.h +++ b/arch/x86/kvm/mmu/tdp_iter.h @@ -24,16 +24,24 @@ static inline u64 kvm_tdp_mmu_write_spte_atomic(tdp_ptep_t sptep, u64 new_spte) return xchg(rcu_dereference(sptep), new_spte); } +static inline u64 tdp_mmu_clear_spte_bits_atomic(tdp_ptep_t sptep, u64 mask) +{ + atomic64_t *sptep_atomic = (atomic64_t *)rcu_dereference(sptep); + + return (u64)atomic64_fetch_and(~mask, sptep_atomic); +} + static inline void __kvm_tdp_mmu_write_spte(tdp_ptep_t sptep, u64 new_spte) { WRITE_ONCE(*rcu_dereference(sptep), new_spte); } /* - * SPTEs must be modified atomically if they are shadow-present, leaf - * SPTEs, and have volatile bits, i.e. has bits that can be set outside - * of mmu_lock. The Writable bit can be set by KVM's fast page fault - * handler, and Accessed and Dirty bits can be set by the CPU. + * SPTEs must be modified atomically if they have bits that can be set outside + * of the mmu_lock. This can happen for any shadow-present leaf SPTEs, as the + * Writable bit can be set by KVM's fast page fault handler, the Accessed and + * Dirty bits can be set by the CPU, and the Accessed and R/X bits can be + * cleared by age_gfn_range. * * Note, non-leaf SPTEs do have Accessed bits and those bits are * technically volatile, but KVM doesn't consume the Accessed bit of @@ -44,8 +52,7 @@ static inline void __kvm_tdp_mmu_write_spte(tdp_ptep_t sptep, u64 new_spte) static inline bool kvm_tdp_mmu_spte_need_atomic_write(u64 old_spte, int level) { return is_shadow_present_pte(old_spte) && - is_last_spte(old_spte, level) && - spte_has_volatile_bits(old_spte); + is_last_spte(old_spte, level); } static inline u64 kvm_tdp_mmu_write_spte(tdp_ptep_t sptep, u64 old_spte, @@ -61,12 +68,8 @@ static inline u64 kvm_tdp_mmu_write_spte(tdp_ptep_t sptep, u64 old_spte, static inline u64 tdp_mmu_clear_spte_bits(tdp_ptep_t sptep, u64 old_spte, u64 mask, int level) { - atomic64_t *sptep_atomic; - - if (kvm_tdp_mmu_spte_need_atomic_write(old_spte, level)) { - sptep_atomic = (atomic64_t *)rcu_dereference(sptep); - return (u64)atomic64_fetch_and(~mask, sptep_atomic); - } + if (kvm_tdp_mmu_spte_need_atomic_write(old_spte, level)) + return tdp_mmu_clear_spte_bits_atomic(sptep, mask); __kvm_tdp_mmu_write_spte(sptep, old_spte & ~mask); return old_spte; diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 1259dd63defc..c74b0221dae0 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -29,6 +29,11 @@ static __always_inline bool kvm_lockdep_assert_mmu_lock_held(struct kvm *kvm, return true; } +static __always_inline bool kvm_lockdep_assert_rcu_read_lock_held(void) +{ + WARN_ON_ONCE(!rcu_read_lock_held()); + return true; +} void kvm_mmu_uninit_tdp_mmu(struct kvm *kvm) { @@ -178,6 +183,15 @@ static struct kvm_mmu_page *tdp_mmu_next_root(struct kvm *kvm, ((_only_valid) && (_root)->role.invalid))) { \ } else +/* + * Iterate over all TDP MMU roots in an RCU read-side critical section. + */ +#define for_each_tdp_mmu_root_rcu(_kvm, _root, _as_id) \ + list_for_each_entry_rcu(_root, &_kvm->arch.tdp_mmu_roots, link) \ + if (kvm_lockdep_assert_rcu_read_lock_held() && \ + (_as_id >= 0 && kvm_mmu_page_as_id(_root) != _as_id)) { \ + } else + #define for_each_tdp_mmu_root(_kvm, _root, _as_id) \ __for_each_tdp_mmu_root(_kvm, _root, _as_id, false) @@ -1223,6 +1237,27 @@ static __always_inline bool kvm_tdp_mmu_handle_gfn(struct kvm *kvm, return ret; } +static __always_inline bool kvm_tdp_mmu_handle_gfn_lockless( + struct kvm *kvm, + struct kvm_gfn_range *range, + tdp_handler_t handler) +{ + struct kvm_mmu_page *root; + struct tdp_iter iter; + bool ret = false; + + rcu_read_lock(); + + for_each_tdp_mmu_root_rcu(kvm, root, range->slot->as_id) { + tdp_root_for_each_leaf_pte(iter, root, range->start, range->end) + ret |= handler(kvm, &iter, range); + } + + rcu_read_unlock(); + + return ret; +} + /* * Mark the SPTEs range of GFNs [start, end) unaccessed and return non-zero * if any of the GFNs in the range have been accessed. @@ -1236,28 +1271,30 @@ static bool age_gfn_range(struct kvm *kvm, struct tdp_iter *iter, { u64 new_spte; +retry: /* If we have a non-accessed entry we don't need to change the pte. */ if (!is_accessed_spte(iter->old_spte)) return false; if (spte_ad_enabled(iter->old_spte)) { - iter->old_spte = tdp_mmu_clear_spte_bits(iter->sptep, - iter->old_spte, - shadow_accessed_mask, - iter->level); + iter->old_spte = tdp_mmu_clear_spte_bits_atomic(iter->sptep, + shadow_accessed_mask); new_spte = iter->old_spte & ~shadow_accessed_mask; } else { - /* - * Capture the dirty status of the page, so that it doesn't get - * lost when the SPTE is marked for access tracking. - */ + new_spte = mark_spte_for_access_track(iter->old_spte); + if (__tdp_mmu_set_spte_atomic(iter, new_spte)) { + /* + * The cmpxchg failed. If the spte is still a + * last-level spte, we can safely retry. + */ + if (is_shadow_present_pte(iter->old_spte) && + is_last_spte(iter->old_spte, iter->level)) + goto retry; + /* Otherwise, continue walking. */ + return false; + } if (is_writable_pte(iter->old_spte)) kvm_set_pfn_dirty(spte_to_pfn(iter->old_spte)); - - new_spte = mark_spte_for_access_track(iter->old_spte); - iter->old_spte = kvm_tdp_mmu_write_spte(iter->sptep, - iter->old_spte, new_spte, - iter->level); } trace_kvm_tdp_mmu_spte_changed(iter->as_id, iter->gfn, iter->level, @@ -1267,7 +1304,7 @@ static bool age_gfn_range(struct kvm *kvm, struct tdp_iter *iter, bool kvm_tdp_mmu_age_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) { - return kvm_tdp_mmu_handle_gfn(kvm, range, age_gfn_range); + return kvm_tdp_mmu_handle_gfn_lockless(kvm, range, age_gfn_range); } static bool test_age_gfn(struct kvm *kvm, struct tdp_iter *iter, @@ -1278,7 +1315,7 @@ static bool test_age_gfn(struct kvm *kvm, struct tdp_iter *iter, bool kvm_tdp_mmu_test_age_gfn(struct kvm *kvm, struct kvm_gfn_range *range) { - return kvm_tdp_mmu_handle_gfn(kvm, range, test_age_gfn); + return kvm_tdp_mmu_handle_gfn_lockless(kvm, range, test_age_gfn); } /*