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-kernel@vger.kernel.org, linux-mm@kvack.org,
        maple-tree@lists.infradead.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 18/34] mm: Update vma_iter_store() to use MAS_WARN_ON()
Date:   Tue, 25 Apr 2023 10:09:39 -0400
Message-Id: <20230425140955.3834476-19-Liam.Howlett@oracle.com>
In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com>
References: <20230425140955.3834476-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?wXkWA8QArP4h1oqP5mlHlKh1bKVSo5bL//6/3iwPovBvD2vxVI62HV1I7HJt?=
 =?us-ascii?Q?zTcdmH5aPPBopPiosd7imnB8zaeLO8gVhzGYW9kmgc91EvqIMoCjQbs4HlGh?=
 =?us-ascii?Q?l5pXh1V/geoxn4IiFXHnmBiSmyNdjWLD1pVhAkuVKprMwCYoa5fB91uD8YWJ?=
 =?us-ascii?Q?wlvF1GY35hAWfKj9o9dwk/7mp9yfCu08CSnJsu4a7Y1UPmaU7R5MhZKhyvne?=
 =?us-ascii?Q?EmF9FLdVSr0yukn8Syb/viaXjbFCsZw8W0hk02/oSowkB9GAYtlSXPuCNeri?=
 =?us-ascii?Q?9Um28iv8L0kT6aBJ8Az1vvhTWDfbq9ofMhsBCaFPF/qU96Tb2xBVAwIqbKRq?=
 =?us-ascii?Q?a9oVEZ0K2EkevrDi7KmnBBREXXLKTzUAbAobuGlOqEKa45h4jwTAU+ZnDyh2?=
 =?us-ascii?Q?yLfLJGVzUdm0HmkNLZn8cMN7q8Of4Js/ohj8n7AwedS+mV2gTWUiQR8jjQIs?=
 =?us-ascii?Q?oTJeyKVRpmD4T1zcEpZekEe+ot1i43mIapZVFyxuPl6avYNDaYW/Npguzxpp?=
 =?us-ascii?Q?akLCi6xTCh3BEfb3oMPj8gRpRx86fp0Sxih1wMn7lITwNLiMYNY8qUXkrM3f?=
 =?us-ascii?Q?8hAbh64R6p1+Z9IFXlYDRwIRojPUT0wCzssGz+jnqSXakvF0dT7rCnxhVYPI?=
 =?us-ascii?Q?J+Xc+osnQiWtrDVYL7nDYqiG9dcum0Zqb/lP/LE2OduzlQci3ky+AJmMLqnp?=
 =?us-ascii?Q?X4uR5TNGFl9ne38VCt1pdWE7rOwhPAfBUtzemG1SJFvsjXLM5lcQ7Iqr8xPp?=
 =?us-ascii?Q?M6gNGMlMS9KfINBI7WjNiY0RjhNF190mzi2l6xpmeNFp/RlX77MQ/xTUQxWb?=
 =?us-ascii?Q?K7R/StN7wZHhuT8A/PdCNG0o4ptfi+DhHyAyC9F8ge69xM2xUYncZcYLeLP9?=
 =?us-ascii?Q?E5u8+eBIA34iM9Xu9y8PTJHab36TAMbBlWQ52MlFMUK15G/Qd8ug5ADPjW4n?=
 =?us-ascii?Q?pRLvYO4BjTwNcqfaC2VdLve2/ZyVwE0je0zBPP2t4uPIbCxyaD36WUY4Kx8E?=
 =?us-ascii?Q?uqgpEu5I72ojTJNBE1UD4fkkcX/tYSOzktzHHHoWsyCICZp63ERIX8zOGQGw?=
 =?us-ascii?Q?3eWlRznAA1VSK4fsbqwcPv2zYHUx2RLV5TOnWS5vzdeTLZyKklHpSG2EilbF?=
 =?us-ascii?Q?Sgwldxgcif3nPTthsqR5DBOicE1F7H/8EaB5i0t7/9n8cxDMZNZXJg//3Trr?=
 =?us-ascii?Q?KvWexYj5Il7jJ8QZ988i82TO54pJ9jKW/HMH3P+c1vj7dsMJlbOz6RiEoIsJ?=
 =?us-ascii?Q?hrFmnD+euNjH+5/YViiz5VK6t+Fh1McZoZm0M8HaeDYUCGtuA5xWs7lJXXzT?=
 =?us-ascii?Q?ECMteuxOxAPXkn0odJADzEv9hlw+i+uIyn+L3Ert4lFZjakvtPTtxmV7wAjd?=
 =?us-ascii?Q?gF/yPkWeQ8j8dHLZdnlNUEhruoam3F/9jgHKr4T+IZEG0iymt7PGKNiSchML?=
 =?us-ascii?Q?GMDXV9/IAiayx2zYLLw6qosPLz5iY6XvF7DvFbc1l4jh4KB69qRQ3Co872Gs?=
 =?us-ascii?Q?3I3fp7qWYi0lm1Y30aBA6F8kMtcXqjacxJZFtwb1pIX/2iGr31W6W4ujTcnr?=
 =?us-ascii?Q?egtOjY/UK7FFotW3ADikcJp2sXTZXuVtdJ4t07SuD9vCb5mRHSm6zW7nj7E4?=
 =?us-ascii?Q?PQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: zyk+JndoPwUW6mj1AogQQIDUDtc9JFcKADgzZFlEm/jJ83iALjVXYLNwR8KwBAwBGFtUCDrUFq4Vh/7+fE+wvHn4XE7y/X1M8rw7FmPXUuzN+2wHKpB7zS14sxU+wttOU9shUcwhHL1fWGclp6ts+Jh/jofQY4aybZyncwk4LRrih/vu2iUtQWXXVuZT+r+QQrT45NZma55fWTvO5cZkhnvjrkpnA1LQwVDHbwJl7bWgtID3IyZNLY5+J0p5hwVD1mOSmiHrMU72XYGqDl4la6hOOld5dxJt2YiEya5TFYsGCNfVmaNmobe9dzYYw3nekEC6ztoxtiegIsFa52n/QKFjruyagIKvp3tHpPPW6LEfWL9Mt8GepPEfp0PAwdhvzBkEZg30OKs6bft8ynnY0lzYzIk3EZKCvo1JPHDtTDFKXqpQc+VEnBasSjSDVH3Kenh54lFpy9Uk+7QyEq36nrAg/lSeU2t7oEaqo5mTP4B1re8SeYXfVk1OwF+h3Ey3tOli4yoso8NN4Z0BvO1tjgs3rMFv5Y7Ro7YI6MHKDUeBv+53Z+fgAPkXcdFi6YkGBvKcqM8qG0rUIeJjN7qxm8aCU55nAKm4XJcBGgnPhRdHiEpEpqSv0dE9wSflmR+nxuz0+GedB064HOVa9C7k963oJ27XkMOiFB7WViuD2yvTIidEEuI2KAAyBwyjxk+ngJEcxKPfWW7MP8miBq0PGYerBGEI83rVURCJhGYd36/ayLMEOplCAX/0W4G/6JijNtsQr30v8Gu/cMdqzjxtaDJGT8nHhZ0TACuae0P1HXsSnZ3RJocCvhph4N+22Tvsd82SWZPC55TX6pILI+azfJ/AFK/krfQjvYizrMYNQfMJl7BDfLF+THZ5j7S7yguqAfcu+rfI2nEJ79qVjkP/xA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a4f1e9c3-6bd8-4a6c-8028-08db4596e6d0
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:02.3701
 (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: KJdyZ5pEjlo6FRLjYS77igpTZ5rH7HVUSMBqOBnxiDGE0GdXULqKiVyJ3jA488rIaH0gzxLhM/4X3oRy5+GUSg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0
 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304250128
X-Proofpoint-GUID: 13y978_N0BgYI3m1yxMH7up-_yVuiL7c
X-Proofpoint-ORIG-GUID: 13y978_N0BgYI3m1yxMH7up-_yVuiL7c
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,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

MAS_WARN_ON() will provide more information on the maple state and can
be more useful for debugging.  Use this version of WARN_ON() in the
debugging code when storing to the tree.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/internal.h | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/mm/internal.h b/mm/internal.h
index 8d1a8bd001247..76612a860e58e 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1047,18 +1047,17 @@ static inline void vma_iter_store(struct vma_iterator *vmi,
 {
 
 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE)
-	if (WARN_ON(vmi->mas.node != MAS_START && vmi->mas.index > vma->vm_start)) {
-		printk("%lu > %lu\n", vmi->mas.index, vma->vm_start);
-		printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end);
-		printk("into slot    %lu-%lu", vmi->mas.index, vmi->mas.last);
-		vma_iter_dump_tree(vmi);
+	if (MAS_WARN_ON(&vmi->mas, vmi->mas.node != MAS_START &&
+			vmi->mas.index > vma->vm_start)) {
+		printk("%lx > %lx\n", vmi->mas.index, vma->vm_start);
+		printk("store of vma %lx-%lx", vma->vm_start, vma->vm_end);
+		printk("into slot    %lx-%lx", vmi->mas.index, vmi->mas.last);
 	}
-	if (WARN_ON(vmi->mas.node != MAS_START && vmi->mas.last <  vma->vm_start)) {
-		printk("%lu < %lu\n", vmi->mas.last, vma->vm_start);
-		printk("store of vma %lu-%lu", vma->vm_start, vma->vm_end);
-		printk("into slot    %lu-%lu", vmi->mas.index, vmi->mas.last);
-		mt_dump(vmi->mas.tree, mt_dump_hex);
-		vma_iter_dump_tree(vmi);
+	if (MAS_WARN_ON(&vmi->mas, vmi->mas.node != MAS_START &&
+			vmi->mas.last <  vma->vm_start)) {
+		printk("%lx < %lx\n", vmi->mas.last, vma->vm_start);
+		printk("store of vma %lx-%lx", vma->vm_start, vma->vm_end);
+		printk("into slot    %lx-%lx", vmi->mas.index, vmi->mas.last);
 	}
 #endif
 
-- 
2.39.2