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=-4.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 1144BC433E0 for ; Thu, 9 Jul 2020 06:43:45 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CFC9020708 for ; Thu, 9 Jul 2020 06:43:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFC9020708 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 747D36B0008; Thu, 9 Jul 2020 02:43:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D0306B000C; Thu, 9 Jul 2020 02:43:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 598516B000D; Thu, 9 Jul 2020 02:43:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0197.hostedemail.com [216.40.44.197]) by kanga.kvack.org (Postfix) with ESMTP id 42E286B0008 for ; Thu, 9 Jul 2020 02:43:44 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 01BEB8248D52 for ; Thu, 9 Jul 2020 06:43:44 +0000 (UTC) X-FDA: 77017596768.09.list80_611731926ec3 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin09.hostedemail.com (Postfix) with ESMTP id D496A180AD801 for ; Thu, 9 Jul 2020 06:43:43 +0000 (UTC) X-HE-Tag: list80_611731926ec3 X-Filterd-Recvd-Size: 6387 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Thu, 9 Jul 2020 06:43:43 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id o8so645686wmh.4 for ; Wed, 08 Jul 2020 23:43:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=8YpegqAWT/bjJvlOq0I/Mi3KqTiz8SbdYlvSBIE+Da4=; b=gy84HpOPbtbvWqmqF+owQ7LYE9ZJRntl1vTsl8+AYGzgqYLnfAXpKLAM1+KMAT978P B5VDBac8bHH/jyf78W+yRIdWNCpiJqbS3yt0IhYP3nAlZdLy1N7DU0Qi0TbT9MoZCg9+ 6B8BJG1K/DCxQ1k0hsIWOrnXlmcEKPgTqnT1p8x7lXGRm9r0+8c+n8hviXCnoPIWAt+H FT845B58nU7hL3dXYZ9j8K8u7CWSL48fmO3mwtHyavo/fOsK+a8+A01CnIgqoWMiyZJ3 scMuJPC/P0E+ih7lWowNwZcx6JtDW0lAs+Bd7Ja7amB0muFDmFK5BPbD20eevyefch8r gV+A== X-Gm-Message-State: AOAM533tY/vQdoCOh6tcm1U3q804DQnGaGBipTf1k8zTyb9rjnZiXIZ9 T6ekT+2KF5QmYZJ9Aegka6s= X-Google-Smtp-Source: ABdhPJzxBKAHGkSGOC291xS+3G8c/+KPFzP0bBQ5AGZ747jCbO0bB/0w22i1PatbGi7Y/wHwD4GDFw== X-Received: by 2002:a05:600c:241:: with SMTP id 1mr12476277wmj.119.1594277021843; Wed, 08 Jul 2020 23:43:41 -0700 (PDT) Received: from localhost (ip-37-188-179-51.eurotel.cz. [37.188.179.51]) by smtp.gmail.com with ESMTPSA id z16sm3828164wrr.35.2020.07.08.23.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2020 23:43:41 -0700 (PDT) Date: Thu, 9 Jul 2020 08:43:40 +0200 From: Michal Hocko To: Joonsoo Kim Cc: Vlastimil Babka , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@lge.com, Christoph Hellwig , Roman Gushchin , Mike Kravetz , Naoya Horiguchi Subject: Re: [PATCH v4 04/11] mm/hugetlb: make hugetlb migration callback CMA aware Message-ID: <20200709064340.GB19160@dhcp22.suse.cz> References: <1594107889-32228-1-git-send-email-iamjoonsoo.kim@lge.com> <1594107889-32228-5-git-send-email-iamjoonsoo.kim@lge.com> <20200708071602.GB16543@js1304-desktop> <20200708074103.GD7271@dhcp22.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200708074103.GD7271@dhcp22.suse.cz> X-Rspamd-Queue-Id: D496A180AD801 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 Wed 08-07-20 09:41:06, Michal Hocko wrote: > On Wed 08-07-20 16:16:02, Joonsoo Kim wrote: > > On Tue, Jul 07, 2020 at 01:22:31PM +0200, Vlastimil Babka wrote: > > > On 7/7/20 9:44 AM, js1304@gmail.com wrote: > > > > From: Joonsoo Kim > > > > > > > > new_non_cma_page() in gup.c which try to allocate migration target page > > > > requires to allocate the new page that is not on the CMA area. > > > > new_non_cma_page() implements it by removing __GFP_MOVABLE flag. This way > > > > works well for THP page or normal page but not for hugetlb page. > > > > > > > > hugetlb page allocation process consists of two steps. First is dequeing > > > > from the pool. Second is, if there is no available page on the queue, > > > > allocating from the page allocator. > > > > > > > > new_non_cma_page() can control allocation from the page allocator by > > > > specifying correct gfp flag. However, dequeing cannot be controlled until > > > > now, so, new_non_cma_page() skips dequeing completely. It is a suboptimal > > > > since new_non_cma_page() cannot utilize hugetlb pages on the queue so this > > > > patch tries to fix this situation. > > > > > > > > This patch makes the deque function on hugetlb CMA aware and skip CMA > > > > pages if newly added skip_cma argument is passed as true. > > > > > > Hmm, can't you instead change dequeue_huge_page_node_exact() to test the PF_ > > > flag and avoid adding bool skip_cma everywhere? > > > > Okay! Please check following patch. > > > > > > I think that's what Michal suggested [1] except he said "the code already does > > > by memalloc_nocma_{save,restore} API". It needs extending a bit though, AFAICS. > > > __gup_longterm_locked() indeed does the save/restore, but restore comes before > > > check_and_migrate_cma_pages() and thus new_non_cma_page() is called, so an > > > adjustment is needed there, but that's all? > > > > > > Hm the adjustment should be also done because save/restore is done around > > > __get_user_pages_locked(), but check_and_migrate_cma_pages() also calls > > > __get_user_pages_locked(), and that call not being between nocma save and > > > restore is thus also a correctness issue? > > > > Simply, I call memalloc_nocma_{save,restore} in new_non_cma_page(). It > > would not cause any problem. > > I believe a proper fix is the following. The scope is really defined for > FOLL_LONGTERM pins and pushing it inside check_and_migrate_cma_pages > will solve the problem as well but it imho makes more sense to do it in > the caller the same way we do for any others. > > Fixes: 9a4e9f3b2d73 ("mm: update get_user_pages_longterm to migrate pages allocated from CMA region") > > I am not sure this is worth backporting to stable yet. Should I post it as a separate patch do you plan to include this into your next version? > > diff --git a/mm/gup.c b/mm/gup.c > index de9e36262ccb..75980dd5a2fc 100644 > --- a/mm/gup.c > +++ b/mm/gup.c > @@ -1794,7 +1794,6 @@ static long __gup_longterm_locked(struct task_struct *tsk, > vmas_tmp, NULL, gup_flags); > > if (gup_flags & FOLL_LONGTERM) { > - memalloc_nocma_restore(flags); > if (rc < 0) > goto out; > > @@ -1802,11 +1801,13 @@ static long __gup_longterm_locked(struct task_struct *tsk, > for (i = 0; i < rc; i++) > put_page(pages[i]); > rc = -EOPNOTSUPP; > + memalloc_nocma_restore(flags); > goto out; > } > > rc = check_and_migrate_cma_pages(tsk, mm, start, rc, pages, > vmas_tmp, gup_flags); > + memalloc_nocma_restore(flags); > } > > out: > -- > Michal Hocko > SUSE Labs -- Michal Hocko SUSE Labs