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 62D9EC25B10 for ; Mon, 13 May 2024 05:08:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4D786B00AB; Mon, 13 May 2024 01:08:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0BE96B00CB; Mon, 13 May 2024 01:08:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A9E446B00AB; Mon, 13 May 2024 01:08:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 898F66B0256 for ; Mon, 13 May 2024 01:08:42 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 164CBC0BE5 for ; Mon, 13 May 2024 05:08:42 +0000 (UTC) X-FDA: 82112192484.04.96DEE48 Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by imf10.hostedemail.com (Postfix) with ESMTP id DD159C0011 for ; Mon, 13 May 2024 05:08:39 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YMUTmWTT; spf=pass (imf10.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 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=1715576920; 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=/wPvXkyuXgii0bLFUI24fcIW75QnUckPu3WAKMN0v0o=; b=OblYHIYGcGamG/NlxCeHFsy3qcdQsvep96mkRWZtJM97DBbtSU9GB3+tKv9STtZGQ2TEwu 5iKfcCln58tn/s5kRniikArKwS0DWEJ5bU51+yDZU+dA6Kyb3U9huSLXPfwCafFnlIYADp pUU0WiOEcgroTBG4hIguyE1tkF6+nKQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715576920; a=rsa-sha256; cv=none; b=jIPOr0wfnGMUX3sGcI5L90CpLb6aBhtZcCwe+R79eqVwOfMy7w5TkBaM4laNASu1xYryHd kYmKAW8ZVHU7awAWkFXsg1xnx6VbEwXf3nIowr9XNFSyVmvxTFuYgYNTgpaXnAdKvpBgTS jJisH2JelagrEJElpxVH7nLFC8PUK2c= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YMUTmWTT; spf=pass (imf10.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1715576916; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=/wPvXkyuXgii0bLFUI24fcIW75QnUckPu3WAKMN0v0o=; b=YMUTmWTT1UYtaBphNlJ83Z0UnGWSGCE0+ov7/10Ik9Tn5PxQBQiq09cWTGntFbo7toUqx+uSk9njFnAV92U2ZCcpalXPqOuFa+HkGkBiQQsjxtUpSGl+qYSAnGuAR10TfvgVupdkEozq1XSn7VYknhjkBZUl8+aLLfdalaWC6pg= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R271e4;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_---0W6HFTB5_1715576913; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W6HFTB5_1715576913) by smtp.aliyun-inc.com; Mon, 13 May 2024 13:08:34 +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 v2 1/7] mm: memory: extend finish_fault() to support large folio Date: Mon, 13 May 2024 13:08:11 +0800 Message-Id: <131bcf31a07fade15a012ed5cdf7156d42a4c2fa.1715571279.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Stat-Signature: ru7y3aeu4kfm1s5w7dxy9ytzdffzec85 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: DD159C0011 X-HE-Tag: 1715576919-19546 X-HE-Meta: U2FsdGVkX1/pNPSeS0xsIbFkHvigxE633RXPc0ikr+tXOLJZGwlMFbWc+YAkkNwxIAKwvv7cPI1QdjHUyN8g76YdfmGyFPj7CHs2EwxqzRIwDzYMOLbIW7iP5tsiF6vkdKP0cDmlkkV9S4fgsgrUkDdY4rHp93wvPcqOUfDvQGVQmFn0it1Ftn9iCtt8ACTnJAXu0diq2phF1OxUHVqNfxurm0U72M8hxW/qKWB/yvnPliJTcHndGD8qhYIBf5+7JGRshVq9vscWM+Lb5/jVYEHyp5z9Gb/j+hlg24wahEf1mkjixTVeSOkSeNGWIG2vZeLmz0n4poU6mH4e32ixmW0tJaw6fHHwaaJ0olMfff3oPEluk6N1vmf3yEc5pMc4B5KHuLW4j3GOCdLhb/ad9tARNa/PyoEz/qz6ODC8arwbGjrnw0FLFL7P99c5WzwOv4HUFH2ldzLqU6UrxwG57l1BM5wfkesX5Tp7gVXIzg8iO91/2wM9r5VZy1aGjdI50NhwCJGUDt5IJZvzgRIteOhXoBFVDX6Hp9i61N9IGV0rIhqrbDcU0pth2RmLsUNh6XrX1KJ835d6BmIMfSWGHQGHB53DZBsHZ3LU4ee/Fm6C1JbPsp3tJqs7DIf3+OyLcKNKgqPY7o+7GpU9XLAGPv2DHj+mfqVbbePkgOt5u2XbRKm1uQmXrXcCttqkNxNOi5HjhH0LtrVHTbX9TKL0OjvWhXhYuFUux7O0BWP2FMkUXySyv5ZGRkfveYBDd1Q48woLof+uX51aMxNfBgcH+DhAZt9NZ20/tlDqsDE46neZIDgAZQ7Z4IhYUSF9F+eZRzVq5UnjJcW7tLAAkFx3BmCA3TL4SsMuW++W93YYr+ksWy0UX5qgeugWw4lgQAj/6kiJD0ZYRfs0ce2D0jQw4EBP/z/kaex2n/Hki8hMb30aP08WTdnLqIm5DqDHAt/ua1X4r+v8jJZWjO7I0cs 4BDGA+n6 F5G6XlgANq8ywxSFtFOlX0qdgGTBR5UE6l9kTv8631ms5MegrUH6zlCLGHYgCuRdzoPceNb4gy42r7a8aFJFTMLFtXhzqlUvorrr/VDQFybVsWulvTHpdllDmZUkjuaYRUcsOBb6eU+ZDA4Ebt9CB9A7Bok3C8YRYRgyP2D5t5zRbhFlw6DNoQpmkH5VbcmQQQr5K3+yqoPJnu5Xr3x8YxxUJhstgxss+d4nMT5wJrWqaX37XGEkM6Et9+GPwd4LaWZ+Tthrygv+pVEk= 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 | 58 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index eea6e4984eae..f5ffe012556c 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,59 @@ vm_fault_t finish_fault(struct vm_fault *vmf) return VM_FAULT_OOM; } + folio = page_folio(page); + nr_pages = folio_nr_pages(folio); + + /* + * Using per-page fault to maintain the uffd semantics, and same + * approach also applies to non-anonymous-shmem faults to avoid + * inflating the RSS of the process. + */ + if (!vma_is_anon_shmem(vma) || unlikely(userfaultfd_armed(vma))) { + nr_pages = 1; + } else if (nr_pages > 1) { + pgoff_t idx = folio_page_idx(folio, page); + /* The page offset of vmf->address within the VMA. */ + pgoff_t vma_off = vmf->pgoff - vmf->vma->vm_pgoff; + + /* + * Fallback to per-page fault in case the folio size in page + * cache beyond the VMA limits. + */ + if (unlikely(vma_off < idx || + vma_off + (nr_pages - idx) > vma_pages(vma))) { + nr_pages = 1; + } else { + /* Now we can set mappings for the whole large folio. */ + addr = vmf->address - idx * PAGE_SIZE; + page = &folio->page; + } + } + 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; } + folio_ref_add(folio, nr_pages - 1); + 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