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 82449C6FD1F for ; Tue, 2 Apr 2024 20:13:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39A2C6B0093; Tue, 2 Apr 2024 16:13:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 349DB6B0095; Tue, 2 Apr 2024 16:13:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 211B56B0098; Tue, 2 Apr 2024 16:13:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 007E76B0093 for ; Tue, 2 Apr 2024 16:13:04 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8DB891A05EC for ; Tue, 2 Apr 2024 20:13:04 +0000 (UTC) X-FDA: 81965690688.30.98490F8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id E6EC2C0002 for ; Tue, 2 Apr 2024 20:13:02 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Ql+wRWJ1; dmarc=none; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712088783; 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=e1hlJ7o2gk3mHAyuSZ6004f3QEoMdjwYdrk3GsoxpIc=; b=t5zWHHNNm2KNC6n2FKgkgkmzyodR2YW0Kr88I8gJ553oa0v9ZEj+yUTFOG5bTx1x7v1hoQ 4apVYqwzDHO7Brh10oI/R8Sy0vBfrmlcbyS/MkZry7esUvnZNCZraiM5sLHSQecfhGhNFT vpg6mo56+olbADmry0l8ZUvu6G1hRBQ= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Ql+wRWJ1; dmarc=none; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712088783; a=rsa-sha256; cv=none; b=J2UaqcIq9w3Ab+R4Mig3nsRDrSseTzMSIJiH3hUsN85FHqbCZ5D5BeiE+pEg2f9tsd+G2+ F7e7IuIgJsK7u7isafAIO3yXUuKpmADIQ/DvYEyDnLriXQRj/lh5hiXvAEjlfvJUExR8Uh B1ZHaB+Ap3Z7Mu+A5b5vBToq23rbVdc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=e1hlJ7o2gk3mHAyuSZ6004f3QEoMdjwYdrk3GsoxpIc=; b=Ql+wRWJ1lLCueTZ/gqy0LLsh9P VENcmG/hSpXabmYcNpyTYxFrLaTiSTgK7jzG2aaK0SXqBDcOwVfWmvsmVQYNTEogzCsrVYK8XfCCa UVSkzLLTLL8NkPVR90FEyD4ADHSQgEmKwizHj0/T/OoyUUzjarKpAmXfPdgPhoHWSAtpURlqUUJbq WmhiKSLWQ1PhmyF9jM18aRlV3dwxm+Pq/C7YN5PGt1L4ZbC8KToC/ScCjyQmiIYOmLFy01ky+iDNw XNiwVg4udRFGvoUEhbSXbR7Sg8CMHJ8jF4Qh6vV4COchA3r7v2B0lexLgx3/wZOspm1BugZoTMYt6 PtCRHUHQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rrkV5-00000003qeB-2mET; Tue, 02 Apr 2024 20:12:55 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 2/4] proc: Convert smaps_account() to use a folio Date: Tue, 2 Apr 2024 21:12:49 +0100 Message-ID: <20240402201252.917342-3-willy@infradead.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240402201252.917342-1-willy@infradead.org> References: <20240402201252.917342-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E6EC2C0002 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 61qcyan9qfaki45uaueqxoke48we8f6a X-HE-Tag: 1712088782-587243 X-HE-Meta: U2FsdGVkX1+hFyZKg2E/yQKb3Pvib33faOQXm5xzOwwjYNYMIt5cFqgWSeKfcQvsqMsz2IpftpJvwyzgsjeUjfFsYwlbvuAHUT00lZD+YGCHHw4om42kjimMGTYvcwkmAbZawBK+gu6LEM6Z4WsIt9raAAum+WtOJW1Gp1JL0blKk+2U1GpRO5rQqb3yK4M7eTOcHvm/NwKHPciis2XKAwqXwxKtRzec6Y6Ahf9sU4S/3WFZuh5ultxPl+gWsY5CWfhUBDtpGRGVPYgLJbNz8BvIBFp+W0UuxUtyWqQf8Up7+XtdEiVA6RmO+gTlmUyiMU2hMby9POYSDfbT9wE4o0qGCnuQkCYyCP5leGxvANRSgM6p1IxJou/g1Xlrx1GsU0r8ya8Mse2j9MbGZBKNZY70mAF53Y8zXsFTZsqSWf+PCA+AvbuJpku8JqvVLntEsj9+LW8jFMVY/wDCNnF5GYKLtqPJ4CF3au8WyQ/AY6U0m7Wu327B4pq3HunR8w1DJOV+wcBbhFZ5IVJBU8QRuqqOy+SccDFoaTnsTDvmXAqyKvXonnxra++TfIEvvLrDsI00wObAV5+/+DCbm+q6YGgO1T0EPrlV1fwGyIZsfOuL3yH/GhoTH0/F1HjS/B++H58NPuMXL5Br0OLMKWbEprO6HaFWh4zxaQ0k7RpyK10PLXsDQNlsb28WptRM5ojvs0xQXUYIZvLm1r86uFeEFkDynPgxOaE9VBZFCRnCGSnqpE+RuAPX/GR6f+SGGKqDhdJ147U+4yh5BcvHZSJzLSn7UaeQ3OR5bNhb+n+er1/HuYINhJc5F+EXMb7M1J3hrZzpmyal9pDP00XiSLsfQRA0lO9LnVGfrWWY5tgjaUBrpsCeKV6S+GI4acfJIMJBEYvK+/qlG0+UaDADT6nKGJgCm/nQshZSmLufeWujg+s4gNAQBTamXEK/Ok74AMxTFId3vlnUriW4EmMhPGh mWAg1ISc 1QGbN1b/1WNeyaMJ9f+L3WZKtAQLpPE5RXqeJ442n88XS2Zv+0G7UgSxr+VGKGJ1yxNAtf2ZNDjLBa6gP8RkKSHE+1Scv4wS6e8vXHuUXuecjUyC8NZywqNUOuUKSUg5gcOVV2Z0ZT3cmncGSC0ddD0hV7t9fUTX60EzTIAjWYE8yFl42O/ZgvyZ5opqpMVOGThGOKoAincpojKvzAQo5WJDy+M296aoBJhT8 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: Replace seven calls to compound_head() with one. Signed-off-by: Matthew Wilcox (Oracle) --- fs/proc/task_mmu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index b94101cd2706..e8d1008a838d 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -444,6 +444,7 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page, bool compound, bool young, bool dirty, bool locked, bool migration) { + struct folio *folio = page_folio(page); int i, nr = compound ? compound_nr(page) : 1; unsigned long size = nr * PAGE_SIZE; @@ -451,27 +452,28 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page, * First accumulate quantities that depend only on |size| and the type * of the compound page. */ - if (PageAnon(page)) { + if (folio_test_anon(folio)) { mss->anonymous += size; - if (!PageSwapBacked(page) && !dirty && !PageDirty(page)) + if (!folio_test_swapbacked(folio) && !dirty && + !folio_test_dirty(folio)) mss->lazyfree += size; } - if (PageKsm(page)) + if (folio_test_ksm(folio)) mss->ksm += size; mss->resident += size; /* Accumulate the size in pages that have been accessed. */ - if (young || page_is_young(page) || PageReferenced(page)) + if (young || folio_test_young(folio) || folio_test_referenced(folio)) mss->referenced += size; /* * Then accumulate quantities that may depend on sharing, or that may * differ page-by-page. * - * page_count(page) == 1 guarantees the page is mapped exactly once. + * refcount == 1 guarantees the page is mapped exactly once. * If any subpage of the compound page mapped with PTE it would elevate - * page_count(). + * the refcount. * * The page_mapcount() is called to get a snapshot of the mapcount. * Without holding the page lock this snapshot can be slightly wrong as @@ -480,7 +482,7 @@ static void smaps_account(struct mem_size_stats *mss, struct page *page, * especially for migration entries. Treat regular migration entries * as mapcount == 1. */ - if ((page_count(page) == 1) || migration) { + if ((folio_ref_count(folio) == 1) || migration) { smaps_page_accumulate(mss, page, size, size << PSS_SHIFT, dirty, locked, true); return; -- 2.43.0