From patchwork Thu Nov 14 17:05:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sidhartha Kumar X-Patchwork-Id: 13875507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FAEED68B3F for ; Thu, 14 Nov 2024 17:06:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E3B66B00AC; Thu, 14 Nov 2024 12:06:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 16DAF6B00AD; Thu, 14 Nov 2024 12:06:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2ABD6B00AE; Thu, 14 Nov 2024 12:06:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CA1666B00AC for ; Thu, 14 Nov 2024 12:06:31 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7CF3C1A123C for ; Thu, 14 Nov 2024 17:06:31 +0000 (UTC) X-FDA: 82785327114.07.D4AED75 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf01.hostedemail.com (Postfix) with ESMTP id F19EF40074 for ; Thu, 14 Nov 2024 17:04:58 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=I15HK8i7; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf01.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731603869; a=rsa-sha256; cv=none; b=1zF1lPuF5bQafHSKe9E8Rp5R60ZR1FMiE5OS46Bwl2IPla5KHe9m7NphxZxOtknrcjnJrS Bojr1IINaHma7L8AHakSsPSH91tzxEVhH8/PO9ynSxBRyuDvxm6tMXVICXv1n5s+WPF7R1 S9KECoZhh/L/7PF4gKMeHjooujVGPF8= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b=I15HK8i7; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf01.hostedemail.com: domain of sidhartha.kumar@oracle.com designates 205.220.177.32 as permitted sender) smtp.mailfrom=sidhartha.kumar@oracle.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731603869; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7n8i7NEm1gSxP0N4uiNn0lAGElW5oeiIKP+aNCEbcoY=; b=KhW9GBJtPDQFNhcO3aYZMfBzY/KNJ39MhMyr22iKHf6SVGHLSsYbkUvFxHLh7rm+5ZU2Oy bcr82xPvB5ETCJEuJwTCe+zuAsdShTDlNLZ/5H+a2BOabbkJah6vBi4WjK4k92zdOmoaNh DwZqCiScaSGmmM/e+4Cqu3M3DAa7ftk= Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AECwwRQ015665; Thu, 14 Nov 2024 17:05:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=corp-2023-11-20; bh=7n8i7 NEm1gSxP0N4uiNn0lAGElW5oeiIKP+aNCEbcoY=; b=I15HK8i7hsG0PDKMeAozq TJ2kPd9fpgiRXiYPzyKxxlpgyDqPVrKSFKp8h2zOrWIPVwyphFppHW5Qu1Pur2NJ ix4Jn8CmrY2exq7D7H9XKqXAmkLhd5Ki9AVzxTbKrKQXcVfFzNH46z3VjDz8ZmlO FqhwjuFfGWVX4OL/D3JuhGVrTeF/Dx+7vL4wa/1nEQ8QmNmct+xzFPodRbiH2Zdr scueIvKDFPbHHHUuvEW3MdYdMI8zisB6FoF3Ag2+aaOKIj571qdJA4AsQ81G6HdZ r5WXszi0fXuIxB6SCIIh5uO9Y7niRG0Q5vDBpUPMxipu2KxjsXuu28mCcdFfGsYz w== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 42t0k29phr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Nov 2024 17:05:31 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 4AEFZCp4022682; Thu, 14 Nov 2024 17:05:31 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 42vuw1jy98-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Nov 2024 17:05:30 +0000 Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 4AEH5QmP032739; Thu, 14 Nov 2024 17:05:30 GMT Received: from sidkumar-mac.us.oracle.com (dhcp-10-39-201-66.vpn.oracle.com [10.39.201.66]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 42vuw1jy5w-5; Thu, 14 Nov 2024 17:05:30 +0000 From: Sidhartha Kumar To: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, liam.howlett@oracle.com, Sidhartha Kumar Subject: [PATCH 4/5] maple_tree: break on convergence in mas_spanning_rebalance() Date: Thu, 14 Nov 2024 12:05:23 -0500 Message-ID: <20241114170524.64391-5-sidhartha.kumar@oracle.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241114170524.64391-1-sidhartha.kumar@oracle.com> References: <20241114170524.64391-1-sidhartha.kumar@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-11-14_05,2024-11-13_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxlogscore=871 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2411140134 X-Proofpoint-ORIG-GUID: hAce8W2brrC5ZjcaybhLTlN17kwCsQrq X-Proofpoint-GUID: hAce8W2brrC5ZjcaybhLTlN17kwCsQrq X-Rspam-User: X-Rspamd-Queue-Id: F19EF40074 X-Rspamd-Server: rspam11 X-Stat-Signature: n5jymsurpeijhb8iixrk4ibpixe97oby X-HE-Tag: 1731603898-787364 X-HE-Meta: U2FsdGVkX1/Si+PSa2hYdpXymWEwkwf57w5StRZ/tvWpZegoP87V0fYYD1Ip4twqMy9Xtvxy9bSCXpvVI6Gx8DbB6t61CTJl5ET3S72npeaLCyavrDidUNYj0u23y1U88KhgjNco3pyaQ2og3eFdQd9IX1N21O1REaH2pqCDjb4e14yD/0J+OHZVudnHwLRstJpJlD/iNbnMyjv/bDZOa4lGeZlO4cFUgagAyhx9tYekZwQosLq6dopE44T9EgkHrev4DbPaI8xNGR3LvMIF4JJZ+alYyNNRNgL+1w7+vwjq8l0kVyk4/2Gf+U0aqM2NHK3GJh+DcJdDK18YjlCSoy1mGx0JQnDQCBle30rqU8VCNEo1PjFvBcJQeUTiUlhQBjYWK9c1Fh8mfSgzBxyVVnwIznVgGZfdAI8v8Rjru2W7p+ZMkLggiH/ZFXs0p2ESFST8xUW2vVtBihvEyghfk5L/8URnaXM2xdyUbYc8SZVrcZwMxhT7QGmd51zpXETMtCFmZaPrF3cW/xiS5eeWJp8W1hMi0U9ytMeEaRm7NXgipdx1EsA45SPgSIoW5QFgxBAkDQZpJGAme9W1MY/i7mtQfUPw2j7fdp6UIo/R0GLLWgqieEd/Ei5E2hq0Mlcb1+yrgzyTM5UTUXHc4qHNqKMKW0K/xglptvghXFscrjnX5xz18Nzp8Z7Pdae1xdEFfSNTD0CFsfRSV46Iw9r6GSbGuYHlyF+gOnTL87e61i1biEWBOa9jCVy4Ds0FlPAMjN5ijoIOUKhHes/kRmzbpm0WzxFnUnre+1fszOfQjKUrTVrGoKR3RNzw5KGclSNYbiWONU+KRNsQoGjAwYNHVVCHsxD4CPNeLBSI/KN0DahKMLDHp/VZoB7x9HVfPAh/q3a+bOzxsjN8FOQkdClWnX1UtpahFYX0Lyy611zQ6+eSus82ZNr8q49qZSbvtdwkv9m7KH7f9ndc24qrjWX bKqetoNJ lHrwUJaEU3gq42QH43XYNKYlu9vmrVuN5Sy3gasJ37KANXifQLAvxW7Kfhg8iUc/HoiTD+3BveU6vooeIc4FgR4MKXSRE0vcJ6YpFEgm6kseCNzYyrMfRWDiQC93In4nw+8M4Acrsuk0sxc+pf1BqfKgD3C7bCNA88oYJXrtppm4s0jklrKUDfyeaCqeSPPICaE0XWiCGlh+GWEtVWIqrz9I9gu9aBS1dMSs7MdOdvEaOP+/70y7/wneSL1xnmidEr6bOv6O1Hng/c3CM5N7e0mkxIQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This allows support for using the vacant height to calculate the worst case number of nodes needed for wr_rebalance operation. mas_spanning_rebalance() was seen to perform unnecessary node allocations. We can reduce allocations by breaking early during the rebalancing loop once we realize that we have ascended to a common ancestor. Suggested-by: Liam Howlett Signed-off-by: Sidhartha Kumar Reviewed-by: Wei Yang --- lib/maple_tree.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index f14d70c171c2..59c5c3f8db30 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -2904,11 +2904,21 @@ static void mas_spanning_rebalance(struct ma_state *mas, mast_combine_cp_right(mast); mast->orig_l->last = mast->orig_l->max; - if (mast_sufficient(mast)) - continue; + if (mast_sufficient(mast)) { + if (mast_overflow(mast)) + continue; + + if (mast->orig_l->node == mast->orig_r->node) { + /* + * The data in b_node should be stored in one + * node and in the tree + */ + slot = mast->l->offset; + break; + } - if (mast_overflow(mast)) continue; + } /* May be a new root stored in mast->bn */ if (mas_is_root_limits(mast->orig_l))