From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Jan 2022 04:20:44 +0000 (+0200)
Subject: Merge tag 'bitmap-5.17-rc1' of git://github.com/norov/linux
X-Git-Tag: baikal/mips/sdk6.1~6564
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=ed2d62f703d754b164b97fd5f3282d2a133da94e;p=kernel.git

Merge tag 'bitmap-5.17-rc1' of git://github.com/norov/linux

Pull bitmap updates from Yury Norov:

 - introduce for_each_set_bitrange()

 - use find_first_*_bit() instead of find_next_*_bit() where possible

 - unify for_each_bit() macros

* tag 'bitmap-5.17-rc1' of git://github.com/norov/linux:
  vsprintf: rework bitmap_list_string
  lib: bitmap: add performance test for bitmap_print_to_pagebuf
  bitmap: unify find_bit operations
  mm/percpu: micro-optimize pcpu_is_populated()
  Replace for_each_*_bit_from() with for_each_*_bit() where appropriate
  find: micro-optimize for_each_{set,clear}_bit()
  include/linux: move for_each_bit() macros from bitops.h to find.h
  cpumask: replace cpumask_next_* with cpumask_first_* where appropriate
  tools: sync tools/bitmap with mother linux
  all: replace find_next{,_zero}_bit with find_first{,_zero}_bit where appropriate
  cpumask: use find_first_and_bit()
  lib: add find_first_and_bit()
  arch: remove GENERIC_FIND_FIRST_BIT entirely
  include: move find.h from asm_generic to linux
  bitops: move find_bit_*_le functions from le.h to find.h
  bitops: protect find_first_{,zero}_bit properly
---

ed2d62f703d754b164b97fd5f3282d2a133da94e
diff --cc arch/s390/kvm/kvm-s390.c
index 9c6d45d0d3451,9aba96d621b9f..577f1ead6a518
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@@ -1988,9 -2018,10 +1988,9 @@@ static unsigned long kvm_s390_next_dirt
  		ofs = 0;
  	}
  	ofs = find_next_bit(kvm_second_dirty_bitmap(ms), ms->npages, ofs);
 -	while ((slotidx > 0) && (ofs >= ms->npages)) {
 -		slotidx--;
 -		ms = slots->memslots + slotidx;
 +	while (ofs >= ms->npages && (mnode = rb_next(mnode))) {
 +		ms = container_of(mnode, struct kvm_memory_slot, gfn_node[slots->node_idx]);
- 		ofs = find_next_bit(kvm_second_dirty_bitmap(ms), ms->npages, 0);
+ 		ofs = find_first_bit(kvm_second_dirty_bitmap(ms), ms->npages);
  	}
  	return ms->base_gfn + ofs;
  }