lkml.org 
[lkml]   [2016]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem collapse error path
On Mon, Nov 14, 2016 at 11:48:22AM -0500, Johannes Weiner wrote:
> On Mon, Nov 14, 2016 at 10:52:50AM -0500, Johannes Weiner wrote:
> > On Mon, Nov 14, 2016 at 05:29:02PM +0300, Kirill A. Shutemov wrote:
> > > @@ -1400,7 +1400,9 @@ static void collapse_shmem(struct mm_struct *mm,
> > > PAGE_SIZE, 0);
> > >
> > > spin_lock_irq(&mapping->tree_lock);
> > > -
> > > + slot = radix_tree_lookup_slot(&mapping->page_tree, index);
> > > + VM_BUG_ON_PAGE(page != radix_tree_deref_slot_protected(slot,
> > > + &mapping->tree_lock), page);
> > > VM_BUG_ON_PAGE(page_mapped(page), page);
> >
> > That looks good to me. The slot may get relocated, but the content
> > shouldn't change with the page locked.
> >
> > Are you going to send a full patch with changelog and sign-off? If so,
> > please add:
> >
> > Acked-by: Johannes Weiner <hannes@cmpxchg.org>
>
> Just to clarify, this is in addition to my radix_tree_iter_next()
> change. The iterator still needs to be reloaded because the number of
> valid slots that come after the current one can change as well.

Could you just amend all these fixups into your patch?

--
Kirill A. Shutemov

\
 
 \ /
  Last update: 2016-11-14 20:42    [W:0.101 / U:0.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site