Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        maple-tree@lists.infradead.org
Cc:     akpm@linux-foundation.org, willy@infradead.org,
        liam.howlett@oracle.com, zhangpeng.00@bytedance.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 2/3] maple_tree: use preallocations in mas_store_gfp()
Date:   Mon,  9 Oct 2023 13:16:38 -0700
Message-ID: <20231009201639.920512-3-sidhartha.kumar@oracle.com>
In-Reply-To: <20231009201639.920512-1-sidhartha.kumar@oracle.com>
References: <20231009201639.920512-1-sidhartha.kumar@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?CYNtsjwMFytaiHutQniWb+QtCfJ8wzdZx3US3L+9n+zOXCMB9BZxeeYhOClT?=
 =?us-ascii?Q?8WEXudUUffy1vKcGf8R3saRqF9erdlPCJ3UAUglquNfJqFQKe1aOinrkHK72?=
 =?us-ascii?Q?eTZVoDM129nsCKz7URJdO76oADGwMc/x7GlE/l/ByHg4gGFfh3Zm//SyL1CY?=
 =?us-ascii?Q?nXN3RrmhmfWWoikOrVBocDi7xp5zEG9dUdluLpz/d3kRkBvlqC8drCNK3MBo?=
 =?us-ascii?Q?DPmFONbDO1LspmS32uJv8QH9dhyTqKlh+AUltzZyNhnpjHpr5r7lHFe/hIId?=
 =?us-ascii?Q?4foE+oqXPHAYoOWeD2LdBKja/2PPO7BVjgIOk3q+6rlfdTe2HUbfgjIoD3qc?=
 =?us-ascii?Q?k3Jgu75dT53MXkceYAskOU1NnVroxiFXfqyLXoYc2gHTeD3BkOjBLHYO9uq8?=
 =?us-ascii?Q?A1O/Q6OFloUIjBijqnvRCdakFyfCGIL9fTS4zl5MydsDN/WCGfu/Cfz8+MKo?=
 =?us-ascii?Q?8BZta7FXj/BDv4TbPOfqWwwbb9n7tCQ36BgqMifj50Z7Bc5fFo4UdMGrcv40?=
 =?us-ascii?Q?LO6vp3A5imeaWU7d9y5ulyDMDsdRC8SIDl348C/klY/0CkkCXXdmTjflgxer?=
 =?us-ascii?Q?slWzPyKs09Ub6iUBZQIx7ZrwlQ5IE5Z1hDW/YqNJyl2BvVVRfywJNyCThzND?=
 =?us-ascii?Q?aA7TUJnU04mCmUi+kZDWyEWVOz7svLzcWqZMXTO+YTErTlMaqZYgxCnQF5Jo?=
 =?us-ascii?Q?Hj0y4mwMNQ43OvvH0+bRrEFwIDOb+SFkPimv1sm6ZMW+LJBFAxABJOKJLch9?=
 =?us-ascii?Q?38mM83ISet7F39W0QYfC76y7sMASsRsbDCYRkRhP4ajsWNS8hhd2fJCxcqnZ?=
 =?us-ascii?Q?F/hhC7zP+SqEY5Ep2gh1KySSrF/qaxIxrs2cTa08DpFoCSGwMtHlXeo/cwve?=
 =?us-ascii?Q?H69TyfW3lnisjY3HoM/scefV0gs5WJuXERJCwNctlY22pRLrTElyy3pd1FET?=
 =?us-ascii?Q?2tJAWMq9oLjuCDaM7obmySv/trwLSmZNkrAO1DxxOGxm5jaX+RlOlHnJaSIG?=
 =?us-ascii?Q?9D+aoP8r5oDwrrm21GesccEzBZbvf8NkzZKh2cf2aQTE5YD4IDt+I/CFsw1t?=
 =?us-ascii?Q?lxKqgE8QGUtyI8rBqgSRsoCP1PJl2ti1ySefvP8DIFIGV3yMCh2bCU7abspe?=
 =?us-ascii?Q?2oOmZ2pMJMpLkrszwNKOkSqL41axZK0MF8vSMEjpfauULWOYHwSulmC3gCip?=
 =?us-ascii?Q?J6ywpSrDf45WtuGZlknsW/HkJ5TFeiD27fDCjM2Mb937OgPccJUhO3g2QNYa?=
 =?us-ascii?Q?/f8hDYmX5QG64g78wnPD9Ok5rN2X1kd7J35y56wKeGGn7GbwEtkElmf9vnHv?=
 =?us-ascii?Q?7AL9WSTuYFxwIeCjCU0boek5YAshl+hmcbZ4nccRrCrdi//lXY2mmXrYTsYs?=
 =?us-ascii?Q?RJXypaM3hzFgUDIIFzJAy9Z8JA7MjS/hRRa7HsC+ZONxfaapJa9rJ/1MWQxF?=
 =?us-ascii?Q?An89QW2ilVtqgXON5MZeOHdixmFtCrptj/ua3x6r3qn2FW2vNs9315X7rgcs?=
 =?us-ascii?Q?xXKflQAl6r6JqYrBwh3i8+Sz/iCR8q+8wYIZtQ7DMOUytOVEWrpB1VYfUmyp?=
 =?us-ascii?Q?Snr/J+6FTmIBdnpQhXQWt/VSoMBK3KxILpauoduuYncEq1ev3rkcbEQAMmP7?=
 =?us-ascii?Q?ONL5m993mflYb0aNA/H1rcE=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?HyPEzU2lsgwdMlF983u/IDfS26yBDJmaALuor8kHa+geei2tN3v94MHV9Qcx?=
 =?us-ascii?Q?6CApT8s2PLT0H55yRR7NKRQu7bn04SraxmjuaqRr0q+m3WubrpLm2JTfae3p?=
 =?us-ascii?Q?UnnZZBop6BiUKzUz3moVp8S7A0jL+oGt8LNC2VFxCdxltlKUGDIRyheO9PHZ?=
 =?us-ascii?Q?hf9f6zdSJ5Iox6BGtR+ndP1l6BOCvnjsyVcCq1LmHt/AT8dqdaqKP7cyZ/fj?=
 =?us-ascii?Q?XJMiNtOkyj24lH7tDh1/w2Q+gm1E/4PBfRKse3WKKSzWoMeLIb2DilLvPWcN?=
 =?us-ascii?Q?7CJP+7TgRAzEvLiTx1rbxfMj+PgHVV1qaad5UjoLYB3QNuOuOJ5ZZ2dP79YW?=
 =?us-ascii?Q?SFhzdTe6A977dX5RzAm9Cqs+wVcm7LQSBQYTAfnY8eG2WAbGTxnc7AawMLBl?=
 =?us-ascii?Q?hg1PFmTEXYx2rxgTmLrkrvqDYRb95tA3ATH3HOcQovyY733nK3ppDEAXRLVE?=
 =?us-ascii?Q?fqfhO78TdLqGJIoGpJNYPSJSai87rptzYvKUUG/cg38oLqlgjpQ2CDSoIj5B?=
 =?us-ascii?Q?yEzU3fj3a41U99Nu5T8V6qsF+SfT+5dkcxY4/FV+qCjo2ZdpuUgJDMDFMeyT?=
 =?us-ascii?Q?/QUobwJDl4Fw4x1ye2FWIIyr/Vq/JbKpQKa81zrBBpZSVa04JXDNwDp54Yso?=
 =?us-ascii?Q?vIPBzX6M3g5l43+Xbauw09F2hiVUnvGXu/PkQDfw+a8pgULvUYmtm3Zjeygr?=
 =?us-ascii?Q?wvVME7PpBjMa+FVP047bHTsezntwKIRliR82TyiMeeoLh3RksQ/I18hbMhwX?=
 =?us-ascii?Q?o8cveC6fimAL4qvCSaaZRzN7NG7ouA0/BZhX7kR9o2fsU/nIUJI3CAMljKeJ?=
 =?us-ascii?Q?qDHgjSjieqtJ9roj2CI+4pIvXi95SWFnAiFeMyt6Pok7tMB3GKD6hD/qLRq3?=
 =?us-ascii?Q?Tgibw+Z8lpFhSk5uNHtYHRZ/V14DJaj7I3UDVHd9PcPx8g0+g4QKRe19U2e3?=
 =?us-ascii?Q?FPnoF6CvJuwgNrS7AGkdRg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2de33596-c95f-406b-19d1-08dbc904accf
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 20:16:52.0423
 (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: znOV2H6GjDyY0wwOtwwh6BmvzYZdzEYKiATTmdXiw/tfSZ5aS8Vtqpwu6ubu85gb/EC0XqvFLsiyGprtXvpISkf+8vcoIES60Hljveo1Ab0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR10MB6998
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-10-09_18,2023-10-09_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 spamscore=0
 mlxlogscore=999 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000
 definitions=main-2310090163
X-Proofpoint-ORIG-GUID: kf9SUGuqoWXaUrzWB7HsuGtKv3iwpWjE
X-Proofpoint-GUID: kf9SUGuqoWXaUrzWB7HsuGtKv3iwpWjE
X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 09 Oct 2023 13:17:35 -0700 (PDT)
X-Spam-Level: **

Preallocate maple nodes before call to mas_wr_store_entry(). If a new
node is not needed, go directly to mas_wr_store_entry(), otherwise
allocate the needed nodes and set the MA_STATE_PREALLOC flag.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 lib/maple_tree.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index e239197a57fc..25ae66e585f4 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5478,17 +5478,33 @@ int mas_prealloc_calc(struct ma_wr_state *wr_mas)
 int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp)
 {
 	MA_WR_STATE(wr_mas, mas, entry);
+	int request;
 
 	mas_wr_store_setup(&wr_mas);
-	trace_ma_write(__func__, mas, 0, entry);
-retry:
+	wr_mas.content = mas_start(mas);
+
+	request = mas_prealloc_calc(&wr_mas);
+	if (!request)
+		goto store_entry;
+
+	mas_node_count_gfp(mas, request, gfp);
+	if (unlikely(mas_is_err(mas))) {
+		mas_set_alloc_req(mas, 0);
+		mas_destroy(mas);
+		mas_reset(mas);
+		return xa_err(mas->node);
+	}
+	mas->mas_flags |= MA_STATE_PREALLOC;
+
+store_entry:
 	mas_wr_store_entry(&wr_mas);
 	if (unlikely(mas_nomem(mas, gfp)))
-		goto retry;
+		goto store_entry;
 
 	if (unlikely(mas_is_err(mas)))
 		return xa_err(mas->node);
 
+	trace_ma_write(__func__, mas, 0, entry);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(mas_store_gfp);
-- 
2.41.0