From patchwork Wed May 23 17:07:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huaisheng Ye X-Patchwork-Id: 10421935 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 0BB1B60327 for ; Wed, 23 May 2018 17:07:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F146328DC8 for ; Wed, 23 May 2018 17:07:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E5A6C28FCF; Wed, 23 May 2018 17:07:28 +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 5844028DC8 for ; Wed, 23 May 2018 17:07:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C75D6B026C; Wed, 23 May 2018 13:07:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1779E6B026D; Wed, 23 May 2018 13:07:27 -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 0665B6B026E; Wed, 23 May 2018 13:07:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id B8E206B026C for ; Wed, 23 May 2018 13:07:26 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id 31-v6so1253774plf.19 for ; Wed, 23 May 2018 10:07:26 -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=zHX6vj0yUosU1Yfo3onMPiW90dQ8apjipbJ481pfeSI=; b=bpaPa9bHaiq7d0CmpCYR53EXwHNInUcopn9yHqN8DzopkmlR6PVZTFqr1Br+zdetyg PAV+Ftrd+wxA4rqGrSBiX2lK7sTatOUDYHcevqjl2fAvqBx9sIXKnnM9diPpIgnzWDbb UafZ3QGinTm3p+qzOuqrPlVr7a3okQwtOA7BgSEUHBx0t1iyN2Hz+Pafl4DM1xHwe5Vp VvGITz8a087SmwTB5+LKtFgBJVoP0UgkPxh/mj9caR0A5/hCF1QqvMiUA24rxgs9ZLdB bocXJmlzg5OvOPJ7CY1Nd8DxfK+wnBdcLYQwDTfUdYzw3vpZ64mHAEGLUmVXEc7c5ChY 2jHA== X-Gm-Message-State: ALKqPwcnO/XMdgbvt75VDL8ob+Gkd6jH+x6C0v1HRQgx8aDCpWIfR3D+ hR1n1f/xLFazt30wslG48NnfaYkb+Stvntz12em99Nj1wXkOtec/IcV+3g5Oj8WoJhQ/vghoGEl fSwiZa6ROXCJW2CMCX4yKPfcNiW+AwfovIZFaRbYwIg/w+zKOfDg7AaEAkd41quBdzmqTLquyXN m9jJn3ZxfX8EKXPi+EPnQ/IzPC67AeyyjABhHryMtF2sjXbcQ31RyoHJemA+RwN6GWTUwyMRf4+ ft0yU351kjtrob9PZzCP3bIt0gpLKqa7PhQJXxPocp2cP//9hLDdY6edGmMxBocOlefincN7jSb 3BWIg3+svD/4u249Wj9KT0JMpyYf1+lmRatLpoAZ2dNbCZCWb4RjdrEk2LGAkCt7v3SGa1ph97V d X-Received: by 2002:a62:e903:: with SMTP id j3-v6mr3727511pfh.196.1527095246403; Wed, 23 May 2018 10:07:26 -0700 (PDT) X-Received: by 2002:a62:e903:: with SMTP id j3-v6mr3727390pfh.196.1527095244324; Wed, 23 May 2018 10:07:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527095244; cv=none; d=google.com; s=arc-20160816; b=Pya/jCKuItRD39kv/i/y3UP7yC5k1mCKqF/yGjzAAizcI0LGW1Hfq3CePoEIqr+wnC Mfs4VUZq+UaNLB6zqIwsPRSLu7TywdjVWi2SW/xhDwlJjDTFXv5XFZueG7AkEVQHfJWC aiZtrU1brifnnoSthItOGuYClDVWClw06ly2S5eqRWyw0ihDLOqNzsn9W3F60wqOD7Qw yVhpsukado93lytckNAVcbqe1uoiWbP4xEZV8eRPN/VRsl1P5dTfgf5IiTO+cuKXyJQo hlWVtJMjuenD0KC+1KD1us10O+gXNe0jSf9lxxbewh1Yhig+aHSKpbCbqZ/hYW/7s+/V EcYA== 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=zHX6vj0yUosU1Yfo3onMPiW90dQ8apjipbJ481pfeSI=; b=INCeBNlutnImnCv8Ai/ZW/bXasEtx5Pa3K+Q9YOS4fc/x6+lHt/qxnYpFx8ZX44/SR TNj+R5Y8ySjV6fPqN6ZbczBB6PZ3hBKCy5iHbJYyOrrrhlswdKfu+sO5ngCn7x3k/WRV 6lVtqDZ3LgOb0F0XkZYJkSzC1La2isqyEfuvESujpnKnBdGg2TasJXi4ulYgOcKMhu8t Pl7XyS95Hl1ghAbx5+SAK6SGCA/2nBo3YYSuJQGac1ntW5HZYs40Lm8UBe8e5UCAm/Pe GYOG+92xsgP+S/pnnxFLWkMmV8o2NZPA3gJ1r32n8rNCQ1mQtZ1J9HPCWp+6xgr5X4xB gGNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OQPjybPZ; 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 t71-v6sor5172667pgd.65.2018.05.23.10.07.24 for (Google Transport Security); Wed, 23 May 2018 10:07:24 -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=OQPjybPZ; 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=zHX6vj0yUosU1Yfo3onMPiW90dQ8apjipbJ481pfeSI=; b=OQPjybPZLnMNvkBbzehABjsvNx7elZM/CHSCuDaq3UF+BBDbJ/SbT49byYWQvlpeF8 Ikl+761hx3tpRAZSvFazHpSlK9o916daJXMN6jQzar2NPCmByRTILiB/RT8D0zJk3qZW KF7Zidn6rvyQgm/5cei2OrNjm9D5Z16OlKN2QbjHr9zPEppUJjXGZzJ/zZ1mGlvV2zBZ pX6jG8Dqrichx79Sy/oeodYOSVCu0B9PYOM26086IkqibUXG36oaC1QQl+JGAsOVf7hB ticmmIlNBjgKcGSVNcKBiM3ZsGeM+ogTlH+rOziExW4wpw1F0zyZx6djeTE6lXA9yxjo Qu4A== X-Google-Smtp-Source: AB8JxZrgR9gjPZKz2l7J7uS/+SBPb63YzOQOlQ2mNOdpKXmOjHt1pTcsRaObh2VYyNRTh8/1Bqey/g== X-Received: by 2002:a63:794d:: with SMTP id u74-v6mr2980610pgc.328.1527095244049; Wed, 23 May 2018 10:07:24 -0700 (PDT) Received: from localhost.localdomain ([123.120.56.60]) by smtp.gmail.com with ESMTPSA id a5-v6sm45611363pff.8.2018.05.23.10.07.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 10:07:23 -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 7/9] mm/zsmalloc: update usage of zone modifiers Date: Thu, 24 May 2018 01:07:06 +0800 Message-Id: <1527095226-5079-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, Use GFP_NORMAL_UNMOVABLE() to clear bottom 4 bits of GFP bitmaks. Signed-off-by: Huaisheng Ye Cc: Minchan Kim Cc: Nitin Gupta Cc: Sergey Senozhatsky Cc: Christoph Hellwig --- mm/zsmalloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 61cb05d..e250c69 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -345,7 +345,7 @@ static void destroy_cache(struct zs_pool *pool) static unsigned long cache_alloc_handle(struct zs_pool *pool, gfp_t gfp) { return (unsigned long)kmem_cache_alloc(pool->handle_cachep, - gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE)); + GFP_NORMAL_UNMOVABLE(gfp)); } static void cache_free_handle(struct zs_pool *pool, unsigned long handle) @@ -356,7 +356,7 @@ static void cache_free_handle(struct zs_pool *pool, unsigned long handle) static struct zspage *cache_alloc_zspage(struct zs_pool *pool, gfp_t flags) { return kmem_cache_alloc(pool->zspage_cachep, - flags & ~(__GFP_HIGHMEM|__GFP_MOVABLE)); + GFP_NORMAL_UNMOVABLE(flags)); } static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage)