Subject: [folded-merged] mm-per-thread-vma-caching-fix-6.patch removed from -mm tree To: hughd@xxxxxxxxxx,davidlohr@xxxxxx,oleg@xxxxxxxxxx,riel@xxxxxxxxxx,torvalds@xxxxxxxxxxxxxxxxxxxx,walken@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 07 Apr 2014 15:04:44 -0700 The patch titled Subject: mm-per-thread-vma-caching-fix-6 has been removed from the -mm tree. Its filename was mm-per-thread-vma-caching-fix-6.patch This patch was dropped because it was folded into mm-per-thread-vma-caching.patch ------------------------------------------------------ From: Hugh Dickins <hughd@xxxxxxxxxx> Subject: mm-per-thread-vma-caching-fix-6 I was getting the "kernel BUG at mm/vmacache.c:76!" running KSM on mmotm: Oleg's patch (buildable version below) fixes it for me. Tested-by: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Davidlohr Bueso <davidlohr@xxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Michel Lespinasse <walken@xxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmacache.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff -puN mm/vmacache.c~mm-per-thread-vma-caching-fix-6 mm/vmacache.c --- a/mm/vmacache.c~mm-per-thread-vma-caching-fix-6 +++ a/mm/vmacache.c @@ -31,15 +31,20 @@ void vmacache_flush_all(struct mm_struct rcu_read_unlock(); } +static bool vmacache_valid_mm(struct mm_struct *mm) +{ + return current->mm == mm && !(current->flags & PF_KTHREAD); +} + void vmacache_update(unsigned long addr, struct vm_area_struct *newvma) { - int idx = VMACACHE_HASH(addr); - current->vmacache[idx] = newvma; + if (vmacache_valid_mm(newvma->vm_mm)) + current->vmacache[VMACACHE_HASH(addr)] = newvma; } static bool vmacache_valid(struct mm_struct *mm) { - struct task_struct *curr = current; + struct task_struct *curr; /* * This task may be accessing a foreign mm via (for example) @@ -47,9 +52,10 @@ static bool vmacache_valid(struct mm_str * task's vmacache pertains to a different mm (ie, its own). There is * nothing we can do here. */ - if (mm != curr->mm) - return false; + if (!vmacache_valid_mm(mm)) + return false; + curr = current; if (mm->vmacache_seqnum != curr->vmacache_seqnum) { /* * First attempt will always be invalid, initialize _ Patches currently in -mm which might be from hughd@xxxxxxxxxx are origin.patch mm-implement-map_pages-for-page-cache.patch mm-implement-map_pages-for-shmem-tmpfs.patch mm-per-thread-vma-caching.patch mm-per-thread-vma-caching-fix-6-checkpatch-fixes.patch mm-per-thread-vma-caching-fix-6-fix.patch mm-try_to_unmap_cluster-should-lock_page-before-mlocking.patch mm-only-force-scan-in-reclaim-when-none-of-the-lrus-are-big-enough.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