From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by kanga.kvack.org (Postfix) with ESMTP id 13DED6B0069 for ; Fri, 29 Sep 2017 11:14:00 -0400 (EDT) Received: by mail-wr0-f197.google.com with SMTP id u48so780700wrf.19 for ; Fri, 29 Sep 2017 08:14:00 -0700 (PDT) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 62sor887427wmo.84.2017.09.29.08.13.58 for (Google Transport Security); Fri, 29 Sep 2017 08:13:58 -0700 (PDT) Date: Fri, 29 Sep 2017 17:13:39 +0200 From: Alexandru Moise <00moses.alexander00@gmail.com> Subject: [PATCH] mm, hugetlb: fix "treat_as_movable" condition in htlb_alloc_mask Message-ID: <20170929151339.GA4398@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: mike.kravetz@oracle.com, mhocko@suse.com, n-horiguchi@ah.jp.nec.com, aneesh.kumar@linux.vnet.ibm.com, punit.agrawal@arm.com, gerald.schaefer@de.ibm.com, aarcange@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kirill@shutemov.name If hugepage_migration_supported() returns true, this renders the hugepages_treat_as_movable sysctl completely pointless. Let's keep this behavior optional by switching the if() condition from || to &&. Signed-off-by: Alexandru Moise <00moses.alexander00@gmail.com> --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 424b0ef08a60..ab28de0122af 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -926,7 +926,7 @@ static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask, /* Movability of hugepages depends on migration support. */ static inline gfp_t htlb_alloc_mask(struct hstate *h) { - if (hugepages_treat_as_movable || hugepage_migration_supported(h)) + if (hugepages_treat_as_movable && hugepage_migration_supported(h)) return GFP_HIGHUSER_MOVABLE; else return GFP_HIGHUSER; -- 2.14.2 -- 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: email@kvack.org