From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 000A6C433E3 for ; Tue, 21 Jul 2020 12:39:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AB31D20717 for ; Tue, 21 Jul 2020 12:39:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB31D20717 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 345E56B0002; Tue, 21 Jul 2020 08:39:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F4FB6B0003; Tue, 21 Jul 2020 08:39:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20C2B6B0005; Tue, 21 Jul 2020 08:39:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0080.hostedemail.com [216.40.44.80]) by kanga.kvack.org (Postfix) with ESMTP id 0BF526B0002 for ; Tue, 21 Jul 2020 08:39:03 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 9E92F8248047 for ; Tue, 21 Jul 2020 12:39:02 +0000 (UTC) X-FDA: 77062037724.18.steam57_4c0ee4626f2d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin18.hostedemail.com (Postfix) with ESMTP id 75D76100EF84E for ; Tue, 21 Jul 2020 12:39:02 +0000 (UTC) X-HE-Tag: steam57_4c0ee4626f2d X-Filterd-Recvd-Size: 2997 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Tue, 21 Jul 2020 12:39:01 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 55666B182; Tue, 21 Jul 2020 12:39:07 +0000 (UTC) Subject: Re: [PATCH] mm/page_alloc: fix memalloc_nocma_{save/restore} APIs To: Matthew Wilcox , js1304@gmail.com Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@lge.com, Christoph Hellwig , Roman Gushchin , Mike Kravetz , Naoya Horiguchi , Michal Hocko , "Aneesh Kumar K . V" , Joonsoo Kim , stable@vger.kernel.org References: <1595302129-23895-1-git-send-email-iamjoonsoo.kim@lge.com> <20200721120533.GD15516@casper.infradead.org> From: Vlastimil Babka Message-ID: <4c484ce0-cfed-0c50-7a20-d1474ce9afee@suse.cz> Date: Tue, 21 Jul 2020 14:38:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200721120533.GD15516@casper.infradead.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 75D76100EF84E X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: On 7/21/20 2:05 PM, Matthew Wilcox wrote: > On Tue, Jul 21, 2020 at 12:28:49PM +0900, js1304@gmail.com wrote: >> +static inline unsigned int current_alloc_flags(gfp_t gfp_mask, >> + unsigned int alloc_flags) >> +{ >> +#ifdef CONFIG_CMA >> + unsigned int pflags = current->flags; >> + >> + if (!(pflags & PF_MEMALLOC_NOCMA) && >> + gfp_migratetype(gfp_mask) == MIGRATE_MOVABLE) >> + alloc_flags |= ALLOC_CMA; > > Please don't indent by one tab when splitting a line because it looks like > the second line and third line are part of the same block. Either do > this: > > if (!(pflags & PF_MEMALLOC_NOCMA) && > gfp_migratetype(gfp_mask) == MIGRATE_MOVABLE) > alloc_flags |= ALLOC_CMA; > > or this: > if (!(pflags & PF_MEMALLOC_NOCMA) && > gfp_migratetype(gfp_mask) == MIGRATE_MOVABLE) > alloc_flags |= ALLOC_CMA; Ah, good point. >> @@ -4619,8 +4631,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, >> wake_all_kswapds(order, gfp_mask, ac); >> >> reserve_flags = __gfp_pfmemalloc_flags(gfp_mask); >> - if (reserve_flags) >> + if (reserve_flags) { >> alloc_flags = reserve_flags; >> + alloc_flags = current_alloc_flags(gfp_mask, alloc_flags); >> + } > > Is this right? Shouldn't you be passing reserve_flags to > current_alloc_flags() here? Also, there's no need to add { } here. Note the "alloc_flags = reserve_flags;" line is not being deleted here. But if it was, your points would be true, and yeah it would be a bit more tidy.