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 9DB2DC4332F for ; Sat, 31 Dec 2022 21:46:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A31C8E000A; Sat, 31 Dec 2022 16:46:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 329378E0001; Sat, 31 Dec 2022 16:46:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A3588E000A; Sat, 31 Dec 2022 16:46:16 -0500 (EST) 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 030868E0001 for ; Sat, 31 Dec 2022 16:46:16 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id CE7E48023D for ; Sat, 31 Dec 2022 21:46:15 +0000 (UTC) X-FDA: 80303935110.27.A2C13C2 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 63DE8100003 for ; Sat, 31 Dec 2022 21:46:14 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=C0xHObCN; dmarc=none; 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672523174; 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=2xGuPcvz5Lm1GKzxr0YAaEtd00Qs958dmzHJkyKnDCA=; b=Ma6daf2nbXpBlxFXsepYyJVrzkIOj/X5oAfLwSYjvX/DcZnz+luGOXkRRYiH9FcaPrKGnm omz+rL6gWhic2mNJXOgEX8/Vv8he8tpm7Ohp+r73UITMLhMSnim6FPY9U+Q6uW8hmWRMlq g96XXhBZ8mgcYYwRIiBJXOTlzGMXHvw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=C0xHObCN; dmarc=none; 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672523174; a=rsa-sha256; cv=none; b=Qe3+LqGOM6CDus8X9oI08dENvDfDfiAnXl2jsFx6UKK0bTohDhETEHROgKAg54TBlLKEL6 +TmB1Okv0dweGrqkSGMRdW9AHtHOp8WLM/WShs3XzSJgh34tftPhKn3pLPeba3klheQM01 Kv+BISwcWOWx2GTzKQdbpkFTO1NqoXo= 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=2xGuPcvz5Lm1GKzxr0YAaEtd00Qs958dmzHJkyKnDCA=; b=C0xHObCNfOd0cvYx7mvzmXcvaR fSQ28WH8biSuZddMRVZ9Sn4gCCcy2bRcA2phlpNvB5FcxVkXNfi5Z3UdkpislMvaQAh8cXViJtV8H MSmOPSynU7GjzSzqsTPzOjZNr+DkQ5pRkAyXLp/HLnPomURUVSEJNqArg4tgkAc79SsE83dRiarR7 oZG73fhzAVACLxI0CzWrW5EZjaK5+m0SM9n3xJRFP7C/o9+OtCWCPw9unXJ3MElLmppD688fuYHXq Q/gAbJGD/26GMxj1XjTGzlHgNCz9Nu4XhSeNWoxrHIYiSyBf+QpIgdabINCFqVkvjfObzxdAex/lO mbMHp7BQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgD-00Bkav-TQ; Sat, 31 Dec 2022 21:46:13 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 15/22] mm: Remove head_compound_mapcount() and _ptr functions Date: Sat, 31 Dec 2022 21:46:03 +0000 Message-Id: <20221231214610.2800682-16-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221231214610.2800682-1-willy@infradead.org> References: <20221231214610.2800682-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 63DE8100003 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: o69j8pz9tumazognbfiud7mu1kqc68dq X-HE-Tag: 1672523174-560379 X-HE-Meta: U2FsdGVkX18Fi/i2m1UGyFedvK33rYwZSI2aq5YvxACbmPd4vIWpfkcLxZc9DvuDSZxet3hSAVqXucMl4DSjcFYosulg2vFNnH7IFR+B2/8XXn7MQa66bhTUyZQBYWRzG9kT+JJGWv+xwI0RuO6VK5Anx6f4K6ZlIp1VgX5vi9likmLHkqrrlYgSaeEyqpDPfPHckQFnbxkSRvqpw8O+MQHnzDtcZCm4koQcm+K8XHSBIuv6galovrrSfMFSHQP/d92G1j3MO6TkCFjlAOJPgmR0emO+81g+kXu2lhw/18apR02uhPH+1S76K0h8ECLmAoPYnuNL+gnE/VXox7Sn06K5G5Bu4FoSaZ3D/bZ766yMDaJCx+BPo5K65cm9P2r/31/4KxUvs8Hi5kObgLe3rzsvH95C3EW8Ja5IuzEU+YM6lu6imA/SGPYC7v07oemHxPzCYkd0zMW+IusIUABJR4k/4uQEf9dqVZA7MEq1YeP/Ix7Bgy7GcByJRq4EYPAOpajjWmdW9Buy4MepdtJsHORpMf7k63QyXaxKrcjsXBXtJ9OqHB9qXZ7wDA4+Nmb306CvEuToHJ9MH8oPDRq906otZAbEw447EgMIi44uDDq5DaO+F4ok+wKyawp4x1OdBnS1D1oJnV2M6qcD8aSMx+/g9L+FbokSHPWPiSlAS+sA0j1LCYw3zQWjhgeiN/dfskrm5I/U2LcVSe7ekFGL/iZQL408JG+FNwvllCyLE16h44HEO0+2WcaUNObXc2GRA/efaeJiZ/pPbKGTIsw8OMxtvbms0yo8DznYgOGIJDv0QTy1qWqZ+7J61oxS+SQ7ULSlH2+IJGh+JjGZPGIkBEVcjzdBGSjEErzpgSVuK/oERxM9Pswa0WMm0Zq2QzhLXN9BSt6EF7qsO6s2y7AxdNc3J/d1EnflpwaeZeGXdEdS4kOoIJq6zw== 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: folio_mapcount_ptr(), compound_mapcount_ptr() and subpages_mapcount_ptr() are all now unused. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 15 +++------------ include/linux/mm_types.h | 16 ---------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index cc6e94647ed8..fca37afa71c8 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -826,16 +826,7 @@ static inline int is_vmalloc_or_module_addr(const void *x) static inline int folio_entire_mapcount(struct folio *folio) { VM_BUG_ON_FOLIO(!folio_test_large(folio), folio); - return atomic_read(folio_mapcount_ptr(folio)) + 1; -} - -/* - * Mapcount of compound page as a whole, does not include mapped sub-pages. - * Must be called only on head of compound page. - */ -static inline int head_compound_mapcount(struct page *head) -{ - return atomic_read(compound_mapcount_ptr(head)) + 1; + return atomic_read(&folio->_entire_mapcount) + 1; } /* @@ -900,11 +891,11 @@ static inline int total_mapcount(struct page *page) static inline bool folio_large_is_mapped(struct folio *folio) { /* - * Reading folio_mapcount_ptr() below could be omitted if hugetlb + * Reading _entire_mapcount below could be omitted if hugetlb * participated in incrementing nr_pages_mapped when compound mapped. */ return atomic_read(&folio->_nr_pages_mapped) > 0 || - atomic_read(folio_mapcount_ptr(folio)) >= 0; + atomic_read(&folio->_entire_mapcount) >= 0; } /** diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 15cfb0e24e84..381103c81cdf 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -421,22 +421,6 @@ FOLIO_MATCH(hugetlb_cgroup_rsvd, _hugetlb_cgroup_rsvd); FOLIO_MATCH(hugetlb_hwpoison, _hugetlb_hwpoison); #undef FOLIO_MATCH -static inline atomic_t *folio_mapcount_ptr(struct folio *folio) -{ - struct page *tail = &folio->page + 1; - return &tail->compound_mapcount; -} - -static inline atomic_t *compound_mapcount_ptr(struct page *page) -{ - return &page[1].compound_mapcount; -} - -static inline atomic_t *subpages_mapcount_ptr(struct page *page) -{ - return &page[1].subpages_mapcount; -} - /* * Used for sizing the vmemmap region on some architectures */ -- 2.35.1