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 89293C4332F for ; Sat, 31 Dec 2022 21:46:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 181418E0017; Sat, 31 Dec 2022 16:46:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0DB718E0013; Sat, 31 Dec 2022 16:46:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3AF88E0013; Sat, 31 Dec 2022 16:46:36 -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 C131C8E0001 for ; Sat, 31 Dec 2022 16:46:36 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id AA8331A0572 for ; Sat, 31 Dec 2022 21:46:36 +0000 (UTC) X-FDA: 80303935992.23.A0F0762 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 38A7E20006 for ; Sat, 31 Dec 2022 21:46:34 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iFptPSjy; spf=none (imf13.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=1672523195; a=rsa-sha256; cv=none; b=Vz5CakRA6NyJFhF1+SC4PaKG6JmZW57BdhLsTJ+/Zym0bSfSNvbCngBGhehuOF3f3kSZBY dYyHahxvmf84RaC3qbWO7BvmOTulmoMg6WfRO38FCOSgQOR4Z75Q/lI+y2CeW4vrj5VWpE 91NYcGXiPsTksctuv9RbDVN/mzO4Ud8= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=iFptPSjy; spf=none (imf13.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=1672523195; 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=Jm/W9DQTADB2OgGGthHKKMzuYVzV1Z3o9PGI+apsPUU=; b=HBSwC0pX35egPvDUhTQUdXjwQw5Gp/BZeNA02J3qUoFiWhwy+Q1+oH/qpY6cSDjZSGV+fb K1XfRRdKgNTaapRDLcNQSB1NEU8k3VQLlzFsaryYwhd22EiAjvQhJ+zg8l7syfO4uBPdJO lNht+x9g0tdk2EScuz0nbJPtlqxTQlA= 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=Jm/W9DQTADB2OgGGthHKKMzuYVzV1Z3o9PGI+apsPUU=; b=iFptPSjyq1Xqn54VTcIyoUdqjj yF+GAuiw9ndR41RkC8eOf9+eLXQyQeuoffJkP24vwMgRh0mVxrsrfybJIbofTTCzFPczjCm9MKv2W Z+nuVNBEa3dUok9oiWhbKBdrf1xjvR0t4YVswsFs1JI/Y/EYrcmSQ+BB9vsOxr1dG3T5Bpcc91qN8 Cw/nKiRuSrhjaY/l63V26rj6vstrann4SI7a82qUQh0aKmIuXW3KTi/owER0xKZ9jtb+MQKis9e8W kgu6ZLFQCFRsfv/cJir4i6eeLZFPLfALPAPsErlCwkxTQj7WDkmzS1WMZpfja6SdRkrgqCUwpQWic ZMnDpf1w==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgE-00Bkb1-5H; Sat, 31 Dec 2022 21:46:14 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 18/22] mm: Convert set_compound_page_dtor() and set_compound_order() to folios Date: Sat, 31 Dec 2022 21:46:06 +0000 Message-Id: <20221231214610.2800682-19-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-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 38A7E20006 X-Stat-Signature: bqpdi4y4cwtwxtuzwyj7pa5yftp6m73m X-HE-Tag: 1672523194-429106 X-HE-Meta: U2FsdGVkX19wlDSJv6aHjb7Tc/zfAgAqV1jfpLnOzQzd1SggGQhxUW/eIPXnpSo67WNEJ6glH4ddEBT0djy2q1kY4nqgH8Ok448ZMRKmyf0kah5t8HkL64QbilMAnvbSBvjnp7768W0GdDFxGaqq5iMGw2d6qeMo9GlW4ZUVr/pFNIXe/JoqoJbdaG0FreA0Cu4EOdXiH3YPz9/3Ijy65Z80xSBDerKdxYYnvrOF0r4RruyFFdMUON5Km+7/UWSvPpT0o9a5dQPNfsc/eOvjjomynZ3nxxz8Bf7F5IYMXwdUGp8UQ/V12gKf+QqPcnqYpFNCKZa1kjx73Wfyq7TFhTq1mt5kAnLIeRe9hCtQb+SJvAi9QLwSu/VRkXAsvtZ2K+i5zQYfMNli0e7RyKddkQeyR5wthDNr2nbuuGwXKZJ+I9CZtpdbWX529hOvgii3fEvUqBLddKdjh8GAnU58C92edRDZlbR+Eh1FiJzjqiGFuA1RlsCYmwGhA+mgQVv6bFbDSkPHloc8FGIrA54OIecVhDC2IEs2A0ipdATEvdoa8xnya2rfrttyPJsCRFaUJ5oYVpammkU5V7/cusmkSpx4f7d/wL4CAd3RNtqOhPI+otFPRA7zSzK/W8kXch7judlA3oCAmagLWEsu+jSh+v1K2I095rZdIxTe5KFzK5O1fmnm2vWk2xxlBOhH1aNoz2Zf98+kNf+8vITcQpBvvbRre2caCtMobsdFyMXtYk/ps+Qn989S4vFwFEQa6tFZ0cGHwTaPR4vM+rnKrzE3FinkKal+qt47V9ZQ38EDHZhwSgllnilxJss3H/v5H3dIMcoeyxIN0Tn9HBOnt2YSLrHPnbbTsicrGfsMIotQw4zqjKjUrmEUQJTVP6RW3adXt+I8lJwP+m4naD4djYAMA6eRNZo07Lhy0+2taesYaovSWq6iv3g5Xw== 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: Replace uses of compound_dtor, compound_order and compound_nr by their folio equivalents. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 75054fce8ec6..125a9138d754 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -979,8 +979,11 @@ extern compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS]; static inline void set_compound_page_dtor(struct page *page, enum compound_dtor_id compound_dtor) { + struct folio *folio = (struct folio *)page; + VM_BUG_ON_PAGE(compound_dtor >= NR_COMPOUND_DTORS, page); - page[1].compound_dtor = compound_dtor; + VM_BUG_ON_PAGE(!PageHead(page), page); + folio->_folio_dtor = compound_dtor; } static inline void folio_set_compound_dtor(struct folio *folio, @@ -994,9 +997,11 @@ void destroy_large_folio(struct folio *folio); static inline void set_compound_order(struct page *page, unsigned int order) { - page[1].compound_order = order; + struct folio *folio = (struct folio *)page; + + folio->_folio_order = order; #ifdef CONFIG_64BIT - page[1].compound_nr = 1U << order; + folio->_folio_nr_pages = 1U << order; #endif } -- 2.35.1