From patchwork Fri Mar 1 16:44:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pankaj Raghav (Samsung)" X-Patchwork-Id: 13578739 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 721EEC5478C for ; Fri, 1 Mar 2024 16:44:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 029F96B0081; Fri, 1 Mar 2024 11:44:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F1C646B0082; Fri, 1 Mar 2024 11:44:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DE4E06B0083; Fri, 1 Mar 2024 11:44:57 -0500 (EST) 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 CBBC36B0081 for ; Fri, 1 Mar 2024 11:44:57 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AB5FC1C1761 for ; Fri, 1 Mar 2024 16:44:57 +0000 (UTC) X-FDA: 81849044634.17.9C62ECA Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by imf17.hostedemail.com (Postfix) with ESMTP id 145F940018 for ; Fri, 1 Mar 2024 16:44:55 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=fNWUnrtg; spf=pass (imf17.hostedemail.com: domain of me@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=me@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709311496; a=rsa-sha256; cv=none; b=pJawqD8ydjeGLAIGWA95LFuXdryESCZdpbwRHMX01u30MUBlyZrnkZSOn/LdQf/zX29uTo yO4D3tfgjGPw4QA753qsgS6HXHbESt99nc9O9CnAgHBmQLhoSJPW6KNnmMBddpBPqIGvEQ qB3D1HSLb9YbXvkEO48VVdGDUGEEwmQ= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=fNWUnrtg; spf=pass (imf17.hostedemail.com: domain of me@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=me@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709311496; 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=O82T73AIK6qGhlYorGzOupTzei7wEk6+FPA8o3URJUE=; b=wAsdmEpncDO+FqjSlpaw9Y1CVaRu3DA0dQKlwId20eMerDYq2nYR2Ds3Ft+aooeccNFGqK M2UklbjoVWT7m44EtaO6N+KLdo1tSKKtrRDTo57lOJamo6TxN2rRmn0pui95Xe+1wV073w mp9F3v0UHLmqWgzBTxqiDgAIVV2AF5Q= Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (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 4TmYpr21J9z9t8W; Fri, 1 Mar 2024 17:44:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1709311492; 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=O82T73AIK6qGhlYorGzOupTzei7wEk6+FPA8o3URJUE=; b=fNWUnrtgSvHwlKswQCDBdMZ99aHEG9IE0hNSW5jexFvvQkpzgpzjuETR588Aq25oYo7zKm 8/eeN0UkSi/gyP8pjyFHWVKgnqR3ti1wvcPmdX3uCpNLcdx7pAw4DTQ/lkD/MWS4JI7jCc lWQn7nG2EGhY3dAQjA0kSFrC6IVJyl6Kx/V1NZAN5ZMSUU8rpTjjNQ68eAgTbbYXLDlU+D nunEh6RLwLQd9tGcIVuB9KmtTSEiCFBkw/cg0DX8LZECOWq5I6YzTySOTqCL7PStVsWUB/ V3TcSHJAm7jDZ6M3hPNRYHqx5COZfIg5tVkt5O731DxQR8wWHdF2+4rgwYKw7A== From: "Pankaj Raghav (Samsung)" To: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Cc: djwong@kernel.org, mcgrof@kernel.org, linux-mm@kvack.org, hare@suse.de, david@fromorbit.com, akpm@linux-foundation.org, gost.dev@samsung.com, linux-kernel@vger.kernel.org, chandan.babu@oracle.com, willy@infradead.org Subject: [PATCH v2 01/13] mm: Support order-1 folios in the page cache Date: Fri, 1 Mar 2024 17:44:32 +0100 Message-ID: <20240301164444.3799288-2-kernel@pankajraghav.com> In-Reply-To: <20240301164444.3799288-1-kernel@pankajraghav.com> References: <20240301164444.3799288-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 145F940018 X-Stat-Signature: dxpdxo97g53xs4yfhcdgdumdakwirfwz X-Rspam-User: X-HE-Tag: 1709311495-252991 X-HE-Meta: U2FsdGVkX19vVEO6kNWlrRgq2MUckMYCOZ0XAfz4jJJuA49V3I6lCoi/pCn+cWyBs/lMRtxYrUPbSx933gHHTn1wDNXSjy2Q6Qjj81Bn76pSJGRHIT0MViEtKk9EofmQ5zOEwmHooPCeIR4NkuJEDixSKeM4M+VEa60KjFESQD3iEOLPZK5gn69ROBn0lPeFlLOEpVl2tN49Z8Bf7UK2ESqJikAJtrxys6Jgf/tPqqpLkTrqwqs/Q+HOuV3cYvicOEYFsdpg3QdQi5azExEqDvWysatWrHASkiCuJFOoEKUdCe7EjpVQWvOFiPBUSJ19Iq/plwdilBf0SwxgnnkjInx2nJL06qlmhEcGd1zcaaNlrll4oKksx0F9X03Z5GnzF/nVU8QtvfzUG7qXmpQdYQvqqYUA+rA8tR4ASCCWbbH/fK9Jq5DVILIuhY2Cg9O0kVq87eeFMUOajQ4G+g+oC1nqi5qDNghlBBoaoml47adB/HLzxJn3UZCnKNLFdop16uSR4ndY+3zgwxtxeYDfwJwbH2MY1dw9qSjAdyWWVM01jfKcOGT1c3xFqL0ZchdD/7zmW1v1pOcMdGZlKReyNbTmfFtR0xiPMTBg/Td+hnz46YpkOYDcOKaSdLrErvVQjiFOwfvVFM4GQrufEAcpSIcEnUy3ibYbCRy5ln8ueGqqrnnZBZce/hUU7fFIkWOoKj3lGW9cODds6mXF41OXABtWU+aiAexiS3kikptYpjHyKXC1nNY3oUCpOxXjWGPNcXI5eKE0CXaGmFDrFK4PZBAEGKpLzG55LxL4rCk7ZO1iNrxv36V0F2ccs9HMiJB2mOvU+P9Y8Au0LUBSG1elHeqtmX7M1BhUcPEhJrm4QhOIDnSFjNYxNLXgEy+2XlhHo+CcS4XsAEeT5+2JC/NtsrpcENjg5WECuiuf6eX4tIyT9qJR9gJ/PJtwtwSnIC6c61RA3RhWc59CUAXgFwF GxAwtmcZ 7Rju6jVM1N43xRpOxi31oDppQgkHv8WU9dFUJmgV84aGOkDT8MDrHiWJYfGQl/zbC+fcKB+OZOSEOOusshqdTZFqzyrvTlr8zXHnS 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: From: "Matthew Wilcox (Oracle)" Folios of order 1 have no space to store the deferred list. This is not a problem for the page cache as file-backed folios are never placed on the deferred list. All we need to do is prevent the core MM from touching the deferred list for order 1 folios and remove the code which prevented us from allocating order 1 folios. Link: https://lore.kernel.org/linux-mm/90344ea7-4eec-47ee-5996-0c22f42d6a6a@google.com/ Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Hannes Reinecke --- include/linux/huge_mm.h | 7 +++++-- mm/filemap.c | 2 -- mm/huge_memory.c | 23 ++++++++++++++++++----- mm/internal.h | 4 +--- mm/readahead.c | 3 --- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 5adb86af35fc..916a2a539517 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -263,7 +263,7 @@ unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); -void folio_prep_large_rmappable(struct folio *folio); +struct folio *folio_prep_large_rmappable(struct folio *folio); bool can_split_folio(struct folio *folio, int *pextra_pins); int split_huge_page_to_list(struct page *page, struct list_head *list); static inline int split_huge_page(struct page *page) @@ -410,7 +410,10 @@ static inline unsigned long thp_vma_allowable_orders(struct vm_area_struct *vma, return 0; } -static inline void folio_prep_large_rmappable(struct folio *folio) {} +static inline struct folio *folio_prep_large_rmappable(struct folio *folio) +{ + return folio; +} #define transparent_hugepage_flags 0UL diff --git a/mm/filemap.c b/mm/filemap.c index 750e779c23db..2b00442b9d19 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1912,8 +1912,6 @@ struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index, gfp_t alloc_gfp = gfp; err = -ENOMEM; - if (order == 1) - order = 0; if (order > 0) alloc_gfp |= __GFP_NORETRY | __GFP_NOWARN; folio = filemap_alloc_folio(alloc_gfp, order); diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 94c958f7ebb5..81fd1ba57088 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -788,11 +788,15 @@ struct deferred_split *get_deferred_split_queue(struct folio *folio) } #endif -void folio_prep_large_rmappable(struct folio *folio) +struct folio *folio_prep_large_rmappable(struct folio *folio) { - VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio); - INIT_LIST_HEAD(&folio->_deferred_list); + if (!folio || !folio_test_large(folio)) + return folio; + if (folio_order(folio) > 1) + INIT_LIST_HEAD(&folio->_deferred_list); folio_set_large_rmappable(folio); + + return folio; } static inline bool is_transparent_hugepage(struct folio *folio) @@ -3082,7 +3086,8 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) /* Prevent deferred_split_scan() touching ->_refcount */ spin_lock(&ds_queue->split_queue_lock); if (folio_ref_freeze(folio, 1 + extra_pins)) { - if (!list_empty(&folio->_deferred_list)) { + if (folio_order(folio) > 1 && + !list_empty(&folio->_deferred_list)) { ds_queue->split_queue_len--; list_del(&folio->_deferred_list); } @@ -3133,6 +3138,9 @@ void folio_undo_large_rmappable(struct folio *folio) struct deferred_split *ds_queue; unsigned long flags; + if (folio_order(folio) <= 1) + return; + /* * At this point, there is no one trying to add the folio to * deferred_list. If folio is not in deferred_list, it's safe @@ -3158,7 +3166,12 @@ void deferred_split_folio(struct folio *folio) #endif unsigned long flags; - VM_BUG_ON_FOLIO(folio_order(folio) < 2, folio); + /* + * Order 1 folios have no space for a deferred list, but we also + * won't waste much memory by not adding them to the deferred list. + */ + if (folio_order(folio) <= 1) + return; /* * The try_to_unmap() in page reclaim path might reach here too, diff --git a/mm/internal.h b/mm/internal.h index f309a010d50f..5174b5b0c344 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -419,9 +419,7 @@ static inline struct folio *page_rmappable_folio(struct page *page) { struct folio *folio = (struct folio *)page; - if (folio && folio_order(folio) > 1) - folio_prep_large_rmappable(folio); - return folio; + return folio_prep_large_rmappable(folio); } static inline void prep_compound_head(struct page *page, unsigned int order) diff --git a/mm/readahead.c b/mm/readahead.c index 2648ec4f0494..369c70e2be42 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -516,9 +516,6 @@ void page_cache_ra_order(struct readahead_control *ractl, /* Don't allocate pages past EOF */ while (index + (1UL << order) - 1 > limit) order--; - /* THP machinery does not support order-1 */ - if (order == 1) - order = 0; err = ra_alloc_folio(ractl, index, mark, order, gfp); if (err) break;