From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DAACE1C8FC5 for ; Wed, 14 Aug 2024 20:40:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723668034; cv=none; b=lcwyZZRAWylxkdKUlx70AUCmKwB7+drCKmHqwsm7G00eIlRuT6j9GsNMF7ta6xWgqgL5GbCFuuPDYs0Z68pORkhmbjVu0azAfzJWcQo6wrEiGe01LLFLLq12T08YUVP9Yua0XrV1GNG4MHdKokkGNa9ZKEagLf9gs9UOTOZTb0s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723668034; c=relaxed/simple; bh=Hf2lhXrALTQeaWx8tinfznXHiT2oetbKg9yl0mfIh0Y=; h=Date:To:From:Subject:Message-Id; b=Hvz/xJjYyUXEzddcw/qPbfcnZtQNwHIMs3m28Z1YKu5wFKnirxuOCekDpcl0fEbf1rFL/AghheXiTQjWO9K3Swifztmb4BeQt2WI5m+GD9Z2LLAij52ULtgH5fbblJlKX6uACsVg4VV2/9GVGOHOKKvF1kFSpWNcZV85c03Vwvs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=W4y0GBGL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="W4y0GBGL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 665CDC4AF0B; Wed, 14 Aug 2024 20:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1723668034; bh=Hf2lhXrALTQeaWx8tinfznXHiT2oetbKg9yl0mfIh0Y=; h=Date:To:From:Subject:From; b=W4y0GBGLI39JqJ89fZhRAGL2WYFL1Y6Ad3P2mtxf13WDhaIZoFZuPhJ2FmwCRasts rELoj6J3FMEe9zeQ4SLTJ7I9710eM3anUgfUq7t3YUmbbSP/ezuQd87jBpSPo3Ka+x taIMPAUbkGys5eUKtRUhPX84Om3dVy07pz3U578I= Date: Wed, 14 Aug 2024 13:40:33 -0700 To: mm-commits@vger.kernel.org,willy@infradead.org,surenb@google.com,Liam.Howlett@oracle.com,sidhartha.kumar@oracle.com,akpm@linux-foundation.org From: Andrew Morton Subject: + maple_tree-convert-mas_insert-to-preallocate-nodes.patch added to mm-unstable branch Message-Id: <20240814204034.665CDC4AF0B@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: maple_tree: convert mas_insert() to preallocate nodes has been added to the -mm mm-unstable branch. Its filename is maple_tree-convert-mas_insert-to-preallocate-nodes.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple_tree-convert-mas_insert-to-preallocate-nodes.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Sidhartha Kumar Subject: maple_tree: convert mas_insert() to preallocate nodes Date: Wed, 14 Aug 2024 12:19:37 -0400 By setting the store type in mas_insert(), we no longer need to use mas_wr_modify() to determine the correct store function to use. Instead, set the store type and call mas_wr_store_entry(). Also, pass in the requested gfp flags to mas_insert() so they can be passed to the call to mas_wr_preallocate(). Link: https://lkml.kernel.org/r/20240814161944.55347-11-sidhartha.kumar@oracle.com Reviewed-by: Liam R. Howlett Signed-off-by: Sidhartha Kumar Cc: Matthew Wilcox (Oracle) Cc: Suren Baghdasaryan Signed-off-by: Andrew Morton --- lib/maple_tree.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) --- a/lib/maple_tree.c~maple_tree-convert-mas_insert-to-preallocate-nodes +++ a/lib/maple_tree.c @@ -4457,26 +4457,24 @@ static inline void *mas_insert(struct ma if (wr_mas.content) goto exists; - if (mas_is_none(mas) || mas_is_ptr(mas)) { - mas_store_root(mas, entry); + mas_wr_preallocate(&wr_mas, entry); + if (mas_is_err(mas)) return NULL; - } /* spanning writes always overwrite something */ - if (!mas_wr_walk(&wr_mas)) + if (mas->store_type == wr_spanning_store) goto exists; /* At this point, we are at the leaf node that needs to be altered. */ - wr_mas.offset_end = mas->offset; - wr_mas.end_piv = wr_mas.r_max; - - if (wr_mas.content || (mas->last > wr_mas.r_max)) - goto exists; + if (mas->store_type != wr_new_root && mas->store_type != wr_store_root) { + wr_mas.offset_end = mas->offset; + wr_mas.end_piv = wr_mas.r_max; - if (!entry) - return NULL; + if (wr_mas.content || (mas->last > wr_mas.r_max)) + goto exists; + } - mas_wr_modify(&wr_mas); + mas_wr_store_entry(&wr_mas); return wr_mas.content; exists: _ Patches currently in -mm which might be from sidhartha.kumar@oracle.com are maple_tree-reset-mas-index-and-mas-last-on-write-retries.patch maple_tree-add-test-to-replicate-low-memory-race-conditions.patch maple_tree-introduce-store_type-enum.patch maple_tree-introduce-mas_wr_prealloc_setup.patch maple_tree-move-up-mas_wr_store_setup-and-mas_wr_prealloc_setup.patch maple_tree-introduce-mas_wr_store_type.patch maple_tree-remove-mas_destroy-from-mas_nomem.patch maple_tree-preallocate-nodes-in-mas_erase.patch maple_tree-use-mas_store_gfp-in-mtree_store_range.patch maple_tree-print-store-type-in-mas_dump.patch maple_tree-use-store-type-in-mas_wr_store_entry.patch maple_tree-convert-mas_insert-to-preallocate-nodes.patch maple_tree-simplify-mas_commit_b_node.patch maple_tree-remove-mas_wr_modify.patch maple_tree-have-mas_store-allocate-nodes-if-needed.patch maple_tree-remove-node-allocations-from-various-write-helper-functions.patch maple_tree-remove-repeated-sanity-checks-from-write-helper-functions.patch maple_tree-remove-unneeded-mas_wr_walk-in-mas_store_prealloc.patch maple_tree-make-write-helper-functions-void.patch