From patchwork Wed May 23 17:16:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huaisheng Ye X-Patchwork-Id: 10421955 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 AA12860224 for ; Wed, 23 May 2018 17:16:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D0FA290EA for ; Wed, 23 May 2018 17:16:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9140A290F9; Wed, 23 May 2018 17:16:40 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01467290C5 for ; Wed, 23 May 2018 17:16:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E69966B026C; Wed, 23 May 2018 13:16:38 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E18F26B026D; Wed, 23 May 2018 13:16:38 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CBB426B026E; Wed, 23 May 2018 13:16:38 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f72.google.com (mail-pg0-f72.google.com [74.125.83.72]) by kanga.kvack.org (Postfix) with ESMTP id 890A36B026C for ; Wed, 23 May 2018 13:16:38 -0400 (EDT) Received: by mail-pg0-f72.google.com with SMTP id t2-v6so693372pgo.0 for ; Wed, 23 May 2018 10:16:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=WN3xM8hvrCzA4kc2v1+oKvwlya33IS5HgHqC0tiaCqg=; b=pn636sPFzci9I+To1cb7a0ZWCEAuo3maYe8Kj23rZ/5Fr40beZGIY0xSq2R9lmA3d1 C7HTh2D7suzRQ9E7M4VKGWReud+xSqoM5+TV7Wu1v50fNR9gTD+7IALitIMHyDxmTlxl u8Tue3Ngbt5HH1I5cbFgJqjICVR1SS4i6TWuGwzxL2RNavBziiofIKSXkCGu4ZbRKtQo PaiZ3YDFDsUs4lEJJOFeeTiY5D34ialUV1B1iVYRbhRLZkIafZNFm9kqd22GivJHf8ap 9KzA3D0IUFZ/zQNZyYaJthOJDcUXnHosFkT3+jyqi2/7Z3TeZmLutZGZEQx9PzTSrSBA +89Q== X-Gm-Message-State: ALKqPwcauAcyQDvuBgo3N3sbkuqrH02clFEt6zMxT5wB0paamabAWKnf CrjMp6XuMuKXBq+wzZeuwJQEG8d6A3JP5KNH4gy2V1OmuoYLZ1oZ5uTmJUCiPfavUe7D65jlYBs Ux3mHcv8f30fHfKuV2Ti2YjXyvrpezfNB5VcrRiN9adB/5hy1gx0ipGksw+jpXk7mgl5Yv7TPaF G1TBjasdMC+wAk0fxEJ7XjZePxs+/babeKXrbhbuHhXyrsyd8/H2+L2ck+LHmz5bWNJ5tnqbSLE 12mC5AHNkD6VTokaciLePLNpwdb64wDAyZkoyT+WOWrYV/G0lnGnZy23NtFgP5M07jiP2pedCHT qV0/ImtLmtngnPhnqO2nzBIoynC5aQdnBtgViiWWMcW1+4xCWk8C03Q2hgWEB/YXxyb1NlhC2XA r X-Received: by 2002:a17:902:6b04:: with SMTP id o4-v6mr3802624plk.101.1527095798256; Wed, 23 May 2018 10:16:38 -0700 (PDT) X-Received: by 2002:a17:902:6b04:: with SMTP id o4-v6mr3802578plk.101.1527095797525; Wed, 23 May 2018 10:16:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527095797; cv=none; d=google.com; s=arc-20160816; b=OFFxd+OW5rkaBh+ejVY5vlX9E5D7qOM/6MB2z9N7JerPyecXUvKC6ZR29sXBtYJ/CG qVkvhncp/TbJlBBvdS4wa/F0VZ8Qlt1ghuTt7A6RHN73ZmgMZkTRltcx6C9qvC+y2xMD FORAfRiEVhzIlqsn4SVv6DMwfi5FhXSK/lhvMpBEBA6nv6DfeP9P0tMOT2jCsPok/o3P ZDMZ3AJXOF4EWayoWR5IzDkcpvMyP0nga9EmRwyHVfqEgfq9nj67h+JAnVLNiAQr5OSO 7zTz90gF0cRkm0TvytWt9+7eor2Ua/mz24T3O/YmJi/0ZtQs3eqK4nDBhz0cwpOGPCck MqYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=WN3xM8hvrCzA4kc2v1+oKvwlya33IS5HgHqC0tiaCqg=; b=NfzQAlDrev9DlciIi/lF5U+k6yxJjXMa+GYqEMxoMhbEaGd2b+XLRF2Ka0GQCFY6ia 1Of7IMEbgLQGf1uf6XBWIVs8UJkj6TolFomk5+hzUqtgeWmbTPBlNib4Ks7jryJc7qHm JW3d9XonS0csuJCAiHwghQN7RlKje5gVxOoiDBEqbUjZaRXLWQSJJGQUvtrbC1qKh+mG dexDl9zWkY8KWCnDn370w3/aIYR+Go8UvV8ZW9szpFQMdw11sNMX9IRqj/2dJoaVXjai 01gcWzf4AiqB8cU5ovDDn/vYbrmpVRblwB0L1xkmBsO8/vX4t0gxVF6EsxUClYiI3adb E/eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=uZ3xSdrn; spf=pass (google.com: domain of yehs2007@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=yehs2007@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id r9-v6sor8220497pfh.53.2018.05.23.10.16.37 for (Google Transport Security); Wed, 23 May 2018 10:16:37 -0700 (PDT) Received-SPF: pass (google.com: domain of yehs2007@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=uZ3xSdrn; spf=pass (google.com: domain of yehs2007@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=yehs2007@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WN3xM8hvrCzA4kc2v1+oKvwlya33IS5HgHqC0tiaCqg=; b=uZ3xSdrn5KVEjt0LayKxwXlzNbmTYN52YFH9XC69fqwEy0ST5qFPJ3zXxVTYalfJSC lPzF2QkAhGfqzOHZujmirRKWx0mJWlKvAi1zlrxrJlnL+wH4I2YErezEhcICnQutEgfi WKZ/ZpNUdrnp5jzThrC43DtD22yNrgDyNthKVLMqp4tLozR+x4gZbbhkObla470A2LAm WlK4agCak58kxjgihK0tj9ZNtPm78EWxd7vEZf+Acx4k24Zm6qol2+g8xazzGDRtF1S0 AsFq7q2tTw/pTGvwVvGuUsZF80Us9+WY6tX4NfwmDmyxVwj4pqqioPR6u88s6ZL+ddNW Y/8g== X-Google-Smtp-Source: AB8JxZq6fZN6w10LFzifH+DIo6Ko7FkvG+6YdASooynEr+0cXsciwcspLMNTVoEY6u7gxxcVVDnwCg== X-Received: by 2002:a62:c0dc:: with SMTP id g89-v6mr3709809pfk.223.1527095797289; Wed, 23 May 2018 10:16:37 -0700 (PDT) Received: from localhost.localdomain ([123.120.56.60]) by smtp.gmail.com with ESMTPSA id z13-v6sm30029362pfe.77.2018.05.23.10.16.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 10:16:36 -0700 (PDT) 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 , Minchan Kim , Nitin Gupta , Sergey Senozhatsky , Christoph Hellwig Subject: [RFC PATCH v3 5/9] drivers/block/zram/zram_drv: update usage of zone modifiers Date: Thu, 24 May 2018 01:16:29 +0800 Message-Id: <1527095789-5668-1-git-send-email-yehs2007@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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: Minchan Kim Cc: Nitin Gupta Cc: Sergey Senozhatsky Cc: Christoph Hellwig --- drivers/block/zram/zram_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 0f3fadd..1bb5ca8 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1004,14 +1004,12 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, handle = zs_malloc(zram->mem_pool, comp_len, __GFP_KSWAPD_RECLAIM | __GFP_NOWARN | - __GFP_HIGHMEM | - __GFP_MOVABLE); + __GFP_ZONE_MOVABLE); if (!handle) { zcomp_stream_put(zram->comp); atomic64_inc(&zram->stats.writestall); handle = zs_malloc(zram->mem_pool, comp_len, - GFP_NOIO | __GFP_HIGHMEM | - __GFP_MOVABLE); + GFP_NOIO | __GFP_ZONE_MOVABLE); if (handle) goto compress_again; return -ENOMEM;