Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        linux-fsdevel@vger.kernel.org
Cc:     akpm@linux-foundation.org, mike.kravetz@oracle.com,
        muchun.song@linux.dev,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>,
        Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH] mm/hugetlb: have CONFIG_HUGETLB_PAGE select CONFIG_XARRAY_MULTI
Date:   Mon,  4 Dec 2023 10:32:34 -0800
Message-ID: <20231204183234.348697-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?jS3iwdc0A8RUgpXYA9DB6ifm1t7LqKbyGsk7ramnXKPgQtu98ifkNV/clAsa?=
 =?us-ascii?Q?Qm81wVAOmblPCFyEkPgAyODo6wVXgVF7N80z2l8wRlO/EaKriRpn9Y/2UGwk?=
 =?us-ascii?Q?SjuWiAC8VrR+mDt12OU7N4CFoot5em2+YoM5KvDPxWpvpAXi6BMukVuTtnEl?=
 =?us-ascii?Q?b2Mdo21L1Ab4NnhCexNbSZnO6cOfuqgodW0aRtg6aXfC35Opm8ImGMS1DXEb?=
 =?us-ascii?Q?7lI3Ud0sROmVdJ7KW66G2XDz43EGDKVqTqWvnp0xcdsi8WFyMeU6h7HSrUDD?=
 =?us-ascii?Q?e+44kRzcQaBKDptXlcnwwDn7To0M5SUWBRKu4EUz/WlHqHopJLrGUf2li4L5?=
 =?us-ascii?Q?F03u+iCFhypqnNPMnIg4j/bProuubVnVzPo69BegwXffruJl2CcvlNj+S+L0?=
 =?us-ascii?Q?aJBXymH3RM0sPb+h3kvGd1Cz8Q8FmwIC77E74unbfkgmD7MaFL5h0Z+aEI9h?=
 =?us-ascii?Q?pPv5sZ69qsy+STmsH6bvZfcP1quqW8oCzgU/eFQU1XskS76JccEixdbktUAn?=
 =?us-ascii?Q?2Otq1NJ24WUqzM6TKt5PJw++ztNzrFBSgO+aAEIuPia5ALAhksusmbVFQOLq?=
 =?us-ascii?Q?3sxBKYeeO0Z957wWDF/4fTkumoE6+EgMjJBvL1tFjHFkT8Y3cWoAZUx6qd5M?=
 =?us-ascii?Q?GYcLsUjtIuAGYsunmFT3bEmd2CWd7jmc99Pe+n4vmj2kT3FnmZA4xElFPgX4?=
 =?us-ascii?Q?gGb9DJ0W/1XxglLBe6tCh887XIUGiod+w4Q6JqCkoml49U7Zo3AKD5OIe2qE?=
 =?us-ascii?Q?PMxP+ZMBelDBy0kVccrDN24asC3y2W0ApBPZfx5Jter5eJf/21LU3DpvMlqz?=
 =?us-ascii?Q?a3Cn7N0K4djBjGCEe9O/8CK1tFAqFrSCnRsS+qR3mhE5egZ0H/1tJtvCsAHO?=
 =?us-ascii?Q?9pJaKvamEkAwrK3AUmm6Kpemd3uFGqnjjiWpyZvjve5V0KFlQ/7TrzyJYg9U?=
 =?us-ascii?Q?uW39qd3eZLMTC+43Nb8768fChno8E1kadSHVuP/2lRZ/U12mLwtXy10ISo9D?=
 =?us-ascii?Q?H55NzV05q/BmBIzeg8VgcydF0Qz8MxWpBjo5+/bXoVj3Avu57joqMSl76u+c?=
 =?us-ascii?Q?IfllBc8yAocm3sDCPEt0pC+5L55kspN/NwBup7DRwJcxlqNI57dfPE7ZbQWg?=
 =?us-ascii?Q?fQEGYV7A7m+PeCSH4jMxBRETReHNWiY4ijyHAzFNrxsAOJR9SAJyt/fO1SU8?=
 =?us-ascii?Q?B/jM0PhaLd7AAS1Frrga1raI+qSHoqtHxooFbdKRIaS6k2kLnpZCIxXxyykA?=
 =?us-ascii?Q?nV5dpoBBY+VAZgVXdO4O15O/FIkiTKp24akPyQHrvgeC91gFXIhEj9MwyxLn?=
 =?us-ascii?Q?gyA7uUT5vKUwFdEhrywQfncHzjPwMF8xdYD1wn/z1OOOFH4nfoOgR4Ay8Ts6?=
 =?us-ascii?Q?KEmB1WCoWjpgqXVmD53c8k5FxsK5vjpSJqxkZ3+xbp7XS4dVWf0xRh7Z60Oa?=
 =?us-ascii?Q?UDvIEFKgHGmemNOXtWVPuCgs3KXQn2EvZAipjTa37SqHF6czlj+FhZGzbd0E?=
 =?us-ascii?Q?5mBSJ8zhKMyQOnjWP+oyKtQHXprmis9jCo+m673SwM4tID1Uub240+d4Tc5Q?=
 =?us-ascii?Q?V1987bebPoGGVCwgK/UL4vFAX1Bl6pxkssHHIWxkacszFwzeTENn6hObq1lh?=
 =?us-ascii?Q?64KONnE6w33KzzVeaJVz3zo=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RJyEy5t7VjXfOj9eJUAmixiBJpsgJvrQQANgUBslgTC3EPvSTuijX458mYIh1UmylqvH4/yDBLqxm98iXjwMC5LmhgnhM5hjtt9pjaeZmnCFlcO0MNUXlUZWEdFKqC/OzCsHKjRys/7ybXg9S2Xsr2suU3QDXu8jceMOi+nJAQJ1fBXDwkG1l+Tythq16HkBhBjpnF6bY9yLd86dWUlcFMxJC1NbxVkQeJ7SNojjophfjTkkmEKWeWVB4JGeeiK3mTXD/y8DVsbuzazyyqq19XinNN1CqlxugFZfqo/ZH52LHUZGY6HPYAJNFnktyxXRz4uOfhn9q+828hFyPHS3Zg3J2JAWkpVWFSWCvBOmDmS36SKRce+0m3xrJN9CvMI5uEEWfAt8fGsKnP+xDCS8kOhfjSZQOupdhwhJQRAelh7rg8DEhsdWo29ChR7YJmnAyI/2sZbU45ScuqF+TaM6KDOEv8Ev9QKGts1Zr8uAy87V9iIN4hKnzGiWcD4Y7f6Hcy6jXLxqAScH4Juf1lNKq/AWsjI+P0VK0aukx16LHaW14X0h5HqSCLtSo+Q8Nz+a/rDxaAmQ7hEjwOekW7RnNlAHuiJpNifbXMtqTROyfKq08lKE3wVccV6+IMNSIeXnmhVdtcLlEDJVKRwFoso1LaeufACeBuYwufe2+e/SUUfLafHOsqIH//xtptLelPbvVa2p1psQjVBVfyeVDbsG+gkuIhT2kTehu9JD/GOCym8EgxoMHFLJo4D13734kjPkIYinmUxPcmPSpqU4/P17AvhxCUtojlTcptnqMxwOKZKYZLE79z6qOx/xAB+VWcKuRCCvnPfpFn5V/E+A0crnpcndOfR5W/IqFUGa6nEWsz+17w9aIOdps/ZFVj9VxQDkLmodrCEDPRzFGZv6TyC+ae27MVBv/gKOHetImxxAhxc=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8739e990-057d-4112-58d2-08dbf4f764d1
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2023 18:32:38.9952
 (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: QJmhG1Swimcpu598QprU0m/oANm+Ok1sHdE4t3bP4XBWyGnxWMuoIB3BNa2bW016jWrAYsOZROJnPZovNziYUhpUjWVxVEkTFwAc+X116q4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4764
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-12-04_18,2023-12-04_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0
 mlxlogscore=999 mlxscore=0 suspectscore=0 adultscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311060000 definitions=main-2312040143
X-Proofpoint-ORIG-GUID: 9ME4yC1tXOYa7Ik8CNFF8QUxh74iqCGk
X-Proofpoint-GUID: 9ME4yC1tXOYa7Ik8CNFF8QUxh74iqCGk
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 04 Dec 2023 10:33:01 -0800 (PST)

After commit a08c7193e4f1 "mm/filemap: remove hugetlb special casing in
filemap.c", hugetlb pages are stored in the page cache in base page sized
indexes. This leads to mutli index stores in the xarray which is only
supporting through CONFIG_XARRAY_MULTI. The other page cache user of
multi index stores ,THP, selects XARRAY_MULTI. Have CONFIG_HUGETLB_PAGE
follow this behavior as well to avoid the BUG() with a CONFIG_HUGETLB_PAGE
&& !CONFIG_XARRAY_MULTI config.

Fixes:a08c7193e4f1 ("mm/filemap: remove hugetlb special casing in filemap.c")
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 fs/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fs/Kconfig b/fs/Kconfig
index 0b404e61c80b..cf62d86b514f 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -279,6 +279,7 @@ endif # HUGETLBFS
 
 config HUGETLB_PAGE
 	def_bool HUGETLBFS
+	select XARRAY_MULTI
 
 config HUGETLB_PAGE_OPTIMIZE_VMEMMAP
 	def_bool HUGETLB_PAGE
-- 
2.42.0