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:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>,
        Sergey Senozhatsky <senozhatsky@chromium.org>
Subject: [PATCH v3 18/35] mm: Update vma_iter_store() to use MAS_WARN_ON()
Date:   Fri, 12 May 2023 14:20:19 -0400
Message-Id: <20230512182036.359030-19-Liam.Howlett@oracle.com>
In-Reply-To: <20230512182036.359030-1-Liam.Howlett@oracle.com>
References: <20230512182036.359030-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?ImD42Z+Z0wV3PLPnP/HeT17jYRFW5djwI3WWL38uXuu9sszmrAqqtv0JyrQ2?=
 =?us-ascii?Q?P15KyJTx7LZDsAel+y1jUWZwXS0Xj8g3ebCXvQmcD3n6V2TN2wQbDH1kF2mI?=
 =?us-ascii?Q?P/8JQxDJjhkIkcwjl5LVnO4N1FEIV+e2rgEY02035tUucUXK0n1KYJAc/z1E?=
 =?us-ascii?Q?u7gPt0dkrSjHysXQIuooRL1JNRy401FRyDcWVBxo40eDpcTvNlIZOawbpyLY?=
 =?us-ascii?Q?FjKc46yRA/JjWp2wGjY9INbknhZ4+zNnsWTFuViN+49hqA8v1bEMDf2woI1Y?=
 =?us-ascii?Q?UxV9rJymEZIwGoXRF+FhScwvefOqLWBZpC0t7OPHYc9wgPvDVYCvFgRFtITH?=
 =?us-ascii?Q?vsF7TENtUNiKG2xoAYu07OZOAIhDNhXAQpJNiQtD6GRTR6QXWtfNh4rgMxCc?=
 =?us-ascii?Q?W9a/+i1o1SLkxExoP9yUV/4Bveepp2zt2QaGK44ccWoHgIdUty6Pb6/eIZ3/?=
 =?us-ascii?Q?3HCgWMW7hSBx8eQBWI3bh39/kA67U3BhDfdV0zHiyx1ffQ6NlXxRPbm5ATu9?=
 =?us-ascii?Q?o8ewCLmbzplveWKlpfFA23Kp1DHySuv7CUWOetwcz0Xgz0OoZhrg2m6aWx5V?=
 =?us-ascii?Q?+lh8ANk/NH0/XiBbqtg80rma2JaaFgY3OsuV//8WdlOAyWWUyV91qwy7jPTZ?=
 =?us-ascii?Q?1keZHIi/wM8VruBiEnmgU/oG0FK9w/GzhspXfhgKkt7jPr1J7TwvsdFn46EF?=
 =?us-ascii?Q?foqsULfeyeTHCGRsZ4lbQCIQ7UP0KgRC5kiHbftMstyb5wurwCESQU26WDLC?=
 =?us-ascii?Q?rkpx009dzm5Ya3ERKIeJpnPsZUEjK2FSMBRLUIMASAQT0cWVfbepY10eIF1m?=
 =?us-ascii?Q?6yXl+UyR42xrBrX2+8QT3EWEcQxlhIHoELA58jUG6IYx7id+xXzUhxE9E/l1?=
 =?us-ascii?Q?x/zQYSdtY6+pKV4uOXmMf/Ih9EDl9tyAj+UfFcGEUspvafb/IvndhC49svvD?=
 =?us-ascii?Q?OlfFpthAkvbYYBmNBShrwLnmTI0uxuDzl9HEQlirCy0XRjtpjB4V0nX9+/YZ?=
 =?us-ascii?Q?1XA6hhPPwrECdTY+ACznBEScu1cgiW5H08OwSDV+HG5/MiHkewBehkQ2DOVg?=
 =?us-ascii?Q?gcl8bI+JgjJBO0gsFaRBoxFf8LIa/oWMySuU4gtRHSs+uLhZtcJd6sLK2FTU?=
 =?us-ascii?Q?GFeMsGnLc/I0Fk5P1NzR2RRuI6PL0tnBDSMcZ8ppgb1YUVyDtomthRJBU9V/?=
 =?us-ascii?Q?LVghdZphjaePXEfsFG1WM5YjHxtheIeB+ylIWTuJSY4cVc8nrnSQxlvecTXk?=
 =?us-ascii?Q?EDPICw74pvm2mmPV2RTvBC8Rczm2jjjGRvbjm/xiXju6+1AyqlM5OxoYkLkO?=
 =?us-ascii?Q?aCS5h+Bzik3woMFj3pqLMbKKFD8nZKICt5Ena+5fVgcpFn56IrpSbM0wIHXd?=
 =?us-ascii?Q?6R7CZwaE9UDZkLTFt3UCGHcG0wL15l1blqn8oi+ApqLmr2txfGZ1qdMJb01o?=
 =?us-ascii?Q?8elx5haGEWwAhK1Z6pJginJIf2OB39ruAwJu4arxpmExomSFNLgQOX0boh5N?=
 =?us-ascii?Q?K3AcRwSbVncOhjZKsa8pNQSCK7ewKnyq7Zdxt6mv5bQ5dLtCrmEpQw9elS6N?=
 =?us-ascii?Q?/LbLbTax1+3ZpUXQ0LqnMCswA4Y0ixCnRnMTnORbC/G6IGNj6a/2k3HWr9yd?=
 =?us-ascii?Q?Ag=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?Q2OF1G5U/xAKb0WjYX8WbBxlLCOmXx5OsMxQ+2dTT40D2XKMRTwOZO/CQ3hx?=
 =?us-ascii?Q?7DSExbiL8hHNeDfB6wIJW054sH41xQkcEyDlR4bkrpjRQYBBObxQP6eIMQPT?=
 =?us-ascii?Q?XNkWrPc6wFGofXYncJA4WSl4n2WBWo+4hiLM+YOOimDD9NnKT8ricpC4MKO/?=
 =?us-ascii?Q?Yp2QPc+yMt09C5j9DbJmcmxzhpAUrKuyeWm4C32rrt1PBEaryiQD6z6WW88D?=
 =?us-ascii?Q?J/Bni1nx+BTzrGHKyK7IjHkabe+ymWz+W172qf48a5eyqkmJYWlSwb4uEp5z?=
 =?us-ascii?Q?p2dRE4an/PEU4w/ho4zTcY400U4+4eF67sFy/SmyNkXJxb80iyABHvNCg04p?=
 =?us-ascii?Q?KvE22lDK/4DpHD3QUgL5z3cGf+xKDU5Q4YktBEb6EbBCvRVDoBuiOv3EdRKW?=
 =?us-ascii?Q?1/Rq4PzI3NJt4Lj1841YSOgQG12Bhmo5cpwOMwyuddoCHNdPhCCPNX6hdxOv?=
 =?us-ascii?Q?fUSJtbs4JoJGjqrYZdsXC/VDmYdSgM489FFUHiPZ42hg7NluaYHNgCOsaR8q?=
 =?us-ascii?Q?ZU7xn4uJbJVsMf7s/dayPTirwENwzDrR43HHVNbVqbsBxZLJsyfpjmYWzcwO?=
 =?us-ascii?Q?Jf4zIg0mXZ5jAiuWGQzhO208RekJc048s0Ybk2th4jBZlHebvq8LBtTlWduj?=
 =?us-ascii?Q?Lciyahism6Zxl869jpd41Nen7WRNSOhG79x0D5G2elM2LzduX7PjUIY4SeFt?=
 =?us-ascii?Q?KWG3B1HkbPDV/Sd2SAXCTgFKEKSF2+9PpZwxyU0OPptsYaijQ3NpNtX77MdH?=
 =?us-ascii?Q?uKKF7QJZT6WFmdHJQg4jz7NRagu/CFg3hnljqbvy1vdJQIKFBcPg9ikKYnuo?=
 =?us-ascii?Q?zwM8FqutdSbJlBOKhCCFKYuO6c9SaDngqj8F3M3d37XolkagDQTa9+200Kre?=
 =?us-ascii?Q?osE/tgGk3olgNtmvAZxHi7HUX33Bkqcl5pgwkhdVnFaMO6XxCKAkH80IXh45?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c3b1b4e-032d-447c-5907-08db5315b974
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 18:21:37.5598
 (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: tbAcE22UYR2CNgpWhDdG4q4nJc1SYGHftOkJd5MGo4UVswR3u35mP+qmkyxBo+w4mtLxiK37+hhgMh12uJl3Zg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5211
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-05-12_11,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0
 adultscore=0 mlxscore=0 bulkscore=0 suspectscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305120153
X-Proofpoint-GUID: 0bu4JhqgTqYzhwYItFJNFcRu9SWm6LVb
X-Proofpoint-ORIG-GUID: 0bu4JhqgTqYzhwYItFJNFcRu9SWm6LVb
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,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.

Update the printk to a pr_warn(), but this will only be printed when
maple tree debug is enabled anyways.

Making all print statements into one will keep them together on a busy
terminal.

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

diff --git a/mm/internal.h b/mm/internal.h
index 8d1a8bd001247..644fa8b761f5a 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)) {
+		pr_warn("%lx > %lx\n store vma %lx-%lx\n into slot %lx-%lx\n",
+			vmi->mas.index, vma->vm_start, vma->vm_start,
+			vma->vm_end, 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)) {
+		pr_warn("%lx < %lx\nstore vma %lx-%lx\ninto slot %lx-%lx\n",
+		       vmi->mas.last, vma->vm_start, vma->vm_start, vma->vm_end,
+		       vmi->mas.index, vmi->mas.last);
 	}
 #endif
 
-- 
2.39.2