LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Andrea Arcangeli <aarcange@redhat.com>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: werner <w.landgraf@ru.ru>, Borislav Petkov <bp@amd64.org>,
	Ilya Dryomov <idryomov@gmail.com>, linux-mm <linux-mm@kvack.org>,
	linux-kernel@vger.kernel.org
Subject: Re: 2.6.38-rc1 problems with khugepaged
Date: Thu, 20 Jan 2011 01:01:47 +0100	[thread overview]
Message-ID: <20110120000147.GR9506@random.random> (raw)
In-Reply-To: <20110119214523.GF2232@cmpxchg.org>

On Wed, Jan 19, 2011 at 10:45:23PM +0100, Johannes Weiner wrote:
> Hi,
> 
> On Wed, Jan 19, 2011 at 04:59:54PM +0100, Borislav Petkov wrote:
> > Adding some more parties to CC.
> > 
> > On Wed, Jan 19, 2011 at 09:45:25AM -0400, werner wrote:
> > > **  Help   Help Help ***
> > > 
> > > My computer crashs on booting  ...   :( :(
> 
> That sucks!
> 
> I cross-compiled for 32-bit and was able to match up the disassembly
> against the code line from your oops report.  Apparently the pte was
> an invalid pointer, and it makes perfect sense: we unmap the highpte
> _before_ we access the pointer again for __collapse_huge_page_copy().
> 
> Can you test with this fix applied?  It is only compile-tested, I too
> have no 32-bit installations anymore.

Thanks Johannes, I already sent the same fix a few minutes ago, it is
also confirmed to work from Ilya in Message-ID:
<20110119224950.GA3429@kwango.lan.net>

> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 1be1034..e187454 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -1839,9 +1839,9 @@ static void collapse_huge_page(struct mm_struct *mm,
>  	spin_lock(ptl);
>  	isolated = __collapse_huge_page_isolate(vma, address, pte);
>  	spin_unlock(ptl);
> -	pte_unmap(pte);
>  
>  	if (unlikely(!isolated)) {
> +		pte_unmap(pte);
>  		spin_lock(&mm->page_table_lock);
>  		BUG_ON(!pmd_none(*pmd));
>  		set_pmd_at(mm, address, pmd, _pmd);
> @@ -1858,6 +1858,7 @@ static void collapse_huge_page(struct mm_struct *mm,
>  	anon_vma_unlock(vma->anon_vma);
>  
>  	__collapse_huge_page_copy(pte, new_page, vma, address, ptl);
> +	pte_unmap(pte);
>  	__SetPageUptodate(new_page);
>  	pgtable = pmd_pgtable(_pmd);
>  	VM_BUG_ON(page_count(pgtable) != 1);

Good thing your fix is identical to mine ;).

  reply	other threads:[~2011-01-20  0:02 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-19 13:45 werner
2011-01-19 15:59 ` Borislav Petkov
2011-01-19 19:55   ` Andrea Arcangeli
2011-01-19 21:45   ` Johannes Weiner
2011-01-20  0:01     ` Andrea Arcangeli [this message]
2011-01-20  1:10       ` Johannes Weiner
2011-01-20  1:21         ` Andrea Arcangeli
2011-01-19 22:21   ` Andrea Arcangeli
2011-01-20 20:13     ` Steven Rostedt
2011-01-21  8:36 werner
2011-01-21 10:43 werner
2011-01-21 19:17 ` Andrea Arcangeli
2011-01-21 21:14   ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110120000147.GR9506@random.random \
    --to=aarcange@redhat.com \
    --cc=bp@amd64.org \
    --cc=hannes@cmpxchg.org \
    --cc=idryomov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=w.landgraf@ru.ru \
    --subject='Re: 2.6.38-rc1 problems with khugepaged' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).