| Message ID | 20231203193307.542794-1-yury.norov@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | bitops: add atomic find_bit() operations | expand |
On 03/12/2023 20:32, Yury Norov wrote: > Despite that it's only 2- or 3-bit maps, convert for-loop followed by > test_bit() to for_each_test_and_clear_bit() as it makes the code cleaner. > > Signed-off-by: Yury Norov <yury.norov@gmail.com> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> You can take this patch yourself as well. Regards, Hans > --- > drivers/media/radio/radio-shark.c | 5 +---- > drivers/media/radio/radio-shark2.c | 5 +---- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c > index 127a3be0e0f0..0c50b3a9623e 100644 > --- a/drivers/media/radio/radio-shark.c > +++ b/drivers/media/radio/radio-shark.c > @@ -158,10 +158,7 @@ static void shark_led_work(struct work_struct *work) > container_of(work, struct shark_device, led_work); > int i, res, brightness, actual_len; > > - for (i = 0; i < 3; i++) { > - if (!test_and_clear_bit(i, &shark->brightness_new)) > - continue; > - > + for_each_test_and_clear_bit(i, &shark->brightness_new, 3) { > brightness = atomic_read(&shark->brightness[i]); > memset(shark->transfer_buffer, 0, TB_LEN); > if (i != RED_LED) { > diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c > index f1c5c0a6a335..d9ef241e1778 100644 > --- a/drivers/media/radio/radio-shark2.c > +++ b/drivers/media/radio/radio-shark2.c > @@ -145,10 +145,7 @@ static void shark_led_work(struct work_struct *work) > container_of(work, struct shark_device, led_work); > int i, res, brightness, actual_len; > > - for (i = 0; i < 2; i++) { > - if (!test_and_clear_bit(i, &shark->brightness_new)) > - continue; > - > + for_each_test_and_clear_bit(i, &shark->brightness_new, 2) { > brightness = atomic_read(&shark->brightness[i]); > memset(shark->transfer_buffer, 0, TB_LEN); > shark->transfer_buffer[0] = 0x83 + i;
diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index 65f22c2578b0..277e1ca9fd28 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -221,6 +221,65 @@ static void __init test_zero_clear(void) expect_eq_pbl("", bmap, 1024); } +static void __init test_find_and_bit(void) +{ + unsigned long w, w_part, bit, cnt = 0; + DECLARE_BITMAP(bmap, EXP1_IN_BITS); + + /* + * Test find_and_clear{_next}_bit() and corresponding + * iterators + */ + bitmap_copy(bmap, exp1, EXP1_IN_BITS); + w = bitmap_weight(bmap, EXP1_IN_BITS); + + for_each_test_and_clear_bit(bit, bmap, EXP1_IN_BITS) + cnt++; + + expect_eq_uint(w, cnt); + expect_eq_uint(0, bitmap_weight(bmap, EXP1_IN_BITS)); + + bitmap_copy(bmap, exp1, EXP1_IN_BITS); + w = bitmap_weight(bmap, EXP1_IN_BITS); + w_part = bitmap_weight(bmap, EXP1_IN_BITS / 3); + + cnt = 0; + bit = EXP1_IN_BITS / 3; + for_each_test_and_clear_bit_from(bit, bmap, EXP1_IN_BITS) + cnt++; + + expect_eq_uint(bitmap_weight(bmap, EXP1_IN_BITS), bitmap_weight(bmap, EXP1_IN_BITS / 3)); + expect_eq_uint(w_part, bitmap_weight(bmap, EXP1_IN_BITS)); + expect_eq_uint(w - w_part, cnt); + + /* + * Test find_and_set{_next}_bit() and corresponding + * iterators + */ + bitmap_copy(bmap, exp1, EXP1_IN_BITS); + w = bitmap_weight(bmap, EXP1_IN_BITS); + cnt = 0; + + for_each_test_and_set_bit(bit, bmap, EXP1_IN_BITS) + cnt++; + + expect_eq_uint(EXP1_IN_BITS - w, cnt); + expect_eq_uint(EXP1_IN_BITS, bitmap_weight(bmap, EXP1_IN_BITS)); + + bitmap_copy(bmap, exp1, EXP1_IN_BITS); + w = bitmap_weight(bmap, EXP1_IN_BITS); + w_part = bitmap_weight(bmap, EXP1_IN_BITS / 3); + cnt = 0; + + bit = EXP1_IN_BITS / 3; + for_each_test_and_set_bit_from(bit, bmap, EXP1_IN_BITS) + cnt++; + + expect_eq_uint(EXP1_IN_BITS - bitmap_weight(bmap, EXP1_IN_BITS), + EXP1_IN_BITS / 3 - bitmap_weight(bmap, EXP1_IN_BITS / 3)); + expect_eq_uint(EXP1_IN_BITS * 2 / 3 - (w - w_part), cnt); +} + static void __init test_find_nth_bit(void) { unsigned long b, bit, cnt = 0; @@ -1273,6 +1332,8 @@ static void __init selftest(void) test_for_each_clear_bitrange_from(); test_for_each_set_clump8(); test_for_each_set_bit_wrap(); + + test_find_and_bit(); } KSTM_MODULE_LOADERS(test_bitmap);
Add basic functionality test for new API. Signed-off-by: Yury Norov <yury.norov@gmail.com> --- lib/test_bitmap.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)