Date:   Mon, 20 Mar 2023 15:27:56 -0400
From:   "Liam R. Howlett" <Liam.Howlett@Oracle.com>
To:     Vernon Yang <vernon2gm@gmail.com>
Cc:     akpm@linux-foundation.org, willy@infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH] maple_tree: remove the parameter entry of mas_preallocate
Message-ID: <20230320192756.chmdpduys4aseri5@revolver>
Mail-Followup-To: "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        Vernon Yang <vernon2gm@gmail.com>, akpm@linux-foundation.org,
        willy@infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
References: <20230110154211.1758562-1-vernon2gm@gmail.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230110154211.1758562-1-vernon2gm@gmail.com>
User-Agent: NeoMutt/20220429
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OpPe3yqpihq2ZNcLy2qGsQecGiYPjOwQgnRhsE8VoDgMhCQ8af6JrRFKq/CO?=
 =?us-ascii?Q?upmWjtiObesZMKOEr1H/7E1QsDj9OUOZZVjnCQXxPH7wk/kQDJhOV7+4A8u0?=
 =?us-ascii?Q?ZOWO4pCHirNL6bUW63Dc/4vkvZXl3Ywione7AlfeOWtqfRbFHMqlmYLhDj8j?=
 =?us-ascii?Q?d5w4yF6GsmBmHr/1EDGT47s8V+H4hQKdwsFPvzPP10OFIsPLY4M+9mStH+i9?=
 =?us-ascii?Q?9DIDhMwF9RPqi94YEdQOf4KwfeFDzLaRGYHA1RiR124+z4prmUEIyzP0YNYY?=
 =?us-ascii?Q?RmNnjG5iKCndXnVBTyNwTflGrRj7bONs76jwSOmZAUYdxAT0h8fF34eJONmm?=
 =?us-ascii?Q?60RImPFQOr/NkwsmKVGJFY6fu6OymI/JGxWXj540wgXdygB0gW9c1zFeH4HC?=
 =?us-ascii?Q?kONPvklfcYbRmRaZusSn/vnFsusid3/l1AtPDWoH+rYd16pIOQEyCvDr2OE0?=
 =?us-ascii?Q?6neX4ooRwO7nmXKQ4jThFg7etKd9dvXq6oWTTS9RdwJ7BH3hjceAqeOqpBgV?=
 =?us-ascii?Q?unSV2eAPkFGkgiC/MO470n22DbJ1CybcyINyv6rD2gEoWODB3uMmpFwUrNn6?=
 =?us-ascii?Q?MzJv+I+84g6ZAAO3BehLxe6wcm28Jp7kZc43ZqBHk7S9xDzLnubSyCKPS+4n?=
 =?us-ascii?Q?mGjuqI0NOsv1fw58h4G3OH+fQihY7FD8XaAx/CtQOW8xPuHxxj08mW6aGi9n?=
 =?us-ascii?Q?XCHtGeWhmhhGS++/UOFfU8qUqVjKarrG9zmvv/Lz6r6BjOa+rDVNv/3SXs9V?=
 =?us-ascii?Q?VUzmtSTl6hlW95jJkUX/POx+/aA7exMjbuVfec+1cIeOLVAyBQp486cEHPDN?=
 =?us-ascii?Q?XM9OwlWpMJkpvhYXhe8mp4mD/EfRe/olJBOlllOsl3DUpond+jq2jKb7ODKt?=
 =?us-ascii?Q?eaadGQBaLzvhg4bvH5TA9rOL+1qb6Wl8yLX2f7U6B7DmckGDWZ+Qixz7d1Oz?=
 =?us-ascii?Q?s+UGFZbm5pKHazl7/PxUWe9ItNDPPtYSCjhKDdYpZMeuW7MTK6fy4oyPWi1q?=
 =?us-ascii?Q?kX34Vt5jqiAkcpcRh+cHstvs+YMNZX7zaryAsBZtz5VAlJYh0dKCEJSwacwC?=
 =?us-ascii?Q?51nyariangggv/IslyfwhZcLRjPBfDJpE5ySnxidrvh0uIitfSpnXllbgH4K?=
 =?us-ascii?Q?Qpl+yvxhoH1SpiYtcaOzhEn78HflKr0GnB112/C/WNVDr4JfKmrZHIvfT9Sq?=
 =?us-ascii?Q?n9L/lCohjX2HrNUMX2/QE/VbWDXV7EGhldNktsfxv2M2ZxDkPidYGQzyuh3e?=
 =?us-ascii?Q?dAgCtUc0bpa2g6upvMHn3XGcF+aIIxntxn/WkWDUGbb9RDAifxU4Zua8R3Yv?=
 =?us-ascii?Q?y712miRb9HCDfSG3mbCh9DHeH9kkDzH0oNfOPtnZOxcUQKFKC4NTkhiXfxmU?=
 =?us-ascii?Q?jIgpSQWNsbh31CipkC3KCg1udvcTJMmzbOkQYmFcql2fgfRUwh7z3cBTtJ7O?=
 =?us-ascii?Q?lTQo5St2fDTQgb+Gn+eS+De1PCZl1guJ/sHx0c3yfBVhcEGoCcG1MEv89dYB?=
 =?us-ascii?Q?NzVsXWb+WEhfPN55YVt7LcajIAbTzzb3HtlWxJmOrhewJKe+PFM/09F2GW7J?=
 =?us-ascii?Q?0Ha/1ywFEbwfIp0xS7dQqQx+gnJmMPWDgu8EtHRRT6Vxz1EcvDcF7vVK8qWP?=
 =?us-ascii?Q?7Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9trgn4HHe2C+U1fEgATN6D3Ffob1Oo8+NdxGWggJI94ycVzDq0OY1XhSXID5cggT/IqRejF5MGS+1pBrrTamp5/DEAJ1SXbV4TjwtlHNZTDU9LWQMbm4qZ8f1MX4oVWQcLV6TAhsr2uh5yxR8IfKen9I4eLwxj1LxYk8DMn4Tbq5fu2JPNp/vhDZvOvqxOdASjShfTqSbq5GCJiLtIH5xbZZqhpeeXjcghRbjlQ8g95/l7cxb0EOT097ts64nXZM2xipDlGLiisbDfglhId1E7bOxcHIpNnJwiQc99vhlYHDJN1eIW/3caWzh1DKD71gTTHtCzEqv2bFamn0bS3PYNG/ybV2VS/lY0OBHzlD3irkxy1ZemGS0Z0ws6w13SRUACM+0F85Qy9pmVoQ2BFlQaITBkqKiZK0/gte6VWO5UQHwsU/XMtDsRNLaSTCyalhvAZ84kt6705N1ljluFRMfxJo/hParzPLD61DMw73+h2jEHHCnLlP3T8MAJOoCbDt0XvrtwcYi/2g4G9b/CidSL54ZbqxrBl7czdmh28FwxYTZnng0yHOTSIY5W/OuA7Ao51YnS7rdJBMpUXoO2NI7hzXWuIjpPFEfZLh8oMOOKDvsf/4iFCYSOJ+QV3fghjhqNHnUWm4nQ6wEEZUUmx+cXYhUmOM4rsM9r1MZHCQAojJbJZmbL/AKYoduZvBTvWATKjUn20iLfG+xOXIu6Rg0is0Da2MT6CXcXuh1fqYO0mf2Spz5d5vmXGsrTlPS8LBeOg5UwNhIV2X08FCP36OXg+0JrwttL09xX32NfTLqaE0Xt832qEqZzRjYQo/Fkia9pXImCBhEBJPtbcZHin9dVPaxysEy//Qh3zX31Pg31gGjKrPOiqiHKQM4p7IoLmV7LS2x5Z9RrEPArIy9LPBPw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0206ed4e-09fc-42ec-2b26-08db29793667
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2023 19:27:58.6382
 (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: sJCQBrF2zNoq20Qzg+i+NcL/vWJnl5a7OJf0YV3QJtbQhLw5bDe8AlA9Fz49Odk5HBHWAQW3vT8FHNxCm+WkEQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7414
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-20_16,2023-03-20_02,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0
 mlxlogscore=999 malwarescore=0 suspectscore=0 adultscore=0 spamscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002
 definitions=main-2303200164
X-Proofpoint-ORIG-GUID: 1ZhWo_8-NgR1L2YxFW_wVMS2c8LAtqR0
X-Proofpoint-GUID: 1ZhWo_8-NgR1L2YxFW_wVMS2c8LAtqR0
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

* Vernon Yang <vernon2gm@gmail.com> [230110 10:42]:
> The parameter entry of mas_preallocate is not used, so drop it.

This parameter was meant to reduce the allocations needed to store a
given value.  Since NULLs behave differently than actual values (NULLs
are combined), the value being stored was going to be used.

Since the fix to remove GFP_ZERO from the allocator of the maple tree
nodes [1], this may no longer be a worth while optimization.

[1] https://lore.kernel.org/all/20230105160427.2988454-1-Liam.Howlett@oracle.com/


Acked-by: Liam R. Howlett <Liam.Howlett@Oracle.com>

> 
> Signed-off-by: Vernon Yang <vernon2gm@gmail.com>
> ---
>  include/linux/maple_tree.h       |  2 +-
>  lib/maple_tree.c                 |  3 +--
>  mm/mmap.c                        | 16 ++++++++--------
>  mm/nommu.c                       |  8 ++++----
>  tools/testing/radix-tree/maple.c | 32 ++++++++++++++++----------------
>  5 files changed, 30 insertions(+), 31 deletions(-)
> 
> diff --git a/include/linux/maple_tree.h b/include/linux/maple_tree.h
> index e594db58a0f1..a0d43087f27a 100644
> --- a/include/linux/maple_tree.h
> +++ b/include/linux/maple_tree.h
> @@ -456,7 +456,7 @@ int mas_store_gfp(struct ma_state *mas, void *entry, gfp_t gfp);
>  void mas_store_prealloc(struct ma_state *mas, void *entry);
>  void *mas_find(struct ma_state *mas, unsigned long max);
>  void *mas_find_rev(struct ma_state *mas, unsigned long min);
> -int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp);
> +int mas_preallocate(struct ma_state *mas, gfp_t gfp);
>  bool mas_is_err(struct ma_state *mas);
>  
>  bool mas_nomem(struct ma_state *mas, gfp_t gfp);
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 69be9d3db0c8..96fb4b416697 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -5712,12 +5712,11 @@ EXPORT_SYMBOL_GPL(mas_store_prealloc);
>  /**
>   * mas_preallocate() - Preallocate enough nodes for a store operation
>   * @mas: The maple state
> - * @entry: The entry that will be stored
>   * @gfp: The GFP_FLAGS to use for allocations.
>   *
>   * Return: 0 on success, -ENOMEM if memory could not be allocated.
>   */
> -int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
> +int mas_preallocate(struct ma_state *mas, gfp_t gfp)
>  {
>  	int ret;
>  
> diff --git a/mm/mmap.c b/mm/mmap.c
> index e06f9ae34ff8..64bdd38e8d8e 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -472,7 +472,7 @@ static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma)
>  	MA_STATE(mas, &mm->mm_mt, 0, 0);
>  	struct address_space *mapping = NULL;
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL))
> +	if (mas_preallocate(&mas, GFP_KERNEL))
>  		return -ENOMEM;
>  
>  	if (vma->vm_file) {
> @@ -538,7 +538,7 @@ inline int vma_expand(struct ma_state *mas, struct vm_area_struct *vma,
>  	/* Only handles expanding */
>  	VM_BUG_ON(vma->vm_start < start || vma->vm_end > end);
>  
> -	if (mas_preallocate(mas, vma, GFP_KERNEL))
> +	if (mas_preallocate(mas, GFP_KERNEL))
>  		goto nomem;
>  
>  	vma_adjust_trans_huge(vma, start, end, 0);
> @@ -712,7 +712,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
>  		}
>  	}
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL))
> +	if (mas_preallocate(&mas, GFP_KERNEL))
>  		return -ENOMEM;
>  
>  	vma_adjust_trans_huge(orig_vma, start, end, adjust_next);
> @@ -1934,7 +1934,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
>  		/* Check that both stack segments have the same anon_vma? */
>  	}
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL))
> +	if (mas_preallocate(&mas, GFP_KERNEL))
>  		return -ENOMEM;
>  
>  	/* We must make sure the anon_vma is allocated. */
> @@ -2015,7 +2015,7 @@ int expand_downwards(struct vm_area_struct *vma, unsigned long address)
>  			return -ENOMEM;
>  	}
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL))
> +	if (mas_preallocate(&mas, GFP_KERNEL))
>  		return -ENOMEM;
>  
>  	/* We must make sure the anon_vma is allocated. */
> @@ -2307,7 +2307,7 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma,
>  	mt_init_flags(&mt_detach, MT_FLAGS_LOCK_EXTERN);
>  	mt_set_external_lock(&mt_detach, &mm->mmap_lock);
>  
> -	if (mas_preallocate(mas, vma, GFP_KERNEL))
> +	if (mas_preallocate(mas, GFP_KERNEL))
>  		return -ENOMEM;
>  
>  	mas->last = end - 1;
> @@ -2676,7 +2676,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
>  			goto free_vma;
>  	}
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL)) {
> +	if (mas_preallocate(&mas, GFP_KERNEL)) {
>  		error = -ENOMEM;
>  		if (file)
>  			goto close_and_free_vma;
> @@ -2949,7 +2949,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma,
>  	    can_vma_merge_after(vma, flags, NULL, NULL,
>  				addr >> PAGE_SHIFT, NULL_VM_UFFD_CTX, NULL)) {
>  		mas_set_range(mas, vma->vm_start, addr + len - 1);
> -		if (mas_preallocate(mas, vma, GFP_KERNEL))
> +		if (mas_preallocate(mas, GFP_KERNEL))
>  			goto unacct_fail;
>  
>  		vma_adjust_trans_huge(vma, vma->vm_start, addr + len, 0);
> diff --git a/mm/nommu.c b/mm/nommu.c
> index 214c70e1d059..0befa4060aea 100644
> --- a/mm/nommu.c
> +++ b/mm/nommu.c
> @@ -602,7 +602,7 @@ static int add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)
>  {
>  	MA_STATE(mas, &mm->mm_mt, vma->vm_start, vma->vm_end);
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL)) {
> +	if (mas_preallocate(&mas, GFP_KERNEL)) {
>  		pr_warn("Allocation of vma tree for process %d failed\n",
>  		       current->pid);
>  		return -ENOMEM;
> @@ -633,7 +633,7 @@ static int delete_vma_from_mm(struct vm_area_struct *vma)
>  {
>  	MA_STATE(mas, &vma->vm_mm->mm_mt, 0, 0);
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL)) {
> +	if (mas_preallocate(&mas, GFP_KERNEL)) {
>  		pr_warn("Allocation of vma tree for process %d failed\n",
>  		       current->pid);
>  		return -ENOMEM;
> @@ -1081,7 +1081,7 @@ unsigned long do_mmap(struct file *file,
>  	if (!vma)
>  		goto error_getting_vma;
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL))
> +	if (mas_preallocate(&mas, GFP_KERNEL))
>  		goto error_maple_preallocate;
>  
>  	region->vm_usage = 1;
> @@ -1358,7 +1358,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
>  	if (!new)
>  		goto err_vma_dup;
>  
> -	if (mas_preallocate(&mas, vma, GFP_KERNEL)) {
> +	if (mas_preallocate(&mas, GFP_KERNEL)) {
>  		pr_warn("Allocation of vma tree for process %d failed\n",
>  			current->pid);
>  		goto err_mas_preallocate;
> diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
> index 81fa7ec2e66a..8170ef39d8c4 100644
> --- a/tools/testing/radix-tree/maple.c
> +++ b/tools/testing/radix-tree/maple.c
> @@ -35342,7 +35342,7 @@ static noinline void check_prealloc(struct maple_tree *mt)
>  	for (i = 0; i <= max; i++)
>  		mtree_test_store_range(mt, i * 10, i * 10 + 5, &i);
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
> @@ -35351,18 +35351,18 @@ static noinline void check_prealloc(struct maple_tree *mt)
>  	allocated = mas_allocated(&mas);
>  	MT_BUG_ON(mt, allocated != 0);
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
>  	MT_BUG_ON(mt, allocated != 1 + height * 3);
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	mas_destroy(&mas);
>  	allocated = mas_allocated(&mas);
>  	MT_BUG_ON(mt, allocated != 0);
>  
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
> @@ -35370,25 +35370,25 @@ static noinline void check_prealloc(struct maple_tree *mt)
>  	mn = mas_pop_node(&mas);
>  	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
>  	ma_free_rcu(mn);
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	mas_destroy(&mas);
>  	allocated = mas_allocated(&mas);
>  	MT_BUG_ON(mt, allocated != 0);
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
>  	MT_BUG_ON(mt, allocated != 1 + height * 3);
>  	mn = mas_pop_node(&mas);
>  	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	mas_destroy(&mas);
>  	allocated = mas_allocated(&mas);
>  	MT_BUG_ON(mt, allocated != 0);
>  	ma_free_rcu(mn);
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
> @@ -35397,12 +35397,12 @@ static noinline void check_prealloc(struct maple_tree *mt)
>  	MT_BUG_ON(mt, mas_allocated(&mas) != allocated - 1);
>  	mas_push_node(&mas, mn);
>  	MT_BUG_ON(mt, mas_allocated(&mas) != allocated);
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	mas_destroy(&mas);
>  	allocated = mas_allocated(&mas);
>  	MT_BUG_ON(mt, allocated != 0);
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
> @@ -35410,21 +35410,21 @@ static noinline void check_prealloc(struct maple_tree *mt)
>  	mas_store_prealloc(&mas, ptr);
>  	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
>  	MT_BUG_ON(mt, allocated != 1 + height * 3);
>  	mas_store_prealloc(&mas, ptr);
>  	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
>  	MT_BUG_ON(mt, allocated != 1 + height * 3);
>  	mas_store_prealloc(&mas, ptr);
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
> @@ -35432,14 +35432,14 @@ static noinline void check_prealloc(struct maple_tree *mt)
>  	mas_store_prealloc(&mas, ptr);
>  	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
>  	mt_set_non_kernel(1);
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL & GFP_NOWAIT) == 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated != 0);
>  	mas_destroy(&mas);
>  
>  
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL) != 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL) != 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated == 0);
> @@ -35447,7 +35447,7 @@ static noinline void check_prealloc(struct maple_tree *mt)
>  	mas_store_prealloc(&mas, ptr);
>  	MT_BUG_ON(mt, mas_allocated(&mas) != 0);
>  	mt_set_non_kernel(1);
> -	MT_BUG_ON(mt, mas_preallocate(&mas, ptr, GFP_KERNEL & GFP_NOWAIT) == 0);
> +	MT_BUG_ON(mt, mas_preallocate(&mas, GFP_KERNEL & GFP_NOWAIT) == 0);
>  	allocated = mas_allocated(&mas);
>  	height = mas_mt_height(&mas);
>  	MT_BUG_ON(mt, allocated != 0);
> -- 
> 2.34.1
>