From patchwork Mon Aug 8 14:56:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Lu X-Patchwork-Id: 12938861 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6E36C25B08 for ; Mon, 8 Aug 2022 14:57:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 247C08E0005; Mon, 8 Aug 2022 10:57:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F5FD8E0002; Mon, 8 Aug 2022 10:57:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 048FB8E0005; Mon, 8 Aug 2022 10:57:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E8BE98E0002 for ; Mon, 8 Aug 2022 10:57:40 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B4A9480F2A for ; Mon, 8 Aug 2022 14:57:40 +0000 (UTC) X-FDA: 79776729480.27.BD2B34A Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by imf11.hostedemail.com (Postfix) with ESMTP id D5B1740189 for ; Mon, 8 Aug 2022 14:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659970659; x=1691506659; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZZZmTi+uFgSNOrvmXUlZxD/TTF+6bac/va5jAJ+uc90=; b=DVdxxITXj3at7eq+x4iGGMATfTM3YrUsN4SMAf2wATVRyUHfTDWj4bGJ BiU323LtY487ERYBc6Xe2thQGYAjrHkLjYF0OAm8Gasnel7G78UDDjIf2 fqF73nEEyBAE+GK13AknsesHV3U7VRfpraIB25xDLc4R+jNC/tCkIDZDD ctsLoX82SGj+jrZiZRU/Vx8/ZE2iqNUPtdXp9OYfkPzMNcAfKmpK6H692 5huf+owRzSOcYhckUWhYpNDJvhm/J35DvLrcgQxgXidWk7DGxgq6DOlDR 1CnvmlteYXFyKZuUgyspS0BtxMl2F3E9ft7x/SAsK9u98CV85MkWuQjTm Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10433"; a="289369235" X-IronPort-AV: E=Sophos;i="5.93,222,1654585200"; d="scan'208";a="289369235" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Aug 2022 07:57:38 -0700 X-IronPort-AV: E=Sophos;i="5.93,222,1654585200"; d="scan'208";a="663980513" Received: from ziqianlu-desk2.sh.intel.com ([10.238.2.76]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Aug 2022 07:57:36 -0700 From: Aaron Lu To: Dave Hansen , Rick Edgecombe Cc: Song Liu , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH 3/4] x86/mm/cpa: add merge event counter Date: Mon, 8 Aug 2022 22:56:48 +0800 Message-Id: <20220808145649.2261258-4-aaron.lu@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808145649.2261258-1-aaron.lu@intel.com> References: <20220808145649.2261258-1-aaron.lu@intel.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659970660; a=rsa-sha256; cv=none; b=fR7WMlxPusdpwKrR7OutXmsR95OfXJUfV5riOOo/rEL0KZSn14+ajEo8364iSlwFWiOcNW 3bkGwrebIvBiadNFWRPnVqTmWyCmvJc4WWgqf+T7FiCcpKcFBb3JzaWJIBoZ89cKr8jjUm 8Poty9Sc1lhKdN31eiozuSX5Xtxa5RY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=DVdxxITX; spf=pass (imf11.hostedemail.com: domain of aaron.lu@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=aaron.lu@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659970660; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4sjYT3O5jxo/Il99ccyLPXTojDjaSm017zCPZ9M62xc=; b=O/HZHv16B4t/Sf3/2GhUZxiOpL5n+fB4ElH10xCgkRKeW1yFlJ/U0g7PtQTj2JHm3yLtYJ AjuBEhsbkMtZjMf21AmXBZcaDb2X1n8Qv0qSRfmo636WDafXPBwsk9m1XQ5GkLphhD+Wqx Wb0j5qbO9TLGHcUn+jaCuaVW+eGRokc= X-Rspamd-Queue-Id: D5B1740189 X-Rspam-User: X-Rspamd-Server: rspam11 Authentication-Results: imf11.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=DVdxxITX; spf=pass (imf11.hostedemail.com: domain of aaron.lu@intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=aaron.lu@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Stat-Signature: ri5q3u8zayds6zc9fg7pmz79rzywdnin X-HE-Tag: 1659970659-918439 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Like split event counter, this patch add counter for merge event. Signed-off-by: Aaron Lu --- arch/x86/mm/pat/set_memory.c | 19 +++++++++++++++++++ include/linux/vm_event_item.h | 2 ++ mm/vmstat.c | 2 ++ 3 files changed, 23 insertions(+) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index fea2c70ff37f..1be9aab42c79 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -105,6 +105,23 @@ static void split_page_count(int level) direct_pages_count[level - 1] += PTRS_PER_PTE; } +static void merge_page_count(int level) +{ + if (direct_pages_count[level] < PTRS_PER_PTE) { + WARN_ON_ONCE(1); + return; + } + + direct_pages_count[level] -= PTRS_PER_PTE; + if (system_state == SYSTEM_RUNNING) { + if (level == PG_LEVEL_4K) + count_vm_event(DIRECT_MAP_LEVEL1_MERGE); + else if (level == PG_LEVEL_2M) + count_vm_event(DIRECT_MAP_LEVEL2_MERGE); + } + direct_pages_count[level + 1]++; +} + void arch_report_meminfo(struct seq_file *m) { seq_printf(m, "DirectMap4k: %8lu kB\n", @@ -875,6 +892,8 @@ static void merge_splitted_mapping(struct page *pgt, int level) __ClearPageSplitpgt(pgt); __free_page(pgt); + + merge_page_count(level); } static pgprot_t pgprot_clear_protnone_bits(pgprot_t prot) diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index 404024486fa5..00a9a435af49 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -143,6 +143,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, #ifdef CONFIG_X86 DIRECT_MAP_LEVEL2_SPLIT, DIRECT_MAP_LEVEL3_SPLIT, + DIRECT_MAP_LEVEL1_MERGE, + DIRECT_MAP_LEVEL2_MERGE, #endif NR_VM_EVENT_ITEMS }; diff --git a/mm/vmstat.c b/mm/vmstat.c index 373d2730fcf2..1a4287a4d614 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1403,6 +1403,8 @@ const char * const vmstat_text[] = { #ifdef CONFIG_X86 "direct_map_level2_splits", "direct_map_level3_splits", + "direct_map_level1_merges", + "direct_map_level2_merges", #endif #endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */ };