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,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 0BCA0C4361B for ; Sun, 13 Dec 2020 15:47:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B1C0023333 for ; Sun, 13 Dec 2020 15:47:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1C0023333 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 44C396B0036; Sun, 13 Dec 2020 10:47:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FB286B0074; Sun, 13 Dec 2020 10:47:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EB1C6B0075; Sun, 13 Dec 2020 10:47:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0038.hostedemail.com [216.40.44.38]) by kanga.kvack.org (Postfix) with ESMTP id 1B1D46B0036 for ; Sun, 13 Dec 2020 10:47:35 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id D90F33640 for ; Sun, 13 Dec 2020 15:47:34 +0000 (UTC) X-FDA: 77588688828.27.power62_2003b0427413 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id BE4253D663 for ; Sun, 13 Dec 2020 15:47:34 +0000 (UTC) X-HE-Tag: power62_2003b0427413 X-Filterd-Recvd-Size: 5439 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Sun, 13 Dec 2020 15:47:34 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id x12so6820487plr.10 for ; Sun, 13 Dec 2020 07:47:34 -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=W/IANVbAC10oR1yCmyJw00iPLDRZ87joisEDYZKBsYc=; b=h4QHAnO90pJNatAnqiSd6FwpDzPKz7evZGo6Jv35PHkvf5uGCTCg9scbUDwgPLF/Sq LQ9ChkrgO/TUNnGsjydbt2eKVo649UzWcUX4J5ecTj5HW0zAXFA81HyW5TSXoDqUeHYw 5oL3Ify2l+LN74TEgJ/wn2LU1QDb2/J6cFIlh+H7Fk6vHzeFSprETgweuy4eFr6NaL7X 3JOcCrDyd8tDLX+VHHoHnPEkJZbnOOcD38bz8ZiElx0carfbJDtEQQNtifMVRTTzlxNc NaEXhGSe++0/0e6WkfZTvxCAVErvsTyraCIJB85ne6TMeV3m4UkYRaOomSce4KQcY8hz DnfA== 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=W/IANVbAC10oR1yCmyJw00iPLDRZ87joisEDYZKBsYc=; b=bpcBsiBaREaVuQP5WhpPlFovWSS2nbESDz+GPHxQEfSaqW6jE81Gm9mr4ANJlRgUCR VI3NwshDYuWHRxnrG1P6f8+7SE5NiEF/dyeH2qrqFU9fY73cWdAm05gXznBFW5ZKTpGT iQXlxkbTe8NXU/kOPWIpa2UtPA/b+dYjKo0bKxoaUPgigdgiHbaBzKP6cB0TybFvHRZN brPaydf1fFEMTrcFlQ1y6zBvo7FIcDfYYUPM/x9BwNkvdZIWKLJdI2EeqWBymKxJwhTs btzwzSavrqpQrQPl27NMkrZmtzgK6Ym2oHcHcSK7z4x5uEJvwKIqQcQVcxuHIXM1znJM h7+g== X-Gm-Message-State: AOAM533c0jqXp/DFD0PmSGzVmRqLQi82VYejCcCnHuCMlpPnF96S6+M/ lQRSx38MFwzkog9XQNFaEqfcmw== X-Google-Smtp-Source: ABdhPJwNK76xsvc3WyZtf8T7mzZOaqed1/OA/f6WnTwj0FynXSxGhw2aZSeW3K5vwAg3d5eRa/Z7qQ== X-Received: by 2002:a17:90a:248:: with SMTP id t8mr21928466pje.193.1607874453575; Sun, 13 Dec 2020 07:47:33 -0800 (PST) Received: from localhost.bytedance.net ([103.136.221.66]) by smtp.gmail.com with ESMTPSA id e24sm13113753pjt.16.2020.12.13.07.47.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Dec 2020 07:47:33 -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 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 v9 07/11] mm/hugetlb: Flush work when dissolving hugetlb page Date: Sun, 13 Dec 2020 23:45:30 +0800 Message-Id: <20201213154534.54826-8-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20201213154534.54826-1-songmuchun@bytedance.com> References: <20201213154534.54826-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: We should flush work when dissolving a hugetlb page to make sure that the hugetlb page is freed to the buddy. Signed-off-by: Muchun Song --- mm/hugetlb.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 29de425f879a..b0847b2ce01d 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1326,6 +1326,12 @@ static void update_hpage_vmemmap_workfn(struct wor= k_struct *work) } static DECLARE_WORK(hpage_update_work, update_hpage_vmemmap_workfn); =20 +static inline void flush_hpage_update_work(struct hstate *h) +{ + if (free_vmemmap_pages_per_hpage(h)) + flush_work(&hpage_update_work); +} + static inline void __update_and_free_page(struct hstate *h, struct page = *page) { /* No need to allocate vmemmap pages */ @@ -1861,6 +1867,7 @@ static int free_pool_huge_page(struct hstate *h, no= demask_t *nodes_allowed, int dissolve_free_huge_page(struct page *page) { int rc =3D -EBUSY; + struct hstate *h =3D NULL; =20 /* Not to disrupt normal path by vainly holding hugetlb_lock */ if (!PageHuge(page)) @@ -1874,8 +1881,9 @@ int dissolve_free_huge_page(struct page *page) =20 if (!page_count(page)) { struct page *head =3D compound_head(page); - struct hstate *h =3D page_hstate(head); int nid =3D page_to_nid(head); + + h =3D page_hstate(head); if (h->free_huge_pages - h->resv_huge_pages =3D=3D 0) goto out; =20 @@ -1889,6 +1897,14 @@ int dissolve_free_huge_page(struct page *page) } out: spin_unlock(&hugetlb_lock); + + /* + * We should flush work before return to make sure that + * the HugeTLB page is freed to the buddy. + */ + if (!rc && h) + flush_hpage_update_work(h); + return rc; } =20 --=20 2.11.0