From patchwork Fri Jun 25 15:32:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12345503 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D74BC2B9F4 for ; Fri, 25 Jun 2021 15:32:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CA8A61945 for ; Fri, 25 Jun 2021 15:32:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230044AbhFYPeu (ORCPT ); Fri, 25 Jun 2021 11:34:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44575 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbhFYPen (ORCPT ); Fri, 25 Jun 2021 11:34:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624635142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=INi7/NQmQ1q6t1hySvPoVbZhD1CFSoMp7ejAC0hIDQg=; b=E8yedwCWXGaK7urseubcbLtmOwcVZFSdvPLpKieVrfm+m0F6YMRF7SFNNOoueIUBZa1eVK 8VJkfP16d45y/etDvXJzwYJptPHjSPEo5+pDENuNN3n9K2luxTDyx7O5t14iGtJW8SOVwa b3kZ5jI6HA1MGOJOQCi2Sg+lfE7qWTM= Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-533-_KzNI9EgP7yzx1TliiGntQ-1; Fri, 25 Jun 2021 11:32:18 -0400 X-MC-Unique: _KzNI9EgP7yzx1TliiGntQ-1 Received: by mail-io1-f72.google.com with SMTP id l15-20020a5e820f0000b02904bd1794d00eso7273573iom.7 for ; Fri, 25 Jun 2021 08:32:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=INi7/NQmQ1q6t1hySvPoVbZhD1CFSoMp7ejAC0hIDQg=; b=cpgup/AitTpHl+hVgm3i1TP6jk4zNmxosOeFpjLVs/pi7GhmuUkIlpagNAl2gxPrl/ VIHTw5MXBNEBB+OAYWhpyYpNTT3KVqN7HGfYYbigCTBys4hBmFTpYRsQUiWL4Y/fxCmH q7yn74HdFhaQYYjFaFk9pavEeo42EpWSZjeyQs7LCOp5MVda0ddm4jPRODJAimibsMJ5 vUKNDKi8ffZiu8BIx/tExBu2Rq/Je+Y1GniMj1/vVkz8d9Xq/030EeUsu5Adwx25phzS Zw0GAJtKWtvVsGRIFwMTxELxO+IVhJ/TLj78noczSx+FfirRRz/hr94oSnpmSq+9ZkKc 1I2A== X-Gm-Message-State: AOAM533SZ65jroEtCO3nzuN6Ge/jy/GeEmfvtBB60dZNY2uEuADeI6N0 J86bKt71lvMW7Oel14JlY4NIuSdbcTksTn298NcX/m1ke5XCbWnRFhNsizM2Wq4wfCT6l4A+CC7 275CDSJjPu8LM X-Received: by 2002:a05:6638:3fa:: with SMTP id s26mr10138670jaq.16.1624635138228; Fri, 25 Jun 2021 08:32:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGLqINrVZS5FKrdcEe4KyJJCkXQZcmXAZYbOxtJXj3K1ST9f/AyKv8aClT53i5y2FrxTEjdA== X-Received: by 2002:a05:6638:3fa:: with SMTP id s26mr10138658jaq.16.1624635138108; Fri, 25 Jun 2021 08:32:18 -0700 (PDT) Received: from t490s.redhat.com (bras-base-toroon474qw-grc-65-184-144-111-238.dsl.bell.ca. [184.144.111.238]) by smtp.gmail.com with ESMTPSA id s8sm3668772ilj.51.2021.06.25.08.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 08:32:17 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Vitaly Kuznetsov , Paolo Bonzini , Sean Christopherson , peterx@redhat.com, Maxim Levitsky Subject: [PATCH v2 1/9] KVM: X86: Add per-vm stat for max rmap list size Date: Fri, 25 Jun 2021 11:32:06 -0400 Message-Id: <20210625153214.43106-2-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210625153214.43106-1-peterx@redhat.com> References: <20210625153214.43106-1-peterx@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add a new statistic max_mmu_rmap_size, which stores the maximum size of rmap for the vm. Signed-off-by: Peter Xu --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/mmu/mmu.c | 2 ++ arch/x86/kvm/x86.c | 1 + 3 files changed, 4 insertions(+) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 974cbfb1eefe..d798650ad793 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1209,6 +1209,7 @@ struct kvm_vm_stat { u64 lpages; u64 nx_lpage_splits; u64 max_mmu_page_hash_collisions; + u64 max_mmu_rmap_size; }; struct kvm_vcpu_stat { diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index b888385d1933..eb16c1dbbb32 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -2696,6 +2696,8 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, u64 *sptep, if (is_shadow_present_pte(*sptep)) { if (!was_rmapped) { rmap_count = rmap_add(vcpu, sptep, gfn); + if (rmap_count > vcpu->kvm->stat.max_mmu_rmap_size) + vcpu->kvm->stat.max_mmu_rmap_size = rmap_count; if (rmap_count > RMAP_RECYCLE_THRESHOLD) rmap_recycle(vcpu, sptep, gfn); } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8166ad113fb2..d83ccf35ce99 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -237,6 +237,7 @@ const struct _kvm_stats_desc kvm_vm_stats_desc[] = { STATS_DESC_ICOUNTER(VM, mmu_unsync), STATS_DESC_ICOUNTER(VM, lpages), STATS_DESC_ICOUNTER(VM, nx_lpage_splits), + STATS_DESC_PCOUNTER(VM, max_mmu_rmap_size), STATS_DESC_PCOUNTER(VM, max_mmu_page_hash_collisions) }; static_assert(ARRAY_SIZE(kvm_vm_stats_desc) ==