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 62F17C27C44 for ; Thu, 30 May 2024 02:04:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53E7B6B0099; Wed, 29 May 2024 22:04:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 42D4F6B009E; Wed, 29 May 2024 22:04:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 232A56B009B; Wed, 29 May 2024 22:04:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F08066B0098 for ; Wed, 29 May 2024 22:04:41 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9D4641A0C0A for ; Thu, 30 May 2024 02:04:41 +0000 (UTC) X-FDA: 82173418362.27.6ADF545 Received: from out30-132.freemail.mail.aliyun.com (out30-132.freemail.mail.aliyun.com [115.124.30.132]) by imf19.hostedemail.com (Postfix) with ESMTP id 9468B1A000F for ; Thu, 30 May 2024 02:04:39 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YH3mT7mk; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf19.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.132 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717034680; 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=r9qBGwXCngyL5anV+10XHk4WWPAHBJnN4gQCvtOnGdw=; b=8kLcEPcxHMNON3gPijOa0zSUY78JSqsygDIcxEBOlr3j5NYqlCxkcpfQZjMfW3UZTBTfnY xmNeXd+xq6iIfdToexBfmNhkb32RV6NYd3EaoBZKaR/K/joj33DsBzlQgxwGEkzjaj+egV I7dq8M9DriTd4+BDUPpT9osbiDUChmU= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YH3mT7mk; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf19.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.132 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717034680; a=rsa-sha256; cv=none; b=J9ODyNnedew7AkRX/y9zS24QXCmgZJ/capPcmkw9AsV7iKRzqhqZWdwymCQlJYFNqKw9cX NsMOYFH0CLbNaOXJPDlxY4IjrsvdbhKB2/ZI3fprqUmRBclksMlpF/3wxJiaGf7rTVqEQQ p+j0FaEQ7MsSOczGStRzm6Ux+lwg2+s= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1717034676; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=r9qBGwXCngyL5anV+10XHk4WWPAHBJnN4gQCvtOnGdw=; b=YH3mT7mkIWCu7V7DO7q+IM1bR5PyITEN6/wmK8uYeNfcKM7rHLANOAaFsLLqbNSo2R7KiD75S/2EHqLR73m1gpFyCSbGdPbqux4QXzIygRJVmnIJNMeHnNLtWjS3xH6RhlO+o9NE3k6RXCzMDO27GM7004NxMtJr0hi2qCvldAg= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R441e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045075189;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---0W7V0ZBe_1717034674; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W7V0ZBe_1717034674) by smtp.aliyun-inc.com; Thu, 30 May 2024 10:04:35 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/6] mm: memory: extend finish_fault() to support large folio Date: Thu, 30 May 2024 10:04:12 +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: 9468B1A000F X-Stat-Signature: 9pe9fidpi1yczhi3kx36wy3zkau97sfq X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1717034679-440258 X-HE-Meta: U2FsdGVkX191R3Dde8M/6PY8UB6wFZ/2cavNYYVlnf9NKAF6VavBusn8jOWtKvfNKLUyHHZmrNgKBszBSb/prguYIm+m/LuXyjsRjHM9fiF6r0WRY27Q0nq6xHS1nk66DsVkZU9PHrhVeGcCfX2bJ51j/6bTO79ky+t30DqjZVqGezB9Zw5YhCbBpRcUpfSfFk3XOhhz2jmsJgzh9rvp1+Al95vsvy0o4MGH1yjmxeUaT2E3k7xBcIhJ/5c1pEWIrO9IfL1mnRkvTjxZYHm0SQqe7FElBnsySBoGrs57p/EmJjYBcr3CgS4W8qznkWs0OfvWAYGiPTvIJLP+v+hMQO9JpNTZl5h7r1raddXrmkUc2DQX8Y0mgEsaAUWvkMrPXBZwwv4nYIkTRiesjP9F1872CMwT1MTEWEsloI1lRJNWYyG3hpUEOSMgdAoWa9C+09PoTZjVDPhgJfCCuwbw/0/fN6dLdsI8ygFL2Y6TZfxuGarxzeOmTfimeZs9BdqGBJtiH0STik0t6c72XsF970VQxCx4tX7cIpbZAnDYwkqkN05/ULPFyee6dIssoklnxC9Wl/7pQR3VJ+SpDdESzhRDq51Gudep8rUWcHJHH6r+g7sgKn64Ue0/FLNLwh0pHIfq1q69vYC6dZAQE8UhxSi8gH03JONDWta3kyAhCyvTpWpSGR/twdR34Xi1cJ9QUap5kwxPF/95H+qM7oWlaQVAEzJqykE+lIBUd4SoNl5EUS8bg4mAevZTaRw/I/J70vbqvxLT2N74JVrawCRHDl3Pl2tQj8ri39CCegZNmDzkcDcbeitq6TlH21xXcBB2I5rN6LIiAf6StcemdQX+ZXfQ93nzzZyHysoNeI9SmnxoIuE6rbZWdng0JDVTKSaae5f4nIMvnS9BQlSi9OcNkhb+rX4RLK242s6nOr+e5VY33uFXi1jyVKk4Z0U5TgPOgPkhy05u7+CnB9rD136 7d8Ibs6w BjJAV2RGoAhbkf2i1Pkf/IQpMYkvSEMbTOKaCQ/sJzDeHLFVCaVl3PS9EEtMyO3GeM5JTyasV3KcZ7LM02H3TFJQOp5eV1yCktinZvWhMHBgbAggKv6WpBpmnsGcvEpyOYvbqXTLCopFyROdpzgQE9e2b+v5KnfWLGZw2CTzhSdHrkQqSlDs3Uv2ZAAxZcKiI8WC18ERveOsuWsJ62qUVpzvYwm1djd33smrgGmcgXKrRnFn9APK2HhxrsgFfoqQf42lJnetWJmyrD0L4yMHQIjFlAIHpoZKZXnelDPLLfwu0KdrokXV2rWWVdekTSz0MRP5g 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 eef4e482c0c2..435187ff7ea4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4831,9 +4831,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) @@ -4864,24 +4867,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