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 X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 8F680C433DB for ; Wed, 27 Jan 2021 10:18:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 124F72072C for ; Wed, 27 Jan 2021 10:18:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 124F72072C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 87A646B0007; Wed, 27 Jan 2021 05:18:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 82AE56B0008; Wed, 27 Jan 2021 05:18:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 741666B000A; Wed, 27 Jan 2021 05:18:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0067.hostedemail.com [216.40.44.67]) by kanga.kvack.org (Postfix) with ESMTP id 5F33D6B0007 for ; Wed, 27 Jan 2021 05:18:31 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 2C406180AD815 for ; Wed, 27 Jan 2021 10:18:31 +0000 (UTC) X-FDA: 77751155622.07.pull04_420bd6127596 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 136F21803FFCF for ; Wed, 27 Jan 2021 10:18:31 +0000 (UTC) X-HE-Tag: pull04_420bd6127596 X-Filterd-Recvd-Size: 5535 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Wed, 27 Jan 2021 10:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611742709; 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=Xjqz0z3B10MBMjRhyTzjYxNKEzPg2nutGw+BuiLIitY=; b=i8s3LSXokiYeECu8gyjDOv9qK1CUhti+/GCUJ299k7Tw2LYX3+f7Kk33e4DHsIQqJHp/ao zpvshk2plmSizFMREvV6GlxdAkoGWH+9LDvbHJqqVzVQgflK6vkC1qlVTojG/G8nmfC+bN +CpcH4iYFWPe/i0EpDVSqBL9LWoikV0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-nzpZ7BHTOPa1PH98o-_REw-1; Wed, 27 Jan 2021 05:18:25 -0500 X-MC-Unique: nzpZ7BHTOPa1PH98o-_REw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4601D801AB8; Wed, 27 Jan 2021 10:18:24 +0000 (UTC) Received: from t480s.redhat.com (ovpn-114-237.ams2.redhat.com [10.36.114.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id 445086EF55; Wed, 27 Jan 2021 10:18:22 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , Thomas Gleixner , "Peter Zijlstra (Intel)" , Mike Rapoport , Oscar Salvador , Michal Hocko , Wei Yang Subject: [PATCH v1 2/2] mm/page_alloc: count CMA pages per zone and print them in /proc/zoneinfo Date: Wed, 27 Jan 2021 11:18:13 +0100 Message-Id: <20210127101813.6370-3-david@redhat.com> In-Reply-To: <20210127101813.6370-1-david@redhat.com> References: <20210127101813.6370-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Content-Transfer-Encoding: quoted-printable 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: Let's count the number of CMA pages per zone and print them in /proc/zoneinfo. Having access to the total number of CMA pages per zone is helpful for debugging purposes to know where exactly the CMA pages ended up, and to figure out how many pages of a zone might behave differently (e.g., like ZONE_MOVABLE) - even after some of these pages might already have been allocated. For now, we are only able to get the global nr+free cma pages from /proc/meminfo and the free cma pages per zone from /proc/zoneinfo. Note: Track/print that information even without CONFIG_CMA, similar to "nr_free_cma" in /proc/zoneinfo. This is different to /proc/meminfo - maybe we want to make that consistent in the future (however, changing /proc/zoneinfo output might uglify the code a bit). Cc: Andrew Morton Cc: Thomas Gleixner Cc: "Peter Zijlstra (Intel)" Cc: Mike Rapoport Cc: Oscar Salvador Cc: Michal Hocko Cc: Wei Yang Signed-off-by: David Hildenbrand --- include/linux/mmzone.h | 4 ++++ mm/page_alloc.c | 1 + mm/vmstat.c | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index ae588b2f87ef..3bc18c9976fd 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -503,6 +503,9 @@ struct zone { * bootmem allocator): * managed_pages =3D present_pages - reserved_pages; * + * cma pages is present pages that are assigned for CMA use + * (MIGRATE_CMA). + * * So present_pages may be used by memory hotplug or memory power * management logic to figure out unmanaged pages by checking * (present_pages - managed_pages). And managed_pages should be used @@ -527,6 +530,7 @@ struct zone { atomic_long_t managed_pages; unsigned long spanned_pages; unsigned long present_pages; + unsigned long cma_pages; =20 const char *name; =20 diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b031a5ae0bd5..9a82375bbcb2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2168,6 +2168,7 @@ void __init init_cma_reserved_pageblock(struct page= *page) } =20 adjust_managed_page_count(page, pageblock_nr_pages); + page_zone(page)->cma_pages +=3D pageblock_nr_pages; } #endif =20 diff --git a/mm/vmstat.c b/mm/vmstat.c index 7758486097f9..97fc32a53320 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1642,14 +1642,16 @@ static void zoneinfo_show_print(struct seq_file *= m, pg_data_t *pgdat, "\n high %lu" "\n spanned %lu" "\n present %lu" - "\n managed %lu", + "\n managed %lu" + "\n cma %lu", zone_page_state(zone, NR_FREE_PAGES), min_wmark_pages(zone), low_wmark_pages(zone), high_wmark_pages(zone), zone->spanned_pages, zone->present_pages, - zone_managed_pages(zone)); + zone_managed_pages(zone), + zone->cma_pages); =20 seq_printf(m, "\n protection: (%ld", --=20 2.29.2