The patch titled Subject: mm: workingset: make shadow_lru_isolate() use locking suffix has been added to the -mm tree. Its filename is mm-workingset-make-shadow_lru_isolate-use-locking-suffix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-workingset-make-shadow_lru_isolate-use-locking-suffix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-workingset-make-shadow_lru_isolate-use-locking-suffix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> Subject: mm: workingset: make shadow_lru_isolate() use locking suffix shadow_lru_isolate() disables interrupts and acquires a lock. It could use spin_lock_irq() instead. It also uses local_irq_enable() while it could use spin_unlock_irq()/xa_unlock_irq(). Use proper suffix for lock/unlock in order to enable/disable interrupts during release/acquire of a lock. Link: http://lkml.kernel.org/r/20180622151221.28167-3-bigeasy@xxxxxxxxxxxxx Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/workingset.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff -puN mm/workingset.c~mm-workingset-make-shadow_lru_isolate-use-locking-suffix mm/workingset.c --- a/mm/workingset.c~mm-workingset-make-shadow_lru_isolate-use-locking-suffix +++ a/mm/workingset.c @@ -431,7 +431,7 @@ static enum lru_status shadow_lru_isolat /* Coming from the list, invert the lock order */ if (!xa_trylock(&mapping->i_pages)) { - spin_unlock(lru_lock); + spin_unlock_irq(lru_lock); ret = LRU_RETRY; goto out; } @@ -469,13 +469,11 @@ static enum lru_status shadow_lru_isolat workingset_lookup_update(mapping)); out_invalid: - xa_unlock(&mapping->i_pages); + xa_unlock_irq(&mapping->i_pages); ret = LRU_REMOVED_RETRY; out: - local_irq_enable(); cond_resched(); - local_irq_disable(); - spin_lock(lru_lock); + spin_lock_irq(lru_lock); return ret; } _ Patches currently in -mm which might be from bigeasy@xxxxxxxxxxxxx are lib-percpu_idac-dont-do-alloc-from-per-cpu-list-if-there-is-none.patch revert-mm-vmstatc-fix-vmstat_update-preemption-bug.patch ntfs-dont-disable-interrupts-during-kmap_atomic.patch mm-workingset-remove-local_irq_disable-from-count_shadow_nodes.patch mm-workingset-make-shadow_lru_isolate-use-locking-suffix.patch mm-list_lru-add-lock_irq-member-to-__list_lru_init.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html