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 3753BC6FA82 for ; Fri, 2 Sep 2022 19:48:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8FBF8011A; Fri, 2 Sep 2022 15:47:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BC88C80119; Fri, 2 Sep 2022 15:47:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A5BC8011A; Fri, 2 Sep 2022 15:47:11 -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 8574580119 for ; Fri, 2 Sep 2022 15:47:11 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 64598120F14 for ; Fri, 2 Sep 2022 19:47:11 +0000 (UTC) X-FDA: 79868179062.05.E4C7743 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id 0DBA040094 for ; Fri, 2 Sep 2022 19:47:10 +0000 (UTC) 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=3kKnSNC3eA+xvk17r4oT0lcPJYYUylIipEepqwkc/TE=; b=DO11Gy0Y1vxX5/1GF/KG8vmfRm bk5VhWZ5CRFhMMiJpnu1XjuadN//zREOuXipwQWtkqT1Eb1Hr2QHGKQUjof0vDusFBSiLQdVGmmu0 GmZFdNVi63rj0ivn/xr2N3j7U7uU6vBZFHI6ek6BtCexXlsHV9lzKX2AerI7bKmTdkCpVl/70SvJN SAEBTxLeC5V1yS1ScPpIE8L1/8xwkIMKLdKoXQZc90GcuX8NxOsH9ca05Fr/+VQ6/jY3oxLcf9vSK bK2dsTm4m9rs3sWKQOQNWnr3I4XqixuosyhrjmxxIWagilPPQT/gUfSwGbMWnGcknW9OfkzLxWpmT vu6AdtdQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd0-007Ibh-5a; Fri, 02 Sep 2022 19:46:58 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 03/57] mm: Reimplement folio_order() and folio_nr_pages() Date: Fri, 2 Sep 2022 20:45:59 +0100 Message-Id: <20220902194653.1739778-4-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148031; 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=3kKnSNC3eA+xvk17r4oT0lcPJYYUylIipEepqwkc/TE=; b=Bdoo7FmTiINopbt+6t4+0tpLVZaUroGJqviCD1KJeBsNfabSZogZ7odJ/gRbSng/TV9pej LQgUXXy8SUWA9wdjHn5U36eOIAh7Y2bD1QaE/L2gN8QGqi2y6MuOw8V5tDEj+7E9ocSBsw Gp+HCHNzWzyj6aX1Cevo7EPA4BWP22w= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=DO11Gy0Y; spf=none (imf27.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=1662148031; a=rsa-sha256; cv=none; b=PiU/XmjIVOBx0n11G/UdweEnA+qXYiKQyIzvDEMjyai2JsXFcvslpHPO+NYhD+svdvjkBp FW8DENZCEiGO6FyaOpOa/o/VuSv89RuR8oNxbjdHadrH7Yn84zfcS9afnjdGvIfJ6xZt/c mrRvYYPE9m/RGEpNmnlSZJMCSefxVsM= X-Stat-Signature: qyw3nt5hhgfo7ryjk5pj3zee3mod6p1o X-Rspamd-Queue-Id: 0DBA040094 X-Rspam-User: Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=DO11Gy0Y; spf=none (imf27.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspamd-Server: rspam01 X-HE-Tag: 1662148030-108952 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: Instead of calling compound_order() and compound_nr_pages(), use the folio directly. Saves 1905 bytes from mm/filemap.o due to folio_test_large() now being a cheaper check than PageHead(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 21f8b27bd9fd..dcab29e50cca 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -697,7 +697,9 @@ static inline unsigned int compound_order(struct page *page) */ static inline unsigned int folio_order(struct folio *folio) { - return compound_order(&folio->page); + if (!folio_test_large(folio)) + return 0; + return folio->_folio_order; } #include @@ -1597,7 +1599,13 @@ static inline void set_page_links(struct page *page, enum zone_type zone, */ static inline long folio_nr_pages(struct folio *folio) { - return compound_nr(&folio->page); + if (!folio_test_large(folio)) + return 1; +#ifdef CONFIG_64BIT + return folio->_folio_nr_pages; +#else + return 1L << folio->_folio_order; +#endif } /** -- 2.35.1