Groups > linux.kernel > #1522053

Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem collapse error path

From	"Kirill A. Shutemov" <kirill@shutemov.name>
Newsgroups	linux.kernel
Subject	Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem collapse error path
Date	2016-11-14 20:50 +0100
Message-ID	<sDvqp-2Sn-5@gated-at.bofh.it> (permalink)
References	(5 earlier) <sCn1T-6Ie-1@gated-at.bofh.it> <sDkv0-4lZ-7@gated-at.bofh.it> <sDqqJ-892-15@gated-at.bofh.it> <sDrPP-sM-1@gated-at.bofh.it> <sDsCe-12v-23@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Thread

Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem  collapse error path Jan Kara <jack@suse.cz> - 2016-11-14 09:10 +0100
  Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem  collapse error path "Kirill A. Shutemov" <kirill@shutemov.name> - 2016-11-14 15:30 +0100
    Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem  collapse error path Johannes Weiner <hannes@cmpxchg.org> - 2016-11-14 17:00 +0100
      Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem  collapse error path Johannes Weiner <hannes@cmpxchg.org> - 2016-11-14 17:50 +0100
        Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem  collapse error path "Kirill A. Shutemov" <kirill@shutemov.name> - 2016-11-14 20:50 +0100
          Re: [PATCH 1/6] mm: khugepaged: fix radix tree node leak in shmem  collapse error path Johannes Weiner <hannes@cmpxchg.org> - 2016-11-15 15:10 +0100

csiph-web