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 A5993C54EBC for ; Wed, 11 Jan 2023 14:29:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5B5890000E; Wed, 11 Jan 2023 09:29:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D958F8E000F; Wed, 11 Jan 2023 09:29:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0F2C8E0010; Wed, 11 Jan 2023 09:29:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A1E228E000F for ; Wed, 11 Jan 2023 09:29:15 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7A547140878 for ; Wed, 11 Jan 2023 14:29:15 +0000 (UTC) X-FDA: 80342750670.29.211C41F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf30.hostedemail.com (Postfix) with ESMTP id EE65A8000D for ; Wed, 11 Jan 2023 14:29:13 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HIzla7wg; spf=none (imf30.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=1673447354; a=rsa-sha256; cv=none; b=0EC/WlmYs+cgMwYrPIYh2Nso9z6H77D++RTgL83SCon0MOoLNeoXFYhaIMwxsz2I1y9Xlw OWtUe9JflUXYWD3ijJja/xA7aOKsrs1/BEoFUkfwAT/PAPloGoR7mks0CNHTid8ialjVuW m40lZd3dyiEd+uoPQYi/1HBveISnJek= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=HIzla7wg; spf=none (imf30.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=1673447354; 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=bKmmLuHxSB3u7sLoC46CMoIua0qyNhewbdj70P3ETHM=; b=ASE2XDjJfcZhxwrXbRluqtSnRGzc8RQaP9Pb7r/1sEQwEk2H4DC65Un8XVUcFG1iq3VdGG CICz9DBskxpa2YZv4o/lD3tvCzEaE7ri3RSLJMOGuTcIvT5jrod7rYFOf49hMFcloZtL0l yz2RufGvNFHYJudpU6QuH64R2Z2lv2M= 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=bKmmLuHxSB3u7sLoC46CMoIua0qyNhewbdj70P3ETHM=; b=HIzla7wg9aXtyVxwFgUkZR5pmR q6ojGe4C2tuIFSqqzQv3bnurfZ/ismaUeJeohP0gufvUPqBGAPVa6FPA4MKR/Hvjc2T6xVBNuPIOT x9mEFnInjU3ZQY8KeMSkI3icKk58en/oxm1zlIm6nmceb5yKvfZTYaFngCzgSpwNCARonvqJ2HVKH DjMkXLjQcvdjt0qoqy/UkQxMI/JdJxoO+4Qhwal462Rau5o+BBQJbQKOv7NGCLtphdR/cYJe/QiRm POvRImoqaOgsi4lq8Z36szE7fu71fItqUwRvjifTSvLHu/e2k/gLsmkNxbenoqPWBYEKv9Um/Lkhp 6X/6vQtA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6S-004CbT-Jo; Wed, 11 Jan 2023 14:29:20 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: Sidhartha Kumar , linux-mm@kvack.org, Hugh Dickins , Matthew Wilcox Subject: [PATCH 28/28] mm: remove the hugetlb field from struct page Date: Wed, 11 Jan 2023 14:29:14 +0000 Message-Id: <20230111142915.1001531-29-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-Rspam-User: X-Rspamd-Queue-Id: EE65A8000D X-Rspamd-Server: rspam01 X-Stat-Signature: 51spmc3fqm85g5tgfyqo9nsj4r1jqihb X-HE-Tag: 1673447353-891649 X-HE-Meta: U2FsdGVkX18syX9hRWMCuHO2VI43n7gNDwnqZ81Bud1tKeqONpx23+O5llSGcMif27r/p2hJ/nvjq7kf0/N9eLbDw6D7s9UmLcAdmj3/occQN0s9a35yHUwisrr8G1rAn/lSseKZB8/bIenTT8AfA+0FA9dFyxLMxlyh7xNf1XAvV+BHxNg2R5wyeV6PVjY4vGFP/VuROhLflJTlf3IU/flBuhEad7TSLK0zyYpRUUFgpSQDjbfA6AVvJKekhJdXFq4kVb/TC1Xai60ldhykHcWb0SgpGz2wmjm07PxH2gPyZzyFJ9joIkQ3fmUvHTMoVdlq4DeK2X93nkhy5EbM/5Lhg+8nip3ne4ALjNVRrmMEKFhcOE4G9IamyC2J/1Id68yWVAzROXrtilAOapsbvu+iMc70CLmUYXO3Yo2NHE+5IP4Gi5k8807xZdm16Rx7wtjp2iC+H24dONR1uEez1qVEjZXdTJOoMhiRTT0htwnpVX5FQ6i903RhEafCmo7zatYKPSgFF/ANxwqa/7AudvGMIA0RJbY/7WgQBjpo6GYg17Id/7s5KtbdgAjJ13JqOT8wxN5zPXKerTnuKO/mMBjpzTg9Uyiv2lcanCHbw3gm42rDPWioOBvxdSK6UjXcuB3asG/deObZGs/ZfRz4Ht5+QEM/2h+SHx0ZlH2qvh3cp56MFjI9DFU/1NzoHP0BQ+Y5KRbZsYOG1/K05qxj5aIuooN7TdhB+uIs5hz5RTr2qE2a023QuZUWo/NQyljMxtHnZFhdhE2lW1cFRhfXxnUpr9lXDgPQR+iYIcwE9wCXjg4328vyg2Tsgcr2kuZXn3JwmMPrksY1V8aRATar0YC3EyiMwfH9jmR0a27ID/hs36WCeKaBDvdN+7vY3+5e 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: From: Sidhartha Kumar commit dad6a5eb5556(mm,hugetlb: use folio fields in second tail page) added a transitional hugetlb field to struct page and struct folio to make room for another int in the first tail of a compound page. Hugetlb folio conversions have changed all page users of this field to use the fields within the folio so struct page no longer needs this hugetlb specific field. Signed-off-by: Sidhartha Kumar Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm_types.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index c464205cf7ea..9932a4cd5b42 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -141,14 +141,6 @@ struct page { struct { /* Tail pages of compound page */ unsigned long compound_head; /* Bit zero is set */ }; - struct { /* Second tail page of hugetlb page */ - unsigned long _hugetlb_pad_1; /* compound_head */ - void *hugetlb_subpool; - void *hugetlb_cgroup; - void *hugetlb_cgroup_rsvd; - void *hugetlb_hwpoison; - /* No more space on 32-bit: use third tail if more */ - }; struct { /* Page table pages */ unsigned long _pt_pad_1; /* compound_head */ pgtable_t pmd_huge_pte; /* protected by page->ptl */ @@ -399,10 +391,6 @@ FOLIO_MATCH(compound_head, _head_1); offsetof(struct page, pg) + 2 * sizeof(struct page)) FOLIO_MATCH(flags, _flags_2); FOLIO_MATCH(compound_head, _head_2); -FOLIO_MATCH(hugetlb_subpool, _hugetlb_subpool); -FOLIO_MATCH(hugetlb_cgroup, _hugetlb_cgroup); -FOLIO_MATCH(hugetlb_cgroup_rsvd, _hugetlb_cgroup_rsvd); -FOLIO_MATCH(hugetlb_hwpoison, _hugetlb_hwpoison); #undef FOLIO_MATCH /* -- 2.35.1