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=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 17DFBC433B4 for ; Fri, 16 Apr 2021 08:36:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B450161166 for ; Fri, 16 Apr 2021 08:36:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B450161166 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 477C06B0036; Fri, 16 Apr 2021 04:36:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 428196B006C; Fri, 16 Apr 2021 04:36:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 279AD6B0070; Fri, 16 Apr 2021 04:36:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0029.hostedemail.com [216.40.44.29]) by kanga.kvack.org (Postfix) with ESMTP id 092566B0036 for ; Fri, 16 Apr 2021 04:36:07 -0400 (EDT) Received: from smtpin09.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B64C218045E62 for ; Fri, 16 Apr 2021 08:36:06 +0000 (UTC) X-FDA: 78037572732.09.3DB9E81 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 9E31F80192D8 for ; Fri, 16 Apr 2021 08:36:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618562165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gAIh4WsVS/ayzhp5HjJe99OkPRqXPu6YrMhzHKnuu4E=; b=hJjnNGSTtGsetkTtNTHoPe7kiyUYH3d4VP1SXJxOEQ3kF/bHh45c1p0h1DJWdT1tRRRk0b j7wicOwLCleK8HBxnh5L59i1NK5pRo3SL7FR34Z70TRwjXJ9o4jPuPQ4vCMPasEwa4vXn4 HnZyI0LB1OoQ11mH1JIPmU8Da449VBY= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-161-8ncmMHxeMzqc4PTGuotD-w-1; Fri, 16 Apr 2021 04:36:04 -0400 X-MC-Unique: 8ncmMHxeMzqc4PTGuotD-w-1 Received: by mail-ed1-f69.google.com with SMTP id l7-20020aa7c3070000b029038502ffe9f2so862216edq.16 for ; Fri, 16 Apr 2021 01:36:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=gAIh4WsVS/ayzhp5HjJe99OkPRqXPu6YrMhzHKnuu4E=; b=PXf631wzzpYz2XR3otKYONDO5XsPq/qDBLJqo3UxvDmWLED8+SDkTsPb4pchTdcUhv db2mwNF+d6FYkf+HLyoseOqBCDEB13XaWrP6pFhTM1FE/H9jTr0LFNSwl52Wy81C3/BI 1414WEaWQapANOk84TMj6ok3FuFsrhS1i0l+BJivL8ywvU8fsYoWZfwBs+UHODmBzGQ+ Bv4TnYk1FslT7a89H/oEyyE5PkF/vGso4jZpi4Xp+c8DaKVSaXuiY0f6tIHV473sjWxC +eCqaP3DpfadukXLHDug4ue5cja/MNvjGH1taWjq3V4kRrIJhRJKttu4mynny8usdL9I ha2w== X-Gm-Message-State: AOAM530NcTki/hNxr1xlSIOPaah3u/FCjxdiEofd7xhCyNcvpcHaj3V/ fcWzj9fq01lvuGCypPIDyKVbL1Wkdy8pjUeW+qjCXedgq016WusItfNyylKnkTFy6WY2DOY6SwC takXNtiI5TTw= X-Received: by 2002:a17:906:2b03:: with SMTP id a3mr7529689ejg.481.1618562162786; Fri, 16 Apr 2021 01:36:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgAusKooTgufLR2oxQaNZJSdVLxPdce8E3XlDxu6rxKUOMWItS6xghBQPlz5lFNQCfdDw8FQ== X-Received: by 2002:a17:906:2b03:: with SMTP id a3mr7529674ejg.481.1618562162630; Fri, 16 Apr 2021 01:36:02 -0700 (PDT) Received: from [192.168.3.132] (p5b0c64fb.dip0.t-ipconnect.de. [91.12.100.251]) by smtp.gmail.com with ESMTPSA id k16sm3764251ejv.37.2021.04.16.01.36.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Apr 2021 01:36:02 -0700 (PDT) Subject: Re: [PATCH v9 6/7] mm: Make alloc_contig_range handle in-use hugetlb pages To: Oscar Salvador , Andrew Morton Cc: Mike Kravetz , Vlastimil Babka , Michal Hocko , Muchun Song , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Michal Hocko References: <20210416070023.4742-1-osalvador@suse.de> <20210416070023.4742-7-osalvador@suse.de> From: David Hildenbrand Organization: Red Hat Message-ID: <02de399f-1ecf-98d6-6a78-1301f9a97d5a@redhat.com> Date: Fri, 16 Apr 2021 10:36:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210416070023.4742-7-osalvador@suse.de> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 9E31F80192D8 X-Stat-Signature: in8683pyyan4x54zq4xk9a8eqypmmobn Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf16; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618562165-560695 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: > -int isolate_or_dissolve_huge_page(struct page *page) > +int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list) > { > struct hstate *h; > struct page *head; > + int ret = -EBUSY; > > /* > * The page might have been dissolved from under our feet, so make sure > @@ -2373,13 +2380,18 @@ int isolate_or_dissolve_huge_page(struct page *page) > > /* > * Fence off gigantic pages as there is a cyclic dependency between > - * alloc_contig_range and them. Return -ENOME as this has the effect > + * alloc_contig_range and them. Return -ENOMEM as this has the effect Nit: belongs into previous patch. > * of bailing out right away without further retrying. > */ > if (hstate_is_gigantic(h)) > return -ENOMEM; > > - return alloc_and_dissolve_huge_page(h, head); > + if (page_count(head) && isolate_huge_page(head, list)) > + ret = 0; > + else if (!page_count(head)) > + ret = alloc_and_dissolve_huge_page(h, head, list); > + > + return ret; > } > > struct page *alloc_huge_page(struct vm_area_struct *vma, > diff --git a/mm/vmscan.c b/mm/vmscan.c > index bb8321026c0c..5199b9696bab 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1703,8 +1703,9 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, > LIST_HEAD(clean_pages); > > list_for_each_entry_safe(page, next, page_list, lru) { > - if (page_is_file_lru(page) && !PageDirty(page) && > - !__PageMovable(page) && !PageUnevictable(page)) { > + if (!PageHuge(page) && page_is_file_lru(page) && > + !PageDirty(page) && !__PageMovable(page) && > + !PageUnevictable(page)) { Nit: adding to the end of the list would require less modifications ;) > ClearPageActive(page); > list_move(&page->lru, &clean_pages); > } > Acked-by: David Hildenbrand -- Thanks, David / dhildenb