treewide: Refactor heap related implementation
Subsystems (3)
v5 cover treewide: Refactor heap related implementation
This patch series focuses on several adjustments related to heap implementation. Firstly, a type-safe interface has been added to the min_heap, along with the introduction of several new functions to enhance its functionality. Additionally, the heap implementation for bcache and bcachefs has been replaced with the generic min_heap implementation from include/linux. Furthermore, several typos have been corrected.
Previous discussion with Kent Overstreet:
https://lkml.kernel.org/ioyfizrzq7w7mjrqcadtzsfgpuntowtjdw5pgn4qhvsdp4mqqg@nrlek5vmisbu
Regards,
Kuan-Wei
---
You can preview this patch series on the 'refactor-heap' branch of the repository at the following link:
https://github.com/visitorckw/linux
Changes in v5:
- Rebase on the block tree to resolve the conflict in bcache.
- Fix missing initialization for heap data pointer in bcache's bch_btree_node_read_done().
Changes in v4:
- Change struct initializations to use designated initializers.
- Replace memcpy() with func->swp() in heap_del() due to issues with set_backpointer in bcachefs when setting idx.
- Fix an error in ec_stripes_heap_swap() where ec_stripes_heap_set_backpointer() should be called after swapping.
Changes in v3:
- Avoid heap->heap.nr to eliminate the nested types.
- Add MIN_HEAP_PREALLOCATED macro for preallocating some elements.
- Use min_heap_sift_up() in min_heap_push().
- Fix a bug in heap_del() where we should copy the last element to 'data + idx * element_size' instead of 'data'.
- Add testcases for heap_del().
- Fix bugs in bcache/bcachefs patches where the parameter types in some compare functions should have been 'type **', but were mistakenly written as 'type *'.
Changes in v2:
- Add attribute __always_unused to the compare and swap functions that do not use the args parameter.
- Rename min_heapify() to min_heap_sift_down().
- Update lib/test_min_heap.c to use min_heap_init().
- Refine the commit message for bcache and bcachefs.
- Adjust the order of patches in the patch series.
Link to v4: https://lore.kernel.org/[email protected]
Link to v3: https://lore.kernel.org/[email protected]
Link to v2: https://lore.kernel.org/[email protected]
Link to v1: https://lkml.kernel.org/[email protected]
Kuan-Wei Chiu (16):
perf/core: Fix several typos
bcache: Fix typo
bcachefs: Fix typo
lib min_heap: Add type safe interface
lib min_heap: Add min_heap_init()
lib min_heap: Add min_heap_peek()
lib min_heap: Add min_heap_full()
lib min_heap: Add args for min_heap_callbacks
lib min_heap: Add min_heap_sift_up()
lib min_heap: Add min_heap_del()
lib min_heap: Update min_heap_push() and min_heap_pop() to return bool
values
lib min_heap: Rename min_heapify() to min_heap_sift_down() lib min_heap: Update min_heap_push() to use min_heap_sift_up() lib/test_min_heap: Add test for heap_del()
bcache: Remove heap-related macros and switch to generic min_heap
bcachefs: Remove heap-related macros and switch to generic min_heap
drivers/md/bcache/alloc.c | 64 ++++++++--- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/bset.c | 124 ++++++++++++++-------- drivers/md/bcache/bset.h | 40 +++---- drivers/md/bcache/btree.c | 69 +++++++----- drivers/md/bcache/extents.c | 53 ++++++---- drivers/md/bcache/movinggc.c | 41 +++++-- drivers/md/bcache/super.c | 3 +- drivers/md/bcache/sysfs.c | 4 +- drivers/md/bcache/util.c | 2 +- drivers/md/bcache/util.h | 67 +----------- drivers/md/bcache/writeback.c | 13 ++- drivers/md/dm-vdo/repair.c | 19 ++-- drivers/md/dm-vdo/slab-depot.c | 14 +-- fs/bcachefs/clock.c | 43 ++++++-- fs/bcachefs/clock_types.h | 2 +- fs/bcachefs/ec.c | 76 ++++++++----- fs/bcachefs/ec_types.h | 2 +- fs/bcachefs/util.c | 2 +- fs/bcachefs/util.h | 118 +-------------------- include/linux/min_heap.h | 188 +++++++++++++++++++++++++-------- kernel/events/core.c | 29 ++--- lib/test_min_heap.c | 75 +++++++++---- 23 files changed, 583 insertions(+), 467 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/16 perf/core: Fix several typos
Replace 'artifically' with 'artificially'. Replace 'irrespecive' with 'irrespective'. Replace 'futher' with 'further'.
Replace 'sufficent' with 'sufficient'.
--- kernel/events/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/events/core.c +4 -4
@@ -534,7 +534,7 @@ void perf_sample_event_took(u64 sample_len_ns)__this_cpu_write (running_sample_length, running_len);/* -* Note: this will be biased artifically low until we have +* Note: this will be biased artificially low until we have * seen NR_ACCUMULATED_SAMPLES. Doing it this way keeps us * from having to maintain a count. */
@@ -596,10 +596,10 @@ static inline u64 perf_event_clock(struct perf_event *event)* * Event groups make things a little more complicated, but not terribly so. The * rules for a group are that if the group leader is OFF the entire group is -* OFF, irrespecive of what the group member states are. This results in +* OFF, irrespective of what the group member states are. This results in * __perf_effective_state(). * -* A futher ramification is that when a group leader flips between OFF and +* A further ramification is that when a group leader flips between OFF and * !OFF, we need to update all group member times. * *
@@ -891,7 +891,7 @@ static int perf_cgroup_ensure_storage(struct perf_event *event,int cpu, heap_size, ret =0 ;/* -* Allow storage to have sufficent space for an iterator for each +* Allow storage to have sufficient space for an iterator for each * possibly nested cgroup plus an iterator for events with no cgroup. */ for (heap_size =1 ; css; css = css->parent)
Signature · 1 line
2.34.1
PATCH v5 2/16 bcache: Fix typo
In reply to Kuan-Wei ChiuReplace 'utiility' with 'utility'.
--- drivers/md/bcache/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/bcache/util.c +1 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* random utiility code, for bcache but in theory not specific to bcache +* random utility code, for bcache but in theory not specific to bcache * * Copyright 2010, 2011 Kent Overstreet <[email protected]> * Copyright 2012 Google, Inc.
Signature · 1 line
2.34.1