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 v2 18/36] mm: Update vma_iter_store() to use MAS_WARN_ON()
Date:   Fri,  5 May 2023 13:41:46 -0400
Message-Id: <20230505174204.2665599-19-Liam.Howlett@oracle.com>
In-Reply-To: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
References: <20230505174204.2665599-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?VjvI3exbFocWp9BQ+jNQbnwtCyJgwAsk+2mYFBUfPb1hs11rLutSdclD/TWa?=
 =?us-ascii?Q?BuuajlX9axD+QuYLbXLUQIP1mD6GGWL5o6JHKCryUDDYCmZ1vT2Eug5CEd40?=
 =?us-ascii?Q?nrMC+CD/9FnvuKfKV3PtReT9CNJljBdBK12WCzrgB1twkIz6MDWSUdpmKOGf?=
 =?us-ascii?Q?7g8wq6cCPaQNFSLQ7SnEf5g6XmYO4AayvqYzcwiwLMG4hWL7LyzAAMk0GhWB?=
 =?us-ascii?Q?Ty+Z4IBs+eAC0NU5dfVyNV6plRf0kMw9Gf15NvOiVBJSAi5TVNdRUmRk/+NN?=
 =?us-ascii?Q?AqNNHryj3i3xM1xgpbOW2GTDiTLG0sRnD5TRnpgXOrCvuMtAJ3pirvtqcqug?=
 =?us-ascii?Q?SyjMokKCu0TCnCbo9vgIVPTzCfgkhfWeJ6zxd7XYDDyhzk5uYsTAZ7Zk6a9s?=
 =?us-ascii?Q?JfejhOYPGPZm4on8UHDpJxWGMXg/aQZnrouy0i38WEasSMuT3DsNDzdKN40/?=
 =?us-ascii?Q?B/R0DVfozbsKfgc5ie1Kg5TrPMAI9zbw7XT3Q4msRkW2Xg47efpxKG186VwI?=
 =?us-ascii?Q?9s7hXugbm+WAbIg82trXblWCx67Z7kYxKEMsbT8a0jq2Y6Sn5iFdZvxZ2CG8?=
 =?us-ascii?Q?eNDLptCLVOuPZmGzoHG3Gk38sVJGK2CM8fP606UAlKnef04oxz+9YJ+veNUP?=
 =?us-ascii?Q?Z+3KGgMZIAXWanEmdVYT9OCPcdbIWEjr34rvZI+nU+7O/Lel6h6LIB7sa98k?=
 =?us-ascii?Q?ZXASTMRRDrJYq6LTb8ARzb1ZUShm9H3LNkUQ0JV2aP/uUD6PslaWVRBPIUnT?=
 =?us-ascii?Q?eHw0G/ARcjT6f8a3oq8ToSSSJ09lYtzZ2kX9A1IrbJwYSrkTjDsrx4kE74IH?=
 =?us-ascii?Q?BfxpEuGkRXYEm8eLj88+kxQdpx6jAIX7WAlEpjJotxk+tQsE4d9EYOnvX192?=
 =?us-ascii?Q?83KVu1QQoLCVyl/V4fQX0qQOWUgj5YlvMK3xhZ2zoxG8v4DCbDbmRa/DNBZF?=
 =?us-ascii?Q?0ALdjJWFN/OzHxk2Z/R/+D2vdokMM3/DHwPRTQqM0MgP2i4fXOgNa/sq+jxM?=
 =?us-ascii?Q?fbxnh6DmpcC1kx4SjHxumrnecysvDZehGtXnwRp4eStFhAuE5ohwKQY0kNoc?=
 =?us-ascii?Q?yEe7Bx9feSHiK5Vo18xjV1UycjdbqhOqFo63CJcgWcheHQtlOFwmGgSU9JTJ?=
 =?us-ascii?Q?MA+iZ2v5A8T7Ibi7Fcz4fTWwypO3X94eg5WJlsQSjpLUy/OhSob1tbiXhrWY?=
 =?us-ascii?Q?JhmF+BwJk4VokMDDIGE2ZFJf3lkJXcfiOWPL5qo/Oq4XRakgol5gNqCI37he?=
 =?us-ascii?Q?kHT/CrtzGFHsTIntbHPnGBj3+oMTWoQQoG/kytKZdbI6IoAMxlDMcxhTJHT0?=
 =?us-ascii?Q?cOueOGMirAa3mCF8jJ+tifP00Jxs/6NR4fwsAo1rEAMwW4Pr4ZTA0cr1+/+b?=
 =?us-ascii?Q?xKaIL9s1ftk9vawqLoELGb7UA+aFk91MBjUFJrI61eiN+7sDMQBh/BtMDCqJ?=
 =?us-ascii?Q?9+fsLAADAq2fB1q5zCUMV/fCWuVDE6HzPBW6K1xBoj+T/QCAVKwLPB15l+dm?=
 =?us-ascii?Q?/HW16ZBeEOLLaV4MBSrrPl3XQXsED4uh3tiRJp4PFypWBvEoRagSuxhV4isI?=
 =?us-ascii?Q?UX1CcaZaaOR5Ammctr2bIF1GFljOXrecF+WZJVxsEQsyprRoIwJVA9qv433X?=
 =?us-ascii?Q?dA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 0Bqx/PExt6CeimaIHC4OyySQLJLnhiOfCuGvpKsnBOrsT52Ln7UDnXvL1eLwIDh0Ca1cFSgyx9Fab81pYaWIWXWFwH8kphfcISMPQ3//5Dvoeqy+8nSOv465WsY5y/tHMMQgSlC88yKsfDxQmYXqH6wqvnUIUl9iIGP/21MUGYZSFi2LoiBXRtyo85e2Svut7OfhtSa64sNQSTCRrjQSlGGyVW+Iv+9m35IaAAn65HM/HlM0nyEfFrZjaFBC9rOqR1Wo5OhAhrHyyBv28AB+Tui95cmsfRifM+Vwqigts3u9kSXknepulkREYdrFesNqPVq4XFY0vSpyn6AmhSo3eM1qdA/SDV9LbHwe0oQAX59lGETuvsBZb8kzdnBuPBbzyOv6lgGQ/NbtB4SxY0zETpcmibkP2BHVJTXjKmxb+3vwMOPHVfZpyz2KbKmvziOp8m/69aM6Y5gJD/DTFDbGTDtRSAvojLmf9BCyeFzQ/xWG8gY/BXduPSk0sBHIAWrqk1YobiA7B3HbszUhFOyU2a9Fp8/Gz10+ZP2WErvTz54HoTSgpn5PSn8o+gvfAbDv+uLytIVjqNkpUOKwJc/ZVzjdTd/y3MDAbTHnk3tlkvUalieHsXtzLyZTiIurKPJY6okaN/MqAZRf6wd+iB5PexulcaLQX50MQi2jMx5rbkAbkY1/Hs2soPZ6rEX6TcK1OnMNmgvy3bduUMMWY/pRmQLCa5VKrcf4pD7qtTCh+SmWB3cUmh3NJlm/7fCbc4TMntjJL/kehx3vywftQaGeE+ZhsqeHHY/SAVqd1PLPHQwUrqc/aPt7w0EbCagjl1PHPpwbUtoMd/U7Rj0Uo4nJDJ4ClrwDTpOFMPreaIjP6GEGQCGjipRBtqrDLT7zRXJ/yQzMDR15E6csEJ1F+MVCGtdQJ9lg5LnhfLYHqVbFeFE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e0b6c3a5-82f9-454d-beec-08db4d905e30
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 17:44:25.5238
 (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: 2GD9rHRB++dw+p/+70OvpC7WF2dXX+8Rd+SmtdweOVaPv0n+sd6SYzIgHkJs7hlrinrGOleoUodVnqxyMTMGMQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6089
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-05_24,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 phishscore=0 bulkscore=0 suspectscore=0 mlxscore=0 spamscore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2305050146
X-Proofpoint-GUID: doIPoNrvrcjG4tLVKVDZwZsGvm7XjGIN
X-Proofpoint-ORIG-GUID: doIPoNrvrcjG4tLVKVDZwZsGvm7XjGIN
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.

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.

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

diff --git a/mm/internal.h b/mm/internal.h
index 8d1a8bd001247..6112108322461 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -1047,18 +1047,23 @@ 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 of 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\n"
+		       "store of vma %lx-%lx\n"
+		       "into 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