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,URIBL_BLOCKED,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 849F1C433B4 for ; Thu, 15 Apr 2021 12:42:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0434C61249 for ; Thu, 15 Apr 2021 12:42:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0434C61249 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 80A106B0070; Thu, 15 Apr 2021 08:42:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B8FE6B0071; Thu, 15 Apr 2021 08:42:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65ADB6B0072; Thu, 15 Apr 2021 08:42:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0202.hostedemail.com [216.40.44.202]) by kanga.kvack.org (Postfix) with ESMTP id 46F456B0070 for ; Thu, 15 Apr 2021 08:42:25 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F0FA01EF2 for ; Thu, 15 Apr 2021 12:42:24 +0000 (UTC) X-FDA: 78034564608.06.55F5A3F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id D4A7D40002DE for ; Thu, 15 Apr 2021 12:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618490544; 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=ar7jE+OGjgWhr4Cr/7k8/to/kgomCc9gO1itsRhfVjo=; b=EP9jyR0vxQhkoqXFevQtJFSImtQA2+hHYMeMy9eFDnC47W0M9nHPDkWRlrWLpqFVdd3HFB szecMVZbJLsLq8QTNWHIFsGkjvvdRZ7iktuW8Cfd5MuokgJU84FzDadyMyD+aD1EzgHxXy zKqLqDO0KwJTqLQ6QFnVgjK2NbFuynw= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-364-dIeIdyCBMfOnzca5Q3zAMg-1; Thu, 15 Apr 2021 08:42:22 -0400 X-MC-Unique: dIeIdyCBMfOnzca5Q3zAMg-1 Received: by mail-wr1-f72.google.com with SMTP id y13-20020adfdf0d0000b02901029a3bf796so2705511wrl.15 for ; Thu, 15 Apr 2021 05:42:22 -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=ar7jE+OGjgWhr4Cr/7k8/to/kgomCc9gO1itsRhfVjo=; b=GvaVJDaELRyt6KHyFNUEZ34BzJ6BR4NYYuAPZmfQKE/y19BvDNtxixKisIu7fIgu5Q 5AhP03RaVzt8n6IotAJc7d6H2B6cGeByBVEIqYX257j3FoEwIwyVxHn5Ljvh3KiVR3eD syCF0M6v4mp5HDCgeDSBaMC7T6onW/8paSFEX4LGP3oaxMgIWn1/G2HYW93XqsnBvdqy bVClsu3O505q0IBViOZBruXAUILCPGE0EHWfIVAc1tuFoMVyDevXjEpphzh516I9LrK5 lqKAiQEq1jSWeOS9Jnx1xdDAiqf943l5slWgrg8Zp+ikxZsThkZrg2mZUM6eu6zU0upk Y+Gw== X-Gm-Message-State: AOAM5304YeCb+fH/JPO9zZCXQl6Ydp+bWX3Czn4lVhSNt53hfsZ0cPHk C2hSkrtoZf8ioFISoj60TGNjj6IkGaZG6/4yBbznRNqLpY4b0LJK3PEvuwFjcyXtVMjdRRjQDs7 lRFvguT3ic2M= X-Received: by 2002:a5d:658c:: with SMTP id q12mr3398343wru.30.1618490541373; Thu, 15 Apr 2021 05:42:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy70NNG0NvXrtbxBSPuoc+/nExBGycC8ugDorCmUYmJFJyQFhnrWCbd70HcbUQjCzoKdJC/+A== X-Received: by 2002:a5d:658c:: with SMTP id q12mr3398324wru.30.1618490541195; Thu, 15 Apr 2021 05:42:21 -0700 (PDT) Received: from [192.168.3.132] (p5b0c6392.dip0.t-ipconnect.de. [91.12.99.146]) by smtp.gmail.com with ESMTPSA id w4sm2848464wrp.58.2021.04.15.05.42.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 15 Apr 2021 05:42:20 -0700 (PDT) Subject: Re: [PATCH v8 4/7] mm,hugetlb: Split prep_new_huge_page functionality 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: <20210415103544.6791-1-osalvador@suse.de> <20210415103544.6791-5-osalvador@suse.de> From: David Hildenbrand Organization: Red Hat Message-ID: <021eb32f-9664-8a1b-c3eb-9d51ca4fe21a@redhat.com> Date: Thu, 15 Apr 2021 14:42:20 +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: <20210415103544.6791-5-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-Stat-Signature: md39pwkmyry14pdn8jx4ui385uyyaygb X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: D4A7D40002DE Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf10; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=170.10.133.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1618490538-766801 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 15.04.21 12:35, Oscar Salvador wrote: > Currently, prep_new_huge_page() performs two functions. > It sets the right state for a new hugetlb, and increases the hstate's > counters to account for the new page. > > Let us split its functionality into two separate functions, decoupling > the handling of the counters from initializing a hugepage. > The outcome is having __prep_new_huge_page(), which only > initializes the page , and __prep_account_new_huge_page(), which adds > the new page to the hstate's counters. > > This allows us to be able to set a hugetlb without having to worry > about the counter/locking. It will prove useful in the next patch. > prep_new_huge_page() still calls both functions. > > Signed-off-by: Oscar Salvador > Acked-by: Michal Hocko > Reviewed-by: Mike Kravetz > --- > mm/hugetlb.c | 20 +++++++++++++++++--- > 1 file changed, 17 insertions(+), 3 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 2cb9fa79cbaa..6f39ec79face 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1483,16 +1483,30 @@ void free_huge_page(struct page *page) > } > } > > -static void prep_new_huge_page(struct hstate *h, struct page *page, int nid) > +/* > + * Must be called with the hugetlb lock held > + */ > +static void __prep_account_new_huge_page(struct hstate *h, int nid) > +{ > + lockdep_assert_held(&hugetlb_lock); > + h->nr_huge_pages++; > + h->nr_huge_pages_node[nid]++; > +} > + > +static void __prep_new_huge_page(struct page *page) > { > INIT_LIST_HEAD(&page->lru); > set_compound_page_dtor(page, HUGETLB_PAGE_DTOR); > hugetlb_set_page_subpool(page, NULL); > set_hugetlb_cgroup(page, NULL); > set_hugetlb_cgroup_rsvd(page, NULL); > +} > + > +static void prep_new_huge_page(struct hstate *h, struct page *page, int nid) > +{ > + __prep_new_huge_page(page); > spin_lock_irq(&hugetlb_lock); > - h->nr_huge_pages++; > - h->nr_huge_pages_node[nid]++; > + __prep_account_new_huge_page(h, nid); > spin_unlock_irq(&hugetlb_lock); > } > > Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb