From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70D032590 for ; Tue, 26 Jul 2022 14:33:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LiBGC1b1QxEEeViky5NbRgM9y6bFr53DkHc/XfdWgQ8=; b=FYx2jhy9iKEIuDnvr+JYStiyj4yS2k4IvusxLZBJMpTgx4GV18SjTAUVtQWGTJ4JClja/y VidAYEhtVCcXiQMpc7N23P7nFQlzlS+3QtBsS8IyFUWG3fQNJbj+wR+kTX5BqrD3h8aSyW VWdEm7IqA4dIO+7+cZ99lUgHJCxvMUM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-235-cm5gRmqMNquo7hrODl5RAQ-1; Tue, 26 Jul 2022 10:33:22 -0400 X-MC-Unique: cm5gRmqMNquo7hrODl5RAQ-1 Received: by mail-wm1-f72.google.com with SMTP id n19-20020a05600c3b9300b003a314062cf4so864692wms.0 for ; Tue, 26 Jul 2022 07:33:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=LiBGC1b1QxEEeViky5NbRgM9y6bFr53DkHc/XfdWgQ8=; b=j4BdfzNHQRs5KQht4kb0OHqcl/E6XBAbENycdXfxTet1y4+zrGtof4Y8DE0ddsJAc1 ejNg/ttH4PcTTzkM2uRMIowu1BAY9lofsh2pKVBEHRA1NufO8IijNknhjBBYt1FqPFGH 9Nl1fS8eGebTAqXBsSDm89f/hkPkZSzrUWCnlL0lViomIAwvpz8J1YhV0XEBGDRVCnO+ QKC2zx02ZB9XMpoxzMu7JMlE7GXRHLfAdqGQuXlu5uuSRl5ElzpQAU6SLJCGQMxPUYmY Iu73KU5d4tuilWJ9S2MSOB7iGOovrjQyGU88WqApBRKF/Zrh7LrjCOnbUjicmlXINMg9 t9og== X-Gm-Message-State: AJIora/DAkihiPxJj9m9GojZnTSqqunvGgmkgtK0h+MGlZ917tlB8zXw KsyNO5Wn/ujn7g4E93C0wxvHhTbGttW+gjm7oySSx8FYzsdtEb6C6bE6KZPTO+UydUcCiFs/BCA A2JxaR3sRkzruQobdUEEYWA== X-Received: by 2002:a05:600c:a18e:b0:3a3:10ef:672a with SMTP id id14-20020a05600ca18e00b003a310ef672amr24280343wmb.14.1658846000929; Tue, 26 Jul 2022 07:33:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t7oH12XlY/+hi4IxsJEdLzeaHKs9wMX+Cz8IWG78oiZGfbXTFAAmw67L/BOMUCstC0heXYBA== X-Received: by 2002:a05:600c:a18e:b0:3a3:10ef:672a with SMTP id id14-20020a05600ca18e00b003a310ef672amr24280313wmb.14.1658846000544; Tue, 26 Jul 2022 07:33:20 -0700 (PDT) Received: from ?IPV6:2003:cb:c708:fe00:8ba4:5871:abc3:8a75? (p200300cbc708fe008ba45871abc38a75.dip0.t-ipconnect.de. [2003:cb:c708:fe00:8ba4:5871:abc3:8a75]) by smtp.gmail.com with ESMTPSA id az14-20020adfe18e000000b0021e529efa60sm9253089wrb.1.2022.07.26.07.33.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 26 Jul 2022 07:33:20 -0700 (PDT) Message-ID: Date: Tue, 26 Jul 2022 16:33:18 +0200 Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCHv7 03/14] mm: Report unaccepted memory in meminfo To: "Kirill A. Shutemov" , Borislav Petkov , Andy Lutomirski , Sean Christopherson , Andrew Morton , Joerg Roedel , Ard Biesheuvel Cc: Andi Kleen , Kuppuswamy Sathyanarayanan , David Rientjes , Vlastimil Babka , Tom Lendacky , Thomas Gleixner , Peter Zijlstra , Paolo Bonzini , Ingo Molnar , Varad Gautam , Dario Faggioli , Dave Hansen , Mike Rapoport , marcelo.cerri@canonical.com, tim.gardner@canonical.com, khalid.elmously@canonical.com, philip.cox@canonical.com, x86@kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org References: <20220614120231.48165-1-kirill.shutemov@linux.intel.com> <20220614120231.48165-4-kirill.shutemov@linux.intel.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220614120231.48165-4-kirill.shutemov@linux.intel.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 14.06.22 14:02, Kirill A. Shutemov wrote: > Track amount of unaccepted memory and report it in /proc/meminfo and in > node meminfo. > > Signed-off-by: Kirill A. Shutemov > --- > drivers/base/node.c | 7 +++++++ > fs/proc/meminfo.c | 5 +++++ > include/linux/mmzone.h | 1 + > mm/page_alloc.c | 9 ++++++++- > mm/vmstat.c | 1 + > 5 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/drivers/base/node.c b/drivers/base/node.c > index 0ac6376ef7a1..fc7cf4d91eb6 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -446,6 +446,9 @@ static ssize_t node_read_meminfo(struct device *dev, > "Node %d ShmemPmdMapped: %8lu kB\n" > "Node %d FileHugePages: %8lu kB\n" > "Node %d FilePmdMapped: %8lu kB\n" > +#endif > +#ifdef CONFIG_UNACCEPTED_MEMORY > + "Node %d UnacceptedPages: %8lu kB\n" Nit: I'd just call that "Unaccepted", as the unit is kB. > #endif > , > nid, K(node_page_state(pgdat, NR_FILE_DIRTY)), > @@ -474,6 +477,10 @@ static ssize_t node_read_meminfo(struct device *dev, > nid, K(node_page_state(pgdat, NR_SHMEM_PMDMAPPED)), > nid, K(node_page_state(pgdat, NR_FILE_THPS)), > nid, K(node_page_state(pgdat, NR_FILE_PMDMAPPED)) > +#endif > +#ifdef CONFIG_UNACCEPTED_MEMORY > + , > + nid, K(node_page_state(pgdat, NR_UNACCEPTED)) > #endif > ); > len += hugetlb_report_node_meminfo(buf, len, nid); > diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c > index 6e89f0e2fd20..796544e50365 100644 > --- a/fs/proc/meminfo.c > +++ b/fs/proc/meminfo.c > @@ -153,6 +153,11 @@ static int meminfo_proc_show(struct seq_file *m, void *v) > global_zone_page_state(NR_FREE_CMA_PAGES)); > #endif > > +#ifdef CONFIG_UNACCEPTED_MEMORY > + show_val_kb(m, "UnacceptedPages:", > + global_node_page_state(NR_UNACCEPTED)); Dito. > +#endif > + > hugetlb_report_meminfo(m); > > arch_report_meminfo(m); > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index aab70355d64f..aa08cd7eaaf5 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -212,6 +212,7 @@ enum node_stat_item { > NR_FOLL_PIN_ACQUIRED, /* via: pin_user_page(), gup flag: FOLL_PIN */ > NR_FOLL_PIN_RELEASED, /* pages returned via unpin_user_page() */ > NR_KERNEL_STACK_KB, /* measured in KiB */ > + NR_UNACCEPTED, Do we want to ifdef that as well? (and in all other cases below) > #if IS_ENABLED(CONFIG_SHADOW_CALL_STACK) > NR_KERNEL_SCS_KB, /* measured in KiB */ > #endif > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 279c2746aaa8..6316d695a567 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -1012,6 +1012,7 @@ static void accept_page(struct page *page, unsigned int order) > > accept_memory(start, start + (PAGE_SIZE << order)); > __ClearPageUnaccepted(page); > + mod_node_page_state(page_pgdat(page), NR_UNACCEPTED, -(1 << order)); > > /* Assert that there is no PageUnaccepted() on tail pages */ > if (IS_ENABLED(CONFIG_DEBUG_VM)) { > @@ -1063,6 +1064,7 @@ static inline void __free_one_page(struct page *page, > struct page *buddy; > bool to_tail; > bool page_needs_acceptance = false; > + int nr_unaccepted = 0; > > VM_BUG_ON(!zone_is_initialized(zone)); > VM_BUG_ON_PAGE(page->flags & PAGE_FLAGS_CHECK_AT_PREP, page); > @@ -1076,6 +1078,7 @@ static inline void __free_one_page(struct page *page, > > if (PageUnaccepted(page)) { > page_needs_acceptance = true; > + nr_unaccepted += 1 << order; > __ClearPageUnaccepted(page); > } > > @@ -1117,6 +1120,7 @@ static inline void __free_one_page(struct page *page, > /* Mark page unaccepted if any of merged pages were unaccepted */ > if (PageUnaccepted(buddy)) { > page_needs_acceptance = true; > + nr_unaccepted += 1 << order; > __ClearPageUnaccepted(buddy); > } > > @@ -1143,8 +1147,11 @@ static inline void __free_one_page(struct page *page, > */ > if (!page_needs_acceptance && (fpi_flags & FPI_UNACCEPTED_SLOWPATH)) > page_needs_acceptance = page_contains_unaccepted(page, order); > - if (page_needs_acceptance) > + if (page_needs_acceptance) { > __SetPageUnaccepted(page); > + __mod_node_page_state(page_pgdat(page), NR_UNACCEPTED, > + (1 << order) - nr_unaccepted); > + } > > if (fpi_flags & FPI_TO_TAIL) > to_tail = true; > diff --git a/mm/vmstat.c b/mm/vmstat.c > index 373d2730fcf2..4e12d22f1e04 100644 > --- a/mm/vmstat.c > +++ b/mm/vmstat.c > @@ -1236,6 +1236,7 @@ const char * const vmstat_text[] = { > "nr_foll_pin_acquired", > "nr_foll_pin_released", > "nr_kernel_stack", > + "nr_unaccepted", > #if IS_ENABLED(CONFIG_SHADOW_CALL_STACK) > "nr_shadow_call_stack", > #endif LGTM -- Thanks, David / dhildenb