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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91F0DC54E60 for ; Thu, 14 Mar 2024 14:33:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 266AB800B3; Thu, 14 Mar 2024 10:33:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 21675800A9; Thu, 14 Mar 2024 10:33:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DE9F800B3; Thu, 14 Mar 2024 10:33:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F387B800A9 for ; Thu, 14 Mar 2024 10:33:19 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 917D2A0F8E for ; Thu, 14 Mar 2024 14:33:19 +0000 (UTC) X-FDA: 81895887318.25.8604B20 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf03.hostedemail.com (Postfix) with ESMTP id 5DDBC20004 for ; Thu, 14 Mar 2024 14:33:16 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=kJWP0qT3; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710426797; a=rsa-sha256; cv=none; b=QP7q4b+GzpPOklf4wpjpsUJXVTnN9+UWptrqnS5EZ+JS/Eb0XltlwZJI5TW3HHLZI0U7Os Fe0jCiGf22J3fynLEKtiejOE78Lwt69tCzHBVXHg9ce0hVTNXUbRWcInESA9QMFpbMImN9 hzEL4eqEAKBGHn9INOyo1VC8W9oAASg= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=kJWP0qT3; spf=none (imf03.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710426797; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Z3aOPfxBbujJhw/U0bloiBfBtp4shVZO9yNNLDkGi1A=; b=4DEaaRyNzjSpHPmZ/ZSYgry0Vav3Ra9d6C2y4Tz2SAFFJrtRXZbmofMMcNtIvsElDePXFx OA40vTDFsT/iB/B6yeaHgYsTKRH4/1g1uMzAsmN7SUSuFMCH+GxyjhhhUuZdcBnbpGCm1o CsT833VSNLiWZsURVtbZkbJEutbTlj4= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Z3aOPfxBbujJhw/U0bloiBfBtp4shVZO9yNNLDkGi1A=; b=kJWP0qT3BtO33jGikjh97+Xf2P AUTwdUAo9YCgOIQEOIaiiZduTZE+8S4JM0+VzIh05m5kE54bd2OphalH5L0fgfa6CELif3pmXtHrd tZI3b/w/6oGasft9cqMlLG9hEutFyQCUDpCuj3denhQavFTbkFGf2enM6mwjzVAu6CSCVgBEJ5Hsp AjZkxC0EciuKVqnAT8OKlf3PChKrksvncyGeGwt5VNKCPP4FMtTKZuHpT58mtGidYEQixUi/0ONQN TAOtIdQkJhjQqjs4+3l4tyYq+COrisTgcqG2PEwk5TUTJml6UQXjIjBUC8AdtF6c7O2YuqQTp+zFT RNVjvmlQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rkm8t-0000000825H-09Fd; Thu, 14 Mar 2024 14:33:11 +0000 Date: Thu, 14 Mar 2024 14:33:10 +0000 From: Matthew Wilcox To: David Hildenbrand Cc: Andrew Morton , linux-mm@kvack.org, Oscar Salvador , Miaohe Lin Subject: Re: [PATCH 1/2] mm: Turn folio_test_hugetlb into a PageType Message-ID: References: <20240314012506.1600378-1-willy@infradead.org> <20240314012506.1600378-2-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 5DDBC20004 X-Stat-Signature: w98pw7hr1rzfh8uuweuqkjz74gqoxt3e X-Rspam-User: X-HE-Tag: 1710426796-570809 X-HE-Meta: U2FsdGVkX1/vgp2pNFUQZ+FYUe2u/uqF5AAdygYwXlV7fLJqCP5iADnKpMmlMUEBIzLeiSpf4cjfZX0RegewTki0jzKXartA6idF9P9vx+3KClgOAKDGSMcjc4vmkPz51x7YNemsaAt1aEsUqxMgbG0/iDSW8R8R9sIQIo5kYp5GwsyNcRWHAKX32XegO/V7i7Bb8Ngbv6LoOzT2BEDgnD2lSG0IbydSAvgvv/3lR/ZW4MpuOUo6XsuJzQmrh1J85yywhSiJmqAEQNd/mjpeqjg/I9/MgG2bNeP/dwDlSVgBKnX+Vdtj2Rr3oTpBrdhqUa1G8xG/Uk+3NKtfjuZzJTeRC6WO3/a2bHXjcpFA5ShIEvZtVM1NYT2njdvLFiXmknP8GJoHfXcdy9U2TlpS2e5TuvfBmIL2uGhgmdBypg7iSmdnsRsBWyCHj1+G+1jrjxwSBOmPHrZocbFnfximnD5pRg3iOy9tmTtAFU9YRJEBAB6/brOuUzqDxmPGcFO7zQ1mShGmkl8AWXqSWl1pYf/ZEU35Y2Kf4bzLdtHq/U6Hv9etIKXDlHzyfrJRvaouGFQVLVWQNIZzK24sAaPi2PKDcb03dy7OaH7pC49fQK7yQQp0mGeNl4du1HMeGOCv3eP3apRkvdsQHkOWcxUCb8ltZUcCWzGFn1daatYKnauRXJxPvd5HALKlrBRtHMBNOErEuqgUE+c7fqTmFPnqn+eZrg1ToGz6Ry7ewwUw/9v6YHrbrlk90wT8eazWdqetB2MQA+pEBBNoO9hFOZwXFB/cGV0YHPjRQzHFxmrm+XcTmgCXjvxXtV4kSiyneE9s/T270xJdJfoOyYZWA15uOE2U3VDdYsAQkABN6dQvPGYU9y2PQDqkv5Ix7e72X98p 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: List-Subscribe: List-Unsubscribe: On Thu, Mar 14, 2024 at 11:26:17AM +0100, David Hildenbrand wrote: > Should we include this hunk: > > diff --git a/mm/debug.c b/mm/debug.c > index c1c1a6a484e4c..f521e17150a10 100644 > --- a/mm/debug.c > +++ b/mm/debug.c > @@ -63,7 +63,8 @@ static void __dump_folio(struct folio *folio, struct page *page, > * encode own info, and we must avoid calling page_folio() again. > */ > if (!folio_test_slab(folio)) { > - mapcount = atomic_read(&page->_mapcount) + 1; > + if (!folio_test_hugetlb(folio)) > + mapcount = atomic_read(&page->_mapcount) + 1; > if (folio_test_large(folio)) > mapcount += folio_entire_mapcount(folio); > } > > Apart from that, LGTM I actually want to do a bit more here ... +++ b/mm/debug.c @@ -58,15 +58,10 @@ static void __dump_folio(struct folio *folio, struct page *page, int mapcount = 0; char *type = ""; - /* - * page->_mapcount space in struct page is used by slab pages to - * encode own info, and we must avoid calling page_folio() again. - */ - if (!folio_test_slab(folio)) { + if (!page_has_type(page)) { mapcount = atomic_read(&page->_mapcount) + 1; - if (folio_test_large(folio)) - mapcount += folio_entire_mapcount(folio); - } + if (folio_test_large(folio)) + mapcount += folio_entire_mapcount(folio); pr_warn("page: refcount:%d mapcount:%d mapping:%p index:%#lx pfn:%#lx\n", folio_ref_count(folio), mapcount, mapping, @@ -99,7 +94,8 @@ static void __dump_folio(struct folio *folio, struct page *page, */ pr_warn("%sflags: %pGp%s\n", type, &folio->flags, is_migrate_cma_folio(folio, pfn) ? " CMA" : ""); - pr_warn("page_type: %pGt\n", &folio->page.page_type); + if (page_has_type(page)) + pr_warn("type: %pGt\n", &folio->page.page_type); print_hex_dump(KERN_WARNING, "raw: ", DUMP_PREFIX_NONE, 32, sizeof(unsigned long), page, and I think that deserves its own patch. Also, I need to do: +++ b/include/trace/events/mmflags.h @@ -135,6 +135,7 @@ IF_HAVE_PG_ARCH_X(arch_3) #define DEF_PAGETYPE_NAME(_name) { PG_##_name, __stringify(_name) } #define __def_pagetype_names \ + DEF_PAGETYPE_NAME(hugetlb) \ DEF_PAGETYPE_NAME(offline), \ DEF_PAGETYPE_NAME(guard), \ DEF_PAGETYPE_NAME(table), \ (and I think having this in the include/trace directory is a mistake; putting it in page-flags.h will lead to it not being forgotten)