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 D3347C04FFE for ; Wed, 8 May 2024 03:44:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 243876B0083; Tue, 7 May 2024 23:44:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CCF96B0085; Tue, 7 May 2024 23:44:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 06F3B6B0088; Tue, 7 May 2024 23:44:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id DC9336B0083 for ; Tue, 7 May 2024 23:44:10 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 394B180E81 for ; Wed, 8 May 2024 03:44:10 +0000 (UTC) X-FDA: 82093835460.30.FDDB4BC Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf12.hostedemail.com (Postfix) with ESMTP id B034C4000A for ; Wed, 8 May 2024 03:44:06 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=HbuRIYCU; spf=pass (imf12.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 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=1715139848; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Pn3vBXANuMvF5ku6GRIIqsfOGK3UsbQF8fYDYvSVp0I=; b=EofkMArbjNZfYlwGjNGdPK5KQN4Jw2zF4YNmP5dtMQNQJ2jrL50onCAAZD7AbKrKO2elUF uPteihm5rlB59NkW9rmLr76XHlBx8erl5K/PJ1TiIeB/sIvCdaX/Yt23KfvFsSxb8E3t0f 3bFI47vvcRH4ooqIIb/cZQWMJDxIgRk= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=HbuRIYCU; spf=pass (imf12.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 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=1715139848; a=rsa-sha256; cv=none; b=VGmiJqSopcshpW+fCzOG6yhriGSAsptSFbl4+A1TDhx3aPyTw+G3rnEApiRl9RCDzaDFku V5El5ykb7J43EFKqkVPARPKMSGvl1nIFVOQ6TwVeqXLcK/NPSBZKL1bTot8boPKW9JVoMS r+LLssbayRSYK0WteC3ru6CMl2I+gAI= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1715139843; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=Pn3vBXANuMvF5ku6GRIIqsfOGK3UsbQF8fYDYvSVp0I=; b=HbuRIYCUerJ94Vp87LyjEhAI6VyFav9WMoWthz5GVIQkV970WMyb8B2Y/Jf3IQgiYJ1DDuCYeCwHtlvFuhyEJg1Pqt2igFHIvpNyScFQ2FATk/W9zy1RwK4lKVf8HVluroD+KsfdtII0L6vj89zSD8d4RKF21DieIUgmVuW3mBE= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R291e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033068173054;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=13;SR=0;TI=SMTPD_---0W625alR_1715139840; Received: from 30.97.56.69(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W625alR_1715139840) by smtp.aliyun-inc.com; Wed, 08 May 2024 11:44:01 +0800 Message-ID: Date: Wed, 8 May 2024 11:44:00 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/8] mm: memory: extend finish_fault() to support large folio To: Ryan Roberts , 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, shy828301@gmail.com, ziy@nvidia.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <13939ade-a99a-4075-8a26-9be7576b7e03@arm.com> From: Baolin Wang In-Reply-To: <13939ade-a99a-4075-8a26-9be7576b7e03@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: B034C4000A X-Rspamd-Server: rspam06 X-Stat-Signature: i7o4sennt5mec9n8wxkgrrj8wjttecam X-HE-Tag: 1715139846-100370 X-HE-Meta: U2FsdGVkX1++gPrj1wWjgxjurGl1J9pOWeGo1rLOsrgYat0DwAmSX9FWLa2EfbnjCkWmW+i6KaEwTGiqu3bFyvCeUCuVbLBM6S3tDIrDY5v7q2lIKt7vPjWqWmNWHLdAINauQvxv3megA33kS1YURjhimwGzZKn2n20GEOIb3OZKR/j4NQPHqMedn0Aadi2NODcVELpVTVAq2Plu5YdMps9L9eSnUui4rTA9khriKIMYxg9vYdH1lTjzWOcUCNANmI3emj8y+gA3H3m0CNfWynSNqWtWZGjmTpQPvLAaLkQCb4DBIXtGfvy3EeWVCLmGXNjcK3ixawtWp9zaC55ccqQUfE489Xrx8CjYtaVDF7xBH7LlysdEvEtUrUPWJCLt9onLtHJ5Q+FccvrAbbx7uJF3PPizOOaf8fIpAuphZqmyrncj9XY7b6jVn2dWmHJIQ0JprLfcb/cnzdjawOFFWub8VGsG/gY3RNJxmpsSFCogfLFAGdYcu2gZobVxvgwYB+WcO8RhHDx6wTlbMSZqryqGeG+xRiB3YRI8tA1mJNMpv+0BasijAEEFn35qeS9RPRyI1AxOUMJEVQIrawQJR08itE2Y17llxslu7dfmJ7sIl/YEnXUs3T1Lrf/ymSOwgxIVVEuH15xiwDpIv20ViIBM2I/5Bj1nD3NWATBp5uRT0nUJroOMFMypfBR1/Vny39sUHr71ZWVgRgQ/5Uo4sN5VB9thBytM+OXcVF1DkZYBsIC888p4Z8qYi6hWequTXvjDQwu6Y9QcwSJAcXPnLXNQkvSH1FixDob0eFY20dc8aj5aRvM7kqbHitnSi+qnv95V3NuKyXp9iqhyP6F4luUgwDLX1RQCZwuw8qoF9Mm1B47/hsO+DsXF6Ygu0EwLAhU0kOyOllZfbOKFLwkZDqLoTYAKC+yrdOd/yy9gJXFP3yu5SRygjs7SHUug1AF/oX+XSEIxL7hb19uogCY Ox7rVwKX T7zRCAysjJZ/3Z+SwdfyapGtq0gjAjw2VWXYJCuB59onLU4UJE530Y8i5/EIgx4kMuL2d3b7fVWBlLxwNDdskqwTSqRsI8QxAKbC7zEUFziRTNrURQ/E7NBdZVGy28vCKmAz8Gvq8S7SEw8Ikf/thbT6PpXdIm9IgVhj6bv4PWDlQfq4/qHapyorWQ8q134T1Oi0fPPhoZy+/j9OWaRk0kSutcNKQgaF8kZ242n7SvKZxT8O//P23mpJ9JPigrqBdnOkovJu/aAO6H8vbVgV8DUfDuB/kRVWBj92Y 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: On 2024/5/7 18:37, Ryan Roberts wrote: > On 06/05/2024 09:46, Baolin Wang wrote: >> 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); > > I still don't really follow the logic in this else if block. Isn't it possible > that finish_fault() gets called with a page from a folio that isn't aligned with > vmf->address? > > For example, let's say we have a file who's size is 64K and which is cached in a > single large folio in the page cache. But the file is mapped into a process at > VA 16K to 80K. Let's say we fault on the first page (VA=16K). You will calculate For shmem, this doesn't happen because the VA is aligned with the hugepage size in the shmem_get_unmapped_area() function. See patch 7. > start=0 and end=64K I think? Yes. Unfortunately, some file systems that support large mappings do not perform alignment for multi-size THP (non-PMD sized, for example: 64K). I think this requires modification to __get_unmapped_area--->thp_get_unmapped_area_vmflags() or file->f_op->get_unmapped_area() to align VA for multi-size THP in future. So before adding that VA alignment changes, only allow building the large folio mapping for anonymous shmem: diff --git a/mm/memory.c b/mm/memory.c index 936377220b77..9e4d51826d23 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4786,7 +4786,7 @@ vm_fault_t finish_fault(struct vm_fault *vmf) folio = page_folio(page); nr_pages = folio_nr_pages(folio); - if (unlikely(userfaultfd_armed(vma))) { + if (unlikely(userfaultfd_armed(vma)) || !vma_is_anon_shmem(vma)) { nr_pages = 1; } else if (nr_pages > 1) { unsigned long start = ALIGN_DOWN(vmf->address, nr_pages * PAGE_SIZE); > Additionally, I think this path will end up mapping the entire folio (as long as > it fits in the VMA). But this bypasses the fault-around configuration. As I > think I mentioned against the RFC, this will inflate the RSS of the process and > can cause behavioural changes as a result. I believe the current advice is to > disable fault-around to prevent this kind of bloat when needed. With above change, I do not think this is a problem? since users already want to use mTHP for anonymous shmem. > It might be that you need a special variant of finish_fault() for shmem? > > >> + } >> 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; >> }