From patchwork Fri Dec 23 00:57:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 36030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp69281wrn; Thu, 22 Dec 2022 16:58:56 -0800 (PST) X-Google-Smtp-Source: AMrXdXsZeZC026c27FIDKsIUDtZJJSCl+sakdIPKy3ZLcXy+O6Ql5y3rlgvviGSWtoQ2yFzICCeT X-Received: by 2002:a05:6402:1759:b0:468:260e:ad53 with SMTP id v25-20020a056402175900b00468260ead53mr6149019edx.10.1671757135855; Thu, 22 Dec 2022 16:58:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671757135; cv=none; d=google.com; s=arc-20160816; b=wiskUIIDTzbyNINLulW3DGS/7bYkquVQjo7jIFVOldBHOS1IIXsM5mDp4SZ6PG5rmR +C0tIcx1HWmmXtHD1CEV1tfcj09zqlUViJCOI6b+X1FUCZNLU0YwjxR44qtoOjPgc38n V5HRffqr+VHrlJQ+ddHa88Y4Yg70MhZJazhxm+4SFfIYB9kfQYUqLG8ItE/jtfqsMRAs kEKYX1gDX4xgHuNr/N8SP4D2o8qV0O8EJ0kqRvOph9yLjvp/XHjsiU1gPmOKCsSZe0gO RQRYOUM+rPjo4646aW0WuUvxeFVRhApMvFb9uUXCZT+rYRC71H/FVwzgqHtcix4LB3VP 4RrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=BIUstVDoT6s4wHBx8tH1b6wi7gNM5cmrC590QJLnU+k=; b=L8cM6gelLi7hUhfV99nTn0Pl7bYygCNiJ0dLcexvKQ1JeJkjFNh51yNVe83prmUewa Lo8khUaMc2GC4ImVlemh6L1GmdzfydEJ2eEcQxhwPlReRA2cBzPipI7HsorLvJGc2e/j fqMGfrC9nvHRf2mXJg7cTVTzE2mkGRDs5Puf7RR74GCiDvGeEJ9d/+BKPK6Vrzyrzszx SkLIVgJB4Pah9Lvc/S2JywvMpGk+A8AC9Vjf3rAin/aN9jMhyYgmPgOr1YL7DsTdAmVH XCUU55g5sB7hytanMyJJ+HGLeKW0pGRtL2HZxBsuwFrNxshHhMITJTPwr7kibJKhwwRA Btjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=P84tHODT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o13-20020aa7c50d000000b0046ae9e1bacesi1547655edq.604.2022.12.22.16.58.32; Thu, 22 Dec 2022 16:58:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=P84tHODT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230444AbiLWA56 (ORCPT + 99 others); Thu, 22 Dec 2022 19:57:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230062AbiLWA5u (ORCPT ); Thu, 22 Dec 2022 19:57:50 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BEEB2182B for ; Thu, 22 Dec 2022 16:57:49 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id i65-20020a25d144000000b0074dd0da5b01so3611838ybg.7 for ; Thu, 22 Dec 2022 16:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=BIUstVDoT6s4wHBx8tH1b6wi7gNM5cmrC590QJLnU+k=; b=P84tHODTrynNhdwBSDHNrxQLisM+BhYybSBCojVB/63wz1zWifGIfdd5+Pu04t7g9y +9zTX7G/UYvQjnElf0ibJnn+n/r7F1g8IOGyhM07oROfKPBCKEWpWaHxC2yRRxR2YIXx gI96EHJgCijYm/1ncMTKq9j1xLzlY3f+6bYt6gzKWP8s4CXW/oix2fcIDxJye8MUYPTk PHUWUupAlaFjQxaeCAslY4oMoZQKrNhKriuaMxDrzPpjHAg6ly1DgFDmhC2CwaZsnjjN xdcCdmgHTPervwSEitdWLEjfgm4TfySNkQAAvvpkEuVhOO3L03cFnyk2s7rr2r5qhtDT OnQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BIUstVDoT6s4wHBx8tH1b6wi7gNM5cmrC590QJLnU+k=; b=729Ni6QtoSqVh3PbcTISw/L18rPs/10ia5TYOGp9b37n91D3oJ4y2HlcjNH7NE+RAd 4UURzOVXc8GQvSsrY2c7zyU9O4LGxVnI0LtdkwoNuahVDPZB45Y44EtwnIINgrJ0cH8x gTtWUhzR2H8xoNE+VzdaSimOx6GJVa42h5ZtiemMu+78WU4EFDMMYl+JBXIuixv7tMlL 7JNUoajcd+/dQIzD5dI2jBNVBnKKaFCBotnbxDNbIUR3QSsp6PmN9ONtm6SNf9FoGnvM rXrItw1AdlGvm1hBQA3ERHu7VeK09jxFu6brof3udhNjz0VSCjRpi91na+enhganrqYn hcyQ== X-Gm-Message-State: AFqh2kpv1UZqqu79t5lMSBA7XtBdqWUxEfO02T/GLWeMfk7yiiGHKVvY pMy6HlPuFj82vb3cxw4mIRJftHTssiE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:e6c6:0:b0:746:cd75:3ab8 with SMTP id d189-20020a25e6c6000000b00746cd753ab8mr831064ybh.7.1671757068716; Thu, 22 Dec 2022 16:57:48 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 23 Dec 2022 00:57:14 +0000 In-Reply-To: <20221223005739.1295925-1-seanjc@google.com> Mime-Version: 1.0 References: <20221223005739.1295925-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221223005739.1295925-3-seanjc@google.com> Subject: [PATCH 02/27] KVM: x86/mmu: Factor out helper to get max mapping size of a memslot From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Zhenyu Wang , Zhi Wang Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Yan Zhao , Ben Gardon X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752964410395152501?= X-GMAIL-MSGID: =?utf-8?q?1752964410395152501?= Extract the memslot-related logic of kvm_mmu_max_mapping_level() into a new helper so that KVMGT can determine whether or not mapping a 2MiB page into the guest is (dis)allowed per KVM's memslots. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 21 +++++++++++++++------ arch/x86/kvm/mmu/mmu_internal.h | 2 ++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 254bc46234e0..ca7428b68eba 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3064,20 +3064,29 @@ static int host_pfn_mapping_level(struct kvm *kvm, gfn_t gfn, return level; } +int kvm_mmu_max_slot_mapping_level(const struct kvm_memory_slot *slot, + gfn_t gfn, int max_level) +{ + struct kvm_lpage_info *linfo; + + for ( ; max_level > PG_LEVEL_4K; max_level--) { + linfo = lpage_info_slot(gfn, slot, max_level); + if (!linfo->disallow_lpage) + break; + } + return max_level; +} + int kvm_mmu_max_mapping_level(struct kvm *kvm, const struct kvm_memory_slot *slot, gfn_t gfn, int max_level) { - struct kvm_lpage_info *linfo; int host_level; max_level = min(max_level, max_huge_page_level); - for ( ; max_level > PG_LEVEL_4K; max_level--) { - linfo = lpage_info_slot(gfn, slot, max_level); - if (!linfo->disallow_lpage) - break; - } + max_level = kvm_mmu_max_slot_mapping_level(slot, gfn, max_level); + /* Avoid walking the host page tables if a hugepage is impossible. */ if (max_level == PG_LEVEL_4K) return PG_LEVEL_4K; diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h index ac00bfbf32f6..b078c29e5674 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -314,6 +314,8 @@ static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, return r; } +int kvm_mmu_max_slot_mapping_level(const struct kvm_memory_slot *slot, + gfn_t gfn, int max_level); int kvm_mmu_max_mapping_level(struct kvm *kvm, const struct kvm_memory_slot *slot, gfn_t gfn, int max_level);