From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751839AbbJNFjs (ORCPT ); Wed, 14 Oct 2015 01:39:48 -0400 Received: from mga14.intel.com ([192.55.52.115]:39460 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750759AbbJNFjo (ORCPT ); Wed, 14 Oct 2015 01:39:44 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,681,1437462000"; d="scan'208";a="580346538" Message-ID: <561DE9F3.504@intel.com> Date: Wed, 14 Oct 2015 13:36:51 +0800 From: Pan Xinhui User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org, linux-mm@kvack.org CC: Andrew Morton , vbabka@suse.cz, rientjes@google.com, hannes@cmpxchg.org, mhocko@suse.cz, nasa4836@gmail.com, mgorman@suse.de, alexander.h.duyck@redhat.com, aneesh.kumar@linux.vnet.ibm.com, "yanmin_zhang@linux.intel.com" Subject: [PATCH] gfp: GFP_RECLAIM_MASK should include __GFP_NO_KSWAPD Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pan Xinhui GFP_RECLAIM_MASK was introduced in commit 6cb062296f73 ("Categorize GFP flags"). In slub subsystem, this macro controls slub's allocation behavior. In particular, some flags which are not in GFP_RECLAIM_MASK will be cleared. So when slub pass this new gfp_flag into page allocator, we might lost some very important flags. There are some mistakes when we introduce __GFP_NO_KSWAPD. This flag is used to avoid any scheduler-related codes recursive. But it seems like patch author forgot to add it into GFP_RECLAIM_MASK. So lets add it now. Signed-off-by: Pan Xinhui --- include/linux/gfp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index f92cbd2..9ebad4d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -130,7 +130,8 @@ struct vm_area_struct; /* Control page allocator reclaim behavior */ #define GFP_RECLAIM_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\ __GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|\ - __GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC) + __GFP_NORETRY|__GFP_MEMALLOC|__GFP_NOMEMALLOC|\ + __GFP_NO_KSWAPD) /* Control slab gfp mask during early boot */ #define GFP_BOOT_MASK (__GFP_BITS_MASK & ~(__GFP_WAIT|__GFP_IO|__GFP_FS)) -- 1.9.1