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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC463C63797 for ; Wed, 11 Jan 2023 14:29:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2486C900008; Wed, 11 Jan 2023 09:29:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E118C900005; Wed, 11 Jan 2023 09:29:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A8D08E0001; Wed, 11 Jan 2023 09:29:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 145CA90000C for ; Wed, 11 Jan 2023 09:29:11 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C055F160DF2 for ; Wed, 11 Jan 2023 14:29:10 +0000 (UTC) X-FDA: 80342750460.16.FE12B8A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id 2EBDC40014 for ; Wed, 11 Jan 2023 14:29:08 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=r22T2BiO; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673447349; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=tjAbopy+7Q6PAJdQy6rk54Uza9KTpHMnJD/4tJWFpVU=; b=WpecbckKrEDHfNXUMhHc5Kvi8rdF7pHS+p0orgcbHOUBYLgpsHmPkCxEGakkJKobKETq94 QcaLwYwea1+J55+ns5tZYEbRBs7O9tpN3gFquoHZRBvmh6V0CtkpL5hbZyhUGZE+p8DI2o wTYmCrtZzk86i1HQBtAf8N+7MUQEvpY= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=r22T2BiO; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673447349; a=rsa-sha256; cv=none; b=xk9tItSD4tFy/XPqRW2QS0Tir8EiK+R9wipXbEmZZYYz/80zPdN9E0Qk/v91fy716+Pptr m//7+Z+Q7WpxDIZeT7S5uPP0Cz9oQEW4DFuPkiMdegvuJ6e4Xii6mR/XoMmJYNibgropHW Nqurfyi4KbCAo1f21Cj1AgpnAVQbx2Y= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=tjAbopy+7Q6PAJdQy6rk54Uza9KTpHMnJD/4tJWFpVU=; b=r22T2BiOzS3fqPouvWoMiHtzOT vvpt9rnyw02Jn3OEkh1ILoz7yQMk9gZThuxNE0CXYCCtHMzg9yzsAVurc4cSqjTX6edDcygPZFMOP n4yvixGNK6u+7V5XTCPzspSAOeXruy31v0jGgfmGTudvRrvdXYlhodxcqolM64KxDQai33NPotVH0 3k15FvOue5OJjabDG/6/xcCHdPCixKPUQ6+MAJgD1S11ed4bjIoHI4HxS4R9pSAMZrM8gC7LCUtF9 A+rAI22kCqAuSnOGUo22lU2DyBwN7gCV5NM9pnPp+1LmrlECFcJbMKVMdvWKhH2XY0jtI19Z4sfRi zPQLhT8A==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFc6S-004CbH-F0; Wed, 11 Jan 2023 14:29:20 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Hugh Dickins Subject: [PATCH 27/28] mm: Convert deferred_split_huge_page() to deferred_split_folio() Date: Wed, 11 Jan 2023 14:29:13 +0000 Message-Id: <20230111142915.1001531-28-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230111142915.1001531-1-willy@infradead.org> References: <20230111142915.1001531-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 2EBDC40014 X-Stat-Signature: uijyyzfgmrof93ssir5i46z8xugtxqh8 X-HE-Tag: 1673447348-400714 X-HE-Meta: U2FsdGVkX186Tz1lmncSjOGK6bZRCDRuyIyJYHXnGkpadk+4VP7tvS0ZfVUr4gHGxGIjhczGseZZ+9HKSVKmaYFuqeF4K1laLXkNKDui6NX+82J50WKo+z12K3RHy+qTUidc7dMqkZzdO4Kp8lXn0prIFZDeW1udpw2MjsOnXktwT4QBgAGtJnEU+y3yghCLFS9e9R20+WRePAQBX+UUwphnmnk5J2jFZrlmFz106LAHgax4kgHEheY6OI4S8/ll4nYv2Yx+WsMaUL3nqkU1emcOx3eBIg6ylkITTmRVJzX7DIvx3pUJqsyCMPNv1B4ukZUAlcjZjbVOzclr/RJsUv7OEOfA49esZzVE/MBDXjTYEKsVxWXIwrYBOHAvtUWUItdMFPkfxnPTkuCXDaTP2AUpdH/TK1adnEISUZCRa7RGrZB20aCcQShF7zNtLRuQKUv3f4oh2DDQew9hD4pJl6RmeBf8Tghin9Ia6q37qBr2h/YKgSAgTkhxa74tTEUo5FDL7PdGIduQKezlZGToOyrYIJuEZc+qY2a+pdsLW21Rghgv+wSDuhOoRf/7WfD/MJ+91ttvDTegCGpwaKGVaD8nDTf+Neb2BxUP06oVg+MyGvU3DAabwg+RiLxF0MVeDRNQz6GwWEE4AIDa3XVLK2s8dBoViSDq7zIEMPpFuW8u4pMI9D2qhHTQejygFpJVluAAqaer0tUHzhrXH04hg824VZ8C9vJiqgWO14UW/49I+LEbCk3tMSyKejTAmvgVMhI6iB8s5OnCTnr6h7U/4DATOcf990SFOizE5EUJmIReXXBj+oFJZ6BH+wO1C/6XWZ1P5SDRuS3R7V8GwlxcW10aiMm0ZKypYZpBuLuCB96PoYm2vDZYUWGVCCiPLD2qsOASqUHbKUTbXDhcudOVfj2wLf0IXuknm9bi1ZyrfvX4JoIoaH5u7w== 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: Now that both callers use a folio, pass the folio in and save a call to compound_head(). Signed-off-by: Matthew Wilcox (Oracle) --- Documentation/mm/transhuge.rst | 6 +++--- include/linux/huge_mm.h | 4 ++-- mm/huge_memory.c | 3 +-- mm/rmap.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Documentation/mm/transhuge.rst b/Documentation/mm/transhuge.rst index 03bbd0a19041..a9608fe51649 100644 --- a/Documentation/mm/transhuge.rst +++ b/Documentation/mm/transhuge.rst @@ -153,8 +153,8 @@ clear where references should go after split: it will stay on the head page. Note that split_huge_pmd() doesn't have any limitations on refcounting: pmd can be split at any point and never fails. -Partial unmap and deferred_split_huge_page() -============================================ +Partial unmap and deferred_split_folio() +======================================== Unmapping part of THP (with munmap() or other way) is not going to free memory immediately. Instead, we detect that a subpage of THP is not in use @@ -166,6 +166,6 @@ the place where we can detect partial unmap. It also might be counterproductive since in many cases partial unmap happens during exit(2) if a THP crosses a VMA boundary. -The function deferred_split_huge_page() is used to queue a page for splitting. +The function deferred_split_folio() is used to queue a folio for splitting. The splitting itself will happen when we get memory pressure via shrinker interface. diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index b9978978a160..70bd867eba94 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -187,7 +187,7 @@ static inline int split_huge_page(struct page *page) { return split_huge_page_to_list(page, NULL); } -void deferred_split_huge_page(struct page *page); +void deferred_split_folio(struct folio *folio); void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, bool freeze, struct folio *folio); @@ -340,7 +340,7 @@ static inline int split_huge_page(struct page *page) { return 0; } -static inline void deferred_split_huge_page(struct page *page) {} +static inline void deferred_split_folio(struct folio *folio) {} #define split_huge_pmd(__vma, __pmd, __address) \ do { } while (0) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c23b0e01734b..868fcccdff72 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2815,9 +2815,8 @@ void free_transhuge_page(struct page *page) free_compound_page(page); } -void deferred_split_huge_page(struct page *page) +void deferred_split_folio(struct folio *folio) { - struct folio *folio = page_folio(page); struct deferred_split *ds_queue = get_deferred_split_queue(folio); #ifdef CONFIG_MEMCG struct mem_cgroup *memcg = folio_memcg(folio); diff --git a/mm/rmap.c b/mm/rmap.c index 462b334d6842..7f76fc40af9a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1427,7 +1427,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma, */ if (folio_test_pmd_mappable(folio) && folio_test_anon(folio)) if (!compound || nr < nr_pmdmapped) - deferred_split_huge_page(&folio->page); + deferred_split_folio(folio); } /* -- 2.35.1