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 B7D5CC8303D for ; Fri, 4 Jul 2025 18:18:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B0286B8065; Fri, 4 Jul 2025 14:18:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 587CA6B8059; Fri, 4 Jul 2025 14:18:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C5506B8065; Fri, 4 Jul 2025 14:18:34 -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 3DDF86B8059 for ; Fri, 4 Jul 2025 14:18:34 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 17A0E1A0222 for ; Fri, 4 Jul 2025 18:18:34 +0000 (UTC) X-FDA: 83627392548.10.04C3C40 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by imf16.hostedemail.com (Postfix) with ESMTP id 45719180004 for ; Fri, 4 Jul 2025 18:18:32 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=BlL9YH3n; spf=pass (imf16.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.178 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751653112; 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=aENP2iu4I7U0kmp4JHtI/iZifd2SYatC9OugRasA0/8=; b=IDwt6EC6xQFUHITtyBu/8h7Rbz/GIYSSmJ+gJAUOJy+xEh7B70QhAjw2wCd8ls0EAlK02N I3YrtY9d30l/TjxC2HgX2uBh7jDQfbFf+TtByux6Y0mFCQg9/+zmNh7cX3G5F9W97LitPF fogZxb5OnCKCfEnmaN8s9EPByTEv2XQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=BlL9YH3n; spf=pass (imf16.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.178 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751653112; a=rsa-sha256; cv=none; b=0u656TawApqWjsNC/YwWWQCqgUGCvCuEZ6KWIZogBVApXxrseUw9UB01ZQ/DQn1GEEdO6p 1NJwrFPpmFwXj0EeS0x5LBsMsXBsfLq16uD0UR00YyUXlgCqO4ylieUImkv3x4yx2OFUee RdM9XnoAjPPB1rHUroJQljLOGFmk3SM= Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-7d3dd14a7edso177598585a.2 for ; Fri, 04 Jul 2025 11:18:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751653110; x=1752257910; 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=aENP2iu4I7U0kmp4JHtI/iZifd2SYatC9OugRasA0/8=; b=BlL9YH3nLF5WB99kSmLBw/iUZHlFxmbrWjbTcfcgsQmpJtiR4q0RFj8eCT3iMlsyQk NdKxAoKR4NsTJoxPIgKcpwNo7UjZH/8oYOH6TpYTLSa4luriEQzTTM/JTJ5Ha941OFBX I71BWHazV9H60LQVBZHZRSz7DR5mIzdWl+CmBt+Gyd1PQObEqhVIPdDFmdZUWBdY4RlL t6lIs6prAF6UJ8AfQxz/dsFlGbDSK8F1cZah/Jy4ipY7L8DslpMqR7RjhsPFbcGlsU4H nJl/aGRqyPV6E7Fl7S2j311/h+5WWdVhYyaEzR7rC8g842OF8Yvbd4w3thVKNAXVkRAZ uukQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751653110; x=1752257910; 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=aENP2iu4I7U0kmp4JHtI/iZifd2SYatC9OugRasA0/8=; b=MaZpI5433Q1+dblfI4MOyQc5LHXGhj5RLW7UoisQsxIAUW6e4BoBqvf4LzjbSVdo9v 0MabwwGEFChTakEBJVaEeZoTBh/n4Xia/GEoXIW5f9hwLOAd2SMBsbfl/WZdAU/bSv2e yPgpE9V+5o7chLnA3i48LzaTJmpPVLKpwyvtZun2tnDNNuVCr8DttvhHw0PEjmArV2Q3 jKfDBkEXxS9WOiRgGvPqfPXKDpzieXfKMvRoGdBlnU6dk6LsFZ98fT40PH3emhiRbLyA OGSMKepICbgoaOZXMp6/ih0RzKVk/osCuBXeEm5WSnbIfVSLYPxT2ls6VsEyaqKuLwSH /KWA== X-Gm-Message-State: AOJu0YySlfCm/HSDEmtOZDd4OI3YJazB5ZliNT22ZLhiJ7myeLJYkQUo o+NmqAsapipv+0IgCq++DjlsrCPMOXsa4rxypAwufMvFFLEokkJkCHo2LAA3NqBfwOs= X-Gm-Gg: ASbGncuHdZ6CXe62v5TefwuvvPHJ+bMAEyPGFY+wl32Hzr9HgcAi+HZUHtXcWyej5j/ f0BnPRn9Ye1IeYB3ZtaZPPdbH485tuEunKtbsmwVtcbXBR3VWQNG0nSZZeyDwEgFKJaKKcyebTP NDor8gkOpaKSxeo+iKk72B2cedXhowl60f/78BJm0QOkIqyk7qDbCNtP8zSabBB05G2eOQXB3GL ZPjS2TZl/RVB1KUHwMIzReABZUzAvoB91+N9KbhwO2Sv5NfOV4L8zr7TQEH8Pgj1gAeuZOOQtsK cn+F8vPg+5NjBwo/IEXaeLCGYiLN8QcXrJJ+/H83o1AmGIxyzasEqKENKNEeMbLFAeI= X-Google-Smtp-Source: AGHT+IGEgOE2jwpm8pCR+sUWgH7jwim5UJ8UqD4Xh0VD4cdL7RfEFoa9A6rupdlAWG9NTMjYVL9FfQ== X-Received: by 2002:a05:620a:7017:b0:7ce:bd8b:2d08 with SMTP id af79cd13be357-7d5dcc4904emr490235885a.10.1751653110162; Fri, 04 Jul 2025 11:18:30 -0700 (PDT) Received: from KASONG-MC4 ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d5dbe7c188sm183300585a.59.2025.07.04.11.18.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Jul 2025 11:18:29 -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 v4 7/9] mm/shmem, swap: simplify swapin path and result handling Date: Sat, 5 Jul 2025 02:17:46 +0800 Message-ID: <20250704181748.63181-8-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250704181748.63181-1-ryncsn@gmail.com> References: <20250704181748.63181-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 45719180004 X-Rspamd-Server: rspam09 X-Stat-Signature: 3om75dqxchx48q8gfye6xc3s7otqj1tq X-HE-Tag: 1751653112-445655 X-HE-Meta: U2FsdGVkX198NQPYqXPW+B/90VvNvdrHAk7xXDtzFmUJnbs9VEJMssZT21jRhu/ZEswh80gL3Zgr0FNzgPI0P75d43NB+kQUAtA3qMJH/riKM7qyMppz7xxZKUSbINUJ7oIemn5Jt6bqpR9c026ozCqAcR9yJ/NberfcO9Lc2ESyX3b6cCg01/FAfZWzy/vqfYHn0zk+2XinGAHZ8BXhbzTnPHAqJhqiwswcV6Otl7ERfMs4qtm82SEmrAKoGpVkm+ci24AJmZLrxUZqpY0whEnKRCnmp403fpSFsmWpHjnVfunCBofpwiSbllGh6veTOb+xOHDHuE3mrpVI/d1x6qq3wWFnLnNr1bo8tvMtPagfDIL6VmlkC1D5XgGSpzeOJ2qPzizVJ7HTx2pXHhMDNn50WmTO1Kw+2n4ftE6Obi+dSPigGdwoFoBr4saP/guivnDBm+r0+fvn1bevR9LAsRf46kskaM9BxxZKLYrNn55jkHA4hdW6p106KH+spdJpOFU9IMkcrpJKTiabzeHId4t6aG4gOK/Ue9xElKyhWhbIBOVBC6CmiwfD4wX32vKwWJvdcVMgJKNE6JUOH5fCTGChVD0j1L10tnUQKTrLu9XNYOTGYjw9QuQ7rZo51+pCctM79sdcQH0g31SPOOYhlZdnfHTN6OSKxFmnVhAekehuwUF3+Rm5oGKIE0lJCAvhW5W2WUIEsklZ6TSSZFbIeunfZBW0iAVqwj87Be4wOnY1U7rQmDRmNcruZdH9ITC4BPGXAH0UCj/pSeLbLeExUGmAZN2DJvRs5UIRaBgLNGELT0oGCMW+s0ODJJ4fUKNAR9LddloAhy3q1dniZi8n31IeEDKHu7MW8MkceyGMomWXmOi+ttrwJKz7z/fbL3gvL8pRNGfKFmgSpAlW/oyR7qwxs+RyDjtsTV2aW++WJRGxBXuGoSwCO9c2JFqpfefh1d93dO9MK9gcg1UJ3Yk dHX+kGp8 zWRh6zgVINJ2z/RXvodQf99NUjGnsibDnOowRHIKmAUkf1ddgI1eVdGC0wpisLNPp67YBWMegxyx/pGus74J1xbe+lu3y5twA1j0Btl4IVbH/L39iTq7EKThxljTAEsAviGr/Ncz+/7adoFqnbdGcB4WMXddzyN6of2khIHlke9AYf416sSx+faHmchPLHEdtuejf5gachNoTjLzeNULFrp9SbCFQXO6CeW2nxTu//9p9PjBTj580nxlWG0kK1Ymqe/WjdMSyQnD5XzrqQtmtbiCZwniFSuY56EjKfn65pgSThtoA85fd2NYW5rcK7q0xjmqJPsZ0Ig7Z3gM9qusT/HT5A6C5OD/AfLhhLwOfnBxfeV1sDIyGDNtoaA6zzYcquPb3tgjTfniLfMj9Dd3lH899Y3CVqst7+IVzHJPdZnYDO03RDo4pWKduILwqwrKJdX3BkmLKM9/9l2dFZfyGHK7QcfZN7sWxAMzcYsqTQNmGqyDaC377H/98aDIiUwAO/wOHqy7f8f762fZPQz9zA2L5sSCyxTE7b5F831Y/mbPE+NeHslVyNM4JDQzWCaosivaxqOHpzdVyg61KMt2sciWqWavo8Em+RswgLoceu3Piadaux+CJxp30B0KzQeH3eDSw0N+w7bL5VGI= 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_swapin_direct 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 | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 1fe9a3eb92b1..782162c0c4e0 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2327,33 +2327,28 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, 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: -- 2.50.0