From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 40D6A1FE461 for ; Fri, 4 Jul 2025 20:20:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751660411; cv=none; b=u2LgyT0Ww7kAGVLegMHVy2pVBhYyq3sCNRo2PjGCoS9HPxMUdnDX0gvY4/v9SCVpyLKGORKN5pZ9MvPsow+DmvUchCA45GzwxPMYIxQb95aLX6mfCcC5qt5fV3ZtItakAZdWV2l+hBbzNXv3xnhfsZUEEc+SlpkAoiFsbgQXHhs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751660411; c=relaxed/simple; bh=T9w8JCJAdpJlfT/MfWenciNdWgPQnsp5CGT0wBez0ww=; h=Date:To:From:Subject:Message-Id; b=N+80nZC3qjpdV1Wr3RuA2MOHkw8iQ7adcUydv22CCVbWmRbRVQcneoY5oWHprY9/1Mow/iEFl1KSRYAhk1sKY16eTeEl9hkm0qX31/CwTQQeVXiI+InInLPg46KwhOzB60tQGC2oPdLEPzIylm5YxpBrsNqy/iNjFpWrR3Qc6VI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=Zv4fw4ox; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="Zv4fw4ox" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EC98C4CEE3; Fri, 4 Jul 2025 20:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1751660411; bh=T9w8JCJAdpJlfT/MfWenciNdWgPQnsp5CGT0wBez0ww=; h=Date:To:From:Subject:From; b=Zv4fw4oxGD2MXTOkyT/05Mbgs+HURDJyeP83ZxM++4+aDWYN2CIQ3RkJguQWYShec nvKwGnra9+jj0GQXBmIcd/XGGbC9TSrEvyn1OKzzFcVTyyhxguMHbq+5V+gDDw3njJ ljzv3+8BByBeMS0i+2qnkLB6ogik7aHSELFBmD70= Date: Fri, 04 Jul 2025 13:20:10 -0700 To: mm-commits@vger.kernel.org,willy@infradead.org,shikemeng@huaweicloud.com,nphamcs@gmail.com,hughd@google.com,dev.jain@arm.com,chrisl@kernel.org,bhe@redhat.com,baolin.wang@linux.alibaba.com,baohua@kernel.org,kasong@tencent.com,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-shmem-swap-simplify-swapin-path-and-result-handling.patch added to mm-unstable branch Message-Id: <20250704202011.0EC98C4CEE3@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm/shmem, swap: simplify swapin path and result handling has been added to the -mm mm-unstable branch. Its filename is mm-shmem-swap-simplify-swapin-path-and-result-handling.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-shmem-swap-simplify-swapin-path-and-result-handling.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Kairui Song Subject: mm/shmem, swap: simplify swapin path and result handling Date: Sat, 5 Jul 2025 02:17:46 +0800 Slightly tidy up the different handling of swap in and error handling for SWP_SYNCHRONOUS_IO and non-SWP_SYNCHRONOUS_IO devices. Now swapin will always use either shmem_swapin_direct or shmem_swapin_cluster, then check the result. Simplify the control flow and avoid a redundant goto label. Link: https://lkml.kernel.org/r/20250704181748.63181-8-ryncsn@gmail.com Signed-off-by: Kairui Song Cc: Baolin Wang Cc: Baoquan He Cc: Barry Song Cc: Chris Li Cc: Dev Jain Cc: Hugh Dickins Cc: Kemeng Shi Cc: Matthew Wilcox (Oracle) Cc: Nhat Pham Signed-off-by: Andrew Morton --- mm/shmem.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) --- a/mm/shmem.c~mm-shmem-swap-simplify-swapin-path-and-result-handling +++ a/mm/shmem.c @@ -2327,33 +2327,28 @@ static int shmem_swapin_folio(struct ino count_vm_event(PGMAJFAULT); count_memcg_event_mm(fault_mm, PGMAJFAULT); } - /* Skip swapcache for synchronous device. */ if (data_race(si->flags & SWP_SYNCHRONOUS_IO)) { + /* Direct mTHP swapin skipping swap cache & readhaed */ folio = shmem_swapin_direct(inode, vma, index, swap, index_entry, order, gfp); - if (!IS_ERR(folio)) { + if (IS_ERR(folio)) { + error = PTR_ERR(folio); + folio = NULL; + goto failed; + } else { if (folio_test_large(folio)) swap = index_entry; skip_swapcache = true; - goto alloced; } - - /* - * Direct swapin handled order 0 fallback already, - * if it failed, abort. - */ - error = PTR_ERR(folio); - folio = NULL; - goto failed; - } - /* Cached swapin with readahead, only supports order 0 */ - folio = shmem_swapin_cluster(swap, gfp, info, index); - if (!folio) { - error = -ENOMEM; - goto failed; + } else { + /* Cached swapin with readhaed, only supports order 0 */ + folio = shmem_swapin_cluster(swap, gfp, info, index); + if (!folio) { + error = -ENOMEM; + goto failed; + } } } -alloced: if (order > folio_order(folio)) { /* * Swapin may get smaller folios due to various reasons: _ Patches currently in -mm which might be from kasong@tencent.com are mm-list_lru-refactor-the-locking-code.patch mm-shmem-swap-improve-cached-mthp-handling-and-fix-potential-hung.patch mm-shmem-swap-avoid-redundant-xarray-lookup-during-swapin.patch mm-shmem-swap-tidy-up-thp-swapin-checks.patch mm-shmem-swap-tidy-up-swap-entry-splitting.patch mm-shmem-swap-avoid-false-positive-swap-cache-lookup.patch mm-shmem-swap-never-use-swap-cache-and-readahead-for-swp_synchronous_io.patch mm-shmem-swap-simplify-swapin-path-and-result-handling.patch mm-shmem-swap-simplify-swap-entry-and-index-calculation-of-large-swapin.patch mm-shmem-swap-fix-major-fault-counting.patch