From nobody Wed Feb 11 10:01:55 2026 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D1FC770F3 for ; Tue, 21 May 2024 11:03:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.101 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716289427; cv=none; b=dgC7KlT1aqnaGw1uL4py1opqInU4Hu1IqD3VLHdvGbuAxGRon9afJBuiNDf5jB3qQJbOd70l/k2wD/GgSw4bz8w0UNk4akzy5gtVuKygiitWBK4rY+wbZ8XrAmWSpFNWxE2cAHSbccDghaqEgiGOrKdCC8J+xJrGu2+uKkLQZCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716289427; c=relaxed/simple; bh=CkVLodKJ9ucWBi7mpVP2iJelihrLRHWS7bUyzqopUjM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vDLJ40h+i2eq07gOOgQD4zd2mAmzxnRjnbH/VyFW77bXMyYuRhOfdQo2QAAfRcuOFo6FB4Js3dyUPw8oHHFULgTwdAEaLR3ZhVY9bo5sXLKpFY/36xgD1HPdZj6zg6UxMUohRHfT7DPDh3zo5T+ZzqTFF1T6GUFdZKLgLNn4R50= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=fUJdX6hW; arc=none smtp.client-ip=115.124.30.101 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="fUJdX6hW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1716289423; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=/V3DnBye2LjO7u5ouBgBU8nPrUqi/2Egdsz3zKACdwM=; b=fUJdX6hWqHjDussoPyT9DN3O/eSP1VyI5mUQHx5keTV89BRSE3o3E2RJsTSshV+b+JIGO0raC3TK6naifFHJpE+xUlla0YCYIdAlHHTmULJb9TCfZLgw+IdgmZpxUg6Xxo+TSVJ7llXpTFTP6/n/176rElMjaulhKZkoNGCxt34= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R931e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067113;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=17;SR=0;TI=SMTPD_---0W6xl985_1716289419; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W6xl985_1716289419) by smtp.aliyun-inc.com; Tue, 21 May 2024 19:03:41 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, ioworker0@gmail.com, hrisl@kernel.org, p.raghav@samsung.com, da.gomez@samsung.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 7/8] mm: shmem: use swap_free_nr() to free shmem swap entries Date: Tue, 21 May 2024 19:03:17 +0800 Message-Id: <90fda314a9e966374fe837ae3ebd74708380479d.1716285099.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As a preparation for supporting shmem large folio swapout, use swap_free_nr= () to free some continuous swap entries of the shmem large folio when the large folio was swapped in from the swap cache. Signed-off-by: Baolin Wang --- mm/shmem.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index b3e39d9cf42c..fdc71e14916c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1962,6 +1962,7 @@ static void shmem_set_folio_swapin_error(struct inode= *inode, pgoff_t index, struct address_space *mapping =3D inode->i_mapping; swp_entry_t swapin_error; void *old; + int nr_pages; =20 swapin_error =3D make_poisoned_swp_entry(); old =3D xa_cmpxchg_irq(&mapping->i_pages, index, @@ -1970,6 +1971,7 @@ static void shmem_set_folio_swapin_error(struct inode= *inode, pgoff_t index, if (old !=3D swp_to_radix_entry(swap)) return; =20 + nr_pages =3D folio_nr_pages(folio); folio_wait_writeback(folio); delete_from_swap_cache(folio); /* @@ -1977,8 +1979,8 @@ static void shmem_set_folio_swapin_error(struct inode= *inode, pgoff_t index, * won't be 0 when inode is released and thus trigger WARN_ON(i_blocks) * in shmem_evict_inode(). */ - shmem_recalc_inode(inode, -1, -1); - swap_free(swap); + shmem_recalc_inode(inode, -nr_pages, -nr_pages); + swap_free_nr(swap, nr_pages); } =20 /* @@ -1997,7 +1999,7 @@ static int shmem_swapin_folio(struct inode *inode, pg= off_t index, struct swap_info_struct *si; struct folio *folio =3D NULL; swp_entry_t swap; - int error; + int error, nr_pages; =20 VM_BUG_ON(!*foliop || !xa_is_value(*foliop)); swap =3D radix_to_swp_entry(*foliop); @@ -2044,6 +2046,7 @@ static int shmem_swapin_folio(struct inode *inode, pg= off_t index, goto failed; } folio_wait_writeback(folio); + nr_pages =3D folio_nr_pages(folio); =20 /* * Some architectures may have to restore extra metadata to the @@ -2062,14 +2065,14 @@ static int shmem_swapin_folio(struct inode *inode, = pgoff_t index, if (error) goto failed; =20 - shmem_recalc_inode(inode, 0, -1); + shmem_recalc_inode(inode, 0, -nr_pages); =20 if (sgp =3D=3D SGP_WRITE) folio_mark_accessed(folio); =20 delete_from_swap_cache(folio); folio_mark_dirty(folio); - swap_free(swap); + swap_free_nr(swap, nr_pages); put_swap_device(si); =20 *foliop =3D folio; --=20 2.39.3