| Message ID | 20240604174145.563900-13-sidhartha.kumar@oracle.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce a store type enum for the Maple tree | expand |
Hi Sidhartha,
kernel test robot noticed the following build warnings:
[auto build test WARNING on akpm-mm/mm-nonmm-unstable]
[also build test WARNING on linus/master v6.10-rc2 next-20240604]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Sidhartha-Kumar/maple_tree-introduce-store_type-enum/20240605-014633
base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-nonmm-unstable
patch link: https://lore.kernel.org/r/20240604174145.563900-13-sidhartha.kumar%40oracle.com
patch subject: [PATCH 12/18] maple_tree: convert mas_insert() to preallocate nodes
config: openrisc-allnoconfig (https://download.01.org/0day-ci/archive/20240605/202406050614.NwHTjXFD-lkp@intel.com/config)
compiler: or1k-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240605/202406050614.NwHTjXFD-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202406050614.NwHTjXFD-lkp@intel.com/
All warnings (new ones prefixed by >>):
lib/maple_tree.c:4304: warning: Function parameter or struct member 'entry' not described in 'mas_prealloc_calc'
>> lib/maple_tree.c:4449: warning: Function parameter or struct member 'gfp' not described in 'mas_insert'
vim +4449 lib/maple_tree.c
e0c5446b52f6a9 Sidhartha Kumar 2024-06-04 4439
54a611b605901c Liam R. Howlett 2022-09-06 4440 /**
54a611b605901c Liam R. Howlett 2022-09-06 4441 * mas_insert() - Internal call to insert a value
54a611b605901c Liam R. Howlett 2022-09-06 4442 * @mas: The maple state
54a611b605901c Liam R. Howlett 2022-09-06 4443 * @entry: The entry to store
54a611b605901c Liam R. Howlett 2022-09-06 4444 *
54a611b605901c Liam R. Howlett 2022-09-06 4445 * Return: %NULL or the contents that already exists at the requested index
54a611b605901c Liam R. Howlett 2022-09-06 4446 * otherwise. The maple state needs to be checked for error conditions.
54a611b605901c Liam R. Howlett 2022-09-06 4447 */
9d36d13535c7c8 Sidhartha Kumar 2024-06-04 4448 static inline void *mas_insert(struct ma_state *mas, void *entry, gfp_t gfp)
54a611b605901c Liam R. Howlett 2022-09-06 @4449 {
54a611b605901c Liam R. Howlett 2022-09-06 4450 MA_WR_STATE(wr_mas, mas, entry);
54a611b605901c Liam R. Howlett 2022-09-06 4451
54a611b605901c Liam R. Howlett 2022-09-06 4452 /*
54a611b605901c Liam R. Howlett 2022-09-06 4453 * Inserting a new range inserts either 0, 1, or 2 pivots within the
54a611b605901c Liam R. Howlett 2022-09-06 4454 * tree. If the insert fits exactly into an existing gap with a value
54a611b605901c Liam R. Howlett 2022-09-06 4455 * of NULL, then the slot only needs to be written with the new value.
54a611b605901c Liam R. Howlett 2022-09-06 4456 * If the range being inserted is adjacent to another range, then only a
54a611b605901c Liam R. Howlett 2022-09-06 4457 * single pivot needs to be inserted (as well as writing the entry). If
54a611b605901c Liam R. Howlett 2022-09-06 4458 * the new range is within a gap but does not touch any other ranges,
54a611b605901c Liam R. Howlett 2022-09-06 4459 * then two pivots need to be inserted: the start - 1, and the end. As
54a611b605901c Liam R. Howlett 2022-09-06 4460 * usual, the entry must be written. Most operations require a new node
54a611b605901c Liam R. Howlett 2022-09-06 4461 * to be allocated and replace an existing node to ensure RCU safety,
54a611b605901c Liam R. Howlett 2022-09-06 4462 * when in RCU mode. The exception to requiring a newly allocated node
54a611b605901c Liam R. Howlett 2022-09-06 4463 * is when inserting at the end of a node (appending). When done
54a611b605901c Liam R. Howlett 2022-09-06 4464 * carefully, appending can reuse the node in place.
54a611b605901c Liam R. Howlett 2022-09-06 4465 */
54a611b605901c Liam R. Howlett 2022-09-06 4466 wr_mas.content = mas_start(mas);
54a611b605901c Liam R. Howlett 2022-09-06 4467 if (wr_mas.content)
54a611b605901c Liam R. Howlett 2022-09-06 4468 goto exists;
54a611b605901c Liam R. Howlett 2022-09-06 4469
9d36d13535c7c8 Sidhartha Kumar 2024-06-04 4470 mas_wr_preallocate(&wr_mas, entry, gfp);
9d36d13535c7c8 Sidhartha Kumar 2024-06-04 4471 if (mas_is_err(mas))
54a611b605901c Liam R. Howlett 2022-09-06 4472 return NULL;
54a611b605901c Liam R. Howlett 2022-09-06 4473
54a611b605901c Liam R. Howlett 2022-09-06 4474 /* spanning writes always overwrite something */
9d36d13535c7c8 Sidhartha Kumar 2024-06-04 4475 if (mas->store_type == wr_spanning_store)
54a611b605901c Liam R. Howlett 2022-09-06 4476 goto exists;
54a611b605901c Liam R. Howlett 2022-09-06 4477
54a611b605901c Liam R. Howlett 2022-09-06 4478 /* At this point, we are at the leaf node that needs to be altered. */
9d36d13535c7c8 Sidhartha Kumar 2024-06-04 4479 if (mas->store_type != wr_new_root && mas->store_type != wr_store_root) {
54a611b605901c Liam R. Howlett 2022-09-06 4480 wr_mas.offset_end = mas->offset;
54a611b605901c Liam R. Howlett 2022-09-06 4481 wr_mas.end_piv = wr_mas.r_max;
54a611b605901c Liam R. Howlett 2022-09-06 4482
54a611b605901c Liam R. Howlett 2022-09-06 4483 if (wr_mas.content || (mas->last > wr_mas.r_max))
54a611b605901c Liam R. Howlett 2022-09-06 4484 goto exists;
9d36d13535c7c8 Sidhartha Kumar 2024-06-04 4485 }
54a611b605901c Liam R. Howlett 2022-09-06 4486
9d36d13535c7c8 Sidhartha Kumar 2024-06-04 4487 mas_wr_store_entry(&wr_mas);
54a611b605901c Liam R. Howlett 2022-09-06 4488 return wr_mas.content;
54a611b605901c Liam R. Howlett 2022-09-06 4489
54a611b605901c Liam R. Howlett 2022-09-06 4490 exists:
54a611b605901c Liam R. Howlett 2022-09-06 4491 mas_set_err(mas, -EEXIST);
54a611b605901c Liam R. Howlett 2022-09-06 4492 return wr_mas.content;
54a611b605901c Liam R. Howlett 2022-09-06 4493
diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 20e9d13c2980..314691fd1c67 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -4445,7 +4445,7 @@ static inline void mas_wr_preallocate(struct ma_wr_state *wr_mas, void *entry, g * Return: %NULL or the contents that already exists at the requested index * otherwise. The maple state needs to be checked for error conditions. */ -static inline void *mas_insert(struct ma_state *mas, void *entry) +static inline void *mas_insert(struct ma_state *mas, void *entry, gfp_t gfp) { MA_WR_STATE(wr_mas, mas, entry); @@ -4467,26 +4467,24 @@ static inline void *mas_insert(struct ma_state *mas, void *entry) 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, gfp); + 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: @@ -4531,7 +4529,7 @@ int mas_alloc_cyclic(struct ma_state *mas, unsigned long *startp, return ret; do { - mas_insert(mas, entry); + mas_insert(mas, entry, gfp); } while (mas_nomem(mas, gfp)); if (mas_is_err(mas)) return xa_err(mas->node); @@ -6532,7 +6530,7 @@ int mtree_insert_range(struct maple_tree *mt, unsigned long first, mtree_lock(mt); retry: - mas_insert(&ms, entry); + mas_insert(&ms, entry, gfp); if (mas_nomem(&ms, gfp)) goto retry; @@ -6581,7 +6579,7 @@ int mtree_alloc_range(struct maple_tree *mt, unsigned long *startp, if (ret) goto unlock; - mas_insert(&mas, entry); + mas_insert(&mas, entry, gfp); /* * mas_nomem() may release the lock, causing the allocated area * to be unavailable, so try to allocate a free area again. @@ -6663,7 +6661,7 @@ int mtree_alloc_rrange(struct maple_tree *mt, unsigned long *startp, if (ret) goto unlock; - mas_insert(&mas, entry); + mas_insert(&mas, entry, gfp); /* * mas_nomem() may release the lock, causing the allocated area * to be unavailable, so try to allocate a free area again.
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(). Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com> --- lib/maple_tree.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)