From mboxrd@z Thu Jan 1 00:00:00 1970 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 spte) * 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); } -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_head, + 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 = false; if (kvm_memslots_have_rmaps(kvm)) - flush = kvm_handle_gfn_range(kvm, range, kvm_set_pte_rmapp); + flush = kvm_handle_gfn_range(kvm, range, kvm_set_pte_rmap); if (is_tdp_mmu_enabled(kvm)) flush |= 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; } -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; } -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_range *range) bool young = false; if (kvm_memslots_have_rmaps(kvm)) - young = kvm_handle_gfn_range(kvm, range, kvm_age_rmapp); + young = kvm_handle_gfn_range(kvm, range, kvm_age_rmap); if (is_tdp_mmu_enabled(kvm)) young |= 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 = false; if (kvm_memslots_have_rmaps(kvm)) - young = kvm_handle_gfn_range(kvm, range, kvm_test_age_rmapp); + young = kvm_handle_gfn_range(kvm, range, kvm_test_age_rmap); if (is_tdp_mmu_enabled(kvm)) young |= kvm_tdp_mmu_test_age_gfn(kvm, range); -- 2.37.0.144.g8ac04bfd2-goog