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>
Subject: [PATCH v4 11/35] maple_tree: Use MAS_BUG_ON() in mas_set_height()
Date:   Thu, 18 May 2023 10:55:20 -0400
Message-Id: <20230518145544.1722059-12-Liam.Howlett@oracle.com>
In-Reply-To: <20230518145544.1722059-1-Liam.Howlett@oracle.com>
References: <20230518145544.1722059-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?cg+KYeQgfl999tunnQdsbEfXaSHz5XpWFuN+X/ZGfn98vS9GW2riC57d7+AS?=
 =?us-ascii?Q?QdHb51goZI17ONwOAdG0bIq8t1fmln6So/QuDPiwBl7vWFm90AnoXe1/rUd5?=
 =?us-ascii?Q?fhN2eJDEnTEyTiVt+VoJarn8oz+T8ld+B0OJxeLOHiMWpPKUXGIV+YHf2jQJ?=
 =?us-ascii?Q?2Mk//65wMyh7uBY/KijBk4bESWKkhviGJFAVXwx5Troq+UeYgL52ku8Q73i/?=
 =?us-ascii?Q?IyHhJMmb3A6rFlGCysLQLK92PLNxpDGD88+bHSE8CNY8ZiKEIjQyKB8G1mOu?=
 =?us-ascii?Q?NqAMO+xigfACafiuZt+up4JY18mltUU4m4TulPujYGJmi8vIChO6vFWe3SDv?=
 =?us-ascii?Q?fh/DnFHZFwTkP2Y5GuM7ViAE/0Um2ZwKLbjgh5eXji1WFGm9AF4qkfPuvhHj?=
 =?us-ascii?Q?zVwk4xxtw/+cJb9re1lVvhMhK5QC5/jGHTt0oQ4tZlVm2KYs8lI7RF1AlKCX?=
 =?us-ascii?Q?YhvrlyEPmlxBjEraP+93772Nm/iWr6HC1B2e5pPpakBubUvRxkWCA6quPrw2?=
 =?us-ascii?Q?RCvT0zDOx4Na/qhu265Baip8rHLCNCrUkZ5dXnmPwTnJ7T/1hqrJfpg+NqNN?=
 =?us-ascii?Q?v4zI5g8k7QkRgiLC4dYLCgKWiVparffs65CAfA/5Dw2S8RlUgKmqSBOLR9XL?=
 =?us-ascii?Q?7xy2OA+3SsH45OqlMcaaaXVvoTuWzQ8zzniDBzEyYJ2ISD7fFRW0WE5oZW6V?=
 =?us-ascii?Q?RTU55Ey5pbhV8Z7DlkB2/XOdjRpVZ6YoVbwuzVuH1xWHifRlMVUhr9uyw+4F?=
 =?us-ascii?Q?czUUOKHkfX/O/JwyK+Y2paSzhp9OSNVYwkAha45B6Q+9bGxgt8otj/x/8JNt?=
 =?us-ascii?Q?W8Nb8b/gVbXeH9sJ5U5IcXW8N/YjgLctxlF1t48TEChPQbmW3ayNjPA2LqJv?=
 =?us-ascii?Q?4eWHLOg7j9t36EGjlXuwhtb8g3uaknn42ZfKheS0QObqUCiJXrEPnnf3fXN9?=
 =?us-ascii?Q?PHVGhLJDEFgZ8b6AvLqZxMvnZsOboM04QkCkjYCkrSpx1U7AgBtwJePwRsCB?=
 =?us-ascii?Q?X1QkVMFWSwu/Ebiu+1PPiggoVvxw/Bn2RYrilrJidp1DaO8FWxx9HmnPTYR2?=
 =?us-ascii?Q?zqTmx/psHmXJ2Wmua/F+Yf25PV9tco2AvqqmgJ3VV+OgKkhV4FDy7rLFikgA?=
 =?us-ascii?Q?xIe2W/ToYykIEjj76dQgAr5ZCaeiwE08z0Hv0eDs2kgAfZuOMPuXMt1N6GZc?=
 =?us-ascii?Q?sSi61rLvowBuaN9SCXPkE6//2OoFyIxmzg3xB23CKRKYkjFptW/cxXSTtigw?=
 =?us-ascii?Q?EyjYhVAJW8CXneLcorj+OHQI6kDsu5R3Zh8Ff3kPwn09XATv0v7XTAZPZ/4l?=
 =?us-ascii?Q?TQruKZX0zOkI0WOe7RgTaivaklPOq6/W3i/MCx21QjMpzwk+aqo7V3lzzuiz?=
 =?us-ascii?Q?6Qa50tAaK4UlXZWtC7sdWPqQ1Slw8/HyCBBaw2VdYIU0Y+Q2j7CMEuFkicjK?=
 =?us-ascii?Q?rV01VvxQrmhI8rm5JxWgUW0tSLZC/vjil63Soy0aZwFNQP7RMSNDd1Ii9euq?=
 =?us-ascii?Q?LYApYz4IL5SBQZEh/p1pefnzXBG0juPZ03sQzRreIa71oaS2TLI+TIed2Mzt?=
 =?us-ascii?Q?x04sQwQWMZuvgiJv4NMjsS483VoO+ga+kYCmWFWeuNlOIKMjCaDw/Y0NSsrn?=
 =?us-ascii?Q?/w=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 4xqJzALnbbxx614B1b11DEfhjI4zT8OXeSRqttNsCvXhNLiSZFwVk13Jeb+GNpYfg7dAlU/CCHCig+8xHMEw25YJZpcKYBmYWQFggwJzOKxkKeX5Iu2KWdeKOl8+Vj4R2s5O/n8DuJhpoeQNiCeevlNAm3idrMRnYwqAG97ctthcF91Isq7RCCHoSDJBo4/9G0Ojn8gOYyaysjhgyQJZQAh5QlQf9oCV+5CghOk/IknUJAuPKC1PtDU4Ahg5rRu4TTGRpKr6meideotn3fYPlZ6B1WLyy/B71Ga9bKnObX6laSBMD6aocWtvV5IOTcs2p77umVJpmA3KtNLBjmsadfVRFx0V7gjzd7RyNL6T2yOPbnWRPsfTLbsel31dNKOx5XDSrXWUn/W/o7Hi1GFxoVnQTq/ddNoOu2SxbMO+I3ML5Gx0ntM3J1zsP8HfmGGhmE7vYMElt3DDb4mJhv+Xh/wBfnIcRGkaNYdwv9yjwde7Aa7UgvkTNsHthYWnx19VQoWrD2qH0p0aX7qc5/K/qXoceNnw57k37ciNqhRoWH+ub+Krw/ev0JBMQno3MVu3vChSNvKVU8tC1lR7Y7+/1YSmvHiDjsA5oI9YXvzRg3tTuxkSVth1NnE1CIkZ6henR2KO4er5r3nnXorrfXHjk0yWjjY/e/jc5pTr5M68zcmPuV5Of33/VkDjNayPHHAj86PgZ+6GtKKVJoZ3Oj/vgRCa1jPR1ZUvi/9ckY1ezW+GSxftHu+s6CRgyUhRg/OGLwiOpBTYUMF8/8cPCMgvdaSgFEXwnlrTNQlTQwPhAffjHWy6kb0VdENcUSsVNODcAhFBfAGUhIxvFDFTS6FosgL7/N/mLd/krRX+2a0YIdlq7BnvlyN+x++H8XzSKmrHyqQMTgu46v67NTIhOGFYbA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e2a29ebe-abf3-41e3-fed1-08db57b00765
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2023 14:56:15.4056
 (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: FNSUg9jAvQWqqDCnIG0OmbIvKPNxnP3c0I0sHJSAraPiLd1a2WcJfn9lxfl4kFlzrrIB6rdj3QUR1p89DgRakA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4347
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-18_11,2023-05-17_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0
 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 phishscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2304280000 definitions=main-2305180120
X-Proofpoint-GUID: -pMsodl5__u1cw-MHwCjLQ4WtzyHTN4z
X-Proofpoint-ORIG-GUID: -pMsodl5__u1cw-MHwCjLQ4WtzyHTN4z
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

Use MAS_BUG_ON() instead of MT_BUG_ON() to get the maple state
information.  In the unlikely event 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 a594f1d88d06..da441042ec8a 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