From patchwork Tue Jun 18 06:54:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13701842 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 20E54C27C4F for ; Tue, 18 Jun 2024 06:54:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 246776B0155; Tue, 18 Jun 2024 02:54:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C6956B0157; Tue, 18 Jun 2024 02:54:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6F2E6B0159; Tue, 18 Jun 2024 02:54:40 -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 BD09F6B0155 for ; Tue, 18 Jun 2024 02:54:40 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7B17D8047A for ; Tue, 18 Jun 2024 06:54:40 +0000 (UTC) X-FDA: 82243096320.22.4E627C5 Received: from out30-111.freemail.mail.aliyun.com (out30-111.freemail.mail.aliyun.com [115.124.30.111]) by imf08.hostedemail.com (Postfix) with ESMTP id 62461160008 for ; Tue, 18 Jun 2024 06:54:37 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=Ez6ad5pk; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.111 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=1718693672; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Y0p1KmYvp9sydPHpYYHL11MSmx/npKoL7TRhS1PPQNA=; b=eXovOPiGkewuCKsNS8qDjD7xJrIwNbhnuhz5WkG+z6q2ywT2ECFqlK7bjGmRU/nSWxp/g7 RDMo2241ENQqRRsNU2slZWexsiYbYRuqnv4XvDxVaEZGkkeXOFEvMR0Q9huDRN2ijFvwKD enF/LxF6Tl5hCcHjCUikh+sTncVmX8w= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718693672; a=rsa-sha256; cv=none; b=daGp2H7kqcWUP3j1XfrAnO0ixx3DnV/ysFhMXks+E7xrwfYY9ZXjJikUhvkJBhO2cDy5Ke KApI4Vj/FrRJ/spY894Qu2SCRB985fpNg2Og2ROGcrcUlsBwenqBRfACjUZX7SUnrSJhfm 9UwrXMCuRTBXYQOZSRTQWGg5zocbyU0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=Ez6ad5pk; spf=pass (imf08.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.111 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1718693674; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=Y0p1KmYvp9sydPHpYYHL11MSmx/npKoL7TRhS1PPQNA=; b=Ez6ad5pkvaQ5CO4OnICZhrFr2C+EuX8PzqZkFFpv4PN26dqCCRE20+Lh91F11AA3ePxYKxyeg1640JhkZZ38fXsnCrcW4eFvA9OUfY9me2UfPvOvsDf8j/l7CkHo0vj6I+NiVjolzeJ9v5Swc2gxzYiFB+/yRzgt1PAesqvlbYA= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R981e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067111;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=17;SR=0;TI=SMTPD_---0W8jKUYu_1718693673; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W8jKUYu_1718693673) by smtp.aliyun-inc.com; Tue, 18 Jun 2024 14:54:33 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, chrisl@kernel.org, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/9] mm: shmem: use swap_free_nr() to free shmem swap entries Date: Tue, 18 Jun 2024 14:54:18 +0800 Message-Id: <373a0d959930494b83f68169eddb62d0d49a29cf.1718690645.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 62461160008 X-Stat-Signature: abn39d9eai8t496mwsz3s3kbzp8ho8tm X-HE-Tag: 1718693677-131805 X-HE-Meta: U2FsdGVkX1+Pj0haVDKIXHyAlgRRhHqMHigmCTn3z35sK8BBqvbplj1u2u1KAHRJiGPMq/OmJdPNyuQvCnDoubZjksOptPiva76oa5+xfEKHTkU6J/tkge9UfZs7rpUkv5K2fBp0OUr7Kar3cBh2zIX+mtC7m0xyTibaVqvuxOAEfLXlbqVBrZPMOAiOLFSIZuI1CPVl3LV3VldmZb8aeDhj6j1243WQiGtCtwSC0+7CdgG5rnFpShFr3obD3LJXc73tg8NKjPizh6mbP0OE7J4pyfgUD5CrRgN4QmVw3T8ubeA6d9QBQXREX56eE1vTlmpKmzcbQ5VDTO9lFrhVndv7DRcCFdxH0vqeSzgAZfW/r+144n3zzcoVJyz+ZpTZekr8/eh/xs/l4Y6qIxA994mHOjE8MaUsnqzFCqpRgjo6N34F4VeOEl7vw7SpcBNfVI8ThRlfHXESiUYo630khGAYJiaAmIK5ygGtRmVywQx4GXoJaO+3X5mF+ntwPkHqRSVhj1VORZGr0RaacCe3zbj7Zxw+TmSPSGZ1viMfuzgohrfEecu2Tb+26X8NcLtgpWkQA5PvnTmAei/ZTxqBNVlxNa+DHb8CspZAjuPaHrG5aUqRVAdyjKieia+G4Bgwa7pum1rOwWGNUYjmw1p+8QoCnei3GjFJit9CJbmJbDPE5QZZgD9XBwSmXtL/pQZZ45S3+LsdXPeefPCJbZMP/98+feqhXnMejUppeRGjMRBsxmRWah+GNo6Vj9EhARlifIduPwYee37LlIusm3ufCfxZYGocA7m37O6bHehdDIzk+5Bg39AWsqu/r8DqGHAg60LNVIdawWeQ9ikCpCviykPISorU954ZGFgazT+stst6KkFLNBv05YzvQlZURJt8McOnbdt2cyC8XmTZqbTGyXO/3dAHcTH4KTT9afvwMG19p/mmGLzqNnq3aNL18otrsDgcuxP0HUf7OuMG4Sg YIPMcNUI JSAJNQ7JwarFxy4TWe0raLmQGWMzsG7U0le8wgDwssbeaNfrDs3RfpjFQYIieJJhZwiIOiyRQ7c4NoH4ZaEWSFiFjss2qt4OV8h02xYj9BkwcVg0H+sQUbgpm03ofNZv/S0BD+56mO9UseQY87IOf51RKsERe3YTORmhPOuKHIt+EAeFqhWwpERfvZzzHDeXI2wxxc49mrmCUbEt19j7Kwgu9+uBhOrGNS4NxzibkP/IaVO/D53y60ftMCn44ymV4zn7tI+mjbUuNpICx8UdYqAliJV4ylxpufmt6 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: 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. In addition, the index should also be round down to the number of pages when adding the swapin folio into the pagecache. Signed-off-by: Baolin Wang --- mm/shmem.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index a73d2da54897..4d7996962388 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1950,6 +1950,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, struct address_space *mapping = inode->i_mapping; swp_entry_t swapin_error; void *old; + int nr_pages; swapin_error = make_poisoned_swp_entry(); old = xa_cmpxchg_irq(&mapping->i_pages, index, @@ -1958,6 +1959,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, if (old != swp_to_radix_entry(swap)) return; + nr_pages = folio_nr_pages(folio); folio_wait_writeback(folio); delete_from_swap_cache(folio); /* @@ -1965,8 +1967,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); } /* @@ -1985,7 +1987,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, struct swap_info_struct *si; struct folio *folio = NULL; swp_entry_t swap; - int error; + int error, nr_pages; VM_BUG_ON(!*foliop || !xa_is_value(*foliop)); swap = radix_to_swp_entry(*foliop); @@ -2032,6 +2034,7 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, goto failed; } folio_wait_writeback(folio); + nr_pages = folio_nr_pages(folio); /* * Some architectures may have to restore extra metadata to the @@ -2045,19 +2048,20 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, goto failed; } - error = shmem_add_to_page_cache(folio, mapping, index, + error = shmem_add_to_page_cache(folio, mapping, + round_down(index, nr_pages), swp_to_radix_entry(swap), gfp); if (error) goto failed; - shmem_recalc_inode(inode, 0, -1); + shmem_recalc_inode(inode, 0, -nr_pages); if (sgp == SGP_WRITE) folio_mark_accessed(folio); delete_from_swap_cache(folio); folio_mark_dirty(folio); - swap_free(swap); + swap_free_nr(swap, nr_pages); put_swap_device(si); *foliop = folio;