From nobody Thu Sep 19 01:36:06 2024 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2F2917B40A; Fri, 26 Jul 2024 12:00:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721995234; cv=none; b=K2iPmvCcoBnlsoPY/W2ch+O2BDTNx32tqWFvfUD6j/JGmlWvyIEcUZWRWrqE5MHnk/VLFjlb7zRhuwlO8bLmAsQDRz9DXUdrhfhqP5VOzYxJlsajaikRe3weaILXi6Qzyskm333H7rIGry0Tvkph9HZfHU5oc9SNJ9Gre7CkTno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721995234; c=relaxed/simple; bh=Jadkut4ApW0mWOJoHNcP94ee6jMwQdv75HdW5y5euek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LOUtxMRqRxBQ6f0pZOP8zYFcLmtp2J3jJpQbMT7AqdTLJnSi26WlynLOpqqRp/4AwTjiViEJJ36tAxmHNUwXvTYOIyqteUsQG/bupNdZ9+RKBZpgAgP1Ub7sMhIB/McXb8a+8CQI7KIVbRs2CMDBqGfvzT7IiheOXnp6J/7cfsE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com; spf=pass smtp.mailfrom=pankajraghav.com; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b=ebxtZ3WP; arc=none smtp.client-ip=80.241.56.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pankajraghav.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pankajraghav.com header.i=@pankajraghav.com header.b="ebxtZ3WP" Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4WVmXl1b8kz9t3P; Fri, 26 Jul 2024 14:00:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1721995223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H7rWLiCMk4lxgxSKZFr+zzX4eLbJPbbhmvYIIxBW16M=; b=ebxtZ3WPq8tl0BSuDEGx8mZY4cTvzgF3Eo6nFoNccLPR/HxTkWwX0elN95mQqBgCsxPq9T oASrkb3RS9W5q88YBIbTQ7F4a+QwLNQid6U5nVsHQXeQKG7h/DtwjeIY3yUbSNmao+57FU JNau+DBqLg6eQ6mjd/KySkEwQLZAd+Ds0f+v4FFhwaILAmDDS6HUMQAOGdXSEw6obvZfuX 192YkvGgthTtajv4X4L9znREHJaPqcSgTgjjgHw6qyDfqpZ720GlfZvYHT+NaRTBKGbrB/ eKrr0a6IAgLMt//l3cruFnKy3Hy3bE4x++6vyxjIuY45udBxPXDCr/2u0k+sHA== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, willy@infradead.org, chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org, akpm@linux-foundation.org Cc: yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, john.g.garry@oracle.com, linux-fsdevel@vger.kernel.org, hare@suse.de, p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, ryan.roberts@arm.com, hch@lst.de, Zi Yan Subject: [PATCH v11 04/10] mm: split a folio in minimum folio order chunks Date: Fri, 26 Jul 2024 13:59:50 +0200 Message-ID: <20240726115956.643538-5-kernel@pankajraghav.com> In-Reply-To: <20240726115956.643538-1-kernel@pankajraghav.com> References: <20240726115956.643538-1-kernel@pankajraghav.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Luis Chamberlain split_folio() and split_folio_to_list() assume order 0, to support minorder for non-anonymous folios, we must expand these to check the folio mapping order and use that. Set new_order to be at least minimum folio order if it is set in split_huge_page_to_list() so that we can maintain minimum folio order requirement in the page cache. Update the debugfs write files used for testing to ensure the order is respected as well. We simply enforce the min order when a file mapping is used. Signed-off-by: Luis Chamberlain Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke Reviewed-by: Zi Yan --- include/linux/huge_mm.h | 14 +++++++--- mm/huge_memory.c | 59 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index e25d9ebfdf89a..7c50aeed05228 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -96,6 +96,8 @@ extern struct kobj_attribute thpsize_shmem_enabled_attr; #define thp_vma_allowable_order(vma, vm_flags, tva_flags, order) \ (!!thp_vma_allowable_orders(vma, vm_flags, tva_flags, BIT(order))) =20 +#define split_folio(f) split_folio_to_list(f, NULL) + #ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES #define HPAGE_PMD_SHIFT PMD_SHIFT #define HPAGE_PUD_SHIFT PUD_SHIFT @@ -317,9 +319,10 @@ unsigned long thp_get_unmapped_area_vmflags(struct fil= e *filp, unsigned long add bool can_split_folio(struct folio *folio, int *pextra_pins); int split_huge_page_to_list_to_order(struct page *page, struct list_head *= list, unsigned int new_order); +int split_folio_to_list(struct folio *folio, struct list_head *list); static inline int split_huge_page(struct page *page) { - return split_huge_page_to_list_to_order(page, NULL, 0); + return split_folio(page_folio(page)); } void deferred_split_folio(struct folio *folio); =20 @@ -484,6 +487,12 @@ static inline int split_huge_page(struct page *page) { return 0; } + +static inline int split_folio_to_list(struct folio *folio, struct list_hea= d *list) +{ + return 0; +} + static inline void deferred_split_folio(struct folio *folio) {} #define split_huge_pmd(__vma, __pmd, __address) \ do { } while (0) @@ -598,7 +607,4 @@ static inline int split_folio_to_order(struct folio *fo= lio, int new_order) return split_folio_to_list_to_order(folio, NULL, new_order); } =20 -#define split_folio_to_list(f, l) split_folio_to_list_to_order(f, l, 0) -#define split_folio(f) split_folio_to_order(f, 0) - #endif /* _LINUX_HUGE_MM_H */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f4be468e06a49..1a273625eb507 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3082,6 +3082,9 @@ bool can_split_folio(struct folio *folio, int *pextra= _pins) * released, or if some unexpected race happened (e.g., anon VMA disappear= ed, * truncation). * + * Callers should ensure that the order respects the address space mapping + * min-order if one is set for non-anonymous folios. + * * Returns -EINVAL when trying to split to an order that is incompatible * with the folio. Splitting to order 0 is compatible with all folios. */ @@ -3163,6 +3166,7 @@ int split_huge_page_to_list_to_order(struct page *pag= e, struct list_head *list, mapping =3D NULL; anon_vma_lock_write(anon_vma); } else { + unsigned int min_order; gfp_t gfp; =20 mapping =3D folio->mapping; @@ -3173,6 +3177,14 @@ int split_huge_page_to_list_to_order(struct page *pa= ge, struct list_head *list, goto out; } =20 + min_order =3D mapping_min_folio_order(folio->mapping); + if (new_order < min_order) { + VM_WARN_ONCE(1, "Cannot split mapped folio below min-order: %u", + min_order); + ret =3D -EINVAL; + goto out; + } + gfp =3D current_gfp_context(mapping_gfp_mask(mapping) & GFP_RECLAIM_MASK); =20 @@ -3285,6 +3297,25 @@ int split_huge_page_to_list_to_order(struct page *pa= ge, struct list_head *list, return ret; } =20 +int split_folio_to_list(struct folio *folio, struct list_head *list) +{ + unsigned int min_order =3D 0; + + if (folio_test_anon(folio)) + goto out; + + if (!folio->mapping) { + if (folio_test_pmd_mappable(folio)) + count_vm_event(THP_SPLIT_PAGE_FAILED); + return -EBUSY; + } + + min_order =3D mapping_min_folio_order(folio->mapping); +out: + return split_huge_page_to_list_to_order(&folio->page, list, + min_order); +} + void __folio_undo_large_rmappable(struct folio *folio) { struct deferred_split *ds_queue; @@ -3515,6 +3546,8 @@ static int split_huge_pages_pid(int pid, unsigned lon= g vaddr_start, struct vm_area_struct *vma =3D vma_lookup(mm, addr); struct page *page; struct folio *folio; + struct address_space *mapping; + unsigned int target_order =3D new_order; =20 if (!vma) break; @@ -3535,7 +3568,13 @@ static int split_huge_pages_pid(int pid, unsigned lo= ng vaddr_start, if (!is_transparent_hugepage(folio)) goto next; =20 - if (new_order >=3D folio_order(folio)) + if (!folio_test_anon(folio)) { + mapping =3D folio->mapping; + target_order =3D max(new_order, + mapping_min_folio_order(mapping)); + } + + if (target_order >=3D folio_order(folio)) goto next; =20 total++; @@ -3551,9 +3590,13 @@ static int split_huge_pages_pid(int pid, unsigned lo= ng vaddr_start, if (!folio_trylock(folio)) goto next; =20 - if (!split_folio_to_order(folio, new_order)) + if (!folio_test_anon(folio) && folio->mapping !=3D mapping) + goto unlock; + + if (!split_folio_to_order(folio, target_order)) split++; =20 +unlock: folio_unlock(folio); next: folio_put(folio); @@ -3578,6 +3621,7 @@ static int split_huge_pages_in_file(const char *file_= path, pgoff_t off_start, pgoff_t index; int nr_pages =3D 1; unsigned long total =3D 0, split =3D 0; + unsigned int min_order; =20 file =3D getname_kernel(file_path); if (IS_ERR(file)) @@ -3591,9 +3635,11 @@ static int split_huge_pages_in_file(const char *file= _path, pgoff_t off_start, file_path, off_start, off_end); =20 mapping =3D candidate->f_mapping; + min_order =3D mapping_min_folio_order(mapping); =20 for (index =3D off_start; index < off_end; index +=3D nr_pages) { struct folio *folio =3D filemap_get_folio(mapping, index); + unsigned int target_order =3D new_order; =20 nr_pages =3D 1; if (IS_ERR(folio)) @@ -3602,18 +3648,23 @@ static int split_huge_pages_in_file(const char *fil= e_path, pgoff_t off_start, if (!folio_test_large(folio)) goto next; =20 + target_order =3D max(new_order, min_order); total++; nr_pages =3D folio_nr_pages(folio); =20 - if (new_order >=3D folio_order(folio)) + if (target_order >=3D folio_order(folio)) goto next; =20 if (!folio_trylock(folio)) goto next; =20 - if (!split_folio_to_order(folio, new_order)) + if (folio->mapping !=3D mapping) + goto unlock; + + if (!split_folio_to_order(folio, target_order)) split++; =20 +unlock: folio_unlock(folio); next: folio_put(folio); --=20 2.44.1