From patchwork Wed May 23 14:57:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huaisheng Ye X-Patchwork-Id: 10421785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7068360224 for ; Wed, 23 May 2018 15:15:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6053B287FF for ; Wed, 23 May 2018 15:15:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5331828EB5; Wed, 23 May 2018 15:15:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 847C2287FF for ; Wed, 23 May 2018 15:15:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933526AbeEWPPd (ORCPT ); Wed, 23 May 2018 11:15:33 -0400 Received: from m50-134.163.com ([123.125.50.134]:52018 "EHLO m50-134.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933419AbeEWPPb (ORCPT ); Wed, 23 May 2018 11:15:31 -0400 X-Greylist: delayed 914 seconds by postgrey-1.27 at vger.kernel.org; Wed, 23 May 2018 11:15:29 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=m4qJB6bnDNspmM9iAB /C4ilizf1zye6+llwpzbjgjaE=; b=SExPXiYHB3Dq9LC+iltQPd6S+RWzY2Kg5n clADhyMYaErg1otjWnSRmFaAzwp5/g9dVbK8yQ1mXcJ/u8pA4inArg/lwPN9FX3b Ujyy+L0uJFCuMzcAQMajyVAN4tQu/rbm32heawSR345nVdgjuv+md+pZho03yfb0 ovkrP9QuE= Received: from dev31.localdomain (unknown [103.244.59.4]) by smtp4 (Coremail) with SMTP id DtGowAAXEWSIgQVbCQ9NAA--.108S8; Wed, 23 May 2018 22:58:31 +0800 (CST) From: Huaisheng Ye To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: mhocko@suse.com, willy@infradead.org, hch@lst.de, vbabka@suse.cz, mgorman@techsingularity.net, kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, colyli@suse.de, chengnt@lenovo.com, hehy1@lenovo.com, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-btrfs@vger.kernel.org, Huaisheng Ye , zhongjiang , Minchan Kim , Dan Carpenter , David Rientjes , Christoph Hellwig Subject: [RFC PATCH v3 6/9] mm/vmpressure: update usage of zone modifiers Date: Wed, 23 May 2018 22:57:51 +0800 Message-Id: <1527087474-93986-7-git-send-email-yehs2007@163.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1527087474-93986-1-git-send-email-yehs2007@163.com> References: <1527087474-93986-1-git-send-email-yehs2007@163.com> X-CM-TRANSID: DtGowAAXEWSIgQVbCQ9NAA--.108S8 X-Coremail-Antispam: 1Uf129KBjvJXoW7trykKryDJrW8Aw4xZw1fZwb_yoW8Xr15pr 9rCr4xWr95ur13ta4rAa1xGa4Ikw1rCF45GFnrAry7Aas0gr98Wr1akFy8WryDCFWYyrn5 Xr47Aws5ArZ0qa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b2cTdUUUUU= X-Originating-IP: [103.244.59.4] X-CM-SenderInfo: p1hk2jqqqxqiywtou0bp/1tbizRdPT1c7BDy5cQABsH Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Huaisheng Ye Use __GFP_ZONE_MOVABLE to replace (__GFP_HIGHMEM | __GFP_MOVABLE). ___GFP_DMA, ___GFP_HIGHMEM and ___GFP_DMA32 have been deleted from GFP bitmasks, the bottom three bits of GFP mask is reserved for storing encoded zone number. __GFP_ZONE_MOVABLE contains encoded ZONE_MOVABLE and __GFP_MOVABLE flag. With GFP_ZONE_TABLE, __GFP_HIGHMEM ORing __GFP_MOVABLE means gfp_zone should return ZONE_MOVABLE. In order to keep that compatible with GFP_ZONE_TABLE, replace (__GFP_HIGHMEM | __GFP_MOVABLE) with __GFP_ZONE_MOVABLE. Signed-off-by: Huaisheng Ye Cc: Andrew Morton Cc: zhongjiang Cc: Minchan Kim Cc: Dan Carpenter Cc: David Rientjes Cc: Christoph Hellwig --- mm/vmpressure.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmpressure.c b/mm/vmpressure.c index 85350ce..30a40e2 100644 --- a/mm/vmpressure.c +++ b/mm/vmpressure.c @@ -256,7 +256,7 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree, * Indirect reclaim (kswapd) sets sc->gfp_mask to GFP_KERNEL, so * we account it too. */ - if (!(gfp & (__GFP_HIGHMEM | __GFP_MOVABLE | __GFP_IO | __GFP_FS))) + if (!(gfp & (__GFP_ZONE_MOVABLE | __GFP_IO | __GFP_FS))) return; /*