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 0A986C4345F for ; Mon, 6 May 2024 08:46:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 05DC76B0082; Mon, 6 May 2024 04:46:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F28156B0085; Mon, 6 May 2024 04:46:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DEEF46B0087; Mon, 6 May 2024 04:46:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id BF71C6B0082 for ; Mon, 6 May 2024 04:46:52 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 84613A1606 for ; Mon, 6 May 2024 08:46:52 +0000 (UTC) X-FDA: 82087340664.01.205020E Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by imf07.hostedemail.com (Postfix) with ESMTP id 584464000A for ; Mon, 6 May 2024 08:46:49 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="VaC/kRe1"; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714985210; 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=zEr/Eu5mgqpEki8XSyTh3V+LovJcAoeI3KW1/F4hkgg=; b=6034HVEC4nUAMupUvE/wVWOSw9LyyKfUsctOZs+dDW+tqY1/h7ok0IoxHcAU3/CZjZ4mu0 tLIsFMNwyCmDHLSuFw6F5JgJWstIVwdYio9XitaxiUro1M1dzEJgNJXs7IC1m/Yk+j/ory jIqKAB5uAfUwvZIvjNzjUFk3uah+M80= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="VaC/kRe1"; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714985210; a=rsa-sha256; cv=none; b=EuoUVUaiEq5CdaqAqU3+bKhoX/wirY6z02ttAg+XsC/Jp2r5M7xMRJ/vUyISBClH+cSjz9 5Ty6iQmVdymYdY02JadgCJKIZ0kAqC02ELeMBDYr/OAPbjUvkh8IDCTd+LgKQkN43gML5d i5/eZEcZ/SZlHE85+g2/SLuQlPKd7Mo= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1714985207; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=zEr/Eu5mgqpEki8XSyTh3V+LovJcAoeI3KW1/F4hkgg=; b=VaC/kRe1uXXZZhETUNZOyPdATJLv9wdN9iawFkKUMls4e7lUzINH4uM0PxZENld2U6PYzjxI7QUSAKP0Az7SdKF6WA6ea1z1iMbU4a+R0Od02k2s4ZvGl6Pkke/GkaIFIoCl7ij1a0NoZcbMhyA1FELXiH5ihqdVzv3+OtK4feY= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033022160150;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W5weiKG_1714985205; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W5weiKG_1714985205) by smtp.aliyun-inc.com; Mon, 06 May 2024 16:46:46 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] mm: memory: extend finish_fault() to support large folio Date: Mon, 6 May 2024 16:46:26 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 584464000A X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 1d7ysk6wm9ouu71oq8anbc6fhyy5bd1q X-HE-Tag: 1714985209-3402 X-HE-Meta: U2FsdGVkX19I7TloFPKUMudz4wFycH+EPmSX9BKy8Gn9nFQT3hCWD4eOHOKp/Qzj7ydug+QC/Id7Lemi3qeWKmgTpUUsDyU37AIFAPyReiLS7px5LDHemS2CLxLx196P0W8KKjGkKMnosEpHed3NW427cG6Sx9PQuiCZqWSuSmr9Uhf8yteNCu6ceR1i4e1ing2wDvhS8mkM6iV5BFMANHrKygJiP+KPLSQJyq3tYyWvCkjokTSxvXZT5aXUoEZI4EyYnVBnHob9F75NtJSDAyTKrWdkzxG8nw+1tZayQ65FHnIB49rmCOPWnci/K/luzhN1c0LavxXf5HR5MvmHMKFmgXS+pOFuLk3bANZAC8/jUNQgWAIDRbe6s0VKvxW/8XMV/mWKOSvUOyTaTULh8NaKVre+DUf3Qp55SxHn8eWnCkSeXmT7hFW5V+TWJPzqPmSs/ldElWm1vsGtwdBFWEcOcPx6msMtC/+w+UH6GSHhxuCeWEZU28T9X20GCVJ85c1aZO3JhkeaXGd7t7s/WRLA5Mp/MjBCjE23PVHnaGWAc6YpP8oLdzgYxwPgqkVQRpqpW9mT4atAeb2Ez3CAbwxJExCi5PqPLrT0u7ccu+ZhiS3S9rqDYozk7bqazJSCTFfVHy0o5M3tsjPc8zsJ2pDGJLhQQZTNTNnl+RsuLvHuXd7sbAlDM7JJuLE53hMQkU6mpbMMOpUdQpqN8hXIRkbEW5QDDtPqtJLdH2CeOfhrg6QevZJSNi7uFhdfX5ua/0H1+/impSRU6LMAZbudn+nryvaqt1Fl5OluMc1rMFhtQNcdCxkMkxLVz+Q3hM+CTCuZ8r0f84ocvWUV8tBmEsgHb8waeeBSGbpfypM3l9Ke3Wp625102xhkLiiFCtcj/zmz+p7d+XeXwYT12aVzC4ZcdoR5hek2GuJ5bPFPbb3Jdlg/njwM+e/LJvvBxgOQraIk4TvzD8SIXeXoNOr msHSE3xw i84f0qwn/1BqQKncc/npo/YSq2IMKEwa0Lq43I3KZxBK4JoMp/eypQUAobo7qgwcgoXN7KS+R3sT0dLhzO+Ji7aisYeeR8S0UpuB6YY3N7YOFdGwjQdvJ6eMRWt6Ad7uUv/jSoGrz1Q8E5184rszNEOfdlW/WWnivq6HPfPk95FYAbwhB/pR9gGsJ5C/woGs3V65FdliVrx7oeVJjS+4LW5BwaJUfKxFv+Iee24zu2eC5BVcdIcE4DJXF5e20yeyWE7U+dWOV6aypedCaLSRilnhOnrAnj2Hiqol/bWFB3KkfC3t9MMbQLhdOjOBBmIPC7icI 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: List-Subscribe: List-Unsubscribe: Add large folio mapping establishment support for finish_fault() as a preparation, to support multi-size THP allocation of anonymous shmem pages in the following patches. Signed-off-by: Baolin Wang --- mm/memory.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index eea6e4984eae..936377220b77 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4747,9 +4747,12 @@ vm_fault_t finish_fault(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct page *page; + struct folio *folio; vm_fault_t ret; bool is_cow = (vmf->flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED); + int type, nr_pages, i; + unsigned long addr = vmf->address; /* Did we COW the page? */ if (is_cow) @@ -4780,24 +4783,44 @@ vm_fault_t finish_fault(struct vm_fault *vmf) return VM_FAULT_OOM; } + folio = page_folio(page); + nr_pages = folio_nr_pages(folio); + + if (unlikely(userfaultfd_armed(vma))) { + nr_pages = 1; + } else if (nr_pages > 1) { + unsigned long start = ALIGN_DOWN(vmf->address, nr_pages * PAGE_SIZE); + unsigned long end = start + nr_pages * PAGE_SIZE; + + /* In case the folio size in page cache beyond the VMA limits. */ + addr = max(start, vma->vm_start); + nr_pages = (min(end, vma->vm_end) - addr) >> PAGE_SHIFT; + + page = folio_page(folio, (addr - start) >> PAGE_SHIFT); + } vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, - vmf->address, &vmf->ptl); + addr, &vmf->ptl); if (!vmf->pte) return VM_FAULT_NOPAGE; /* Re-check under ptl */ - if (likely(!vmf_pte_changed(vmf))) { - struct folio *folio = page_folio(page); - int type = is_cow ? MM_ANONPAGES : mm_counter_file(folio); - - set_pte_range(vmf, folio, page, 1, vmf->address); - add_mm_counter(vma->vm_mm, type, 1); - ret = 0; - } else { - update_mmu_tlb(vma, vmf->address, vmf->pte); + if (nr_pages == 1 && unlikely(vmf_pte_changed(vmf))) { + update_mmu_tlb(vma, addr, vmf->pte); + ret = VM_FAULT_NOPAGE; + goto unlock; + } else if (nr_pages > 1 && !pte_range_none(vmf->pte, nr_pages)) { + for (i = 0; i < nr_pages; i++) + update_mmu_tlb(vma, addr + PAGE_SIZE * i, vmf->pte + i); ret = VM_FAULT_NOPAGE; + goto unlock; } + set_pte_range(vmf, folio, page, nr_pages, addr); + type = is_cow ? MM_ANONPAGES : mm_counter_file(folio); + add_mm_counter(vma->vm_mm, type, nr_pages); + ret = 0; + +unlock: pte_unmap_unlock(vmf->pte, vmf->ptl); return ret; } -- 2.39.3