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:   "Liam R. Howlett" <Liam.Howlett@oracle.com>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH] mm: Update validate_mm() to use vma iterator CONFIG flag
Date:   Tue,  6 Jun 2023 14:35:38 -0400
Message-Id: <20230606183538.588190-1-Liam.Howlett@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?R6UoHtEAhW0gWBumeEmma+sw0DmdTc8bfWMPcBuSf6w05ZPKjfcMGjByUiiD?=
 =?us-ascii?Q?y3t7mFja8AOpzsxuuVq+4lUH1B+6xB8aFnx9VAJaGO/vnLJoAM8QO6SDCsbK?=
 =?us-ascii?Q?tKErhumNZvmmGIXBzQJHI5vsgRnvQ66PQ9HgskD+rI0gjNz38Gz5Dh1FV0Ak?=
 =?us-ascii?Q?IuDQgNXFqKPI2fdCF8P8cNjdtXSV662xIOSCpR6TUmqLRg05Kxf8k/BzKrGW?=
 =?us-ascii?Q?B+/1IgpBj0lRQ2DpEPLdROC6uMyOSY2Jr1NmIv38j3DiKbpE5C8ULnxMgJ4b?=
 =?us-ascii?Q?UOZXK5j4JgaQ9AGa4HjniDlwc1wg+9WDAvFzKevUw0j4R1ngq5aClTPISy6P?=
 =?us-ascii?Q?+c5+HXUtoULf81dvBNSpk9E8oH8+LcNZG7EYOPW3TpFl7cofkmcg3dnmnGLe?=
 =?us-ascii?Q?IncCFs07enex0t9SSrs5D5UsyVsGW16qeq0qkkYlOqPcxnLNdNQjB4KLmEKa?=
 =?us-ascii?Q?Mb5dgtJgUpvDz/AQcd1MCoif+FC1IXcJn2Y8PloJ0zmmOLjqLAxzeVqKnV1q?=
 =?us-ascii?Q?cfjSTO1vwDsA0SmsRGUPA1NxfNxyIrFhfpnFyTiwpwxSccXpphjCioMhhqY4?=
 =?us-ascii?Q?fNbwYzmmz1Ep4u5KOamAG1KcVwZdCWRsFmGXHG/5wfgKaSUbb17Zfe8nuEJn?=
 =?us-ascii?Q?+lh6D+W4rwBQ04fRS+aniQg18goME+yI2VaLBUEKSlWt4GTPTd75MU+QE9xC?=
 =?us-ascii?Q?YRKQxOgtye1bfVWMFC+UA0ADankabPu6GL6PCNtUxLDdfk8TJQyroBTyppUp?=
 =?us-ascii?Q?zlLXQ56v+eWODLtIwlbWctYDQVSbnlGhk+ZH2PktZ7Q2F97B6rPvmAb2Kw6r?=
 =?us-ascii?Q?QMKcmhNT++g0mmzmfcR1JJQ7i38jwJZk4+Guc9lhRKje+sOdYQqXQlWrAQEK?=
 =?us-ascii?Q?qj3r6yPLaCj3PA6JBPeWAl5od22G0bsAh7yf8dtjT7RUY+NLBXsfSBrrM7Yd?=
 =?us-ascii?Q?phSEenuhNjVEYUJwh6FQGR5Y6a9y1Guw7F5QcactmkUISLx7tXd/MnVuRc44?=
 =?us-ascii?Q?vJLnOl3C7Laq3r1iSuGLJgmCi81FlyYPWb0grvE1FnNwkWPwiDq21FpZ/wmo?=
 =?us-ascii?Q?uRrTjKFmQLZd/H17DhDkScg64qen/SCTJCCR1NzsHoKfGniAhqUmbavTRlTv?=
 =?us-ascii?Q?H9ECFXDadM5lE3vOlcqLl0DuqdRDzRQ+oxIxxC02uKjdhPqbokiSkas8PFzI?=
 =?us-ascii?Q?YUqh1uFR14mOEqjyEsIk2h/0ULXT437IsVJZfwcjw3LZ2Cum7XIOs2yBnYHF?=
 =?us-ascii?Q?ZGyTyo7k30rAnXng3RfR3rE7KCGnA7ksmsBITXi/q5J5YDRI4bEzLz8J5Ws0?=
 =?us-ascii?Q?5bC77JlvdRCwmv65Z+FT8wk3l97ulSbYqauXKO1HEMEXvoE4imx6Ax1UvBoj?=
 =?us-ascii?Q?s17aKaFbll1Y0z4rcPnQRwq4i8RLEbkZ5CDdqG/Cm86R5KX/ZClEZlU58YPC?=
 =?us-ascii?Q?QPp3/bN5h6oCVD/NDH/vh0JPoXYB5aYeHTsR/1L4NNHNafUHo4OZvBnLBgpo?=
 =?us-ascii?Q?fQFPmuZbKG1OmkX9S4KPr46c8bKCxSmnjQ8pY7gstwLi6iAcIeH3abI2K85h?=
 =?us-ascii?Q?ix8bzno8aclV9FfLUqbD4wC9h/U1j4iWygBIrN8a/0j1N4OwmREdHR8naCIs?=
 =?us-ascii?Q?xQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RlcQq6ohWNJb3jKHyUEpE4Wz3bsW0M2VzPJhsYJo08gHIEqWs6SZS58g1pCgbMGnAumKKH5RLkRn8MeS04W/3cTf5tz0RPaQLuBkm/Bq+9RLrHrV3ZB9fj4f05yrxsbI5jn1gmCYVabUYsqhadrl7K99Jp9JRL6rUrz4BcITTzytb55U+725WeFZ9BGDebWw0JHhUBsI7nchMd6l5XInNd8iSauPqduNAyZcH4gng2WVXRw1jsbESTfUwncqk34lepVj/mKhgi3g5nRp7NMOm7EtFgq7D1L5L+lOAR21t1yqNLiaWTAi8dVehSF8cmoD2U7sMdDuo0uO+uoYHjsEhdf3A6Yl6XAi9oTzfx+QUq7ToeKkBxL7vgce7PPeJUyzYpMtmQ4064LXrmnf0C6dq6wTVtUJk4VR32ZmR33Din+S2PFnFKEXYyIERHxwH+uOk6yvvUp2r/oJzEP2MFL3wrlc8a+bPR4/Dhm2xc9jtdTe0ejpg0EG8SxXxvF4zfba4P1gwh6oVJOYPZaZKGzX8ihydeHAYwltmJj0lBJmAQRTfXqwvoRyJUzrWSLiFoLQwSg8FqgOnni4v/TCtrBLj4Gn/zjHPbw9UuWVBrZSqMFH/7TnztW5g2Nj43zkhJBKqFCc1+ho3FlcmyxdU6bTANh3yHP7qwQ4hDw0hqbLawnfPPs3blp6bVyy1oqgpZTeCSBDTifL7n1Hk3b1/lnXxUfJ6gBcStxgn45hfweaA9Oy4UU96ln9Z9hSsbuCg/0tG2wzJ8IM0X22uPbEBTdTkwYBK4JOhZVpd/O5Hzufetn4l9FBSBsJk880qo8YzEel/1B39wo5OT1xfZXprL1Wcw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 784e13e1-2b05-41ab-e144-08db66bcd802
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2023 18:35:46.7737
 (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: v8PXrWZCInxf6NOvpZs20HgoTABsDvpA/qdvrLQX7n7K8AAWzkH1XF8NX062NSDpfjES/1D1QS+wL54/WvW+Lg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7171
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26
 definitions=2023-06-06_13,2023-06-06_02,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0
 suspectscore=0 phishscore=0 adultscore=0 malwarescore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2306060158
X-Proofpoint-GUID: zDhpLnWNxJueeanABtyn4lZwZFT2w7rU
X-Proofpoint-ORIG-GUID: zDhpLnWNxJueeanABtyn4lZwZFT2w7rU
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_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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

The validate_mm() function was deemed too heavy to enable with
CONFIG_DEBUG_VM [1].  Revert the config option to
CONFIG_DEBUG_VM_MAPLE_TREE

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---

Andrew,

Please squash this into your mm-unstable commit e9c9b8e9753d ("mm:
update validate_mm() to use vma iterator")

 mm/mmap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 71733953ff83..7c106a164c0f 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -299,7 +299,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 	return origbrk;
 }
 
-#if defined(CONFIG_DEBUG_VM)
+#if defined(CONFIG_DEBUG_VM_MAPLE_TREE)
 static void validate_mm(struct mm_struct *mm)
 {
 	int bug = 0;
@@ -307,10 +307,7 @@ static void validate_mm(struct mm_struct *mm)
 	struct vm_area_struct *vma;
 	VMA_ITERATOR(vmi, mm, 0);
 
-#if defined(CONFIG_DEBUG_VM_MAPLE_TREE)
 	mt_validate(&mm->mm_mt);
-#endif
-
 	for_each_vma(vmi, vma) {
 #ifdef CONFIG_DEBUG_VM_RB
 		struct anon_vma *anon_vma = vma->anon_vma;
@@ -353,9 +350,9 @@ static void validate_mm(struct mm_struct *mm)
 	VM_BUG_ON_MM(bug, mm);
 }
 
-#else /* !CONFIG_DEBUG_VM */
+#else /* !CONFIG_DEBUG_VM_MAPLE_TREE */
 #define validate_mm(mm) do { } while (0)
-#endif /* CONFIG_DEBUG_VM */
+#endif /* CONFIG_DEBUG_VM_MAPLE_TREE */
 
 /*
  * vma has some anon_vma assigned, and is already inserted on that
-- 
2.39.2