LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: Andrea Arcangeli <aarcange@redhat.com>
Cc: Borislav Petkov <bp@amd64.org>, werner <w.landgraf@ru.ru>,
	linux-kernel@vger.kernel.org, linux-mm <linux-mm@kvack.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: 2.6.38-rc1 problems with khugepaged
Date: Thu, 20 Jan 2011 15:13:06 -0500	[thread overview]
Message-ID: <20110120201306.GA2025@home.goodmis.org> (raw)
In-Reply-To: <20110119222150.GP9506@random.random>

On Wed, Jan 19, 2011 at 11:21:50PM +0100, Andrea Arcangeli wrote:
> Hello Werner,
> 
> this should fix your oops, it's untested still so let me know if you
> test it.

I tested this with ktest.pl on the config that was breaking for me. I
ran the test 20 times and it succeeded for all 20 tests.

Tested-by: Steven Rostedt <rostedt@goodmis.org>

-- Steve


> 
> It's a noop for x86_64 and it only affected x86 32bit with highpte enabled.
> 
> ====
> Subject: khugepaged: fix pte_unmap for highpte x86_32
> 
> From: Andrea Arcangeli <aarcange@redhat.com>
> 
> __collapse_huge_page_copy is still dereferencing the pte passed as parameter so
> we must pte_unmap after __collapse_huge_page_copy returns, not before.
> 
> Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
> ---
> 
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 004c9c2..c4f634b 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -1837,9 +1837,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);
> @@ -1856,6 +1856,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);
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

  reply	other threads:[~2011-01-20 20:13 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
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 [this message]
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=20110120201306.GA2025@home.goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=bp@amd64.org \
    --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).