From patchwork Mon Sep 18 11:21:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 141517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2879188vqi; Mon, 18 Sep 2023 11:51:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5z4dXV2NbE5iRspESrQI8kKPn9k4WbLP7RW+ZO24xEHOcxgBFYs+N9LnUbbMPRsymoRbz X-Received: by 2002:a17:90a:714c:b0:26b:24ed:e0d9 with SMTP id g12-20020a17090a714c00b0026b24ede0d9mr8928194pjs.33.1695063092033; Mon, 18 Sep 2023 11:51:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695063092; cv=none; d=google.com; s=arc-20160816; b=xf+hNa4UYDCk+4SIUU9BIBVqzgp0YReIejI7+makHwflOA+Aqe9cel76zb01wGoxvm +PqN4hM1KBF923PlTk25REK03XPMq5FLVdXsWpneRcqlpl+SgA3DzvE5GChp/R0w8uc9 ULyKL3YgeeiETo599gKqPKoCnU2N/iXDJSMcpfh2mTVsE0rzkWGBWssto2vqgUoPfiiM hHPIyuuVBX+gW5fPd7+iRH3FOTvoaSC7q5dKZak7IZ5fkZl4Q4LCYtzx+jJGwv4t5k8T eCKAxn7AWkx/kEcqYrsJwIfwzXKwsR96c9wYsyfUtdvcb8//GFArC5qF2Ac1FNAg76O7 YchA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fTbn2s70JU4n6q7zX5A96rrHyiVEJajbsq63guaOv5g=; fh=huad6iRJsyL9duZ/mEsnypNTRWjlSl25gjzGtGjMd5k=; b=itSym4Tb2AVXQdQf+vWM47F/SK1Z1BFzxO3Kz25/UGkA7cAHSzFYG88i2+nmMCAQeM f7gE/FoQ9uQSCEWmSo2s6fj6fydow5uf1BW5JNq2+7gNKVCtLB12pu1Msqtam/QwQWA7 0EfOhrs7wsXC6Q0ko8kjJDxMG2M5TszXqF9hQjM+aDC9mIlXDYEBc5G5fMvTSssGP+JQ 3yQ54139xm45t+4FOMRu23Q9JsmuiQIzR8BeKGVROE1i4S5qqU4fo7V3O1CV6ENhAlqW 2DRCuXqY5xvDr2NHtyryfx19GOMxRhm7FpD9IopCWbB0t6lwpDn9Vq19usmZ29c1XMBP i30Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=HaR9Wx4m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id w1-20020a17090ac98100b0026829a94587si8288439pjt.176.2023.09.18.11.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:51:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=HaR9Wx4m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 1597A806E3E8; Mon, 18 Sep 2023 04:23:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241571AbjIRLWr (ORCPT + 27 others); Mon, 18 Sep 2023 07:22:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240006AbjIRLWU (ORCPT ); Mon, 18 Sep 2023 07:22:20 -0400 Received: from mail.xenproject.org (mail.xenproject.org [104.130.215.37]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3184C3; Mon, 18 Sep 2023 04:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=fTbn2s70JU4n6q7zX5A96rrHyiVEJajbsq63guaOv5g=; b=HaR9Wx4m0UWITRpcI3ReX3juWh t7c0zmSrvP4F/zqnGlXxs3AZSc4SkZTVJYWuzJW51K9H0gm645xjxd8oUWaK7YcK0Z9SNhqk036f0 ajgtVfrtdafxrd/R+IDgFCpXvxD+Q2x1DOQm+V10BInuCiqu+JLMzst8QfBE7R9wgd+g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qiCKN-00071p-J1; Mon, 18 Sep 2023 11:22:07 +0000 Received: from ec2-63-33-11-17.eu-west-1.compute.amazonaws.com ([63.33.11.17] helo=REM-PW02S00X.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qiCKN-0005f3-Bc; Mon, 18 Sep 2023 11:22:07 +0000 From: Paul Durrant To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Paul Durrant , David Woodhouse , Paolo Bonzini Subject: [PATCH v2 01/12] KVM: pfncache: add a map helper function Date: Mon, 18 Sep 2023 11:21:37 +0000 Message-Id: <20230918112148.28855-2-paul@xen.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230918112148.28855-1-paul@xen.org> References: <20230918112148.28855-1-paul@xen.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 18 Sep 2023 04:23:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777402476520799928 X-GMAIL-MSGID: 1777402476520799928 From: Paul Durrant We have an unmap helper but mapping is open-coded. Arguably this is fine because mapping is done in only one place, hva_to_pfn_retry(), but adding the helper does make that function more readable. No functional change intended. Signed-off-by: Paul Durrant Reviewed-by: David Woodhouse --- Cc: Paolo Bonzini --- virt/kvm/pfncache.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/virt/kvm/pfncache.c b/virt/kvm/pfncache.c index 2d6aba677830..0f36acdf577f 100644 --- a/virt/kvm/pfncache.c +++ b/virt/kvm/pfncache.c @@ -96,17 +96,28 @@ bool kvm_gpc_check(struct gfn_to_pfn_cache *gpc, unsigned long len) } EXPORT_SYMBOL_GPL(kvm_gpc_check); -static void gpc_unmap_khva(kvm_pfn_t pfn, void *khva) +static void *gpc_map(kvm_pfn_t pfn) +{ + if (pfn_valid(pfn)) + return kmap(pfn_to_page(pfn)); +#ifdef CONFIG_HAS_IOMEM + else + return memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB); +#endif +} + +static void gpc_unmap(kvm_pfn_t pfn, void *khva) { /* Unmap the old pfn/page if it was mapped before. */ - if (!is_error_noslot_pfn(pfn) && khva) { - if (pfn_valid(pfn)) - kunmap(pfn_to_page(pfn)); + if (is_error_noslot_pfn(pfn) || !khva) + return; + + if (pfn_valid(pfn)) + kunmap(pfn_to_page(pfn)); #ifdef CONFIG_HAS_IOMEM - else - memunmap(khva); + else + memunmap(khva); #endif - } } static inline bool mmu_notifier_retry_cache(struct kvm *kvm, unsigned long mmu_seq) @@ -175,7 +186,7 @@ static kvm_pfn_t hva_to_pfn_retry(struct gfn_to_pfn_cache *gpc) * the existing mapping and didn't create a new one. */ if (new_khva != old_khva) - gpc_unmap_khva(new_pfn, new_khva); + gpc_unmap(new_pfn, new_khva); kvm_release_pfn_clean(new_pfn); @@ -193,15 +204,11 @@ static kvm_pfn_t hva_to_pfn_retry(struct gfn_to_pfn_cache *gpc) * too must be done outside of gpc->lock! */ if (gpc->usage & KVM_HOST_USES_PFN) { - if (new_pfn == gpc->pfn) { + if (new_pfn == gpc->pfn) new_khva = old_khva; - } else if (pfn_valid(new_pfn)) { - new_khva = kmap(pfn_to_page(new_pfn)); -#ifdef CONFIG_HAS_IOMEM - } else { - new_khva = memremap(pfn_to_hpa(new_pfn), PAGE_SIZE, MEMREMAP_WB); -#endif - } + else + new_khva = gpc_map(new_pfn); + if (!new_khva) { kvm_release_pfn_clean(new_pfn); goto out_error; @@ -326,7 +333,7 @@ static int __kvm_gpc_refresh(struct gfn_to_pfn_cache *gpc, gpa_t gpa, mutex_unlock(&gpc->refresh_lock); if (unmap_old) - gpc_unmap_khva(old_pfn, old_khva); + gpc_unmap(old_pfn, old_khva); return ret; } @@ -412,7 +419,7 @@ void kvm_gpc_deactivate(struct gfn_to_pfn_cache *gpc) list_del(&gpc->list); spin_unlock(&kvm->gpc_lock); - gpc_unmap_khva(old_pfn, old_khva); + gpc_unmap(old_pfn, old_khva); } } EXPORT_SYMBOL_GPL(kvm_gpc_deactivate);