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 E51781D61B6 for ; Wed, 14 Aug 2024 20:40:30 +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=1723668031; cv=none; b=csoydwY7MSCjYSVEp26BDcmkxw/9r9FHRxeSBN4KusqGy2f+nzPouONDCR5+C4t8ZJBtiUZDUdOY/dcGpKRabNCpm/baT9NMO5Htz81cssHsJigYKO7WW8Osfem/3zoWZ+UTjBtHnpodhySAaU0Htn07NzZFWJHRNB/TjtmOtUU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723668031; c=relaxed/simple; bh=6KY92kSYQnvLZOAmTOEnK1nAH3W+DmFcBxfmiN73LBY=; h=Date:To:From:Subject:Message-Id; b=drdU9s1XEFpq+hG+BLVV+u9+nKx/NlDqvKjzrCRwIZoKHJCavK0JsB402mvd5ze2QARY8t3rpEP4vGe6E1+RBcjpCewMmJ/gA+cAbSX0cNisUPEexBOvXBsRYusYOsR3e3Mt32vVZ7IZVDWLeBSI5LDy79qTcYqfXXww20Flp5k= 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=ab2vsGcZ; 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="ab2vsGcZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6498AC116B1; Wed, 14 Aug 2024 20:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1723668030; bh=6KY92kSYQnvLZOAmTOEnK1nAH3W+DmFcBxfmiN73LBY=; h=Date:To:From:Subject:From; b=ab2vsGcZCi4yev/peoqVKLetZmlS+zF/OhCInnFM3z05pJcElax4bzN3SDl9l3pJg MXdHdowv9zWyVMFGkXOxganb/RR7pG2pYkUd69XDOarkRSYRj7Gni5845ENkHOISpF tnNa2+w1iWrA78k14uJjePZ4YvrIbCpd3Y711P6s= Date: Wed, 14 Aug 2024 13:40:29 -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-use-mas_store_gfp-in-mtree_store_range.patch added to mm-unstable branch Message-Id: <20240814204030.6498AC116B1@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: use mas_store_gfp() in mtree_store_range() has been added to the -mm mm-unstable branch. Its filename is maple_tree-use-mas_store_gfp-in-mtree_store_range.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/maple_tree-use-mas_store_gfp-in-mtree_store_range.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: use mas_store_gfp() in mtree_store_range() Date: Wed, 14 Aug 2024 12:19:34 -0400 Refactor mtree_store_range() to use mas_store_gfp() which will abstract the store, memory allocation, and error handling. Link: https://lkml.kernel.org/r/20240814161944.55347-8-sidhartha.kumar@oracle.com Signed-off-by: Sidhartha Kumar Reviewed-by: Liam R. Howlett Cc: Matthew Wilcox (Oracle) Cc: Suren Baghdasaryan Signed-off-by: Andrew Morton --- lib/maple_tree.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) --- a/lib/maple_tree.c~maple_tree-use-mas_store_gfp-in-mtree_store_range +++ a/lib/maple_tree.c @@ -6476,7 +6476,6 @@ int mtree_store_range(struct maple_tree unsigned long last, void *entry, gfp_t gfp) { MA_STATE(mas, mt, index, last); - MA_WR_STATE(wr_mas, &mas, entry); int ret = 0; trace_ma_write(__func__, &mas, 0, entry); @@ -6487,17 +6486,9 @@ int mtree_store_range(struct maple_tree return -EINVAL; mtree_lock(mt); -retry: - mas_wr_store_entry(&wr_mas); - if (mas_nomem(&mas, gfp)) - goto retry; - + ret = mas_store_gfp(&mas, entry, gfp); mtree_unlock(mt); - if (mas_is_err(&mas)) - ret = xa_err(mas.node); - - mas_destroy(&mas); return ret; } EXPORT_SYMBOL(mtree_store_range); _ 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