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 5EB5DC8303C for ; Fri, 11 Jul 2025 06:29:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B98C76B0098; Fri, 11 Jul 2025 02:29:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B48DE6B0099; Fri, 11 Jul 2025 02:29:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A38976B009D; Fri, 11 Jul 2025 02:29:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 94E556B0098 for ; Fri, 11 Jul 2025 02:29:24 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5EFBF11210A for ; Fri, 11 Jul 2025 06:29:24 +0000 (UTC) X-FDA: 83651007048.11.380DCDC Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by imf10.hostedemail.com (Postfix) with ESMTP id 5F083C0005 for ; Fri, 11 Jul 2025 06:29:22 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nmwJsTgL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.208.176 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=1752215362; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Fu5E02Tz8sonF88pjrRAtZKJjnl5WUYj9ngSree7y1I=; b=sQwt8fGV16qJh+zZibD3q0ljlFhOjwYestPzlKl7kLlsVX3RlEDnnSfVqNWwAd1dy5XBR7 eN17PFXhD5AWBIzFnmM9fB7eZgqCfF2OiEeIHakjxCNMBFX3PfzXgOYFtnqMeSByLInFcp Wk+MOfWHGr2VrLpdXzTR//Axc/oE+xg= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=nmwJsTgL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.208.176 as permitted sender) smtp.mailfrom=ryncsn@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752215362; a=rsa-sha256; cv=none; b=Ylnd5XveXAvaVrm0ybPVCKfDk8AZrTu4jIJ4/yrm30WDdvSVjL7269To/GoqcN63DFN60C Q5gOQG2KtjNuIDnTlLOeRiWDFN+RZ1QNDmvijqGnJoyBKA8lPjeQQOTmceEZP8g7gdkPWT JkfqRv5F2aOIIYf3gWf/fEp+cpeP508= Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-32b43cce9efso13849001fa.3 for ; Thu, 10 Jul 2025 23:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752215360; x=1752820160; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Fu5E02Tz8sonF88pjrRAtZKJjnl5WUYj9ngSree7y1I=; b=nmwJsTgLETGwxdzgwBEO/o1el4PvmJMAXTId0YSnw4TGyMDrTOreC2Ird18bYq+WTs LtmrPlzRsAcM4XNQ7/w5ly7pw2gXTYnEK1o1XCOS5/rNMAkv/wkP9xPxOvA0elvcFX2B e0bGyDhwBL0cUSR3LF1n9BEwCBiuzoaG37uvNimuLkGHHI3GR/sPsp5tLD94P5YryLPQ IUZe3zkMf1YEavG7l4VCR/vJTLs9EBtYPxMPHY/Il13hAZC4UrGYGsdS9th8NeA0oDsU jG2W93fZN1owdK2p0rc5hw2GaDQ4KVdFB4jNesLRHuowGKnEGE+9d3N1xGlHeFNudnae KegA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752215360; x=1752820160; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fu5E02Tz8sonF88pjrRAtZKJjnl5WUYj9ngSree7y1I=; b=AhWwiVH/vswTWzU6YDh3FjKFTgruyEclehdb9l3hHC5EZS8g1nldPJVChnznlc4zV+ EfYA1/KevFIucILqiGsZ1AZyJergfdRqVXLJP2vZE/n2QwEZ22x0Xk13yUrQAU6tANDO 3ApAjiYnapN1bNls1VQnguMvLXLxTJuFz5dyUiNMWhr4WncgXvNFS3PD69yyIzXDEvJV aP4gu71/SXneM2xL9Iwx4DNaC85oQszl7vaZcWVdtuvbc5fJO3Oe0WeRk+ZBBNhAik9A TrHR3mOszGtnSfK4h3ydu1cMlRyKWPv0LnF0QhX/e06YMRWYRgbB+BxJAIK8TxuvRRIq 3/lw== X-Gm-Message-State: AOJu0Yz3BaAVhbQQYipPUfR3v5LsejFVss203j0qBEk96IZ+hh/UMPOY Dce+SZscmPWU5aHJ1ESEcyUH11MDPsq7M14GiGkO39gQ/CJdE33QPVaagFq1r9jK73wvmAhJUit sypp5osjOKlGkf6PeFeOamJv2YVAGqWY= X-Gm-Gg: ASbGncvlFiUmW3U3V/U4SvR5n4fjZduvjkFlcinAvTkShwsYNK71i7emR37owtxye8C XB2nLQ2zBN6rc4qrc7ydRfLZMKo5hvO91DgNBHFb4VdwZfVZYtFT6t7GSAxayI3/3MHEVxrmFSg gIeclyonDOfxy9OLiwL1j+rjZ82vycU/QrwmYuBHLXvZHo9hxw64BC9n/67K8Z83s+TQ+sLY5Nm 2q2YP8= X-Google-Smtp-Source: AGHT+IFsXmgG4Hxg+cg6+SLo/mkUjzPz/39yLkz1m+RzQzzlRzB3h4hzCVNT4GDiQfyR1stChxE+BtGaSN/5L4KgAB8= X-Received: by 2002:a05:651c:40e:b0:32b:3cf5:2ff3 with SMTP id 38308e7fff4ca-330533d821fmr4409051fa.22.1752215360179; Thu, 10 Jul 2025 23:29:20 -0700 (PDT) MIME-Version: 1.0 References: <20250710033706.71042-1-ryncsn@gmail.com> <20250710033706.71042-7-ryncsn@gmail.com> <57e82add-b8d5-49cb-8a3e-58c7c65768d0@linux.alibaba.com> In-Reply-To: <57e82add-b8d5-49cb-8a3e-58c7c65768d0@linux.alibaba.com> From: Kairui Song Date: Fri, 11 Jul 2025 14:28:39 +0800 X-Gm-Features: Ac12FXzCdCLDdRPa9y8HBDq1sE9Ojdw-RlpACb6MtZLbEwVrg9v_lKiQbE6FUwI Message-ID: Subject: Re: [PATCH v5 6/8] mm/shmem, swap: simplify swapin path and result handling To: Baolin Wang Cc: linux-mm@kvack.org, Andrew Morton , Hugh Dickins , Matthew Wilcox , Kemeng Shi , Chris Li , Nhat Pham , Baoquan He , Barry Song , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 5F083C0005 X-Stat-Signature: 5wjra1euawcfpzj6ew3ua1i41pc3qjop X-Rspam-User: X-HE-Tag: 1752215362-374071 X-HE-Meta: U2FsdGVkX197IK6cBBI+HC0O6wF6nA/wo9mO6hQK/EV0rrbh4AKCO1OTkbv4M6llbGABtDakpvohInQoQbbTN0TNMc3Bn9tOmPgKrgUClepXnPLNkcCiTP8mNtlQ2oy6cxUPnsEuZCGSP6rG9Tsg7J5kVw5j1JlmJa4AOh9yG8v7IhTVxGXUHLzDZ6K7SLi0nLICqJOJcR8u5n6/WRPp2PfizamHJPaTkEkBphNGCQW6KfOuSqbNkyHsaX6kZlT5uhvKtNc8T+jw58yAvmq6HWY9OJmwYkGZF1N/9VJ18IjJJUmJeSUx0X0rOXFw8PQuenVMGJOZRCkXHLMc0cCO8MNB/fiLs8fm9iXbAD76Nl/15XAE7+1sz0dZ/f4RshSfTOA0zYLUbxEz77WALhbmr8pK7fcUK/PZLSPUpdFfgs0AMEIBjwLvwYARdbn5hLKCYNpry73qbHitet2+lkHRUgLxni/PQbRfhvuVXJ4dFqz1mbgxvK+Ar/lFzyrWJzWroNZdc7Ibb78cvAR1la+Vn0/zFFNulxJfywXuwyI0FdhvvPuvIi3p+Yau9p5SCDcG5Z7wiwtHCVdPVmir1Si8VjHc93sO2FcLhilhgS1lNHHJiusQSIGHzXBAqWtZli8ehJ9fyLncopUqUqmig62fNB3BgHR8x0ciS9U1LM610kgGxxxVPmeD1Bal9y/jxaIeZ07RmprKPXn8ke0o0G7CMdllViKZC62eBfN9Ff/GFYuxZwc6Ki3L7oJNPbNdTuI/4lOhfoQks804gSEN6rtgXbSHfQSD/x48AYzmW9LZM6c71t3rsiX3OwORcPfWYiqup/98JA5ESXf10Vv7zJeYX9rHhES78M/2U5fGgowgrE4s/TnXNjwSuuHBfYBpdeCpYuQmoq0aXfniN+zHbEN2l67Ke/b4fAcDUEZ9x6TDlQ405GHB7+gxyStC9GWGAPBWpNdmTp9c9lo+dIsDDlh C3t8y0fm FRIEX5tdCHWuKMzVG+rQj3HD0fQLZZNwP9aOOep3F6kN83+KW7+C7+AZIGYwjCqz4Z8QbnE+k9dgCOIXjbHAOvjoEcb+SRocH9ZvJfVPCuQ4iyYCDKudMaCEtvOqNCAZOXeHQjbKJG2LMDPwtOZPmreS95A4fdzmFTIjczJwwdKn4bQQWy2YRzMnL+/68OezT1FHJgqkyeyQQvRhk5tygV2Vplh541Wy/yzZ/CmYmDEiaioYfMwLzhPgSdWu/q6/5N77kKkO21CjmjGKQ0OkaIeB0aIlNvN027g9YhgyDMQ+d3tvWH00ZZWS+jXJjXz8XAt3VYtX4iB6elnhZWokZ6q1vSI61cZEXWyIz6ilSo8yFOQae/58wWSRljv6cJymlEecLudW17QQaSCRLEfkrFLfaNg== 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: On Fri, Jul 11, 2025 at 2:23=E2=80=AFPM Baolin Wang wrote: > > > > On 2025/7/10 11:37, Kairui Song wrote: > > 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 > > LGTM, with a nit as follows. > Reviewed-by: Baolin Wang > > > --- > > 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 *ino= de, 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 & readh= aed */ > > folio =3D shmem_swap_alloc_folio(inode, vma, inde= x, swap, order, gfp); > > Nit: the 'mTHP' word can be confusing, since we will skip swapcache for > order 0 too. Please drop it. > Yes, thanks for the review.