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=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 3ECB0C433E2 for ; Tue, 15 Sep 2020 13:02:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9DE2F20872 for ; Tue, 15 Sep 2020 13:02:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="CIREYWgK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DE2F20872 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 34F32900040; Tue, 15 Sep 2020 09:02:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FF4C90003A; Tue, 15 Sep 2020 09:02:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1C8B3900040; Tue, 15 Sep 2020 09:02:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0240.hostedemail.com [216.40.44.240]) by kanga.kvack.org (Postfix) with ESMTP id 0670E90003A for ; Tue, 15 Sep 2020 09:02:31 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A6D24441E for ; Tue, 15 Sep 2020 13:02:30 +0000 (UTC) X-FDA: 77265309660.13.level73_080fcb827111 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 25D371813F570 for ; Tue, 15 Sep 2020 13:02:25 +0000 (UTC) X-HE-Tag: level73_080fcb827111 X-Filterd-Recvd-Size: 13400 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 13:01:47 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id x123so1888137pfc.7 for ; Tue, 15 Sep 2020 06:01:46 -0700 (PDT) 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=MsxmZcqzO6oU2083Ec8NK/i5aqIGoDCXPmpK1JpMhHU=; b=CIREYWgKG0y5bTAmfbfktZFdPjKSEU5cI0my0xWoAHXu+phapP2kzdoqZzP6oYfOp3 cb4tRG/CCuRHFZ+6hp7B2cKqVKnxHSahJWMv8b0/e5uL2bgioa+c9ywrNOFjOnuF/npb kX9duhMqixMx+wAx3eKjaFg2lHcB5/E4G8bk22aQt9Fj+yhzl8+V7cHeRpa7f4tEMwDj bluG5qNuHjNaL/6aL6rzp08uMymBXb3yObzuvpM2y/vs4+sbI+kiqkiA8b6R/BumcJGW xVf1CpmkgPa8/mBrF+zK/uzyRXEmqVRi1adqci4i1LHQ6Wq/LVLdGw4A7wkgzlMYjVxX C2Ug== 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=MsxmZcqzO6oU2083Ec8NK/i5aqIGoDCXPmpK1JpMhHU=; b=DzjniHhJq/tXmqadL0xF0EF8PtkxFGlfYlcDee2GVBaKWfgBUPf3usLaU2aYkjxfrD r8Tyl+oZfDGCebAGRCi4PxVdrtwMAFE1HVj5wHoIBW3Np51A07qm5MsA87Ux5J+C1d5Q 2zpxNqNh0YSjCXp2BJOuEHvibrLlH3Tse4GfYv7ORSN1aaQ+z9WQSeB1DaDv0NdF54DK FsIpQObKkB90XABmvLUOP1BgwHIUbxfekxVcv+sgYPQ4azNvjXwmxWL3Kbm3HDp0IwhG I+FVBYc2StBazP7FydwOyEFjoYRRI/4uRLV7tnTfHynkAjG259IQR1IcTT/JgTu2i/tS sGMA== X-Gm-Message-State: AOAM530hQbsk4wd+vrU4r7amjlShXYAnF64M/LDiIt4gr7cA5GPkVEcC 2KQPI1qu2XHoqSBOa68g3Tz/vw== X-Google-Smtp-Source: ABdhPJzjBmfywPW7QQgadAqZhmFowNmnURIr9fhphcku0u1eDJDwXVAKp3ksTUFTm+nEemFa1C0ZpQ== X-Received: by 2002:a63:2c44:: with SMTP id s65mr8444889pgs.210.1600174905697; Tue, 15 Sep 2020 06:01:45 -0700 (PDT) Received: from localhost.bytedance.net ([103.136.220.66]) by smtp.gmail.com with ESMTPSA id w185sm14269855pfc.36.2020.09.15.06.01.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2020 06:01:45 -0700 (PDT) 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 Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Muchun Song Subject: [RFC PATCH 10/24] mm/hugetlb: Free the vmemmap pages associated with each hugetlb page Date: Tue, 15 Sep 2020 20:59:33 +0800 Message-Id: <20200915125947.26204-11-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20200915125947.26204-1-songmuchun@bytedance.com> References: <20200915125947.26204-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 25D371813F570 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: When we allocate a hugetlb page from the buddy, we should free the unused vmemmap pages associated with it. We can do that in the prep_new_huge_page(). Signed-off-by: Muchun Song --- include/linux/hugetlb.h | 21 ++++ mm/hugetlb.c | 231 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 252 insertions(+) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index ace304a6196c..2561af2ad901 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -601,6 +601,13 @@ static inline bool arch_vmemmap_support_huge_mapping= (void) } #endif =20 +#ifndef vmemmap_pmd_huge +static inline bool vmemmap_pmd_huge(pmd_t *pmd) +{ + return pmd_huge(*pmd); +} +#endif + #ifndef VMEMMAP_HPAGE_SHIFT #define VMEMMAP_HPAGE_SHIFT PMD_SHIFT #endif @@ -790,6 +797,15 @@ static inline void huge_ptep_modify_prot_commit(stru= ct vm_area_struct *vma, } #endif =20 +#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP +int handle_vmemmap_fault(unsigned long page); +#else +static inline int handle_vmemmap_fault(unsigned long page) +{ + return -EFAULT; +} +#endif + #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; =20 @@ -943,6 +959,11 @@ static inline void set_huge_swap_pte_at(struct mm_st= ruct *mm, unsigned long addr pte_t *ptep, pte_t pte, unsigned long sz) { } + +static inline int handle_vmemmap_fault(unsigned long page) +{ + return -EFAULT; +} #endif /* CONFIG_HUGETLB_PAGE */ =20 static inline spinlock_t *huge_pte_lock(struct hstate *h, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d6ae9b6876be..a628588a075a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1293,10 +1293,20 @@ static inline void destroy_compound_gigantic_page= (struct page *page, #endif =20 #ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP +#include + #define RESERVE_VMEMMAP_NR 2U +#define RESERVE_VMEMMAP_SIZE (RESERVE_VMEMMAP_NR << PAGE_SHIFT) =20 #define page_huge_pte(page) ((page)->pmd_huge_pte) =20 +#define vmemmap_hpage_addr_end(addr, end) \ +({ \ + unsigned long __boundary; \ + __boundary =3D ((addr) + VMEMMAP_HPAGE_SIZE) & VMEMMAP_HPAGE_MASK;\ + (__boundary - 1 < (end) - 1) ? __boundary : (end); \ +}) + static inline unsigned int nr_free_vmemmap(struct hstate *h) { return h->nr_free_vmemmap_pages; @@ -1416,6 +1426,222 @@ static void __init hugetlb_vmemmap_init(struct hs= tate *h) pr_info("HugeTLB: can free %d vmemmap pages for %s\n", h->nr_free_vmemmap_pages, h->name); } + +static inline spinlock_t *vmemmap_pmd_lockptr(pmd_t *pmd) +{ + static DEFINE_SPINLOCK(pgtable_lock); + + return &pgtable_lock; +} + +/* + * Walk a vmemmap address to the pmd it maps. + */ +static pmd_t *vmemmap_to_pmd(const void *page) +{ + unsigned long addr =3D (unsigned long)page; + pgd_t *pgd; + p4d_t *p4d; + pud_t *pud; + pmd_t *pmd; + + if (addr < VMEMMAP_START || addr >=3D VMEMMAP_END) + return NULL; + + pgd =3D pgd_offset_k(addr); + if (pgd_none(*pgd)) + return NULL; + p4d =3D p4d_offset(pgd, addr); + if (p4d_none(*p4d)) + return NULL; + pud =3D pud_offset(p4d, addr); + + WARN_ON_ONCE(pud_bad(*pud)); + if (pud_none(*pud) || pud_bad(*pud)) + return NULL; + pmd =3D pmd_offset(pud, addr); + + return pmd; +} + +static inline int freed_vmemmap_hpage(struct page *page) +{ + return atomic_read(&page->_mapcount) + 1; +} + +static inline int freed_vmemmap_hpage_inc(struct page *page) +{ + return atomic_inc_return_relaxed(&page->_mapcount) + 1; +} + +static inline int freed_vmemmap_hpage_dec(struct page *page) +{ + return atomic_dec_return_relaxed(&page->_mapcount) + 1; +} + +static inline void free_vmemmap_page_list(struct list_head *list) +{ + struct page *page, *next; + + list_for_each_entry_safe(page, next, list, lru) { + list_del(&page->lru); + free_vmemmap_page(page); + } +} + +static void __free_huge_page_pte_vmemmap(struct page *reuse, pte_t *ptep= , + unsigned long start, + unsigned int nr_free, + struct list_head *free_pages) +{ + pte_t entry =3D mk_pte(reuse, PAGE_KERNEL); + unsigned long addr; + unsigned long end =3D start + (nr_free << PAGE_SHIFT); + + for (addr =3D start; addr < end; addr +=3D PAGE_SIZE, ptep++) { + struct page *page; + pte_t old =3D *ptep; + + VM_WARN_ON(!pte_present(old)); + page =3D pte_page(old); + list_add(&page->lru, free_pages); + + set_pte_at(&init_mm, addr, ptep, entry); + } +} + +static void __free_huge_page_pmd_vmemmap(struct hstate *h, pmd_t *pmd, + unsigned long addr, + struct list_head *free_pages) +{ + unsigned long next; + unsigned long start =3D addr + RESERVE_VMEMMAP_NR * PAGE_SIZE; + unsigned long end =3D addr + nr_vmemmap_size(h); + struct page *reuse =3D NULL; + + addr =3D start; + do { + unsigned int nr_pages; + pte_t *ptep; + + ptep =3D pte_offset_kernel(pmd, addr); + if (!reuse) + reuse =3D pte_page(ptep[-1]); + + next =3D vmemmap_hpage_addr_end(addr, end); + nr_pages =3D (next - addr) >> PAGE_SHIFT; + __free_huge_page_pte_vmemmap(reuse, ptep, addr, nr_pages, + free_pages); + } while (pmd++, addr =3D next, addr !=3D end); + + flush_tlb_kernel_range(start, end); +} + +static void split_vmemmap_pmd(pmd_t *pmd, pte_t *pte_p, unsigned long ad= dr) +{ + struct mm_struct *mm =3D &init_mm; + struct page *page; + pmd_t old_pmd, _pmd; + int i; + + /* + * Up to this point the pmd is present and huge and userland has the + * whole access to the hugepage during the split (which happens in + * place). If we overwrite the pmd with the not-huge version pointing + * to the pte here (which of course we could if all CPUs were bug + * free), userland could trigger a small page size TLB miss on the + * small sized TLB while the hugepage TLB entry is still established in + * the huge TLB. Some CPU doesn't like that. + * + * See http://support.amd.com/us/Processor_TechDocs/41322.pdf, Erratum + * 383 on page 93. Intel should be safe but is also warns that it's + * only safe if the permission and cache attributes of the two entries + * loaded in the two TLB is identical (which should be the case here). + * + * So it is generally safer to never allow small and huge TLB entries + * for the same virtual address to be loaded simultaneously. But here + * we should not set pmd non-present first and flush TLB. Because if + * we do that(maybe trriger IPI to other CPUs to flush TLB), we may be + * deadlocked. So we have to break the above rules. Be careful, Let us + * suppose all CPUs are bug free, otherwise, we should not enable the + * feature of freeing unused vmemmap pages on the bug CPU. + * + * Why we should not set pmd non-present first? Here we already hold + * the vmemmap pgtable spinlock on CPU1 and set pmd non-present. If + * CPU0 access the struct page with irqs disabled and the vmemmap + * pgtable lock is held by CPU1. In this case, the CPU0 can not handle + * the IPI interrupt to flush TLB because of the disabling of irqs. + * Then we can deadlock. In order to avoid this issue, we do not set + * pmd non-present. + * + * The deadlock scene is shown below. + * + * CPU0: CPU1: + * disable irqs hold the vmemmap pgtable lock + * set pmd non-present + * read/write `struct page`(page fault) + * jump to handle_vmemmap_fault + * spin for vmemmap pgtable lock + * flush_tlb(send IPI to CPU0) + * set new pmd(small page) + */ + old_pmd =3D READ_ONCE(*pmd); + page =3D pmd_page(old_pmd); + pmd_populate_kernel(mm, &_pmd, pte_p); + + for (i =3D 0; i < VMEMMAP_HPAGE_NR; i++, addr +=3D PAGE_SIZE) { + pte_t entry, *pte; + + entry =3D mk_pte(page + i, PAGE_KERNEL); + pte =3D pte_offset_kernel(&_pmd, addr); + VM_BUG_ON(!pte_none(*pte)); + set_pte_at(mm, addr, pte, entry); + } + + /* make pte visible before pmd */ + smp_wmb(); + pmd_populate_kernel(mm, pmd, pte_p); +} + +static void split_vmemmap_huge_page(struct page *head, pmd_t *pmd) +{ + pte_t *pte_p; + unsigned long start =3D (unsigned long)head & VMEMMAP_HPAGE_MASK; + unsigned long addr =3D start; + + while ((pte_p =3D vmemmap_pgtable_withdraw(head))) { + VM_BUG_ON(freed_vmemmap_hpage(virt_to_page(pte_p))); + split_vmemmap_pmd(pmd++, pte_p, addr); + addr +=3D VMEMMAP_HPAGE_SIZE; + } + + flush_tlb_kernel_range(start, addr); +} + +static void free_huge_page_vmemmap(struct hstate *h, struct page *head) +{ + pmd_t *pmd; + spinlock_t *ptl; + LIST_HEAD(free_pages); + + if (!nr_free_vmemmap(h)) + return; + + pmd =3D vmemmap_to_pmd(head); + ptl =3D vmemmap_pmd_lockptr(pmd); + + spin_lock(ptl); + if (vmemmap_pmd_huge(pmd)) { + VM_BUG_ON(!nr_pgtable(h)); + split_vmemmap_huge_page(head, pmd); + } + + __free_huge_page_pmd_vmemmap(h, pmd, (unsigned long)head, &free_pages); + freed_vmemmap_hpage_inc(pmd_page(*pmd)); + spin_unlock(ptl); + + free_vmemmap_page_list(&free_pages); +} #else static inline void hugetlb_vmemmap_init(struct hstate *h) { @@ -1429,6 +1655,10 @@ static inline int vmemmap_pgtable_prealloc(struct = hstate *h, struct page *page) static inline void vmemmap_pgtable_free(struct hstate *h, struct page *p= age) { } + +static inline void free_huge_page_vmemmap(struct hstate *h, struct page = *head) +{ +} #endif =20 static void update_and_free_page(struct hstate *h, struct page *page) @@ -1637,6 +1867,7 @@ void free_huge_page(struct page *page) =20 static void prep_new_huge_page(struct hstate *h, struct page *page, int = nid) { + free_huge_page_vmemmap(h, page); /* Must be called before the initialization of @page->lru */ vmemmap_pgtable_free(h, page); =20 --=20 2.20.1