Commit 21cb5c05 authored by Linus Torvalds's avatar Linus Torvalds Committed by Kelsey Skunberg

mm: make page ref count overflow check tighter and more explicit

BugLink: https://bugs.launchpad.net/bugs/1868628

commit f958d7b5 upsteam.

We have a VM_BUG_ON() to check that the page reference count doesn't
underflow (or get close to overflow) by checking the sign of the count.

That's all fine, but we actually want to allow people to use a "get page
ref unless it's already very high" helper function, and we want that one
to use the sign of the page ref (without triggering this VM_BUG_ON).

Change the VM_BUG_ON to only check for small underflows (or _very_ close
to overflowing), and ignore overflows which have strayed into negative
territory.
Acked-by: default avatarMatthew Wilcox <willy@infradead.org>
Cc: Jann Horn <jannh@google.com>
Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
[ 4.4.y backport notes:
  Ajay: Open-coded atomic refcount access due to missing
  page_ref_count() helper in 4.4.y
  Srivatsa: Added overflow check to get_page_foll() and related code. ]
Signed-off-by: default avatarSrivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu>
Signed-off-by: default avatarAjay Kaher <akaher@vmware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent 3acc72a4
...@@ -81,7 +81,8 @@ static inline void __get_page_tail_foll(struct page *page, ...@@ -81,7 +81,8 @@ static inline void __get_page_tail_foll(struct page *page,
* speculative page access (like in * speculative page access (like in
* page_cache_get_speculative()) on tail pages. * page_cache_get_speculative()) on tail pages.
*/ */
VM_BUG_ON_PAGE(atomic_read(&compound_head(page)->_count) <= 0, page); VM_BUG_ON_PAGE(page_ref_zero_or_close_to_overflow(compound_head(page)),
page);
if (get_page_head) if (get_page_head)
atomic_inc(&compound_head(page)->_count); atomic_inc(&compound_head(page)->_count);
get_huge_page_tail(page); get_huge_page_tail(page);
...@@ -106,7 +107,7 @@ static inline void get_page_foll(struct page *page) ...@@ -106,7 +107,7 @@ static inline void get_page_foll(struct page *page)
* Getting a normal page or the head of a compound page * Getting a normal page or the head of a compound page
* requires to already have an elevated page->_count. * requires to already have an elevated page->_count.
*/ */
VM_BUG_ON_PAGE(atomic_read(&page->_count) <= 0, page); VM_BUG_ON_PAGE(page_ref_zero_or_close_to_overflow(page), page);
atomic_inc(&page->_count); atomic_inc(&page->_count);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment