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 15409C4332F for ; Sat, 31 Dec 2022 21:46:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 574058E000E; Sat, 31 Dec 2022 16:46:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 500F88E0001; Sat, 31 Dec 2022 16:46:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 302A68E000E; Sat, 31 Dec 2022 16:46:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 089598E0001 for ; Sat, 31 Dec 2022 16:46:22 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D86F28023D for ; Sat, 31 Dec 2022 21:46:21 +0000 (UTC) X-FDA: 80303935362.26.9644B3A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf19.hostedemail.com (Postfix) with ESMTP id 581AD1A000A for ; Sat, 31 Dec 2022 21:46:20 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=DBuTMUN1; spf=none (imf19.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=1672523180; a=rsa-sha256; cv=none; b=237w404C63V7lpD5oVkRoqMqR+BNP3q/3EQgTNcsheVvH+Ne4pQJLWeAepeW3eDLtg3GHl xfiRPz8urkcG7+QCjuNQmdXgjjvoxl0ccpCZtLUBfIjNaSfb9e/mI47Q9pdFjtgdwZCSdZ IsHuxavu6EL+Ng+2t/Wr+yHe3s7uAwA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=DBuTMUN1; spf=none (imf19.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=1672523180; 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=JaUOuTob4FRDJ2LnlAQkJD9Y/TDngA5NdRLNJbcA8pE=; b=cbC8Sy1qkPWzFbrED/m1mbyXzymCjucV2VSFcno982QrcYoYdzqAwz1ZPW1f6AMqpigC9i PNCZOo+n7Y/GerqMNSc11H0LNm2K6ujg7iXirNZoqPW49lFSfhV6IT9kR0oDVyTRzTJv5Z otMS9zwjVQD0Xk3H8Qm7u7wmIb3eFjQ= 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=JaUOuTob4FRDJ2LnlAQkJD9Y/TDngA5NdRLNJbcA8pE=; b=DBuTMUN1rWw85o2t2k4ATGQRhw PTv8ZjZcHnwveBA5P+sLZlFY42XkZw/Uo01CTTOqoRUKOervwtqbWD//ct2ulFMW/CaMD1IV4rY9H D6IJ+kboeY1Ar/Lg4x4l8uQmtV443MnKnyFRtQM9lGS0ggquaNQJzVAdnuhySIYNZDmC/WKs02Vq0 eOdRtdwVrLkA3blXya6HYQpZTf5n1Wg65zzSOFt8Lzcewckz5Am7qnC58MyVblJI9K6k9gbqNtRDe spI44F5ILQff66znHmlADBobgyKuIBlNefKDQLm7BnBhTNalILyefQHIUtYuK50dbR8mo3RV0Eu2i ulR0dsMw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pBjgE-00Bkb9-Fa; 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 22/22] mm: Remove 'First tail page' members from struct page Date: Sat, 31 Dec 2022 21:46:10 +0000 Message-Id: <20221231214610.2800682-23-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: 581AD1A000A X-Stat-Signature: qrw4rckt7w8qzogdki8stngmbifrjgpd X-HE-Tag: 1672523180-37397 X-HE-Meta: U2FsdGVkX1//Bd8XQRoaFVGBanTCFQjPm25VIMhVryaKTpicdFgLUAZ4jT1EaJ1Z66+UY0jtCoq06JunzvqP9PAZzRg5JZzfqKvNElVgGDHQNcxJHwue4w6VuAuxKU3QZqOLQUEhXszqBTFEOc9gTJ8sVulFVMqh3XgGHlvaDRJ8YGcIYnNzBaS/82/Vi0Dkn1gABACfNbUalDr/SxJ7dh/4CdwfDfqcT/vH0B8/cvWtERs3jdsoANY6jSkgCegwzW+9cbXteuOIrRuMQsd6B8HPXMDgyMRtV4i1uYO86RCfma2Wk0An0M5nzqSUmtITJgRAdicKHW+UqmKWBSqZxkZNDLVDuhBgw69Zhu6GWsRIKB2b4yCbdYAgSHM13w7eoOsao+TvpSVZ8GBd5aeWKS9NrdGEXgyIlL5h/5JMxkVODXShN16Dlr/quZ7EtL9a98dvnWoaotnZNXaHE0M4FAtvwESoja0RVVMFeqnCKGuDOFMlgZQHteFeRlMrjdQk4Y0Mw0bxYqxuzTS0MlnqyZGP+xG5+Ody+H2q3d6iZK3bPidZEWBC83Afkmvv8Njmyv+a33HE4OGSbSNAH8rSMNY4ejA6PlDBfOJmpNDY9QxACLhhcucCbMASLksS6WkGtnb+W+ykq8fiGjFipDPCJSZvKRvkE3hwnVclG6H47DJlVLJGHeedkkuZ/Mlm0OD3+99OtohBe7Dki/7bhuCUHLAe+r2FGh9uchGVrgeuAYTfwift0X2ivGcTXOXgWBhwJPjYZhztOv+AADv8Na6Evx/4uhFTICtl0BI01JvArNSiEVxEpo4JG8Kxk7fcLZdReKmuMYDi4PKzLHhmavI3XwOh6nn2c1RuPG8iD6xmn9QH9mjrW2EdTRTsr4fZv6TCT6r51r2B410= 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: All former users now use the folio equivalents, so remove them from the definition of struct page. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm_types.h | 18 ------------------ kernel/crash_core.c | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 381103c81cdf..de879a9f74a8 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -140,16 +140,6 @@ struct page { }; struct { /* Tail pages of compound page */ unsigned long compound_head; /* Bit zero is set */ - - /* First tail page only */ - unsigned char compound_dtor; - unsigned char compound_order; - atomic_t compound_mapcount; - atomic_t subpages_mapcount; - atomic_t compound_pincount; -#ifdef CONFIG_64BIT - unsigned int compound_nr; /* 1 << compound_order */ -#endif }; struct { /* Second tail page of transparent huge page */ unsigned long _compound_pad_1; /* compound_head */ @@ -401,14 +391,6 @@ FOLIO_MATCH(memcg_data, memcg_data); offsetof(struct page, pg) + sizeof(struct page)) FOLIO_MATCH(flags, _flags_1); FOLIO_MATCH(compound_head, _head_1); -FOLIO_MATCH(compound_dtor, _folio_dtor); -FOLIO_MATCH(compound_order, _folio_order); -FOLIO_MATCH(compound_mapcount, _entire_mapcount); -FOLIO_MATCH(subpages_mapcount, _nr_pages_mapped); -FOLIO_MATCH(compound_pincount, _pincount); -#ifdef CONFIG_64BIT -FOLIO_MATCH(compound_nr, _folio_nr_pages); -#endif #undef FOLIO_MATCH #define FOLIO_MATCH(pg, fl) \ static_assert(offsetof(struct folio, fl) == \ diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 87ef6096823f..755f5f08ab38 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -455,8 +455,8 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_OFFSET(page, lru); VMCOREINFO_OFFSET(page, _mapcount); VMCOREINFO_OFFSET(page, private); - VMCOREINFO_OFFSET(page, compound_dtor); - VMCOREINFO_OFFSET(page, compound_order); + VMCOREINFO_OFFSET(folio, _folio_dtor); + VMCOREINFO_OFFSET(folio, _folio_order); VMCOREINFO_OFFSET(page, compound_head); VMCOREINFO_OFFSET(pglist_data, node_zones); VMCOREINFO_OFFSET(pglist_data, nr_zones); -- 2.35.1