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 56204C433EF for ; Fri, 29 Apr 2022 21:00:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381209AbiD2VEM (ORCPT ); Fri, 29 Apr 2022 17:04:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381017AbiD2VDy (ORCPT ); Fri, 29 Apr 2022 17:03:54 -0400 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 312C8D3AD9 for ; Fri, 29 Apr 2022 14:00:35 -0700 (PDT) Received: by mail-pf1-x44a.google.com with SMTP id g5-20020a62e305000000b0050d2dba0c5dso4689435pfh.8 for ; Fri, 29 Apr 2022 14:00:35 -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=ayARFRjTSHz16Sd2ddu94zxJtoFCAjCuQpe45Qe94lo=; b=S95GfX/S/Ks+zuVXI9MoanzvK+iNrqVyrr1B7wA9fsQYHWIIF7qz13FY0UTigxet+M wRPQ9E53NWyDIv1aIqeo2WS6J5ptzZA2F61t+SdgEVs0kpPGbZFH2Ww0Bi7VG/lJsWtx Cf+H/dzboMT5ekyWzpTbzid/0RSPY+t3OfMAttpBH2mzESnW+SiezSkQ/7B670VCrPBK Zd21KJFNjsz2gH8Hm6B+wJ0s0LIoQ1G4Pp/+LFUggTYBueZiu+PoIFasUxqwqnjHHX4y WrO7U/orAlGWkDlCeZkQnjsX/Ke8MWzM/P/sNK1IwjDwvZryISr/BLUoBy6nvAO5ARzS AnAA== 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=ayARFRjTSHz16Sd2ddu94zxJtoFCAjCuQpe45Qe94lo=; b=BPG2JFdNoCcesA6F0EyIcWkQ1RoZaS3ihQEQzsw7KHJqI5BUKiid1bJAJb5by7/VBk cOK/JdNdD0b+2D+tgBSCUNrPY+vdyZ0VOd1k/z6KO+XBXEA118PqdOoZ5SoKIpbtNGbx DCDG+xl+pusv714IFen7uy/D22N7SZBVwQRQDvEYUnLLURCyMTeS9Md03bWB/nMyOYan 0k05vXpu8qOt8v6YavKThbXowNZtUMGMN7PBvZWrQ4OGm69Sox/UhO2yxLsx4Vztx9sF lKykyq5uPEkYiU0SasX7juafZOWU6eJ6Zykswha9kMIRe+7YbJ+Mh7urjU0GSk1IhhS4 tayQ== X-Gm-Message-State: AOAM530bCIWv/+VsRigCK7WvK23XcGMR3iMM9CG1XpMQfGR2opbviFSv pO+E39ZW5EQpjJM9f2CHKaE1M9VVXbM= X-Google-Smtp-Source: ABdhPJzPKEzWmZs45NDM3ffvoqgv6goI1WUDSnwE5tvuhIKuYY6ojV/10fbm9Okicd3b6vFAIa1lp9w/6GE= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:902:bb90:b0:156:2c05:b34f with SMTP id m16-20020a170902bb9000b001562c05b34fmr1170995pls.53.1651266034679; Fri, 29 Apr 2022 14:00:34 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 29 Apr 2022 21:00:20 +0000 In-Reply-To: <20220429210025.3293691-1-seanjc@google.com> Message-Id: <20220429210025.3293691-4-seanjc@google.com> Mime-Version: 1.0 References: <20220429210025.3293691-1-seanjc@google.com> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH v3 3/8] KVM: Drop unused @gpa param from gfn=>pfn cache's __release_gpc() helper From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Christopherson , Lai Jiangshan , David Woodhouse , Mingwei Zhang Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drop the @pga param from __release_gpc() and rename the helper to make it more obvious that the cache itself is not being released. The helper will be reused by a future commit to release a pfn+khva combination that is _never_ associated with the cache, at which point the current name would go from slightly misleading to blatantly wrong. No functional change intended. Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson --- virt/kvm/pfncache.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c index dd84676615f1..e05a6a1b8eff 100644 --- a/virt/kvm/pfncache.c +++ b/virt/kvm/pfncache.c @@ -95,7 +95,7 @@ bool kvm_gfn_to_pfn_cache_check(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, } EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_check); -static void __release_gpc(struct kvm *kvm, kvm_pfn_t pfn, void *khva, gpa_t gpa) +static void gpc_release_pfn_and_khva(struct kvm *kvm, kvm_pfn_t pfn, void *khva) { /* Unmap the old page if it was mapped before, and release it */ if (!is_error_noslot_pfn(pfn)) { @@ -146,7 +146,6 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, unsigned long page_offset = gpa & ~PAGE_MASK; kvm_pfn_t old_pfn, new_pfn; unsigned long old_uhva; - gpa_t old_gpa; void *old_khva; bool old_valid; int ret = 0; @@ -160,7 +159,6 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, write_lock_irq(&gpc->lock); - old_gpa = gpc->gpa; old_pfn = gpc->pfn; old_khva = gpc->khva - offset_in_page(gpc->khva); old_uhva = gpc->uhva; @@ -244,7 +242,7 @@ int kvm_gfn_to_pfn_cache_refresh(struct kvm *kvm, struct gfn_to_pfn_cache *gpc, out: write_unlock_irq(&gpc->lock); - __release_gpc(kvm, old_pfn, old_khva, old_gpa); + gpc_release_pfn_and_khva(kvm, old_pfn, old_khva); return ret; } @@ -254,14 +252,12 @@ void kvm_gfn_to_pfn_cache_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc) { void *old_khva; kvm_pfn_t old_pfn; - gpa_t old_gpa; write_lock_irq(&gpc->lock); gpc->valid = false; old_khva = gpc->khva - offset_in_page(gpc->khva); - old_gpa = gpc->gpa; old_pfn = gpc->pfn; /* @@ -273,7 +269,7 @@ void kvm_gfn_to_pfn_cache_unmap(struct kvm *kvm, struct gfn_to_pfn_cache *gpc) write_unlock_irq(&gpc->lock); - __release_gpc(kvm, old_pfn, old_khva, old_gpa); + gpc_release_pfn_and_khva(kvm, old_pfn, old_khva); } EXPORT_SYMBOL_GPL(kvm_gfn_to_pfn_cache_unmap); -- 2.36.0.464.gb9c8b46e94-goog