All of lore.kernel.org
 help / color / mirror / Atom feed
From: Punit Agrawal <punit.agrawal@arm.com>
To: akpm@linux-foundation.org
Cc: Will Deacon <will.deacon@arm.com>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com,
	n-horiguchi@ah.jp.nec.com, kirill.shutemov@linux.intel.com,
	mike.kravetz@oracle.com, steve.capper@arm.com,
	mark.rutland@arm.com, hillf.zj@alibaba-inc.com,
	linux-arch@vger.kernel.org, aneesh.kumar@linux.vnet.ibm.com,
	Punit Agrawal <punit.agrawal@arm.com>
Subject: [PATCH v3 1/6] mm, gup: Remove broken VM_BUG_ON_PAGE compound check for hugepages
Date: Mon, 22 May 2017 14:35:59 +0100	[thread overview]
Message-ID: <20170522133604.11392-2-punit.agrawal@arm.com> (raw)
In-Reply-To: <20170522133604.11392-1-punit.agrawal@arm.com>

From: Will Deacon <will.deacon@arm.com>

When operating on hugepages with DEBUG_VM enabled, the GUP code checks the
compound head for each tail page prior to calling page_cache_add_speculative.
This is broken, because on the fast-GUP path (where we don't hold any page
table locks) we can be racing with a concurrent invocation of
split_huge_page_to_list.

split_huge_page_to_list deals with this race by using page_ref_freeze to
freeze the page and force concurrent GUPs to fail whilst the component
pages are modified. This modification includes clearing the compound_head
field for the tail pages, so checking this prior to a successful call
to page_cache_add_speculative can lead to false positives: In fact,
page_cache_add_speculative *already* has this check once the page refcount
has been successfully updated, so we can simply remove the broken calls
to VM_BUG_ON_PAGE.

Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Steve Capper <steve.capper@arm.com>
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
---
 mm/gup.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index d9e6fddcc51f..ccf8cb38234f 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1361,7 +1361,6 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
 	head = pmd_page(orig);
 	page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
@@ -1400,7 +1399,6 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr,
 	head = pud_page(orig);
 	page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
@@ -1438,7 +1436,6 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr,
 	head = pgd_page(orig);
 	page = head + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: Punit Agrawal <punit.agrawal@arm.com>
To: akpm@linux-foundation.org
Cc: Will Deacon <will.deacon@arm.com>,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com,
	n-horiguchi@ah.jp.nec.com, kirill.shutemov@linux.intel.com,
	mike.kravetz@oracle.com, steve.capper@arm.com,
	mark.rutland@arm.com, hillf.zj@alibaba-inc.com,
	linux-arch@vger.kernel.org, aneesh.kumar@linux.vnet.ibm.com,
	Punit Agrawal <punit.agrawal@arm.com>
Subject: [PATCH v3 1/6] mm, gup: Remove broken VM_BUG_ON_PAGE compound check for hugepages
Date: Mon, 22 May 2017 14:35:59 +0100	[thread overview]
Message-ID: <20170522133604.11392-2-punit.agrawal@arm.com> (raw)
In-Reply-To: <20170522133604.11392-1-punit.agrawal@arm.com>

From: Will Deacon <will.deacon@arm.com>

When operating on hugepages with DEBUG_VM enabled, the GUP code checks the
compound head for each tail page prior to calling page_cache_add_speculative.
This is broken, because on the fast-GUP path (where we don't hold any page
table locks) we can be racing with a concurrent invocation of
split_huge_page_to_list.

split_huge_page_to_list deals with this race by using page_ref_freeze to
freeze the page and force concurrent GUPs to fail whilst the component
pages are modified. This modification includes clearing the compound_head
field for the tail pages, so checking this prior to a successful call
to page_cache_add_speculative can lead to false positives: In fact,
page_cache_add_speculative *already* has this check once the page refcount
has been successfully updated, so we can simply remove the broken calls
to VM_BUG_ON_PAGE.

Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Steve Capper <steve.capper@arm.com>
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
---
 mm/gup.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index d9e6fddcc51f..ccf8cb38234f 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1361,7 +1361,6 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
 	head = pmd_page(orig);
 	page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
@@ -1400,7 +1399,6 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr,
 	head = pud_page(orig);
 	page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
@@ -1438,7 +1436,6 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr,
 	head = pgd_page(orig);
 	page = head + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
-- 
2.11.0

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

WARNING: multiple messages have this Message-ID (diff)
From: punit.agrawal@arm.com (Punit Agrawal)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/6] mm, gup: Remove broken VM_BUG_ON_PAGE compound check for hugepages
Date: Mon, 22 May 2017 14:35:59 +0100	[thread overview]
Message-ID: <20170522133604.11392-2-punit.agrawal@arm.com> (raw)
In-Reply-To: <20170522133604.11392-1-punit.agrawal@arm.com>

From: Will Deacon <will.deacon@arm.com>

When operating on hugepages with DEBUG_VM enabled, the GUP code checks the
compound head for each tail page prior to calling page_cache_add_speculative.
This is broken, because on the fast-GUP path (where we don't hold any page
table locks) we can be racing with a concurrent invocation of
split_huge_page_to_list.

split_huge_page_to_list deals with this race by using page_ref_freeze to
freeze the page and force concurrent GUPs to fail whilst the component
pages are modified. This modification includes clearing the compound_head
field for the tail pages, so checking this prior to a successful call
to page_cache_add_speculative can lead to false positives: In fact,
page_cache_add_speculative *already* has this check once the page refcount
has been successfully updated, so we can simply remove the broken calls
to VM_BUG_ON_PAGE.

Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Steve Capper <steve.capper@arm.com>
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
---
 mm/gup.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index d9e6fddcc51f..ccf8cb38234f 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1361,7 +1361,6 @@ static int gup_huge_pmd(pmd_t orig, pmd_t *pmdp, unsigned long addr,
 	head = pmd_page(orig);
 	page = head + ((addr & ~PMD_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
@@ -1400,7 +1399,6 @@ static int gup_huge_pud(pud_t orig, pud_t *pudp, unsigned long addr,
 	head = pud_page(orig);
 	page = head + ((addr & ~PUD_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
@@ -1438,7 +1436,6 @@ static int gup_huge_pgd(pgd_t orig, pgd_t *pgdp, unsigned long addr,
 	head = pgd_page(orig);
 	page = head + ((addr & ~PGDIR_MASK) >> PAGE_SHIFT);
 	do {
-		VM_BUG_ON_PAGE(compound_head(page) != head, page);
 		pages[*nr] = page;
 		(*nr)++;
 		page++;
-- 
2.11.0

  reply	other threads:[~2017-05-22 13:36 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-22 13:35 [PATCH v3 0/6] Support for contiguous pte hugepages Punit Agrawal
2017-05-22 13:35 ` Punit Agrawal
2017-05-22 13:35 ` Punit Agrawal
2017-05-22 13:35 ` Punit Agrawal [this message]
2017-05-22 13:35   ` [PATCH v3 1/6] mm, gup: Remove broken VM_BUG_ON_PAGE compound check for hugepages Punit Agrawal
2017-05-22 13:35   ` Punit Agrawal
2017-05-23 13:09   ` Kirill A. Shutemov
2017-05-23 13:09     ` Kirill A. Shutemov
2017-05-23 13:09     ` Kirill A. Shutemov
2017-05-22 13:36 ` [PATCH v3 2/6] mm, gup: Ensure real head page is ref-counted when using hugepages Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-23 13:13   ` Kirill A. Shutemov
2017-05-23 13:13     ` Kirill A. Shutemov
2017-05-23 13:13     ` Kirill A. Shutemov
2017-05-23 15:43     ` Punit Agrawal
2017-05-23 15:43       ` Punit Agrawal
2017-05-23 15:43       ` Punit Agrawal
2017-05-22 13:36 ` [PATCH v3 3/6] mm/hugetlb: add size parameter to huge_pte_offset() Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-23 10:04   ` kbuild test robot
2017-05-23 10:04     ` kbuild test robot
2017-05-23 10:04     ` kbuild test robot
2017-05-23 10:04     ` kbuild test robot
2017-05-23 16:13     ` Punit Agrawal
2017-05-23 16:13       ` Punit Agrawal
2017-05-22 13:36 ` [PATCH v3 4/6] mm/hugetlb: Allow architectures to override huge_pte_clear() Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 13:59   ` Arnd Bergmann
2017-05-22 13:59     ` Arnd Bergmann
2017-05-22 13:59     ` Arnd Bergmann
2017-05-22 15:40     ` Punit Agrawal
2017-05-22 15:40       ` Punit Agrawal
2017-05-22 15:40       ` Punit Agrawal
2017-05-22 16:25   ` [PATCH v3.1 " Punit Agrawal
2017-05-22 16:25     ` Punit Agrawal
2017-05-22 16:25     ` Punit Agrawal
2017-05-22 20:34     ` Arnd Bergmann
2017-05-22 20:34       ` Arnd Bergmann
2017-05-22 20:34       ` Arnd Bergmann
2017-05-23 14:53       ` Punit Agrawal
2017-05-23 14:53         ` Punit Agrawal
2017-05-23 14:53         ` Punit Agrawal
2017-05-23  5:26     ` Martin Schwidefsky
2017-05-23  5:26       ` Martin Schwidefsky
2017-05-23  5:26       ` Martin Schwidefsky
2017-05-23 14:53       ` Punit Agrawal
2017-05-23 14:53         ` Punit Agrawal
2017-05-23 14:53         ` Punit Agrawal
2017-05-22 13:36 ` [PATCH v3 5/6] mm/hugetlb: Introduce set_huge_swap_pte_at() helper Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 16:30   ` [PATCH v3.1 " Punit Agrawal
2017-05-22 16:30     ` Punit Agrawal
2017-05-22 16:30     ` Punit Agrawal
2017-05-22 13:36 ` [PATCH v3 6/6] mm: rmap: Use correct helper when poisoning hugepages Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal
2017-05-22 13:36   ` Punit Agrawal

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=20170522133604.11392-2-punit.agrawal@arm.com \
    --to=punit.agrawal@arm.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@linux.vnet.ibm.com \
    --cc=catalin.marinas@arm.com \
    --cc=hillf.zj@alibaba-inc.com \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mark.rutland@arm.com \
    --cc=mike.kravetz@oracle.com \
    --cc=n-horiguchi@ah.jp.nec.com \
    --cc=steve.capper@arm.com \
    --cc=will.deacon@arm.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.