From nobody Sat Apr 25 11:48:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 433E3C433EF for ; Tue, 12 Jul 2022 01:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232179AbiGLB4K (ORCPT ); Mon, 11 Jul 2022 21:56:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232133AbiGLB4F (ORCPT ); Mon, 11 Jul 2022 21:56:05 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2321C3D5BA for ; Mon, 11 Jul 2022 18:56:04 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id o8-20020a17090ab88800b001ef81869167so6752456pjr.2 for ; Mon, 11 Jul 2022 18:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=x8hGnQGu+TvLoNX/lMBZXMk6ueNBJ63tvcwEjiE74A0=; b=NpwIJ4rTQn6uFIpOi3K/qjN6ir94/cFp6kvxo+/rzokC7IixIq4YbRe6iqqI6i0iPV 8VoH51o0XES5Nhdo7ZwOCxrrTOJ7IPQV6uVFCOHgepoZVDkzg/94+5hg4GjDJnZce5Lm dzs0Jbz+Gu8ioS0gPIvW5FOxrwNgJr30UtOAU/P7rvIkzz5fBo3LjE5rAJ6cj2nUTR9Z U8SVr+wn0hg54CDS1Cc8FSeYrRu7oySeMlY21VQH9rNDuWQUgr4rs8ea0zLtf3gkO2a/ IeXWU3u4Xzzqu4YPiVeHBwyVnZ56Bym2IDzJzd/wIvdllfG0PqllHDgLgUTtCDd79bKI fX7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=x8hGnQGu+TvLoNX/lMBZXMk6ueNBJ63tvcwEjiE74A0=; b=m7C4IymDlSzzl1bsvp4sT3w+bzJ5rfDSRFf4zdejJapOxX4Q5rMke1iROn2JjiHDIh DkboeTEKOmBKUOXeZXqgnJZ++vC+lYdfCScOfloNaZ1JUcUqxxhVVFHjRAMzHdEb5M9o 8GHNbWmAYeF6qFphWu27aGuiFoe/wZ6ua0t2OClgIMm8r8m9KsULzwbNlPjBPAOhlzH7 4fnZFsDpA3n0llPxD1JUHAHgiK/uvdmmgRerfhhQzw5gduPdWb3L/B1JiEGJslFkQ3Es JabuSW7JHQx823CY7/C8Lb2Q1MYHjP5Ggaj0PIG0qxC/NkKwVqHNCTu0XCLbjBut+4cl AEOg== X-Gm-Message-State: AJIora+HEabHGapBorkxOGTSta+V7ztAZvpN83RHwH5Dahl4teMFFa6O BNIncbLfWNW6xYttVLqBdqX+bW6QYKE= X-Google-Smtp-Source: AGRyM1tVehKyCGq7CmihonY0Z7mBNOc9uJhBx26VsPzpgF14z2+zZ3LBeFfhk3GSUT5o3xfyxevM9thX+NM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:778c:b0:16a:6cd5:469f with SMTP id o12-20020a170902778c00b0016a6cd5469fmr21837101pll.102.1657590963692; Mon, 11 Jul 2022 18:56:03 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 12 Jul 2022 01:55:54 +0000 In-Reply-To: <20220712015558.1247978-1-seanjc@google.com> Message-Id: <20220712015558.1247978-2-seanjc@google.com> Mime-Version: 1.0 References: <20220712015558.1247978-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 1/5] KVM: x86/mmu: Return a u64 (the old SPTE) from mmu_spte_clear_track_bits() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Return a u64, not an int, from mmu_spte_clear_track_bits(). The return value is the old SPTE value, which is very much a 64-bit value. The sole caller that consumes the return value, drop_spte(), already uses a u64. The only reason that truncating the SPTE value is not problematic is because drop_spte() only queries the shadow-present bit, which is in the lower 32 bits. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index f7fa4c31b7c5..2605d6ebc193 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -529,7 +529,7 @@ static bool mmu_spte_update(u64 *sptep, u64 new_spte) * state bits, it is used to clear the last level sptep. * Returns the old PTE. */ -static int mmu_spte_clear_track_bits(struct kvm *kvm, u64 *sptep) +static u64 mmu_spte_clear_track_bits(struct kvm *kvm, u64 *sptep) { kvm_pfn_t pfn; u64 old_spte =3D *sptep; --=20 2.37.0.144.g8ac04bfd2-goog From nobody Sat Apr 25 11:48:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14775C43334 for ; Tue, 12 Jul 2022 01:56:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232204AbiGLB4O (ORCPT ); Mon, 11 Jul 2022 21:56:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232138AbiGLB4G (ORCPT ); Mon, 11 Jul 2022 21:56:06 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 663AB3DF39 for ; Mon, 11 Jul 2022 18:56:05 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id e11-20020a17090301cb00b0016c3375abd3so4534424plh.3 for ; Mon, 11 Jul 2022 18:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=eglsQtDj4CdMdD6XF+d1TDYgow2SaSneMXkv7CXAOJE=; b=qq8Lsfiezm9iN06C4o50Rjrfcg9ncT9MD5G2rSl0CSb5HyP8ibG11L2KwronwfU0UU MwQrpSsdeOBOmaG+0E2YVT2f/85+gkqtOAWetdgm4azTZvAJ+A9oIYFPrwx7p9CEwayu D8ZPcoLMZxTEGGfukoQBYQb32Uood6Pfyp9UWwkUH48GuHeZFWBC0RAWFK6hOEHPBF6D p0MbfJZM+Id6puOAmhqXrXRMy3u96ZYjBdVvsun/tCx5XGcJWHv4TVgrFoNDzhwJ1QZ2 uTp9I1L+DRYnUP7sdzN/sKXwwgdcBHn4S7tQnVnZgoJLFGhEwIuAfN3f1y4wB4FpSZAm jwXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=eglsQtDj4CdMdD6XF+d1TDYgow2SaSneMXkv7CXAOJE=; b=cdQ3QX2j3gVsaqtA0+79pajH/iMOUEsnd2NqH6BaeOEyra0XCmp6P/Ful31Mi9FxPf x0f0z3YXKhdEhaeP8EyFnvla55D9f9h9WGqGe9KsC0FWa9jW5Fm9pV0A3a8hXdVZZb3R qH9eTFSa9RyF66sDG5zzeAAJlFAXcUhGj3LblpvW81FK8Uvy3uW5pLP48tB23NkmwbHr dOF5xB6+Dbgj/CBxRQnkofAduvBCSDNb3+CNjTsB+ZAjYvAc4E59ZtgEn/lZTBWbjfDy VwddWWEbUxuT5AK6no4p1nEMApGozGTVC5Oijta29cec+uDs9FuPkluQQNLqNdxFHcNH bO5A== X-Gm-Message-State: AJIora8ut8hYKNPrLy5DL5p2LRAipw9RkAAdZBoBKe88QfFMtTnkN9EX CnW8FgWvl1BeL6IYkSIb9pRDBhncuTo= X-Google-Smtp-Source: AGRyM1thwzmkST4/TSmLMCVNzU/nZWEqa2yA0adk84Az+l7MwfnIsaV0sP5TNbTkhyrqCqNXNy7zQuSlMEM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:114c:b0:528:2c7a:630e with SMTP id b12-20020a056a00114c00b005282c7a630emr21379638pfm.86.1657590965176; Mon, 11 Jul 2022 18:56:05 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 12 Jul 2022 01:55:55 +0000 In-Reply-To: <20220712015558.1247978-1-seanjc@google.com> Message-Id: <20220712015558.1247978-3-seanjc@google.com> Mime-Version: 1.0 References: <20220712015558.1247978-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 2/5] KVM: x86/mmu: Rename rmap zap helpers to better show relationships From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename the helpers that zap rmaps to use consistent naming and better show the relationships between the various helpers. E.g. rename pte_list_remove() to kvm_zap_one_rmap(), use "zap" universally instead of a mix of "zap" and "unmap", etc... No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 2605d6ebc193..32f9427f3334 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -957,15 +957,15 @@ static void __pte_list_remove(u64 *spte, struct kvm_r= map_head *rmap_head) } } =20 -static void pte_list_remove(struct kvm *kvm, struct kvm_rmap_head *rmap_he= ad, - u64 *sptep) +static void kvm_zap_one_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_h= ead, + u64 *sptep) { mmu_spte_clear_track_bits(kvm, sptep); __pte_list_remove(sptep, rmap_head); } =20 -/* Return true if rmap existed, false otherwise */ -static bool pte_list_destroy(struct kvm *kvm, struct kvm_rmap_head *rmap_h= ead) +/* Return true if at least one rmap was zapped, false otherwise */ +static bool ____kvm_zap_rmaps(struct kvm *kvm, struct kvm_rmap_head *rmap_= head) { struct pte_list_desc *desc, *next; int i; @@ -1383,17 +1383,17 @@ static bool kvm_vcpu_write_protect_gfn(struct kvm_v= cpu *vcpu, u64 gfn) return kvm_mmu_slot_gfn_write_protect(vcpu->kvm, slot, gfn, PG_LEVEL_4K); } =20 -static bool kvm_zap_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head, - const struct kvm_memory_slot *slot) +static bool __kvm_zap_rmaps(struct kvm *kvm, struct kvm_rmap_head *rmap_he= ad, + const struct kvm_memory_slot *slot) { - return pte_list_destroy(kvm, rmap_head); + return ____kvm_zap_rmaps(kvm, rmap_head); } =20 -static bool kvm_unmap_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_he= ad, - struct kvm_memory_slot *slot, gfn_t gfn, int level, - pte_t unused) +static bool kvm_zap_rmaps(struct kvm *kvm, struct kvm_rmap_head *rmap_head, + struct kvm_memory_slot *slot, gfn_t gfn, int level, + pte_t unused) { - return kvm_zap_rmapp(kvm, rmap_head, slot); + return __kvm_zap_rmaps(kvm, rmap_head, slot); } =20 static bool kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_= head, @@ -1417,7 +1417,7 @@ static bool kvm_set_pte_rmapp(struct kvm *kvm, struct= kvm_rmap_head *rmap_head, need_flush =3D true; =20 if (pte_write(pte)) { - pte_list_remove(kvm, rmap_head, sptep); + kvm_zap_one_rmap(kvm, rmap_head, sptep); goto restart; } else { new_spte =3D kvm_mmu_changed_pte_notifier_make_spte( @@ -1529,7 +1529,7 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_= gfn_range *range) bool flush =3D false; =20 if (kvm_memslots_have_rmaps(kvm)) - flush =3D kvm_handle_gfn_range(kvm, range, kvm_unmap_rmapp); + flush =3D kvm_handle_gfn_range(kvm, range, kvm_zap_rmaps); =20 if (is_tdp_mmu_enabled(kvm)) flush =3D kvm_tdp_mmu_unmap_gfn_range(kvm, range, flush); @@ -1596,7 +1596,7 @@ static void __rmap_add(struct kvm *kvm, rmap_count =3D pte_list_add(cache, spte, rmap_head); =20 if (rmap_count > RMAP_RECYCLE_THRESHOLD) { - kvm_unmap_rmapp(kvm, rmap_head, NULL, gfn, sp->role.level, __pte(0)); + kvm_zap_rmaps(kvm, rmap_head, NULL, gfn, sp->role.level, __pte(0)); kvm_flush_remote_tlbs_with_address( kvm, sp->gfn, KVM_PAGES_PER_HPAGE(sp->role.level)); } @@ -5977,7 +5977,7 @@ void kvm_mmu_uninit_vm(struct kvm *kvm) mmu_free_vm_memory_caches(kvm); } =20 -static bool __kvm_zap_rmaps(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_en= d) +static bool __kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gf= n_end) { const struct kvm_memory_slot *memslot; struct kvm_memslots *slots; @@ -5999,8 +5999,7 @@ static bool __kvm_zap_rmaps(struct kvm *kvm, gfn_t gf= n_start, gfn_t gfn_end) if (WARN_ON_ONCE(start >=3D end)) continue; =20 - flush =3D slot_handle_level_range(kvm, memslot, kvm_zap_rmapp, - + flush =3D slot_handle_level_range(kvm, memslot, __kvm_zap_rmaps, PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL, start, end - 1, true, flush); } @@ -6025,7 +6024,7 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_sta= rt, gfn_t gfn_end) =20 kvm_inc_notifier_count(kvm, gfn_start, gfn_end); =20 - flush =3D __kvm_zap_rmaps(kvm, gfn_start, gfn_end); + flush =3D __kvm_zap_gfn_range(kvm, gfn_start, gfn_end); =20 if (is_tdp_mmu_enabled(kvm)) { for (i =3D 0; i < KVM_ADDRESS_SPACE_NUM; i++) @@ -6401,7 +6400,7 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *= kvm, if (sp->role.direct && sp->role.level < kvm_mmu_max_mapping_level(kvm, slot, sp->gfn, pfn, PG_LEVEL_NUM)) { - pte_list_remove(kvm, rmap_head, sptep); + kvm_zap_one_rmap(kvm, rmap_head, sptep); =20 if (kvm_available_flush_tlb_with_range()) kvm_flush_remote_tlbs_with_address(kvm, sp->gfn, --=20 2.37.0.144.g8ac04bfd2-goog From nobody Sat Apr 25 11:48:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18F5BC433EF for ; Tue, 12 Jul 2022 01:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232211AbiGLB4Q (ORCPT ); Mon, 11 Jul 2022 21:56:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbiGLB4H (ORCPT ); Mon, 11 Jul 2022 21:56:07 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B8D43DF15 for ; Mon, 11 Jul 2022 18:56:07 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id u12-20020a170902e5cc00b0016c20d40ec1so4802273plf.10 for ; Mon, 11 Jul 2022 18:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=UMTmbKNVtvYEiz66mHbd+juViopDmYcWF5zxIfoz7rg=; b=m8hXvaMknJpczY/qlVucKqde8IXT7SnMcrN79wSiIv75dBOi83l3/D1g39dHHlGT24 bnqm6JK4gMYtdq1AqLIsEzgNf6rCSGJy5JChZ4GpiFbyRus4w3x0njdzrK1envtpwDMF r6/hsqNPBe77XfFMnSCmyr5/NX1DduwWTC19vpjXY8rIctcwf0VKuODgigRk9tQMwBct +sDIQGgE+MX6MU9rwvpmMXRnDrlMxPpE6KVqejEKzyp3V9sWs2S67nMFBeuC5JxHhfVT lCWdeD8v0TI5zknqK5NGG/CISkNLMaAE52Y4GfRA9lytEengHExCqeL3YUtscfjzRSnG CISw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=UMTmbKNVtvYEiz66mHbd+juViopDmYcWF5zxIfoz7rg=; b=E91QUx7PY0IVNbS4FpDoNZpd4bbWjRVSJ/ImIB6ub5YyKThICghvPWVJVaRByCVma/ GGwLp1NI/8CFQR4rAq/JnyvleddRF8ZBre4xPsi6aeWie9iChTA36H1/R1OItO64bIzU I/z48NTc9KcEv2I45CxhtjsC1te4dpYqXxfsh6yspC8GkJ5VHttbfZvgAeoFi+MJFfBI iy13VBu1LRW439rQfGO+x0ryrAb2yljA8lFiNMA3RmuHOwCoWHid8YaPUo0i4Chl1ukH lvpXUaOu2obEp+VudDekbR5THeQ9tUJglzmnEm76f4L0hld0ys/MslHxD1BKumYyc8Sx ivZQ== X-Gm-Message-State: AJIora+MYNNq4gF4lWCPVGWiUrhQnmLNA30CiPOb//H5Lx9AB9G6prCB OOn99rxUebkRoHveX2KXu6viypE5+5A= X-Google-Smtp-Source: AGRyM1seuEp30SuB5d8qo63MlDqAeQhdTRgCoYP/EYKVGCm9ECIbuTx128l91aynk+iR230jzOx9aODUxQY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a62:b513:0:b0:52a:af7f:c6e3 with SMTP id y19-20020a62b513000000b0052aaf7fc6e3mr21158910pfe.34.1657590966878; Mon, 11 Jul 2022 18:56:06 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 12 Jul 2022 01:55:56 +0000 In-Reply-To: <20220712015558.1247978-1-seanjc@google.com> Message-Id: <20220712015558.1247978-4-seanjc@google.com> Mime-Version: 1.0 References: <20220712015558.1247978-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 3/5] KVM: x86/mmu: Remove underscores from __pte_list_remove() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove the underscores from __pte_list_remove(), the function formerly known as pte_list_remove() is now named ____kvm_zap_rmaps() to show that it zaps rmaps/PTEs, i.e. doesn't just remove an entry from a list. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 32f9427f3334..fbe808bb0ce1 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -921,7 +921,7 @@ pte_list_desc_remove_entry(struct kvm_rmap_head *rmap_h= ead, mmu_free_pte_list_desc(desc); } =20 -static void __pte_list_remove(u64 *spte, struct kvm_rmap_head *rmap_head) +static void pte_list_remove(u64 *spte, struct kvm_rmap_head *rmap_head) { struct pte_list_desc *desc; struct pte_list_desc *prev_desc; @@ -961,7 +961,7 @@ static void kvm_zap_one_rmap(struct kvm *kvm, struct kv= m_rmap_head *rmap_head, u64 *sptep) { mmu_spte_clear_track_bits(kvm, sptep); - __pte_list_remove(sptep, rmap_head); + pte_list_remove(sptep, rmap_head); } =20 /* Return true if at least one rmap was zapped, false otherwise */ @@ -1050,7 +1050,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte) slot =3D __gfn_to_memslot(slots, gfn); rmap_head =3D gfn_to_rmap(gfn, sp->role.level, slot); =20 - __pte_list_remove(spte, rmap_head); + pte_list_remove(spte, rmap_head); } =20 /* @@ -1692,7 +1692,7 @@ static void mmu_page_add_parent_pte(struct kvm_mmu_me= mory_cache *cache, static void mmu_page_remove_parent_pte(struct kvm_mmu_page *sp, u64 *parent_pte) { - __pte_list_remove(parent_pte, &sp->parent_ptes); + pte_list_remove(parent_pte, &sp->parent_ptes); } =20 static void drop_parent_pte(struct kvm_mmu_page *sp, --=20 2.37.0.144.g8ac04bfd2-goog From nobody Sat Apr 25 11:48:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 484EFC433EF for ; Tue, 12 Jul 2022 01:56:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232213AbiGLB4T (ORCPT ); Mon, 11 Jul 2022 21:56:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232178AbiGLB4K (ORCPT ); Mon, 11 Jul 2022 21:56:10 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0431348EB6 for ; Mon, 11 Jul 2022 18:56:09 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id u11-20020a654c0b000000b00415ed4acf16so1869379pgq.22 for ; Mon, 11 Jul 2022 18:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=PC+WzugTfmpy8a4WKm922TF8iM8VxRFbGcTUFeFJFUA=; b=dRcboDDcrZAYrd71m94Ycc8GP++lO01Mw65EabvxrzY7DT+fBpk8CpGN5DPjGFBWB2 N7spNflEsIhcmfmRVNeu4wibUWR2Y4Rc1SMDcZnhN01IEwiYUgCSRumePuJidX2VEV1n puIU/gdKRMH0estJWRyFYszf52cJvBZLBfh2m/+YGZ7Z83lPVaJjmLmKKMW8vjC1zaaU vR0RxBCADn9X70kittmw8EZ4sul5azpQGWOXOheC1aWrSKwrKB7xh2m2qZq79SxJPbmp c0xRTHzdhHMyxFpVYio32OHKeuFtsiNPcUQA8PlK8PFA8tXn2W5nxUPAQh2GQvIg5yl4 W/8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=PC+WzugTfmpy8a4WKm922TF8iM8VxRFbGcTUFeFJFUA=; b=GMEtTLOqe07qgrIuAi8v5sapiBew7OjEYDFxJ9sKWX9b/033et1sVEhQXPWR/71xDI +qDmaxHPrtkcZARuozxDxTxN5jajrWCyP6UcD9Rx/nJtkBnLq48bo7sApph/k30GThvA YUOnTS94mynOv9zHrtbKh9PsNYduNBwFmffLqB1vv/hwHq1ja+re/5ZdFzVW8y907Hme SoqsdHLus7yvQjfV99ya9d+pcFXHqaC0jsp0MpneM/duuw643r1i1i+o0lQ8Xr9skXMX 00Tlnn8htTKgsaz0dhnmnCFJHMxTuPlXcPOppaKkX2xdOZyVnscG9Dga/j9x/8sEJ8Kj m9mQ== X-Gm-Message-State: AJIora9Gd7dbfCmsT3WbIWEGO8+HN8QaTwCYJhLwokgvOEvtULa7wJtx 4D98M78Ecq4WhQXDIAARoWeCmdpz6wk= X-Google-Smtp-Source: AGRyM1tbvpN8xCTuIoKBvGHUKvfp9hDoKb+F2XgNGjI8r5pEWBxxOjE85vknj97IAgTR2/GMvXnUWEZOuN8= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:c94e:b0:16c:4d5e:5dfc with SMTP id i14-20020a170902c94e00b0016c4d5e5dfcmr7252805pla.56.1657590968548; Mon, 11 Jul 2022 18:56:08 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 12 Jul 2022 01:55:57 +0000 In-Reply-To: <20220712015558.1247978-1-seanjc@google.com> Message-Id: <20220712015558.1247978-5-seanjc@google.com> Mime-Version: 1.0 References: <20220712015558.1247978-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 4/5] KVM: x86/mmu: Use innermost rmap zap helper when recycling rmaps From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use ____kvm_zap_rmaps() directly when recycling rmaps instead of bouncing through kvm_zap_rmaps() and __kvm_zap_rmaps(). Calling kvm_zap_rmaps() is unnecessary and odd as it requires passing dummy parameters; passing NULL for @slot when __rmap_add() already has a valid slot is especially weird and confusing. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index fbe808bb0ce1..496672ffaf46 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1596,7 +1596,7 @@ static void __rmap_add(struct kvm *kvm, rmap_count =3D pte_list_add(cache, spte, rmap_head); =20 if (rmap_count > RMAP_RECYCLE_THRESHOLD) { - kvm_zap_rmaps(kvm, rmap_head, NULL, gfn, sp->role.level, __pte(0)); + ____kvm_zap_rmaps(kvm, rmap_head); kvm_flush_remote_tlbs_with_address( kvm, sp->gfn, KVM_PAGES_PER_HPAGE(sp->role.level)); } --=20 2.37.0.144.g8ac04bfd2-goog From nobody Sat Apr 25 11:48:43 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B650C433EF for ; Tue, 12 Jul 2022 01:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232260AbiGLB4Z (ORCPT ); Mon, 11 Jul 2022 21:56:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231906AbiGLB4N (ORCPT ); Mon, 11 Jul 2022 21:56:13 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0BF26111D for ; Mon, 11 Jul 2022 18:56:11 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id a127-20020a624d85000000b00525950b1feeso1581990pfb.0 for ; Mon, 11 Jul 2022 18:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=6EgqZPf0D0wnYAjdKuP58XnoafqbcD/Jb2aV9uAljuY=; b=BG0HpeyxmzDKRosaGJZ48VoohZfNgDhr+mvi1x+W6Ap36PtRjUjQ7EhY1Wv7uqDNRR SMOlx3+vGF9SPvl7v5YtXyw6QH2KhyPnaHccuIQeBTBsNmxTtAEyFTJblItqf9NMXM3s ZVRsxOIiqszRx6poRBNJNspWsAQC7DjWdIAwmr1vu4YzDSQNfmWYBxBk7lg6riZ3EiAR KCVPPpf6UP5xkuD39ioM8438S2ZlAALsid+y3mzfHEtq1BkT1BX7VoR7x+3MTKCr53Jp 3E9wm812KJHyBOrRjtHDRGyXpmKFP/AhJ28LboWlbhZytjJ/yFRE7bmFdQ3YxZz8dIi9 maZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=6EgqZPf0D0wnYAjdKuP58XnoafqbcD/Jb2aV9uAljuY=; b=RQ9WGKiT70TgCmInUBJizhMbSadg1hWqNfxsh+NG18KNI93frZnUp9BgGJ9col6qFW OVow5Wd4AKYw4o9yWFkU8xidc5IWT41yfldlQ+FGvkL4M7OVrmjbl67+KSvRY7upR0wf i/8uJTau4T7OEkDNGVbTFPbU/PfJT9txecRPqerk8rAKnlihZRLyFvWpX+9J4a6mJ0Bw X2gD9WXvBYjDrtnVRaH1lSlT1he9KkOs21phmgixKPTEL2izlR1mKKSpmyRX9cjrYZIL SvMeTG6A3UGC21d0QPVvo1NJWWpLip0eafTjqSudlPN3WIlwVTHlpAA1WbIorv7nGTW7 KJmw== X-Gm-Message-State: AJIora+JU0xEZwsDe6Rob1eA5IeAvJ7AsYGWUNhGq1kJbMiwH/EdjR6I TuDtOm7nDlWkBfY9lk0+XJrkCugm/yc= X-Google-Smtp-Source: AGRyM1uivt6jnQCO8wHsYSpbjkHm5SAsYq6O2gwxRAWGKLbqXWnoAWwNUBsA0i4WD0A3aGScRoULdAAYnrY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:249:b0:1e0:a8a3:3c6c with SMTP id t9-20020a17090a024900b001e0a8a33c6cmr40755pje.0.1657590970172; Mon, 11 Jul 2022 18:56:10 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 12 Jul 2022 01:55:58 +0000 In-Reply-To: <20220712015558.1247978-1-seanjc@google.com> Message-Id: <20220712015558.1247978-6-seanjc@google.com> Mime-Version: 1.0 References: <20220712015558.1247978-1-seanjc@google.com> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog Subject: [PATCH 5/5] KVM: x86/mmu: Drop the "p is for pointer" from rmap helpers From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop the trailing "p" from rmap helpers, i.e. rename functions to simply be kvm__rmap(). Declaring that a function takes a pointer is completely unnecessary and goes against kernel style. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 496672ffaf46..47e46c10731d 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -403,7 +403,7 @@ static u64 __update_clear_spte_slow(u64 *sptep, u64 spt= e) * The idea using the light way get the spte on x86_32 guest is from * gup_get_pte (mm/gup.c). * - * An spte tlb flush may be pending, because kvm_set_pte_rmapp + * An spte tlb flush may be pending, because kvm_set_pte_rmap * coalesces them and we are running out of the MMU lock. Therefore * we need to protect against in-progress updates of the spte. * @@ -1396,9 +1396,9 @@ static bool kvm_zap_rmaps(struct kvm *kvm, struct kvm= _rmap_head *rmap_head, return __kvm_zap_rmaps(kvm, rmap_head, slot); } =20 -static bool kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_= head, - struct kvm_memory_slot *slot, gfn_t gfn, int level, - pte_t pte) +static bool kvm_set_pte_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_h= ead, + struct kvm_memory_slot *slot, gfn_t gfn, int level, + pte_t pte) { u64 *sptep; struct rmap_iterator iter; @@ -1542,7 +1542,7 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn= _range *range) bool flush =3D false; =20 if (kvm_memslots_have_rmaps(kvm)) - flush =3D kvm_handle_gfn_range(kvm, range, kvm_set_pte_rmapp); + flush =3D kvm_handle_gfn_range(kvm, range, kvm_set_pte_rmap); =20 if (is_tdp_mmu_enabled(kvm)) flush |=3D kvm_tdp_mmu_set_spte_gfn(kvm, range); @@ -1550,9 +1550,9 @@ bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn= _range *range) return flush; } =20 -static bool kvm_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head, - struct kvm_memory_slot *slot, gfn_t gfn, int level, - pte_t unused) +static bool kvm_age_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_head, + struct kvm_memory_slot *slot, gfn_t gfn, int level, + pte_t unused) { u64 *sptep; struct rmap_iterator iter; @@ -1564,9 +1564,9 @@ static bool kvm_age_rmapp(struct kvm *kvm, struct kvm= _rmap_head *rmap_head, return young; } =20 -static bool kvm_test_age_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap= _head, - struct kvm_memory_slot *slot, gfn_t gfn, - int level, pte_t unused) +static bool kvm_test_age_rmap(struct kvm *kvm, struct kvm_rmap_head *rmap_= head, + struct kvm_memory_slot *slot, gfn_t gfn, + int level, pte_t unused) { u64 *sptep; struct rmap_iterator iter; @@ -1615,7 +1615,7 @@ bool kvm_age_gfn(struct kvm *kvm, struct kvm_gfn_rang= e *range) bool young =3D false; =20 if (kvm_memslots_have_rmaps(kvm)) - young =3D kvm_handle_gfn_range(kvm, range, kvm_age_rmapp); + young =3D kvm_handle_gfn_range(kvm, range, kvm_age_rmap); =20 if (is_tdp_mmu_enabled(kvm)) young |=3D kvm_tdp_mmu_age_gfn_range(kvm, range); @@ -1628,7 +1628,7 @@ bool kvm_test_age_gfn(struct kvm *kvm, struct kvm_gfn= _range *range) bool young =3D false; =20 if (kvm_memslots_have_rmaps(kvm)) - young =3D kvm_handle_gfn_range(kvm, range, kvm_test_age_rmapp); + young =3D kvm_handle_gfn_range(kvm, range, kvm_test_age_rmap); =20 if (is_tdp_mmu_enabled(kvm)) young |=3D kvm_tdp_mmu_test_age_gfn(kvm, range); --=20 2.37.0.144.g8ac04bfd2-goog