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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9890CC433E0 for ; Wed, 6 Jan 2021 14:21:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1E2792311B for ; Wed, 6 Jan 2021 14:21:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E2792311B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7B1436B020E; Wed, 6 Jan 2021 09:21:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 739E96B0213; Wed, 6 Jan 2021 09:21:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 58EC56B0246; Wed, 6 Jan 2021 09:21:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0054.hostedemail.com [216.40.44.54]) by kanga.kvack.org (Postfix) with ESMTP id 3BCAC6B020E for ; Wed, 6 Jan 2021 09:21:02 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id EA4F1181AEF21 for ; Wed, 6 Jan 2021 14:21:01 +0000 (UTC) X-FDA: 77675561922.29.wrist81_0616476274e2 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id C4811180868DC for ; Wed, 6 Jan 2021 14:20:58 +0000 (UTC) X-HE-Tag: wrist81_0616476274e2 X-Filterd-Recvd-Size: 9135 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Wed, 6 Jan 2021 14:20:58 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id q4so1611406plr.7 for ; Wed, 06 Jan 2021 06:20:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9dJD9jIzWDoyhaAcVJQeaUo28aYYhfu54r+mE2CBxNg=; b=o383ghz8HXXGrRY9KqtLQYFhlyvvQT/xvfQy7A2Mg1jVAo8f97qxZteIL9PDoL0Bvq cVmGpCz9aE4xOKwPvVOxBjPusSsT8Kbm8eube8E0rH/Rc4It+g13zWxEn9wMh7LyNJa+ LGFFYFRcixOYFkwMwmOyzHRp/5kAQsSUeDkJ98pEbz8HPdtoQsSstJX+ZjhuZRUEAGW2 c7aCilIgOh6Qg1o/pCnjl19db9xUn3shxOQCCsFlaU5REkTHIBAjTtMWjbxPcbaE/Ug1 C0ugndK5eB7z6f1srm0FDumoDEecZSgaGCmWptGHDlnOKpKrt0Jn603dtKSW+qfZbiOU F52w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9dJD9jIzWDoyhaAcVJQeaUo28aYYhfu54r+mE2CBxNg=; b=QaLfwn1T3dlHQ9CRAHcLOL4C1N3Ka4O4qU5YmExUX+924+eyzibGs/FTEBrDzybK3E D+3HOhS0OvzWNqHKKNBU34OxIzfvzcdWTDASwDaH8BpX6MPLNhu+MruzLrYIzdgabfjm ymm5T1IeXOBbE9iuM5wAuqPm7byUD4BBRM2dRAnibBQZujjWMYHbyV+tpQuVQn3xb6nx l7YBMoauDANGZ1Yl7gd4pWTTf+RsSTSZl14BSQTRJmny4STRaz8rBZI8tLehKy/HxeoC aMW9bSl3aKQjzO8KziykC/j1nh832xvjoLlaU4Is3CzuESMgpEz9n5kooTP/qDzWJRFG nuAw== X-Gm-Message-State: AOAM533ppRvYLsPu8WHBS62K++G2HxT8YPxXbzk+0OJca4gQnB7Z9+nN PZh6XPT3PCC82mHRTzpSHW9rfA== X-Google-Smtp-Source: ABdhPJy2D4DUnh0jFoHdDgH9rkdTzNtaF+xPdJt0bOSH/kuanYvrbndIV2FtJQdLvDbOj8v02hoFyw== X-Received: by 2002:a17:902:521:b029:dc:2836:ec17 with SMTP id 30-20020a1709020521b02900dc2836ec17mr4323835plf.47.1609942857016; Wed, 06 Jan 2021 06:20:57 -0800 (PST) Received: from localhost.bytedance.net ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id a29sm2831730pfr.73.2021.01.06.06.20.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 06:20:56 -0800 (PST) From: Muchun Song To: corbet@lwn.net, mike.kravetz@oracle.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, paulmck@kernel.org, mchehab+huawei@kernel.org, pawan.kumar.gupta@linux.intel.com, rdunlap@infradead.org, oneukum@suse.com, anshuman.khandual@arm.com, jroedel@suse.de, almasrymina@google.com, rientjes@google.com, willy@infradead.org, osalvador@suse.de, mhocko@suse.com, song.bao.hua@hisilicon.com, david@redhat.com, naoya.horiguchi@nec.com Cc: duanxiongchun@bytedance.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Muchun Song Subject: [PATCH v12 05/13] mm/hugetlb: Defer freeing of HugeTLB pages Date: Wed, 6 Jan 2021 22:19:23 +0800 Message-Id: <20210106141931.73931-6-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210106141931.73931-1-songmuchun@bytedance.com> References: <20210106141931.73931-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: In the subsequent patch, we should allocate the vmemmap pages when freeing HugeTLB pages. But update_and_free_page() is always called with holding hugetlb_lock, so we cannot use GFP_KERNEL to allocate vmemmap pages. However, we can defer the actual freeing in a kworker to prevent from using GFP_ATOMIC to allocate the vmemmap pages. The update_hpage_vmemmap_workfn() is where the call to allocate vmemmmap pages will be inserted. Signed-off-by: Muchun Song Reviewed-by: Mike Kravetz --- mm/hugetlb.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++= ++++-- mm/hugetlb_vmemmap.c | 12 --------- mm/hugetlb_vmemmap.h | 17 ++++++++++++ 3 files changed, 89 insertions(+), 14 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 140135fc8113..c165186ec2cf 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1292,15 +1292,85 @@ static inline void destroy_compound_gigantic_page= (struct page *page, unsigned int order) { } #endif =20 -static void update_and_free_page(struct hstate *h, struct page *page) +static void __free_hugepage(struct hstate *h, struct page *page); + +/* + * As update_and_free_page() is always called with holding hugetlb_lock,= so we + * cannot use GFP_KERNEL to allocate vmemmap pages. However, we can defe= r the + * actual freeing in a workqueue to prevent from using GFP_ATOMIC to all= ocate + * the vmemmap pages. + * + * The update_hpage_vmemmap_workfn() is where the call to allocate vmemm= map + * pages will be inserted. + * + * update_hpage_vmemmap_workfn() locklessly retrieves the linked list of= pages + * to be freed and frees them one-by-one. As the page->mapping pointer i= s going + * to be cleared in update_hpage_vmemmap_workfn() anyway, it is reused a= s the + * llist_node structure of a lockless linked list of huge pages to be fr= eed. + */ +static LLIST_HEAD(hpage_update_freelist); + +static void update_hpage_vmemmap_workfn(struct work_struct *work) { - int i; + struct llist_node *node; + + node =3D llist_del_all(&hpage_update_freelist); + + while (node) { + struct page *page; + struct hstate *h; + + page =3D container_of((struct address_space **)node, + struct page, mapping); + node =3D node->next; + page->mapping =3D NULL; + h =3D page_hstate(page); + + spin_lock(&hugetlb_lock); + __free_hugepage(h, page); + spin_unlock(&hugetlb_lock); =20 + cond_resched(); + } +} +static DECLARE_WORK(hpage_update_work, update_hpage_vmemmap_workfn); + +static inline void __update_and_free_page(struct hstate *h, struct page = *page) +{ + /* No need to allocate vmemmap pages */ + if (!free_vmemmap_pages_per_hpage(h)) { + __free_hugepage(h, page); + return; + } + + /* + * Defer freeing to avoid using GFP_ATOMIC to allocate vmemmap + * pages. + * + * Only call schedule_work() if hpage_update_freelist is previously + * empty. Otherwise, schedule_work() had been called but the workfn + * hasn't retrieved the list yet. + */ + if (llist_add((struct llist_node *)&page->mapping, + &hpage_update_freelist)) + schedule_work(&hpage_update_work); +} + +static void update_and_free_page(struct hstate *h, struct page *page) +{ if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported()) return; =20 h->nr_huge_pages--; h->nr_huge_pages_node[page_to_nid(page)]--; + + __update_and_free_page(h, page); +} + +static void __free_hugepage(struct hstate *h, struct page *page) +{ + int i; + for (i =3D 0; i < pages_per_huge_page(h); i++) { page[i].flags &=3D ~(1 << PG_locked | 1 << PG_error | 1 << PG_referenced | 1 << PG_dirty | diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index 4ffa2a4ae2a8..19f1898aaede 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -178,18 +178,6 @@ #define RESERVE_VMEMMAP_NR 2U #define RESERVE_VMEMMAP_SIZE (RESERVE_VMEMMAP_NR << PAGE_SHIFT) =20 -/* - * How many vmemmap pages associated with a HugeTLB page that can be fre= ed - * to the buddy allocator. - * - * Todo: Returns zero for now, which means the feature is disabled. We w= ill - * enable it once all the infrastructure is there. - */ -static inline unsigned int free_vmemmap_pages_per_hpage(struct hstate *h= ) -{ - return 0; -} - static inline unsigned long free_vmemmap_pages_size_per_hpage(struct hst= ate *h) { return (unsigned long)free_vmemmap_pages_per_hpage(h) << PAGE_SHIFT; diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h index 6923f03534d5..01f8637adbe0 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -12,9 +12,26 @@ =20 #ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP void free_huge_page_vmemmap(struct hstate *h, struct page *head); + +/* + * How many vmemmap pages associated with a HugeTLB page that can be fre= ed + * to the buddy allocator. + * + * Todo: Returns zero for now, which means the feature is disabled. We w= ill + * enable it once all the infrastructure is there. + */ +static inline unsigned int free_vmemmap_pages_per_hpage(struct hstate *h= ) +{ + return 0; +} #else static inline void free_huge_page_vmemmap(struct hstate *h, struct page = *head) { } + +static inline unsigned int free_vmemmap_pages_per_hpage(struct hstate *h= ) +{ + return 0; +} #endif /* CONFIG_HUGETLB_PAGE_FREE_VMEMMAP */ #endif /* _LINUX_HUGETLB_VMEMMAP_H */ --=20 2.11.0