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 EC116C83F1A for ; Fri, 11 Jul 2025 06:23:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 747446B0098; Fri, 11 Jul 2025 02:23:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F7E86B0099; Fri, 11 Jul 2025 02:23:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E6756B009B; Fri, 11 Jul 2025 02:23:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5116C6B0098 for ; Fri, 11 Jul 2025 02:23:21 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E5A281DDD1D for ; Fri, 11 Jul 2025 06:23:20 +0000 (UTC) X-FDA: 83650991760.10.F75EFBF Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by imf26.hostedemail.com (Postfix) with ESMTP id A91D1140005 for ; Fri, 11 Jul 2025 06:23:17 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="BwNL/Ghl"; spf=pass (imf26.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 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=1752214999; 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=rtpI047k16F6WKVc1Nno4+p1oxOQn3UL3hgRRvrDrFw=; b=4SWXY9H4IQd5HqHnOVUppMP4Qi4wPMUgOfMvghl8p9wSI4ucZM7aKt162LsE/pDvIN1Wcq VXgoDPkHBs35Bx+r6ocSwDYK3Vnj2VxcirG9DEUEwfExfLWavMDOOOkbHvXx5ZDYHDH83u wA1y2swjzfymZf3Vl07Uk+Doe9K2D0I= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b="BwNL/Ghl"; spf=pass (imf26.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 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=1752214999; a=rsa-sha256; cv=none; b=2ZH35Syk0/L3Fylx+ZrcQxX32+/KYGr/sNzICQXg2k8zA/5zo+0LmWczmx+lFoTi5xHgtX 34lubIIJk7YNRoYoKxNXhHJ6ke8qvP+XnK9VsFsjH3OPA60Nl2pPbkqRYawKCsUsbR7TfP RK/NwinxmErzPUpIXVxWxU1Zp07Mpxo= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1752214993; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=rtpI047k16F6WKVc1Nno4+p1oxOQn3UL3hgRRvrDrFw=; b=BwNL/GhlJ9ynUScZ6JxODmccpA89tQ5NnkGbRYoS6IoB5I/Vd/SO0uHB0QXQmXCvQkppkadsWttILkHElpKTCFp8v9ye4/Tv+lI36YP7Ks9c4aMl5ZzoL5wZ6vg166x9EyOTYgMPuxe/rh6Adc6i9es7Dkjbbj0TJAlQ7aNXQOA= Received: from 30.74.144.131(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Wifv0NS_1752214989 cluster:ay36) by smtp.aliyun-inc.com; Fri, 11 Jul 2025 14:23:10 +0800 Message-ID: <57e82add-b8d5-49cb-8a3e-58c7c65768d0@linux.alibaba.com> Date: Fri, 11 Jul 2025 14:23:09 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 6/8] mm/shmem, swap: simplify swapin path and result handling To: Kairui Song , linux-mm@kvack.org Cc: Andrew Morton , Hugh Dickins , Matthew Wilcox , Kemeng Shi , Chris Li , Nhat Pham , Baoquan He , Barry Song , linux-kernel@vger.kernel.org References: <20250710033706.71042-1-ryncsn@gmail.com> <20250710033706.71042-7-ryncsn@gmail.com> From: Baolin Wang In-Reply-To: <20250710033706.71042-7-ryncsn@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: A91D1140005 X-Rspamd-Server: rspam09 X-Stat-Signature: 1wbkm5bx8t4hkssrbqroeixrmuhrg5kr X-HE-Tag: 1752214997-269666 X-HE-Meta: U2FsdGVkX1/OU83jojrSJaLOtu9wW0Y5QDY3nUPKCs0Jm34Upq8KrFg/vyJXdiDjc/H1i9mGm2/gxchRIFMn2ZAdY8/YgrOQtJCZwQ3ubmi+DXnG/tPj1J7sxSDnDSz9eXUgiV9/arLOK3AlW55VBrROvcCqIMlZ6pMg3jIDrDJk0fmeKxAo9FHB1W2x0+GVJxJ/nHMbXP4YUiub29xQpFei3VqJOYFuSjIOeRUTrhuhS1oLfSbDysNFrjzDvfrrSti1sp96h79OS4eTcJMDNcMGqJV6zA+KabHcsvkTEm+U98Y8FhaFaGsPqw9bBHt0imjt94G9wupk5H5ZmufVPp3e1vSGUBUjBbsLUqLbbSFPzQ4R4J+8p+RdGASEoQbMaO7WzlWuRXH3VqCmVdsFYPHlfZfADAmdS9ikl4tty8PbZObNoGoGI/TUILyC45oDUeI8sxUDURbxCj5hTrV+AjufQBEOLL8HperaFVoYim3FH27/ZPGHRMpnrbekmzP9rO7iVwHQd/X9bNpCgjurROthkYwUW7vwBUzEfD+NNwlpL1DNW+3K25oDSV8/WMg60A9RD2R20a98JZJCbLF9aNIjGOLv12wZDTwiWismHcu+oMm+b/kHQrvpP5Jh4TdasyMjm7XQRR04+C2hfh7/QSvurVP4bDBUZ04x5eipOMI2GUFqgFcI5XFHAYbJic/rkPKy7oTBEA3jcGd1EEp3DP2bGzt9g95yu3/bY0gd74Mx3pVr1hhLTYib3aqb9fdWidLhiIfYBlK5YeKyjqjSMZAiHJ34D2rVHLJN91E7C8pv60ySyWnq/cUv5VYDKfkQZCK1jnBOOL+l41R+4sbW2slPdats5d4273JWeVk7CIIKILhSg6exv18e2XPI+UPj/llyCDb/x72NwXdXiHBkV59tUd4HWRKm 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 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 *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); Nit: the 'mTHP' word can be confusing, since we will skip swapcache for order 0 too. Please drop it.