Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 28 Feb 2020 10:47:00 -0500
From:   Rik van Riel <riel@surriel.com>
To:     Vlastimil Babka <vbabka@suse.cz>
Cc:     Mike Kravetz <mike.kravetz@oracle.com>,
        linux-kernel@vger.kernel.org, kernel-team@fb.com,
        akpm@linux-foundation.org, linux-mm@kvack.org, mhocko@kernel.org,
        mgorman@techsingularity.net, rientjes@google.com,
        aarcange@redhat.com, ziy@nvidia.com
Subject: [PATCH] fix
 mmthpcompactioncma-allow-thp-migration-for-cma-allocations.patch
Message-ID: <20200228104700.0af2f18d@imladris.surriel.com>
In-Reply-To: <ceacd12e-a005-8035-7d88-f79a45a05975@suse.cz>
References: <cover.1582321646.git.riel@surriel.com>
        <20200227213238.1298752-2-riel@surriel.com>
        <df83c62f-209f-b1fd-3a5c-c81c82cb2606@oracle.com>
        <7800e98e3688c124ac3672284b87d67321e1c29e.camel@surriel.com>
        <67185d77-87aa-400d-475c-4435d8b7be11@suse.cz>
        <47198271414db19cecbfa1a6ea685577dad3a72c.camel@surriel.com>
        <ceacd12e-a005-8035-7d88-f79a45a05975@suse.cz>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Thank you Mike & Vlastimil!

---8<---

commit 27f3cd5473d8bbf591b61d8b93b98bc333980d0d
Author: Rik van Riel <riel@surriel.com>
Date:   Fri Feb 28 10:41:48 2020 -0500

Subject: fix mmthpcompactioncma-allow-thp-migration-for-cma-allocations.patch
    
Mike Kravetz pointed out that the second if condition could do the
wrong thing for hugetlbfs pages, and that check really only needs
to run on THPs.
    
Cleanup suggested by Vlastimil.
  
Thank you both!
    
Suggested-by: Mike Kravetz <mike.kravetz@oracle.com>
Suggested-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Rik van Riel <riel@surriel.com>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 4afa13dd3738..71f78a590236 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -8274,12 +8274,12 @@ struct page *has_unmovable_pages(struct zone *zone, struct page *page,
 			struct page *head = compound_head(page);
 			unsigned int skip_pages;
 
-			if (PageHuge(page) &&
-			    !hugepage_migration_supported(page_hstate(head)))
-				return page;
-
-			if (!PageLRU(head) && !__PageMovable(head))
+			if (PageHuge(page)) {
+				if (!hugepage_migration_supported(page_hstate(head)))
+					return page;
+			} else if (!PageLRU(head) && !__PageMovable(head)) {
 				return page;
+			}
 
 			skip_pages = compound_nr(head) - (page - head);
 			iter += skip_pages - 1;