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 2A4F9C8303C for ; Mon, 7 Jul 2025 08:14:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F1508D000C; Mon, 7 Jul 2025 04:14:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 87B728D0002; Mon, 7 Jul 2025 04:14:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 791EB8D000C; Mon, 7 Jul 2025 04:14:49 -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 627D38D0002 for ; Mon, 7 Jul 2025 04:14:49 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EE9E310A7B3 for ; Mon, 7 Jul 2025 08:14:48 +0000 (UTC) X-FDA: 83636757456.22.047C96F Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by imf04.hostedemail.com (Postfix) with ESMTP id 2199F40017 for ; Mon, 7 Jul 2025 08:14:45 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=KlIUnSnc; spf=pass (imf04.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 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=1751876087; 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=al3xd+vqfx8QYsniRark/BwtIMxmJYpnPra7XC6K1e8=; b=4AtlmNrJvcNznlB7LK9AZ8pIHWTjHNLPmQMVctXacgR8bJFgRQQW8MJndPBKcQOvGaXJo2 sp/7Y7s/Ej+abSoKnxiE9MpDXqD5sFj54g0yYoHVFzC3+//lRWTa3QkmxjF0O+lb1UF3eg ZvE3xU0SSJA9w8uKhGuCsjFh+s3ecHA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=KlIUnSnc; spf=pass (imf04.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 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=1751876087; a=rsa-sha256; cv=none; b=P6uwXQFNLlDHHoF52UsBUWJw32UMZ9w6vGMkJm/y5p0VaTxs66NkXlPQcHqwxl2pBe7ZgG g+V08FMreTnPT6EoqVSHGw5vBiUE7E3q18LU+oWPD+8sYa+11giRy3CMnHzNZrQNjx5s+0 zlg84HFFKCSgt3wjpVszt5rTjNx3xpo= DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1751876081; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=al3xd+vqfx8QYsniRark/BwtIMxmJYpnPra7XC6K1e8=; b=KlIUnSncfNDhPgUzrD2GiqhaZFBP5UYyCg9tXHDggRFraYYlE+Wz18nutfnDMj3+LZB5Uzx+z9IjnrvebIaDl6DN5vXWidbRntxhdqEeG5QWMYtaFK1ZMuxifix6vcsRPJ4MRtysDyg4bpoogJGphyhoKpnIJTubnJsQkwmaSi0= Received: from 30.74.144.127(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Wi3TIo._1751876079 cluster:ay36) by smtp.aliyun-inc.com; Mon, 07 Jul 2025 16:14:40 +0800 Message-ID: Date: Mon, 7 Jul 2025 16:14:39 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 7/9] 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: <20250704181748.63181-1-ryncsn@gmail.com> <20250704181748.63181-8-ryncsn@gmail.com> From: Baolin Wang In-Reply-To: <20250704181748.63181-8-ryncsn@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: ntb8x6167s5js37g87zoabsxyeg8ekhd X-Rspamd-Queue-Id: 2199F40017 X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1751876085-285613 X-HE-Meta: U2FsdGVkX18YbEmKXTjJeibttWiSPz2C0agxyOisOQDrmg36Ckk0b7m1oQrEoLa1jHbYHMjUI1JRUILAqyeHn32uNIfrBfMg4e2u7+3Aw/VfDLDsPp31tKNczZRKR0tx67T6iwndQ/TBvIzxvllLli0o/iyuku9f0a0S7QTJrcY16lQhrq+oOotKyybw/0ABflegV1sVX9SSwEbmTyi7aWWMmoFaRaQMGLMp205H6i1gXwFI2wvNCh0eV9sLfEfOjin008E/tg+eCiVcc4DozU8UDK84WhCwQQKojMmnyxC3AFYg6lvZH83Kz973FgM8KRF9SqOl9xvMx8gDqIoCICGRJ8oztNudY677Ar4uNA/xfNckKj7xnpfNC+wazUqrDK6u1GyirgBaBaq/z1CEz5zmdq9NtMR+4lkZsz2FPn8HwS4/Ecwjp4bpNq9B9VWN7LzGIQD40hWz8zy3jLPFVAEo876Gq4SPrR5n3nHIanUHlMuu3zzcle00tv6vi5b7ssE9VvIdWE/E+b1/WgoenZN2tInaKy0crU8iTNroIhl8kGyIUoX7rbg1ds5upu+kfp7eJ3pEGg3KNV7KXvdTwU9pyCiIw8Q3zI4QxswTyfNuVwdeEoxJjEDFEER6nE2yNeQudfSIaRdEmTP3BA/uvL1O9ll/5by5FhJ7MWg0X6Qo2KTW73YvBvOdca0Db3y8Ocq+MRHoLTsGvxOqzXScEXG0qONDLJuE+YFvAAi0jE2Vfb7IiFhIm/vMupx4IQZsVfNauSDBhd0vz6EygaxiKkWHTmwKaKHiwHNU2tbczeIfXH5aewYOCwSs2EmZ1PyolU75HvmO960RMcf95WuAx+UHuJzAR+ltqrjFm1D9n7ycAxgKo3zozr4LeWI1Ce4g5onpFCKMEs+X3X+5U/ik/wcUCE+EA/26r+wHo8uE2IMCOmhJpX2w/aQ+4zRdfNj2CWfElx5QuA6TzpOzxgz ME+pC+8g r9QW4ZULLq2LQgRsMdRv2Asg6iU2c4ZXr3NjbdBjLqBxuTMIYJqyVint8fj/4qoArO8xlnzlXhGKcaFNHCl9J/hJR8cYM9P5jrOcApSGztirLHzPzBhcx3miQSn7uCN2U2XOzu9yDyNOunx9REsrFmcLc3QPeTAladTCc3s1w94mxUF8cgEVq5fvGpeNXKIVZ6kcyjl+bM9Sq8RaaQouFBrZbw28hQdZEm/vRmQPOB+o7SI6v5XAIB8eh9D5f0ugUcmXJWL31QbSA+ndtfyC2pbGHrXeoa0QNgGPwd2iBX8pgeCupaoJJodXP5I3lhD1xO4YR7GgpqvvnqP5PwMv1ywgTWk/eWDla22Ud 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/5 02:17, 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_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 { The 'else' can be avoided, otherwise LGTM. > 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: