From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33388 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750961AbcEBACw (ORCPT ); Sun, 1 May 2016 20:02:52 -0400 Subject: Patch "mm: exclude HugeTLB pages from THP page_mapped() logic" has been added to the 4.5-stable tree To: steve.capper@arm.com, akpm@linux-foundation.org, catalin.marinas@arm.com, gregkh@linuxfoundation.org, kirill.shutemov@linux.intel.com, mhocko@suse.com, mingo@kernel.org, torvalds@linux-foundation.org, will.deacon@arm.com Cc: , From: Date: Sun, 01 May 2016 17:02:51 -0700 Message-ID: <1462147371226218@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled mm: exclude HugeTLB pages from THP page_mapped() logic to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 66ee95d16a7f1b7b4f1dd74a2d81c6e19dc29a14 Mon Sep 17 00:00:00 2001 From: Steve Capper Date: Thu, 28 Apr 2016 16:18:24 -0700 Subject: mm: exclude HugeTLB pages from THP page_mapped() logic From: Steve Capper commit 66ee95d16a7f1b7b4f1dd74a2d81c6e19dc29a14 upstream. HugeTLB pages cannot be split, so we use the compound_mapcount to track rmaps. Currently page_mapped() will check the compound_mapcount, but will also go through the constituent pages of a THP compound page and query the individual _mapcount's too. Unfortunately, page_mapped() does not distinguish between HugeTLB and THP compound pages and assumes that a compound page always needs to have HPAGE_PMD_NR pages querying. For most cases when dealing with HugeTLB this is just inefficient, but for scenarios where the HugeTLB page size is less than the pmd block size (e.g. when using contiguous bit on ARM) this can lead to crashes. This patch adjusts the page_mapped function such that we skip the unnecessary THP reference checks for HugeTLB pages. Fixes: e1534ae95004 ("mm: differentiate page_mapped() from page_mapcount() for compound pages") Signed-off-by: Steve Capper Acked-by: Kirill A. Shutemov Cc: Will Deacon Cc: Catalin Marinas Cc: Michal Hocko Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- include/linux/mm.h | 2 ++ 1 file changed, 2 insertions(+) --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1010,6 +1010,8 @@ static inline bool page_mapped(struct pa page = compound_head(page); if (atomic_read(compound_mapcount_ptr(page)) >= 0) return true; + if (PageHuge(page)) + return false; for (i = 0; i < hpage_nr_pages(page); i++) { if (atomic_read(&page[i]._mapcount) >= 0) return true; Patches currently in stable-queue which might be from steve.capper@arm.com are queue-4.5/mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch