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 11/34] maple_tree: Use MAS_BUG_ON() in mas_set_height()
Date:   Tue, 25 Apr 2023 10:09:32 -0400
Message-Id: <20230425140955.3834476-12-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?qNdUQDsn4vejCg/kY7jl5scHa+z1dlQXv+wFUYUer0lY7CeVZVf7GgP6t8ZQ?=
 =?us-ascii?Q?IbpnZRU5Girg1RJXbvXnqtVKr43Wpmx2nNnkqB4uMLqy9o0fufIRnoco5U7s?=
 =?us-ascii?Q?1pJFU2Vgm8UlFh3dLwqbew3b+yA9blqdc/QB9r8I/GBTolHPDu4I0xVeaODG?=
 =?us-ascii?Q?GJXfu1fGi1i22NVh+qDwTa7f4ncvtufGsSO8aY6+ymeHo2youknKAo0FhUza?=
 =?us-ascii?Q?5m5B3U4SBdagvMkkXO9fpt/bUq01jBNKPpaiEZuyBF6+EeLdX76FbNGJ34QG?=
 =?us-ascii?Q?+mRcsBYx5kdE0Mf7whwH1nqZuHn/DwLK91BFs2Mf6h0SS3htgtDksTrGAYs1?=
 =?us-ascii?Q?3kEKpKkeRiZzKM0sqBtIf2R/4s6Pth80gROGl3w2lOuYdPByje3UzYHqqMP1?=
 =?us-ascii?Q?nzaZwr0smXC3hetUDD1CubOSfEPUwTHVTGJ0VKPRayAW5sPKpMvJKmR+VVZ2?=
 =?us-ascii?Q?Dlr8XffZ4FI+F1k4e24ye61Okc1v+gCXTNKas3m2rQWfxyRxeuYNH+/NuOhF?=
 =?us-ascii?Q?B+6dd4VdNctlmPpzf4Uf5vIzCHZxpN43MpfYf9264hYg/zUYiQcln490sinP?=
 =?us-ascii?Q?C59qsrvpLCqKvOXGZ8B4vBzTpJwtVCG0YFH7Ur7yYMJQ9nm7KVlIpzuewlZ3?=
 =?us-ascii?Q?9LBFFWkXuQQUJAFdfegn9VsEPQA7Dv6KCm6JGNpYdq4xrUSdTjMr8AeS/WAQ?=
 =?us-ascii?Q?C93zWYmnWThh5JrYwpVhFxtuI0waFx2mhUcuzZg2rptLL492VYuhuA5G1uAU?=
 =?us-ascii?Q?1+QG26LYt3KAK4kmG/zwOYYP2zOwwvDacnjE+cBYGJd4fCZjczgXwkPV+w+4?=
 =?us-ascii?Q?1JqtGKg1I2iWw5lvtws6iRuPe1PtBwc0Ot7fCVukeTJS+KietAzuR6rJ/uaO?=
 =?us-ascii?Q?9DHVtGUoiRDwLw1joVSThPE3FHeXPoDPlskq8JgpOTPnHha9OrmXS1aRO+AC?=
 =?us-ascii?Q?lztB063WdytXTFfVUHEIKBsxPPGI9+3J+3X/QQ1E98qeCTlwG5xs918nBJts?=
 =?us-ascii?Q?t5DEw8QBtAHx8Vp0j1ftSy+h6jNJLz5usTUeLAppVj3noi2ayImkcZbwSPFQ?=
 =?us-ascii?Q?Nu8MSuvUIe7mRAHm+6ORhSY7zrDf6jxZzIEAxEH4Rnr67UVAs/M/8RuMNYwJ?=
 =?us-ascii?Q?c6IwO6Z2nJ81ICUzO7ClBqM0v/+tmlDYxfX6msEqCuxjh7GPmDIxZ4Zt7OFg?=
 =?us-ascii?Q?ICW5gJiTlKda8qeiP6NChHGSsztoNV7GZzzoeYv0ui4eOxbwojV+nqPVYQhW?=
 =?us-ascii?Q?tNi7Z4j/fL10vdrwMHkFqqhMyVPUnC/yopiRLJgjcPCaxWAyKk6yN3Dx+T/Y?=
 =?us-ascii?Q?0QJNWRrOtXoAt7u/V9c3fDUy+gUPgnzpQe13y+6UNDa+51bnYviT6W7wGNZp?=
 =?us-ascii?Q?E2qcKimUzQpHNIfYyvkbepq3cXWoaUmYxkYGFbfH7rcPS8oS3FsZOKXbCd65?=
 =?us-ascii?Q?Xw7zoaV3AHFa52e2vMovyHfFZHzU576UGi1KN5ThQInmo02kRU5VgIVDLdfR?=
 =?us-ascii?Q?tNcrcXaSLXGFo8zJ4zhVMacdhN0weQ/bK8KqjZCe1waq30prv/ZXNYPPkzyE?=
 =?us-ascii?Q?GhlVXzCasl9SdGTMno/2+S81+mvu5FE0mWNBr01DxVhb0uww14bK1873Xe5Z?=
 =?us-ascii?Q?0g=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: R6h7xf+iM/jVjHCn3ZnV3MqmEx69BW/X30b0+EhDcYyqUtYg4ck3BGtEu+mIviTP6WoJGCvhecxJU0WY2aoXZhDs9k0UAufEav+FH+CLPpgcF5jy8kzvxsxTrSdJuznmvO7ltwiBA3gLuFXKOTawzIEOFLDPqcLP1mHA6Z23aoh3QUfTHHqpMFA/9VyL/MmwaVy9t5aDPMS4Be4/lbdRSPtYQ9qajolBHRCzOEdE0z5yyBRFkLvQWNqFGmIGE1d1Cv2zi0jZx2nDIn9JhIl9T1nSWmxLsGKLbgKU+a1yTabtLyhdR9N4KpIMTd4vjciqBfVY1hGRWN6L+Edp0dW2DM7zaL76oF0jQvmxLTXSwoWvLAxiehlQmmQ9F8QtGwn5WnVibGMKhjUmy/WjV+UPFGZhwsLh5I7M91hVcLZNn2yhWJOtfABZQQvpmlqGb+xEpEPJuQ81qX3ZnhXMY7W+JshM2fA7GxVBEIJEmibX6M/rHNVClQO9h3pBbcflBTCF4LvC3JWRbls5WPTJeFua3QAicYUh6nwbhR0Lb37OtkDrZoeAqYucRmDiT47OPxPm+/jerbletBLjNBXkanlqSnf2qsnMCJKDXtHDkq/wQ11MM3KgB3v5ZaCI7HEEjlAOfvd2s110cG969xS6iqnaeXAq9WmYhkV9jS05HGpBDLOnqPLxjvN0xV0X++YuAliC+OiAGZagOsmEJ5feGU8tNwfAD0hzPxiKMuKaKODK/g3mbNv4aD09/D0zyueUF3UqgMbw/eGiXK8JA5X3FYrvH0Hqhe2pR3q/rvCm8hXGtT4lD7EH73faRDktIQfdzPJI27Nir8/FHHQ43zDFL7QmexuDBv0vCWJ2SbAxpM/bwasKkPhpA37Acd87VANFBc8/fnmJmublQEu/Xjjn8zh3DQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ddda0046-44f1-46d1-7909-08db4596dc56
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:10:44.8060
 (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: iedxUfOvok6JOIKU0WreE0PJzY7ptoLO4gjIJn0NiwEsKZd0YUKDelWhG+Cw+boDTCynAH4A9avLVCRY9N2M+g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR10MB7650
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 spamscore=0 mlxscore=0 phishscore=0
 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2304250128
X-Proofpoint-GUID: 5eCsCrHMlg9rpdwdkJZY6_BwnNgZGZVi
X-Proofpoint-ORIG-GUID: 5eCsCrHMlg9rpdwdkJZY6_BwnNgZGZVi
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

Use MAS_BUG_ON() instead of MT_BUG_ON() to get the maple state
information.  In the unlikely even of a tree height of > 31, try to increase
the probability of useful information being logged.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 441592be039a2..f1ce3852712db 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -194,7 +194,7 @@ static void mas_set_height(struct ma_state *mas)
 	unsigned int new_flags = mas->tree->ma_flags;
 
 	new_flags &= ~MT_FLAGS_HEIGHT_MASK;
-	MT_BUG_ON(mas->tree, mas->depth > MAPLE_HEIGHT_MAX);
+	MAS_BUG_ON(mas, mas->depth > MAPLE_HEIGHT_MAX);
 	new_flags |= mas->depth << MT_FLAGS_HEIGHT_OFFSET;
 	mas->tree->ma_flags = new_flags;
 }
-- 
2.39.2