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 E39B4C83F09 for ; Thu, 10 Jul 2025 03:38:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7494C6B00A7; Wed, 9 Jul 2025 23:38:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F9DD6B00AA; Wed, 9 Jul 2025 23:38:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E9036B00AC; Wed, 9 Jul 2025 23:38:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4A5CB6B00A7 for ; Wed, 9 Jul 2025 23:38:00 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C1C911405CA for ; Thu, 10 Jul 2025 03:37:59 +0000 (UTC) X-FDA: 83646946278.29.CA794F5 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by imf05.hostedemail.com (Postfix) with ESMTP id DF36110000A for ; Thu, 10 Jul 2025 03:37:57 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=T5ZeFYX8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752118677; h=from:from:sender:reply-to: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=nILRlzs6W9f6pBIwoLukcSVGtWgUoN//llJCwXGQtks=; b=NYxSAqjsny+Xbp0RxPPGd1oc7XAMzvj7kgFhsJ0XDgPWXI4uWGngDJB2HA7tSAiwTOjo5I j0YhK+AmE8f3ZVt+50b5CNtA08jOSXD+7fGk2VVKLp23PIBsH2KEn+tITa7+IYX8sg0wbO E8qGLwxdtaLQU42gpzc6q8A/xTLN67I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752118677; a=rsa-sha256; cv=none; b=f1Crp3NTM6gGollw47ih+/fyXNwM06W5/fHrtfg0XKT5dXVFwGW86Y8HEu+Dpq02XMUu+4 LjyfG7rrLwgZ1SRd3mXcGWCraczOsvRR9O+qbRIel0UVHkyooyydxEGdhMxnYHhU03KZ/3 J1y2JzpwCP1sjlk1yEX6zjXo0i5vrss= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=T5ZeFYX8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf05.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.215.177 as permitted sender) smtp.mailfrom=ryncsn@gmail.com Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-b26f5f47ba1so553721a12.1 for ; Wed, 09 Jul 2025 20:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752118676; x=1752723476; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=nILRlzs6W9f6pBIwoLukcSVGtWgUoN//llJCwXGQtks=; b=T5ZeFYX80KcYqRGMBP+bEH3VCzMJfQhSLUazshWWmyBFBZYfAI3aZB+ugoUlu5XAes h4zDeQWRs+kUEx3OAhVxngcAsk6DghuEV3Rx6PjMxpWpcfNNDOXV41KzGidDnXMwMGMM unM+QNh7zq0DgA/Dg5hAHlABqUFZIcJiVWMDt9B2b+mTZ7LeC5nba9bla1/5VUKjQvKR wXTcBiY9kqTtpNh3RfrCfEj20Hfgg7oauA44BzgDNvmUpAseNMLFEofPOQ6dPAKbABjb qasJ+LGzeesgRw2+sMRAaInNsmjCs3Tzlgxs/R3zm+5eZRIKoq3bEHazdDKuL8T7kJ5Q Ykdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752118676; x=1752723476; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=nILRlzs6W9f6pBIwoLukcSVGtWgUoN//llJCwXGQtks=; b=wTXEY/DD4UWOHX9XYHTRkydALvMOMvaUdZdKXSLda1nqs43kdwAa6XO9UIgA0tUqkC jeQXu0qS4zu0vc0dFHElWZ5VqVEnMvpX++7/+vP4OJlgMMAUqK0QxqmCGrhynRYQ2DWQ HVGzPAuqB8snM/ZGs1RYsBmxt2kYgLuSKHQiGE9JC74PkFB12PqBjvFChnG3NfTtG7wz 9K71Ob5NF1VF3ItHGB8H3DhHqEihYDg/weGPU8zyflKGnlWzetuoxmvgix8O8VrJIUyU 5J4G1T2fh4UcuZUrjgBA4vFcmPs9USsSVUjIzuex2XyHKAYTdb1G6BluM6jFQFXCisKN ++pw== X-Gm-Message-State: AOJu0YwpvjmE3a+sxCjY/Amxm4/P8Ce1md/4VXpOHd+9PCz57CEjY+/R ZSFOmkwCcxBNCG5L1R1WdHGpTbjcdAPeVQp7Hrj6nYZH/IQHpdjxMJQqujEzmJ0O+Mc= X-Gm-Gg: ASbGnct6nD0yG6dTxNius4hG+RW3n9S304mjMKFMwK/Fo3k8yhuXotq/NCWA5MtJAF0 OFai56zWgE8X78/+yKpu4vC0mCeJ9fBAh9FKvEmO1r6xhYSyExjyo4TQbuO5KZ95OWkgqT2UBpk 7ouPlPuyk0h/FP27Sb0UFFeVUD3kGRrdsb719BIUt/CNjfBFaGt5rXiy93p0VM9wLDhkJq1IxGs eoJ4w34ziwINgQ+fnLP4gv/TTt9iSsIwuoGeZNEsMtlW3pcUCzWFV89rlwvHpZwmkrsw0EhGlGh KpS5aLQMZHHqvEL5zA9E8D7Nb5WINigQfIYHoee4hBCKEi3tVNeZYBObVxNi1c6+kHiOtWUG0IS KhQzEww+XjTo= X-Google-Smtp-Source: AGHT+IFJyIDBVba3HKojPZjn0y6Nwa/FH+Rj3zhl8LqZ048q0mLYJ8pfJLTIBQJSD1OjkoOOQrO06g== X-Received: by 2002:a17:90a:d40c:b0:312:1cd7:b337 with SMTP id 98e67ed59e1d1-31c3c255d05mr3461618a91.5.1752118675880; Wed, 09 Jul 2025 20:37:55 -0700 (PDT) Received: from KASONG-MC4 ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31c300689aasm3716320a91.13.2025.07.09.20.37.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 09 Jul 2025 20:37:55 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Hugh Dickins , Baolin Wang , Matthew Wilcox , Kemeng Shi , Chris Li , Nhat Pham , Baoquan He , Barry Song , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v5 6/8] mm/shmem, swap: simplify swapin path and result handling Date: Thu, 10 Jul 2025 11:37:04 +0800 Message-ID: <20250710033706.71042-7-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250710033706.71042-1-ryncsn@gmail.com> References: <20250710033706.71042-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DF36110000A X-Stat-Signature: j9jkyssnj1r4uzrz35y8x1xxybytc4gz X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1752118677-492286 X-HE-Meta: U2FsdGVkX1+rPwapcP+ycFv5K8R30tjpbKFdxFm1pMO//3Hf3MFnxueCl4LPfRWCJiSJVtbn2kuMvLUogSh05qwPr4KPtyko/87QaE+nea1UPPvsCvYg3W8zvPe9WFknV/8YYiHx8+Om/EY9zeANV1dC3v3pQUjSoXNQTFraoKHP+bxK4tOu7zUf1Lftrn7gDNgQ8b42jxTD56IeALuKdI3fZF66L9/5hhf6LD9oOUgdvVucRSjVl5GnRuS019EYJ3N1v2LP92zWu6PH+1rRFpNY3FTjXnBuWZsv3r4ISVVr4RLxAjAtlp4cQSUwWdWzeYQfxJaWeOYGyYqVOvyu1sbrZV9jf/KEZraQP/GvmQWehGiuOL0cm4ZOmxF48jC4RsPoPYwo3GFVvlzTnEoUhDAwG8B8mMythvSa0bgAgnHu0YfHrcYs/G0sCVxeOj70tZ4MaSAVH7TWU/AiyYEXc1G+/53GzhWm8ndhkzKE8bW24vDq7yXHcfCVxTSfqhsl1glPyWrNzruYUiI5AEPzw+IWiaKv/nyhYyWknDVTPXaRaVlcA8SICCCTkhwP9Z2HkjPfe0nLvopb4RsAyd/A/GjGCjHru1r+SfIRMp2y6otiA3FJNiimx6pJcfVqUqSU/wdGwz6nxhdmT7qgMaV6nKwrqjsY3vxDgzpyp0VvusHvNWodeIoJ5J+oxBrfyxUJekvf8wFL4WF8CZd7LPItR/WogqHwHR1uUoBVjD2tJdZntr65ndCYaWLVpG5UCOq5Iyco/n/610bPK/f2lA4cqewy60t9ANnwotAiG9jWs5dfOghaz6jOkcjvP433BH+zD2ZHQMhLxY5okH4MgsnTgR7zG87k7NGLwEd7vcEAYm8jTQOsSC29lUgElWrcjQiXYZBwsD0CKEJaPzniclw9y7K4sAC2yCPhgrJ61zjTRJ3nFR0yN/BR8t0kU/bS4HgQtmBF0xHgh3qvlXURBuu dIvGp1ab qKc+FHlmc8LtpRIkXxsQUrnYd6W3z8fE18z+nwAPa4NMosRotmxA7bs9Y3qSHiUveiSCF2sADB7wAWIm0ZCPCurCkVEQAodP7BJr8aLGgim7f26LJqGYhT/kD+C9tKj7rYTrfYpc/Q2rMfmQ+tMqW0SP472CAObYspLgDMHRh5EJARp6/YOjsSSM30L4h4Map60+Le4sbcyDptymZEIdcCpxoLGEYO1i198fLsIN2wXJ1HTTWDiYVsQUIrX9IgKrQklTZsxwtQV1P1CQPIUWwUTQymWOCKch1tO+bNql9nuedqIJbOZOO/J8LUDaRjzRA1Or2BZgCEGgwkTe1mx7KiF6CrtU7yhj8F+G+7lkndiXhk4O/M2gGNpEtGQacvOUhMLMcfHnzEum+HtRiJ/Q4AmIISbm0LdbuixbRCYN1EZAWH32ouEEEAtYXOqJJsvKwpIkmiyEyjZS9t2ckpa2Vb4lUUF3nNUJ46FCvueoZKT0szuBLtM+5Zea4xoAaTLFzbNoVflw72cXewkRVh0rlcziRafbi0c+/S5OKoLdJ17Xvp2qbCNTXW+YRlwzflwSunV6fJLvmjXGRpOo2Pmpm1vmGWU4JS1gutyNN 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: Kairui Song 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_swap_alloc_folio or shmem_swapin_cluster, then check the result. Simplify the control flow and avoid a redundant goto label. Signed-off-by: Kairui Song --- mm/shmem.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 847e6f128485..80f5b8c73eb8 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2320,40 +2320,33 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, 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_swap_alloc_folio(inode, vma, index, swap, order, gfp); - if (!IS_ERR(folio)) { - skip_swapcache = true; - goto alloced; + if (IS_ERR(folio)) { + error = PTR_ERR(folio); + folio = NULL; + goto failed; } - + skip_swapcache = true; + } else { /* - * Direct swapin handled order 0 fallback already, - * if it failed, abort. + * Cached swapin only supports order 0 folio, it is + * necessary to recalculate the new swap entry based on + * the offset, as the swapin index might be unalgined. */ - error = PTR_ERR(folio); - folio = NULL; - goto failed; - } - - /* - * Now swap device can only swap in order 0 folio, it is - * necessary to recalculate the new swap entry based on - * the offset, as the swapin index might be unalgined. - */ - if (order) { - offset = index - round_down(index, 1 << order); - swap = swp_entry(swp_type(swap), swp_offset(swap) + offset); - } + if (order) { + offset = index - round_down(index, 1 << order); + swap = swp_entry(swp_type(swap), swp_offset(swap) + offset); + } - folio = shmem_swapin_cluster(swap, gfp, info, index); - if (!folio) { - error = -ENOMEM; - goto failed; + 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: -- 2.50.0