Received-SPF: pass (google.com: domain of linux-kernel+bounces-213419-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Thu, 13 Jun 2024 10:27:00 -0400
From: "Liam R. Howlett" <Liam.Howlett@oracle.com>
To: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org,
        linux-mm@kvack.org, akpm@linux-foundation.org, willy@infradead.org
Subject: Re: [PATCH v2 04/16] maple_tree: introduce mas_wr_store_type()
Message-ID: <sf7x5jprzaphl67s5qvw5wgpx3t5hpfmhx6wpvysswm66qwkjn@nit3os7x45xc>
Mail-Followup-To: "Liam R. Howlett" <Liam.Howlett@oracle.com>, 
	Sidhartha Kumar <sidhartha.kumar@oracle.com>, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, 
	linux-mm@kvack.org, akpm@linux-foundation.org, willy@infradead.org
References: <20240607185257.963768-1-sidhartha.kumar@oracle.com>
 <20240607185257.963768-5-sidhartha.kumar@oracle.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240607185257.963768-5-sidhartha.kumar@oracle.com>
User-Agent: NeoMutt/20231103
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?zgMyCk7Peaa8o2UwjvhtLFwQTz2S3dwIcjrAh8Pi4hrMx4oRXsqb+GZMxFtO?=
 =?us-ascii?Q?2fSpRJkxLFqHGFDI6p+hVeCDQP3MuI9se+qItuSnIcK8+/QbysTy3wuBerb9?=
 =?us-ascii?Q?NvofHVeNQirMjFkHwT0qLF/zt7lwlB03QCxgCIcFJWnG7X3Z3hvOvXNvlvcJ?=
 =?us-ascii?Q?Bz58WxTjqIV8Ep3Uxn75nHcCqajM3bZ4uz62pK8sY9H5NuylFwMSboyEYoif?=
 =?us-ascii?Q?eDGn4g6ETuRS7/XvpMPWZhLXceqRsmCqj59UxynfPkQPqj2QfXzLR0BfnNoE?=
 =?us-ascii?Q?e+NvD2oBIdzFuISU9NXyIXB9/U251lRYA2sVnqcvIL2XGsIkv1myL8lIN70n?=
 =?us-ascii?Q?vXV7eGzevQuQmG7AqcSgUj3+txGVq79xlKDj9zSrdz2rusGIGLYxHc+OHiTk?=
 =?us-ascii?Q?okdjiqZCeRXWECpQIwr+/kn/gCHCgFpN53Ql7iVx8fi6KVP+OXPusmlPkb0U?=
 =?us-ascii?Q?LJ2IOleykZzazQZHocBASyKZceEw5iXNiN4/GR220wwoqAcBriwhaax7c+7s?=
 =?us-ascii?Q?Ff5hX13qd5qTFjXqB1dHCl/wRu+uV2zpMbIhY7VJDuAVHRCJ2J4dSdRGDFsk?=
 =?us-ascii?Q?I/373gWHMZieVXKQlxjdSkzzQ9l1TwD2KJsEo4uCqjRJulOAM5TwqlCgNXpC?=
 =?us-ascii?Q?tHkhghJUNSSe0nckQM+WA0uKeuxH7Ne4tT9+FSLs2FQhyr4cPg/pTYVKqqQ2?=
 =?us-ascii?Q?ltRnzmf2/U+TCydwvloPHTuyOpNIki0PtRK7Tx79eztpsLQYpUNsRrl77LOc?=
 =?us-ascii?Q?vDpWqz7yoZqlX4yEICqZ7ISvbEi+Rnqoz4HJQgE8J9hhAwF66X3LfgPKN7zD?=
 =?us-ascii?Q?gfwbDrYg2M1HO2GxqSHMjf4AewOoubuDYnphg0826yyV4lgot9fbYjz4D198?=
 =?us-ascii?Q?mNi3oWTu3/g7DhWoJayoKXY/GMxL7yftxx9H5ibDBmhgPV3BhHISkkwvvGSA?=
 =?us-ascii?Q?impu35MysHNzba+8I8EUk+paybLVWTMy+163EOYIb+12yvpd0YKmlzViwRQF?=
 =?us-ascii?Q?oKYqfnLF7naN6CG3QSYRtSnbumeS1zWfRg07WA5rrf+ZSXFZDH1aRzxcvNYg?=
 =?us-ascii?Q?CjGg2RB0CE0oczYY8PDB47wKjycZ3CklykzC18j93gWI1FFJ3zGBi31+b9K3?=
 =?us-ascii?Q?LT3GHLmbxYD2BmOXWeQ39iJb7HJ5ngmRf0kCgkDfPHieILq1O4ODc1Wj3XFL?=
 =?us-ascii?Q?OkuAn59pJIpjTP2ULiX6ItbkJI6AAwULpFl/gN7nBr+X3AJD0Tlik/D3v5GH?=
 =?us-ascii?Q?mYzyMFP2SOY9CC+dScpl3BgquXsEy9Ch8u8Ka711WvvKSExve6f2PjZonrB6?=
 =?us-ascii?Q?YTKjgSGa+2B2Iiez6tEhpdvyh1RO7BEjuPMWSkJ3AwvUN6pRMcU9yDAq6lZx?=
 =?us-ascii?Q?Plt4hCTr8tX5iOlGDEgu2AnymRvbcuKUTFjSE4I4r8HRwTTJdmpRRoX54yk0?=
 =?us-ascii?Q?mHXa2Y7Ht4TMsghUrHCDWObmdrPyxbJFSUDJk9Q5RfkoCsGoil/SbJPpWg4K?=
 =?us-ascii?Q?kCSHC5L2A4Tl56aQ0BtqSWbiLeDLLXBFSfwp35EBfUckuhWF7f0CA+zu7naO?=
 =?us-ascii?Q?o99ITVIlz1nmG58S3Wl42oFAIinYLByBf3awo3EhUQf6qZnOJxPphhBOJJwy?=
 =?us-ascii?Q?wQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	95/1y3pAFStu00oDtLBqZCocomT0kYv5GVXONFaOOv8ldvQ1CS/9v5kKAFmLnrnzeA6qMetMTBE9lXjS/fXvzfEjRoISq0fgG5gljnMtVJgZ4iMMwIjXeL+5UnFT1yCQngnnezzToYZvbQSujryaCgpEfMfCKn2pe4/Ka2cT6s2s90QEpLKcmizlkyvtGRNRXrrAJL5mU0iNQ/+RKUqL7A/jMPdl6nNJLa6e3pRftkoQ0kTRdrT8iSXwfMI7tp5o2Bu39ZSvJfLxGtSqSRIwtXAMBfI5QpNqrJMckNQvEiFxqhwoq4uyqTY58347XiwIGrsqw7gVw9//GAEMBMx7NT54Z57tfXDmv+LEgHXZTtmOoGFgLC9ARPF7tcSx1yu5/BpuW1i3KQ6PvoOmZLzNwI3zI04RC9FQQw2lwjzsmgaJbu1qsMy8n2UV/tfDyiFbhmzO7TebvkALzFEcDiM2z6Kuc44X4J3/hXp0RtHzQQLUrE9tL1mViEi9I5QkwziLaH5IyTUeRoduLOsJfVGOENkBjlJntjICmBXpHEnEvuA1bdkEeuFGiWB/3nEQOKR9yfNr625sEqgOW6ASCvWJ+ETcuzAECEBCmEoHfA8v84g=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a371db60-9574-467f-8744-08dc8bb4e4d6
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2024 14:27:03.1397
 (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: Vz4Hz+iafFOeH0+OJqRImt0rIAzaQKddPj1o3BVMJbCPFLcQ8njRKWmRq1fAZ8X4X5aqmDGvTT0L39UZ42gnNQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB6434
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-13_07,2024-06-13_02,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0
 mlxlogscore=999 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0
 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2405010000 definitions=main-2406130105
X-Proofpoint-ORIG-GUID: nTVvLZ070bL9-PJdxLXfqC-EvqeBdlAd
X-Proofpoint-GUID: nTVvLZ070bL9-PJdxLXfqC-EvqeBdlAd

* Sidhartha Kumar <sidhartha.kumar@oracle.com> [240607 14:53]:
> Introduce mas_wr_store_type() which will set the correct store type
> based on a walk of the tree.
> 
> mas_prealloc_calc() is also introduced to abstract the calculation used
> to determine the number of nodes needed for a store operation.
> 
> In this change a call to mas_reset() is removed in the error case of
> mas_prealloc(). This is only needed in the MA_STATE_REBALANCE case of
> mas_destroy(). We can move the call to mas_reset() directly to
> mas_destroy().
> 
> Also, add a test case to validate the order that we check the store type
> in is correct. This test models a vma expanding and then shrinking which
> is part of the boot process.
> 
> Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
> ---
>  lib/maple_tree.c                 | 214 ++++++++++++++++++++++---------
>  tools/testing/radix-tree/maple.c |  38 ++++++
>  2 files changed, 192 insertions(+), 60 deletions(-)
> 
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index 2558d15bb748..a7f585ed488c 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -4278,6 +4278,151 @@ static inline void mas_wr_prealloc_setup(struct ma_wr_state *wr_mas)
>  	wr_mas->content = mas_start(mas);
>  }
>  
> +/**
> + * mas_prealloc_calc() - Calculate number of nodes needed for a
> + * given store oepration
> + * @mas: The maple state
> + * @entry: The entry to store into the tree
> + *
> + * Return: Number of nodes required for preallocation.
> + */
> +static inline int mas_prealloc_calc(struct ma_state *mas, void *entry)
> +{
> +	int ret = mas_mt_height(mas) * 3 + 1;
> +
> +	switch (mas->store_type) {
> +	case wr_invalid:
> +		WARN_ON_ONCE(1);
> +		break;
> +	case wr_new_root:
> +		ret = 1;
> +		break;
> +	case wr_store_root:
> +		if (likely((mas->last != 0) || (mas->index != 0)))
> +			ret = 1;
> +		else if (((unsigned long) (entry) & 3) == 2)
> +			ret = 1;
> +		else
> +			ret = 0;
> +		break;
> +	case wr_spanning_store:
> +		ret =  mas_mt_height(mas) * 3 + 1;
> +		break;
> +	case wr_split_store:
> +		ret =  mas_mt_height(mas) * 2 + 1;
> +		break;
> +	case wr_rebalance:
> +		ret =  mas_mt_height(mas) * 2 - 1;
> +		break;
> +	case wr_node_store:
> +	case wr_bnode:
> +		ret = mt_in_rcu(mas->tree) ? 1 : 0;
> +		break;
> +	case wr_append:
> +	case wr_exact_fit:
> +	case wr_slot_store:
> +		ret = 0;
> +	}
> +
> +	return ret;
> +}
> +
> +/*
> + * mas_wr_store_type() - Set the store type for a given
> + * store operation.
> + * @wr_mas: The maple write state
> + */
> +static inline void mas_wr_store_type(struct ma_wr_state *wr_mas)
> +{
> +	struct ma_state *mas = wr_mas->mas;
> +	unsigned char new_end;
> +
> +	if (unlikely(mas_is_none(mas) || mas_is_ptr(mas))) {
> +		mas->store_type = wr_store_root;
> +		return;
> +	}
> +
> +	if (unlikely(!mas_wr_walk(wr_mas))) {
> +		mas->store_type = wr_spanning_store;
> +		return;
> +	}
> +
> +	/* At this point, we are at the leaf node that needs to be altered. */
> +	mas_wr_end_piv(wr_mas);
> +	if (!wr_mas->entry)
> +		mas_wr_extend_null(wr_mas);
> +
> +	new_end = mas_wr_new_end(wr_mas);
> +	if ((wr_mas->r_min == mas->index) && (wr_mas->r_max == mas->last)) {
> +		mas->store_type = wr_exact_fit;
> +		return;
> +	}
> +
> +	if (unlikely(!mas->index && mas->last == ULONG_MAX)) {
> +		mas->store_type = wr_new_root;
> +		return;
> +	}
> +
> +	/* Potential spanning rebalance collapsing a node */
> +	if (new_end < mt_min_slots[wr_mas->type]) {
> +		if (!mte_is_root(mas->node)) {
> +			mas->store_type = wr_rebalance;
> +			return;
> +		}
> +		mas->store_type = wr_node_store;
> +		return;
> +	}
> +
> +	if (new_end >= mt_slots[wr_mas->type]) {
> +		mas->store_type = wr_split_store;
> +		return;
> +	}
> +
> +	if (!mt_in_rcu(mas->tree) && (mas->offset == mas->end)) {
> +		mas->store_type = wr_append;
> +		return;
> +	}
> +
> +	if ((new_end == mas->end) && (!mt_in_rcu(mas->tree) ||
> +		(wr_mas->offset_end - mas->offset == 1))) {
> +		mas->store_type = wr_slot_store;
> +		return;
> +	}
> +
> +	if (mte_is_root(mas->node) || !(new_end <= mt_min_slots[wr_mas->type]) ||
> +		(mas->mas_flags & MA_STATE_BULK)) {
> +		mas->store_type = wr_node_store;
> +		return;
> +	}
> +
> +	mas->store_type = wr_bnode;
> +}
> +
> +/**
> + * mas_wr_preallocate() - Preallocate enough nodes for a store operation
> + * @wr_mas: The maple write state
> + * @entry: The entry that will be stored
> + * @gfp: The GFP_FLAGS to use for allocations.
> + *
> + */
> +static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *entry, gfp_t gfp)
> +{
> +	struct ma_state *mas = wr_mas->mas;
> +	int request;
> +
> +	mas_wr_prealloc_setup(wr_mas);
> +	mas_wr_store_type(wr_mas);
> +	request = mas_prealloc_calc(mas, entry);
> +	if (!request)
> +		return;
> +
> +	mas_node_count_gfp(mas, request, gfp);
> +	if (likely(!mas_is_err(mas)))
> +		return;
> +
> +	mas_set_alloc_req(mas, 0);
> +}
> +
>  /**
>   * mas_insert() - Internal call to insert a value
>   * @mas: The maple state
> @@ -5506,69 +5651,17 @@ EXPORT_SYMBOL_GPL(mas_store_prealloc);
>  int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
>  {
>  	MA_WR_STATE(wr_mas, mas, entry);
> -	unsigned char node_size;
> -	int request = 1;
> -	int ret;
> -
> -
> -	if (unlikely(!mas->index && mas->last == ULONG_MAX))
> -		goto ask_now;
> -
> -	mas_wr_prealloc_setup(&wr_mas);
> -	/* Root expand */
> -	if (unlikely(mas_is_none(mas) || mas_is_ptr(mas)))
> -		goto ask_now;
> -
> -	if (unlikely(!mas_wr_walk(&wr_mas))) {
> -		/* Spanning store, use worst case for now */
> -		request = 1 + mas_mt_height(mas) * 3;
> -		goto ask_now;
> -	}
> -
> -	/* At this point, we are at the leaf node that needs to be altered. */
> -	/* Exact fit, no nodes needed. */
> -	if (wr_mas.r_min == mas->index && wr_mas.r_max == mas->last)
> -		return 0;
> -
> -	mas_wr_end_piv(&wr_mas);
> -	node_size = mas_wr_new_end(&wr_mas);
> -
> -	/* Slot store, does not require additional nodes */
> -	if (node_size == mas->end) {
> -		/* reuse node */
> -		if (!mt_in_rcu(mas->tree))
> -			return 0;
> -		/* shifting boundary */
> -		if (wr_mas.offset_end - mas->offset == 1)
> -			return 0;
> -	}
> +	int ret = 0;
>  
> -	if (node_size >= mt_slots[wr_mas.type]) {
> -		/* Split, worst case for now. */
> -		request = 1 + mas_mt_height(mas) * 2;
> -		goto ask_now;
> +	mas_wr_preallocate(&wr_mas, entry, gfp);
> +	if (mas_is_err(mas)) {
> +		ret = xa_err(mas->node);
> +		mas_destroy(mas);
> +		mas_reset(mas);
> +		return ret;
>  	}
>  
> -	/* New root needs a single node */
> -	if (unlikely(mte_is_root(mas->node)))
> -		goto ask_now;
> -
> -	/* Potential spanning rebalance collapsing a node, use worst-case */
> -	if (node_size  - 1 <= mt_min_slots[wr_mas.type])
> -		request = mas_mt_height(mas) * 2 - 1;
> -
> -	/* node store, slot store needs one node */
> -ask_now:
> -	mas_node_count_gfp(mas, request, gfp);
>  	mas->mas_flags |= MA_STATE_PREALLOC;
> -	if (likely(!mas_is_err(mas)))
> -		return 0;
> -
> -	mas_set_alloc_req(mas, 0);
> -	ret = xa_err(mas->node);
> -	mas_reset(mas);
> -	mas_destroy(mas);
> -	mas_reset(mas);
>  	return ret;
>  }
>  EXPORT_SYMBOL_GPL(mas_preallocate);
> @@ -5594,7 +5687,8 @@ void mas_destroy(struct ma_state *mas)
>  	 */
>  	if (mas->mas_flags & MA_STATE_REBALANCE) {
>  		unsigned char end;
> -

nit: This new line should remain.

> +		if (mas_is_err(mas))
> +			mas_reset(mas);
>  		mas_start(mas);
>  		mtree_range_walk(mas);
>  		end = mas->end + 1;
> diff --git a/tools/testing/radix-tree/maple.c b/tools/testing/radix-tree/maple.c
> index f1caf4bcf937..1c68ccc1b475 100644
> --- a/tools/testing/radix-tree/maple.c
> +++ b/tools/testing/radix-tree/maple.c
> @@ -36223,6 +36223,40 @@ static noinline void __init check_mtree_dup(struct maple_tree *mt)
>  
>  extern void test_kmem_cache_bulk(void);
>  
> +

nit: This new line should not be added.

> + /* test to simulate expanding a vma from [0x7fffffffe000, 0x7ffffffff000)
> +  * to [0x7ffde4ca1000, 0x7ffffffff000) and then shrinking the vma to
> +  * [0x7ffde4ca1000, 0x7ffde4ca2000)
> +  */
> +static inline int check_vma_modification(struct maple_tree *mt)
> +{
> +	MA_STATE(mas, mt, 0, 0);
> +
> +	mtree_lock(mt);
> +	/* vma with old start and old end */
> +	__mas_set_range(&mas, 0x7fffffffe000, 0x7ffffffff000 - 1);
> +	mas_preallocate(&mas, xa_mk_value(1), GFP_KERNEL);
> +	mas_store_prealloc(&mas, xa_mk_value(1));
> +
> +	/* next write occurs partly in previous range [0, 0x7fffffffe000)*/
> +	mas_prev_range(&mas, 0);
> +	/* expand vma to {0x7ffde4ca1000, 0x7ffffffff000) */
> +	__mas_set_range(&mas, 0x7ffde4ca1000, 0x7ffffffff000 - 1);
> +	mas_preallocate(&mas, xa_mk_value(1), GFP_KERNEL);
> +	mas_store_prealloc(&mas, xa_mk_value(1));
> +
> +	/* shrink vma to [0x7ffde4ca1000, 7ffde4ca2000) */
> +	__mas_set_range(&mas, 0x7ffde4ca2000, 0x7ffffffff000 - 1);
> +	mas_preallocate(&mas, NULL, GFP_KERNEL);
> +	mas_store_prealloc(&mas, NULL);
> +	mt_dump(mt, mt_dump_hex);
> +
> +	mas_destroy(&mas);
> +	mtree_unlock(mt);
> +	return 0;
> +}
> +
> +

nit: This new line should not be added.

>  void farmer_tests(void)
>  {
>  	struct maple_node *node;
> @@ -36230,6 +36264,10 @@ void farmer_tests(void)
>  
>  	mt_dump(&tree, mt_dump_dec);
>  
> +	mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE | MT_FLAGS_LOCK_EXTERN | MT_FLAGS_USE_RCU);
> +	check_vma_modification(&tree);
> +	mtree_destroy(&tree);
> +
>  	tree.ma_root = xa_mk_value(0);
>  	mt_dump(&tree, mt_dump_dec);
>  
> -- 
> 2.45.2
>