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 B5B20C54EBC for ; Wed, 11 Jan 2023 14:29:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADC08900002; Wed, 11 Jan 2023 09:29:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 865468E000E; Wed, 11 Jan 2023 09:29:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 407EF8E000D; Wed, 11 Jan 2023 09:29:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 22B2F8E0005 for ; Wed, 11 Jan 2023 09:29:09 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id F3FBD1A0B20 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) X-FDA: 80342750418.08.3EF3F79 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 6FC7310001A for ; Wed, 11 Jan 2023 14:29:07 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XR8fttJD; spf=none (imf14.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=1673447347; 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=IKp5GUfaVn0YeovLGI5UqQOKYLaV3dJc1SkhOFhWgXM=; b=Jfvap9ROfJoHapgtu1HxoKpErBANG4jBCXtUAKDsbv2fqL6weqdRb5mwpkfmlP+Niiy9sl eFIOVjaXFB28bAPi3IclVbWGg+AqrHeMsnZtrxPInq7XCIakVnOY3XIlqaB9GI0caNwMBT In0cglBKsrJ3RzHCTKOlSqmLWJmOrtM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XR8fttJD; spf=none (imf14.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=1673447347; a=rsa-sha256; cv=none; b=3BRZxQljF473iqXxmdFNgH66HTtSch0DwPF4up8pjtPf5P8jSCzSg1OrEBee51dRPq0gjz 9W9ZQ9/1X0vkthdtytH82O3GXDmvWVeyw8jwhPBQYJbOP9NR8fBU1NqZx7a4CGjBKssJYJ OPKfgccCNKYGWhUzXUfm7HNEORLrWNk= 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=IKp5GUfaVn0YeovLGI5UqQOKYLaV3dJc1SkhOFhWgXM=; b=XR8fttJDzKYrjrQ4R6795opsOH HGeF/Zb711cDs2TmdF/Yzu2hYX7shlDmHdLqgxoYCOjT/GurzPesChu/XbVtnPkMfYF84nDEMjkTU NWN/M3/gf7YsgZ4JIp9kf+06urIwu50K2PmHGXymb0GZVjWrEaPHA2B6r7xACj6EVjf3heUn8VXfk v3ALV/XSEuu9JHqepMXHORIU7NMiLJnvrmoa7LIiEwA3d2wHQO6v+ykvrJCilp+RujaYY8Jj2rxA7 V6KXThgdXjqjDoFIkppVKFFLp1Wnpd7xXVgDEc2f/SdwQag5Nuc+zZasZiMkoSEp8A12oqLHiOYgt D6DKe5kw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6Q-004CZ5-Ea; Wed, 11 Jan 2023 14:29:18 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 14/28] mm: Convert page_mapcount() to use folio_entire_mapcount() Date: Wed, 11 Jan 2023 14:29:00 +0000 Message-Id: <20230111142915.1001531-15-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111142915.1001531-1-willy@infradead.org> References: <20230111142915.1001531-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 6FC7310001A X-Rspam-User: X-Stat-Signature: yaz3fmx1reixtafugydopg9mwo9yagke X-HE-Tag: 1673447347-368794 X-HE-Meta: U2FsdGVkX1/zEpfTfUypMOYWIxy3YVLU8+SNFViTxJYcZJT2umtt5cGqGigIKI2KpeYa5c8QjjPYHSAqGL9KqeInQmMqH+uALRpyQ41cZ75c+04Msgi/usbIi6S2jIptUYqs21K6JVv78I2dL9XZMo8oThFQuFOdVkNRKHqT5INysvRFfI5nVSKssb6uDqpcEvAvK5Vd4LySQ5i74exYbiRYWLzcMOyP8UBizHp8dZul2R6VgkgQ5PL6WudoMKgmdv3y94pz0v+YBq/PFC9+u+UtKfB7MyXGTSJQ09hVb7PzDq9gj5AQPlb29chiMDyvOxoIP8/S8ue6pyWFUJOqdlCvI6GqlqzN+S2tWqBft3NVJ8WHm818Chk3qafO+b6qHlBu+Bj0zz/l4CWQQtfQ+CgVcqV0hIrjJUpUVewatU6U8usvfuX1htrMN/t1mOY67jOEPOCAOGTbQeFoitumX6WzfUtEF/X0sbe3JslXVRurxbGFEYhsK+8qSCIDRkgaoDhDCrUUfcqoKQ4tMOPjZLl8L17JCnqc/fV3JWx7QS4l5WhMFl/yhe+q3k680uTwZtfre2BRywUJ8/DcZZ4UIwprLU3hMgcxcksjYNgFbVmnrqqSOeZluZ5TrVrshI8LbuDgBXqomA2ieB4EKnRcYgc97uATjYAQ4nzYTtLAp+/RYypqtfK0KmiQb9eknxqdRT1eIL/bbE2m11i5VrXu3X6udPOts4FNNrk6ddOvjN4byUYlygZZ7Bmj+Z8TI0BZm2Fj/szBhpxFT7tq72TtjJs6wSbWqKAiCbt6ITdnBDrVK4q0yBzcT4FjTzJmxy1+DI8+i2waAU28AFF6d6r/myciG2J5ujzUXYt9RW7MD8nVc3NOi3RbqZgsz5AwdSvsn9mOZ17qP1AgrveGIjLs2XsCBMYUpVCSErb1XKpojycX7k2ejNqzmA== 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: Remove a use of head_compound_mapcount(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 8bddc7810f78..554b73dae188 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -853,22 +853,26 @@ static inline void page_mapcount_reset(struct page *page) atomic_set(&(page)->_mapcount, -1); } -/* - * Mapcount of 0-order page; when compound sub-page, includes - * compound_mapcount of compound_head of page. +/** + * page_mapcount() - Number of times this precise page is mapped. + * @page: The page. + * + * The number of times this page is mapped. If this page is part of + * a large folio, it includes the number of times this page is mapped + * as part of that folio. * - * Result is undefined for pages which cannot be mapped into userspace. + * The result is undefined for pages which cannot be mapped into userspace. * For example SLAB or special types of pages. See function page_has_type(). - * They use this place in struct page differently. + * They use this field in struct page differently. */ static inline int page_mapcount(struct page *page) { int mapcount = atomic_read(&page->_mapcount) + 1; - if (likely(!PageCompound(page))) - return mapcount; - page = compound_head(page); - return head_compound_mapcount(page) + mapcount; + if (unlikely(PageCompound(page))) + mapcount += folio_entire_mapcount(page_folio(page)); + + return mapcount; } int folio_total_mapcount(struct folio *folio); -- 2.35.1