Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc:     akpm@linux-foundation.org, willy@infradead.org, hughd@google.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH mm-unstable] mm: remove the hugetlb field from struct page
Date:   Mon,  9 Jan 2023 17:08:06 -0600
Message-Id: <20230109230806.910287-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KM8HLqkOys0wrdvXSJm26+kcl9mRxJEYC4B6zAji3Y0wDQLguTIBwuNPS6ug?=
 =?us-ascii?Q?G6P2jDw2CFwRnn7Flt2HOVCf36gcAGbkpnIccuqzsDM6jwoh740s7bRUKHa3?=
 =?us-ascii?Q?T5fMncs3m/SnJqSKPsBeOO+9n6kfReNQYMgEfT8kg8Ns4Sna6awgLam1ellN?=
 =?us-ascii?Q?XNUKKpsMVbUhonBj3fMbTMP4MK3PpVrSNj8vw65LP5tK68gs8AEy9iSY3SRH?=
 =?us-ascii?Q?SBGGiO+zLkjjZs1BNjL/zzvczD/DHS8ui+FFEURqmH4KwpsrnwF8EtGUSSul?=
 =?us-ascii?Q?KEe2S8yP4ePJoIsARJkhBJAiZRrsq2vPcaqwMWylguSx+gDKycT/8bj0kMye?=
 =?us-ascii?Q?nEACj/EIlpbLnSLFLWkhRQ0zMyV5I0zT2wfcu4waCB9+EyaVvBnRGIL/xo9J?=
 =?us-ascii?Q?L8mh496FogJ5cPLoTEg/ly4391P1xTHAhEpI4/XYjMj8JBGK4PD3R8J9HXQV?=
 =?us-ascii?Q?ZnH6r2/iypvrPczhD5BuotCfIYKE/w1vA/gjU8a9SG9ANTUM6p0AM37bjB0x?=
 =?us-ascii?Q?wNEjKux9jvITIqh4Qg3mzfCjZhZnUL30dfuDCX15uNzYmbrigV2tsp6XLYo5?=
 =?us-ascii?Q?1kN3g/DQVP3+H0mi4MZPxNj91BYRKjlja8rsTfJPOjENm1dquWv3DJ3W+Pff?=
 =?us-ascii?Q?nHMi/gImwMy+Q4e4R1nULOjK0TOF6VWZzxB3/etZaJnMveKKvcssR3xIudwG?=
 =?us-ascii?Q?89jXg3T9Mume+3qqjV9Zlzfhf92uAx33lky/jWyHwbDbchnE22rDJGyZMsTJ?=
 =?us-ascii?Q?EtDB+iVeqJ2KLulc0Bw7ACijZ5Hn50DnIZlt+a7C7+5Pf8kW6x6F44mnbxqq?=
 =?us-ascii?Q?1Lk48TXrTjoZk56lqCVMvN0XzQHrRwCNVyu8O4dTxOLQDX6iFk8ESUMQ2EHP?=
 =?us-ascii?Q?xFDn62q1I5kZbWMJciLJlSTz7tExRSL1RD/Z48mIsU2xCrIPRpmvSxiOVDrm?=
 =?us-ascii?Q?kNORKDN8txMkAureD72JYx7YAsGpedeCD2f2nzCfkHr9yG1e5iiDOOS/1Fyn?=
 =?us-ascii?Q?H92wdnDvFK5oxp5z2GUNpjjYvFeKtIIP6jm9x3ZS1q2i33jTwbzK+P4iR1Cn?=
 =?us-ascii?Q?iy1818iL5xYE9LncblpNI6NmNoYEPOvt5Zj8c/aZ7SK5qGD5wBJV5qln+Dpf?=
 =?us-ascii?Q?KBg7NaQzjbGJ8GjCFzAfawkKAg6zITVLLATrARuZiCDayqGIUMlql3oSrevG?=
 =?us-ascii?Q?sbpmvw7Y0dtZjaaCinx+MhlCDkmQQT2LU55VkDImEMfZWxuL+4oHnS8HbZ3V?=
 =?us-ascii?Q?d65qhj9yZl8egEcD1veSMZqOzZXfuv4ZhA83avNrxU0fsyym/Ru/X5F/VdZq?=
 =?us-ascii?Q?HLP2H2hco52UtA38vKYGbWaipqGNXOIN+Y0Josd2zMyYeqR4JgOBL/TiBLPB?=
 =?us-ascii?Q?br4NaEei2Owwdc47xVsMqR5cwH1o38WWo5X2xqWZtRuG3gdOyVEJEGDZxaO0?=
 =?us-ascii?Q?P5z5THxEzOu2tRioO27NhKY3T8BX9JhH/214Ft/7KFatR28yBVupeLtpNrek?=
 =?us-ascii?Q?IC7dgoD36rb2SnFBQ+guWWtin0UHDL5SpOKYXnwB4UT9403MDrqFOXUiA9LX?=
 =?us-ascii?Q?xk0H3KW7iJ3bqRJVbYQ1hU5WuRv0HQMDC4uzTH4M83nGn3aGV5AA3tTMAbCv?=
 =?us-ascii?Q?1Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: QP4Acu9nC/dljVmcKYOeBFXsplTf8Uf9lxpIxr49bOzP25Z4vn1Nn9SDAoqBtGIsAiLePDfhlDUY5VOoomAmy60Pxe6HHaWPDHOqIwCzM1n5JZcYhYwOUMfau9gjomMjxBbBbjlib+jx0g9UDl9pS0xTcI03aK/kGOcwB6qxoCPBju2mdi2jKi/c/prrqqOehOSl4I8vtwM+FWs/O4JOL0D8PfJG36rNDq/pTHuO10ICBXyPVFz5Bi9bOPJsek8InmEkKizelzWyCvy68fCMK6TfR5S7MUDmtYJ8puyToCppp36MZ/7Nd1ZPdMq2Pj634/TcfTkc73aGOf21T3EtXzcu1e5lkfvesmNBZIM/nQmqB8dznmvBf4cie9G2kRFZrJh6Sd7e6hZT1bA/4iasb/d72xMSkWVkbobu6n63cd0M48tDBTXHn6H4XTcLIxEFCWFJw9bNVmg2DgMNZnHKXBlXXAvf6NWRvATaAwdtcgG8HN6oNwjMW39xxWiMZ9637TKJ72BAm6k2GJAOzRKdwF6ujZjEaeL2ZVAQuWxzzN0AITwtEnVJS1cMKzmPn52S52/4DuZ6LdF8SHXkdsaGHRigN93sU7IMDq3rS8IURDqIpwuSio2LnumNyAnVUlsG23+esv556PM96OTAVPvNGljsfZ/cbcufQ/r8gQQZLtkDzmcVTjReGovKKRbdbuyHljtAW8JxYoCIXOm5gTeNsPgyJsjIjfrt69zMKe8VRKKfzRKBmOlN8SNE9nDcpOzj+GxWOQfxJUPR4Naq2HtdGZfg+uolsGPcIjAHc2al3MVXe5GZ7P0QBcp6XIixHtfzXKF+ml6NuxurKWiJDJQql3vSWI6FyR0FYe7E7DmMiMlO+6TBJ6nJAOi8jushf4ZUAf6ZcMTDm45Il/XuhVq6ztvNLQSMZ8bD+Kt9iguI9NM=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 47fd5bbe-c9aa-40ef-bdbc-08daf2966650
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5112.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2023 23:08:20.3648
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0So+MJEaBFRYY+jx8ivoI38y/+d8aw8U4fAU2LYvgvvQEnEUbiFcuBpj8KnGJjACtSp9H7YXtdkrXyy4QJevlK6rUGLEP/OWTn8HOPTD9Vc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4370
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-09_14,2023-01-09_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 adultscore=0
 phishscore=0 mlxlogscore=991 malwarescore=0 bulkscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301090162
X-Proofpoint-ORIG-GUID: yPL1uJZvuLqvx4G4k3xc0LC-xPwegqMu
X-Proofpoint-GUID: yPL1uJZvuLqvx4G4k3xc0LC-xPwegqMu
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <sidhartha.kumar@oracle.com>
---
This is rebased on 01/09/2023 mm-unstable plus Matthew's series[1] applied

[1]https://lore.kernel.org/linux-mm/20221231214610.2800682-1-willy@infradead.org/

 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 330d2f2648cd..456adae75f74 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -147,14 +147,6 @@ struct page {
 			/* For both global and memcg */
 			struct list_head deferred_list;
 		};
-		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 */
@@ -397,10 +389,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.39.0