Skip to content

mm/munlock: Fix sleeping function called from invalid context bug

Waiman Long requested to merge llong1/centos-stream-9:bz2109671_munlock into main

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2109671
MR: !1168 (merged)

The 2nd patch fixes the sleeping function called from invalid context bug reported in the BZ. The first patch is added to minimize context diff with the upstream patch.

Signed-off-by: Waiman Long longman@redhat.com

Waiman Long (2):
  mm/migration: add trace events for base page and HugeTLB migrations
  mm/munlock: protect the per-CPU pagevec by a local_lock_t

 arch/x86/mm/init.c             |  1 -
 include/trace/events/migrate.h | 31 +++++++++++++++++++++++
 mm/internal.h                  |  6 +++--
 mm/migrate.c                   |  6 +++--
 mm/mlock.c                     | 46 ++++++++++++++++++++++++++--------
 mm/page_alloc.c                |  1 +
 mm/rmap.c                      | 10 ++++++--
 mm/swap.c                      |  4 ++-
 8 files changed, 87 insertions(+), 18 deletions(-)
Edited by Waiman Long

Merge request reports