From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7E3F85732E for ; Thu, 11 Jan 2024 20:32:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="mDR6VI0L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFD7BC43390; Thu, 11 Jan 2024 20:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1705005157; bh=pV8gYGmxj8fTewc5V0xI4s/LWSn7vSHRoMQ+Injp1Uo=; h=Date:To:From:Subject:From; b=mDR6VI0Lomub/hkSw3rkejuzNubYmbTdoRYDFeRGXCKMmHmmhjlgaWxY9o6yXQStT Fg3v71+7uPg4I9ORDUNTZtSptOWrpf2iIkYp5l9fW1Yviou4sNBoMcnYetd4gPZavz HezOhxzGYTzaSAmaVarE4AA2I2dHa5TUXEfamdjE= Date: Thu, 11 Jan 2024 12:32:36 -0800 To: mm-commits@vger.kernel.org,willy@infradead.org,david@redhat.com,wangkefeng.wang@huawei.com,akpm@linux-foundation.org From: Andrew Morton Subject: + s390-use-pfn_swap_entry_folio-in-ptep_zap_swap_entry.patch added to mm-unstable branch Message-Id: <20240111203236.EFD7BC43390@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: s390: use pfn_swap_entry_folio() in ptep_zap_swap_entry() has been added to the -mm mm-unstable branch. Its filename is s390-use-pfn_swap_entry_folio-in-ptep_zap_swap_entry.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/s390-use-pfn_swap_entry_folio-in-ptep_zap_swap_entry.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Kefeng Wang Subject: s390: use pfn_swap_entry_folio() in ptep_zap_swap_entry() Date: Thu, 11 Jan 2024 15:24:23 +0000 Call pfn_swap_entry_folio() in ptep_zap_swap_entry() as preparation for converting mm counter functions to take a folio. Link: https://lkml.kernel.org/r/20240111152429.3374566-5-willy@infradead.org Signed-off-by: Kefeng Wang Signed-off-by: Matthew Wilcox (Oracle) Cc: David Hildenbrand Signed-off-by: Andrew Morton --- arch/s390/mm/pgtable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/s390/mm/pgtable.c~s390-use-pfn_swap_entry_folio-in-ptep_zap_swap_entry +++ a/arch/s390/mm/pgtable.c @@ -721,9 +721,9 @@ static void ptep_zap_swap_entry(struct m if (!non_swap_entry(entry)) dec_mm_counter(mm, MM_SWAPENTS); else if (is_migration_entry(entry)) { - struct page *page = pfn_swap_entry_to_page(entry); + struct folio *folio = pfn_swap_entry_folio(entry); - dec_mm_counter(mm, mm_counter(page)); + dec_mm_counter(mm, mm_counter(&folio->page)); } free_swap_and_cache(entry); } _ Patches currently in -mm which might be from wangkefeng.wang@huawei.com are mm-memory-use-nth_page-in-clear-copy_subpage.patch s390-use-pfn_swap_entry_folio-in-ptep_zap_swap_entry.patch mm-use-pfn_swap_entry_folio-in-__split_huge_pmd_locked.patch mm-use-pfn_swap_entry_to_folio-in-zap_huge_pmd.patch mm-use-pfn_swap_entry_folio-in-copy_nonpresent_pte.patch mm-convert-to-should_zap_page-to-should_zap_folio.patch mm-convert-mm_counter-to-take-a-folio.patch mm-convert-mm_counter_file-to-take-a-folio.patch