From patchwork Tue Jun 18 06:54:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13701844 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 A5103C27C4F for ; Tue, 18 Jun 2024 06:55:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1CA346B0172; Tue, 18 Jun 2024 02:54:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 150C86B0173; Tue, 18 Jun 2024 02:54:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6F596B0174; Tue, 18 Jun 2024 02:54: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 B888C6B0172 for ; Tue, 18 Jun 2024 02:54:42 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 702C6140490 for ; Tue, 18 Jun 2024 06:54:42 +0000 (UTC) X-FDA: 82243096404.10.BECD7B9 Received: from out30-98.freemail.mail.aliyun.com (out30-98.freemail.mail.aliyun.com [115.124.30.98]) by imf26.hostedemail.com (Postfix) with ESMTP id 7C2B914000D for ; Tue, 18 Jun 2024 06:54:40 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="j/tpHpF6"; spf=pass (imf26.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.98 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=1718693677; a=rsa-sha256; cv=none; b=XMepzSgA33AuIzWztmFJOy7Sbe5PmxrvNOH2hdyN3/rvkKHvuhpwMlHXkluJnjJftnFl9X vlLD/xFYcS2wGOSai9OZNX+jFPnB2TNoVr3d/igMJmRnVfFw2KmsCSDq2dDcuVDZrxo9YA 83clnrxlKEsmqA4VIpLA3SzicKT1QPU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="j/tpHpF6"; spf=pass (imf26.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.98 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=1718693677; 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=X2IkWrVoIA4HwkKR/y14knPLhy9dqitMrcGqnXrDEBs=; b=CP/icvIAEIi6bpEQjlmpmYNYAxmKZsz50NzSOpVN4yWm+3aIWZrAu9Ff3NaBl1pGdhAo4I rTC4i+qqNvTwYrFioSf45jTp93LLZAV9INotk+P8sGMKSGFcIr+NIT9ba0SVrpYzZgTpZM Llv/ba6jbHxRcQCnj7/c+POWKBakYSo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1718693678; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=X2IkWrVoIA4HwkKR/y14knPLhy9dqitMrcGqnXrDEBs=; b=j/tpHpF65loG60eh+FQ8RHML/IKZYpV/JEf/Hx58eIP8cx3s14PxNksyLAxXDZHV66RxDHtvU64yjJqf5rVxSRL49c4gbYI5Ah9wNGB2P61OY4jEe9fJYbLSMDHxmydBJBSiG9krryj/mWAZYprvRPwyMMEKgLvU8y0aYTraplc= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R891e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045046011;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=17;SR=0;TI=SMTPD_---0W8jH7nR_1718693676; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W8jH7nR_1718693676) by smtp.aliyun-inc.com; Tue, 18 Jun 2024 14:54:36 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, chrisl@kernel.org, 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 v2 9/9] mm: shmem: support large folio swap out Date: Tue, 18 Jun 2024 14:54:21 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: d9pfocuuqbmxdt9hg7wci43aiki713ac X-Rspamd-Queue-Id: 7C2B914000D X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1718693680-788027 X-HE-Meta: U2FsdGVkX1/sx/Yht/90EOTeHK42oCZsd6xftQg8WblVtR525rBs+QajQjqibXmVCIXotBtUrudcj/tH6XMq9tCbM3jQhvp5/Bo7KOeFIx0GzDk6awQSV0ytlpyiNnZUxRflC4WqdNGh3vdCJJ8PW7VF+wOr80PXox+toO6UNmx5JHECWitUCkYghxgEPGZUdcSjcXePBKEb1IOPO853hwL6tPPV/aPHYixB/Zq2me1d5v2UIC3P7oKUhPrBBR7Vga9gDLseYsvIPL+1c5bbIEMC7tnct1YBpE1ixNfBILLo+XZcN5ox4/TnMTcjjvpDc4J1VWUoJLcBd7CjPpJUlrfSZjyPn7c+ZukHlt78VDi60HdWsnxC6sImjp1lBUU+VeWNnqI1JwVqbeqDW4OPmvWoeRLlcywAYGvW8YIX5Z0bEKpTwk8lcdWJmQMRd8308rJuqVMStvkFvK8fGecPw8hrLugT5rce8ZggDIbDERIkkwFkBHf7v2s/uBRBZGpDvuefwxo+0/HdOVkN6jiOG9r5XsBMDcjsvpWaMwsjiLYLJOGck3XHGBEfH+pKSXXRBZNTEKJwtHIcwSNVeQeP65QxwpwmAPen7BOL3hRnxEPoc4/wFvnSmUEveSysBCvjU3qpW2aVANuYv8E9KUMHtABg5pNN1CEuL/wrbL6TjWm4E8AszDyymsXbX2GUCh8upV1XUVyIX35mZTumY/G0ros2E5lWA5j0t3OQBMtC7zA9706ByBniyOeMVmhB6BiukRNZoqtGJwv98nhVb+dcC1cT/XqV5d+UjXS7iciN8EaGn4EomPXX4PFdmaq8ER7SRwYl2dRTUpsAuxY0HNjXxeJ/KrXFMtSjV+9u5OTx8lhLnzmLIBD3s1sjMUeXs5ZjXPENaPFiejdw2ndrUx/737TCDNh3eZg8tazzPCDXcn7dviKkhhs2ZeXNhjuTT+AmrYZnlCu7O5lEr1lV46l ykMbOaHJ LMhQn9jh5BFpORguLDPBc33n9eq96cSkEGU4DSoFmv3T2X/sNT5EmjiZkuUyASIYjaAUyO4v2IILDfXLfpX1p8dpyB5DXFuGdZvVf7MVIK0W04UMXbxXs/autfkdYPu22hQj23YPidorao0FSyoO4jrhghNJ9g0vEamHVEXbDm2VEX48HKlmqQyvj1PpJHkUIALcQ4m2rTyFutfESkXyEnTbuaaZQC05qR3tli0fOswDBku4KufCNgAgYy/1tqTn+MInO/Sq/OgbkxVZRqI5rwYoHp0CE5JUlVdvQruxDTEp/u6OdKDzqwaz86kXv3GM/ylTX 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: Shmem will support large folio allocation [1] [2] to get a better performance, however, the memory reclaim still splits the precious large folios when trying to swap out shmem, which may lead to the memory fragmentation issue and can not take advantage of the large folio for shmeme. Moreover, the swap code already supports for swapping out large folio without split, hence this patch set supports the large folio swap out for shmem. Note the i915_gem_shmem driver still need to be split when swapping, thus add a new flag 'split_large_folio' for writeback_control to indicate spliting the large folio. [1] https://lore.kernel.org/all/cover.1717495894.git.baolin.wang@linux.alibaba.com/ [2] https://lore.kernel.org/all/20240515055719.32577-1-da.gomez@samsung.com/ Signed-off-by: Baolin Wang --- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 1 + include/linux/writeback.h | 1 + mm/shmem.c | 3 +-- mm/vmscan.c | 14 ++++++++++++-- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c index c5e1c718a6d2..c66cb9c585e1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c @@ -308,6 +308,7 @@ void __shmem_writeback(size_t size, struct address_space *mapping) .range_start = 0, .range_end = LLONG_MAX, .for_reclaim = 1, + .split_large_folio = 1, }; unsigned long i; diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 112d806ddbe4..6f2599244ae0 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -63,6 +63,7 @@ struct writeback_control { unsigned range_cyclic:1; /* range_start is cyclic */ unsigned for_sync:1; /* sync(2) WB_SYNC_ALL writeback */ unsigned unpinned_netfs_wb:1; /* Cleared I_PINNING_NETFS_WB */ + unsigned split_large_folio:1; /* Split large folio for shmem writeback */ /* * When writeback IOs are bounced through async layers, only the diff --git a/mm/shmem.c b/mm/shmem.c index 9a35ee7e7f40..2c951d936fc1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -775,7 +775,6 @@ static int shmem_add_to_page_cache(struct folio *folio, VM_BUG_ON_FOLIO(index != round_down(index, nr), folio); VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); VM_BUG_ON_FOLIO(!folio_test_swapbacked(folio), folio); - VM_BUG_ON(expected && folio_test_large(folio)); folio_ref_add(folio, nr); folio->mapping = mapping; @@ -1462,7 +1461,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) * "force", drivers/gpu/drm/i915/gem/i915_gem_shmem.c gets huge pages, * and its shmem_writeback() needs them to be split when swapping. */ - if (folio_test_large(folio)) { + if (wbc->split_large_folio && folio_test_large(folio)) { /* Ensure the subpages are still dirty */ folio_test_set_dirty(folio); if (split_huge_page(page) < 0) diff --git a/mm/vmscan.c b/mm/vmscan.c index 61465f92283f..fd503506262d 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1245,8 +1245,12 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, if (!total_swap_pages) goto activate_locked; - /* Split shmem folio */ - if (split_folio_to_list(folio, folio_list)) + /* + * Only split shmem folio when CONFIG_THP_SWAP + * is not enabled. + */ + if (!IS_ENABLED(CONFIG_THP_SWAP) && + split_folio_to_list(folio, folio_list)) goto keep_locked; } @@ -1348,10 +1352,16 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, * starts and then write it out here. */ try_to_unmap_flush_dirty(); +try_pageout: switch (pageout(folio, mapping, &plug)) { case PAGE_KEEP: goto keep_locked; case PAGE_ACTIVATE: + if (shmem_mapping(mapping) && folio_test_large(folio) && + !split_folio_to_list(folio, folio_list)) { + nr_pages = 1; + goto try_pageout; + } goto activate_locked; case PAGE_SUCCESS: stat->nr_pageout += nr_pages;