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 4950C190686 for ; Wed, 26 Jun 2024 20:08:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719432538; cv=none; b=N9k+6BXgd/6NWvZtACG+++1y/jMbFYlGu9SRW6zdCvMi2FYPn03EnNO87zfZ79gvH3APHyQPsWkMKdC0fg5exdD1VdW5VbTeDzJe231SMZLTea0KOC9x3sPsnnXGL4SapVR9htQ8tK0eQCSDNS53GliEmyh/SSH0SSouCi8u8Pg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719432538; c=relaxed/simple; bh=bHQFe31COm6lle3juNH0ni+bb/gy/HTRxdz3hhFV4d8=; h=Date:To:From:Subject:Message-Id; b=cXDXPcGwZI/B4pjwBGMlE92y0uW7ypULKQh5rep96kHp8dttJSQus/ekScvCtyHTfs0Ri0gpxW1pkufTzREsiBSwKlDl5qlqFGFVVhvYLH9db23J6i9VW02C2hnlXfInRinXyuCPmROqM7VJMLtKmyr/tomhW/LH4c8oSJ/bIT4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=En10ZuB8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="En10ZuB8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B2ACC116B1; Wed, 26 Jun 2024 20:08:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1719432538; bh=bHQFe31COm6lle3juNH0ni+bb/gy/HTRxdz3hhFV4d8=; h=Date:To:From:Subject:From; b=En10ZuB8SKz1V+dpldyPtn5AOcycqCG4AHGGC0TNs9ZW/Y17rEfIbQM2yiOi5gIgU CDqsmk93eQ8kBhP9F6itMmbNlnr8A8G4sgqSMZe1dMk4YLcaxBBFaH6Vxi/bGtRcPv pccM8+vu/ZgwA5nC+YdxhzOvuf/AQS85AKEDrJUA= Date: Wed, 26 Jun 2024 13:08:57 -0700 To: mm-commits@vger.kernel.org,willy@infradead.org,vishal.moola@gmail.com,tony.luck@intel.com,osalvador@suse.de,nao.horiguchi@gmail.com,muchun.song@linux.dev,linmiaohe@huawei.com,jiaqiyan@google.com,jglisse@redhat.com,jane.chu@oracle.com,ioworker0@gmail.com,hughd@google.com,david@redhat.com,bcrl@kvack.org,apopple@nvidia.com,wangkefeng.wang@huawei.com,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-migrate-remove-folio_migrate_copy.patch added to mm-unstable branch Message-Id: <20240626200858.1B2ACC116B1@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm: migrate: remove folio_migrate_copy() has been added to the -mm mm-unstable branch. Its filename is mm-migrate-remove-folio_migrate_copy.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-migrate-remove-folio_migrate_copy.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: mm: migrate: remove folio_migrate_copy() Date: Wed, 26 Jun 2024 16:53:28 +0800 The folio_migrate_copy() is just a wrapper of folio_copy() and folio_migrate_flags(), it is simple and only aio use it for now, unfold it and remove folio_migrate_copy(). Link: https://lkml.kernel.org/r/20240626085328.608006-7-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang Reviewed-by: Jane Chu Cc: Alistair Popple Cc: Benjamin LaHaise Cc: David Hildenbrand Cc: Hugh Dickins Cc: Jérôme Glisse Cc: Jiaqi Yan Cc: Lance Yang Cc: Matthew Wilcox (Oracle) Cc: Miaohe Lin Cc: Muchun Song Cc: Naoya Horiguchi Cc: Oscar Salvador Cc: Tony Luck Cc: Vishal Moola (Oracle) Signed-off-by: Andrew Morton --- fs/aio.c | 3 ++- include/linux/migrate.h | 1 - mm/migrate.c | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) --- a/fs/aio.c~mm-migrate-remove-folio_migrate_copy +++ a/fs/aio.c @@ -455,7 +455,8 @@ static int aio_migrate_folio(struct addr * events from being lost. */ spin_lock_irqsave(&ctx->completion_lock, flags); - folio_migrate_copy(dst, src); + folio_copy(dst, src); + folio_migrate_flags(dst, src); BUG_ON(ctx->ring_folios[idx] != src); ctx->ring_folios[idx] = dst; spin_unlock_irqrestore(&ctx->completion_lock, flags); --- a/include/linux/migrate.h~mm-migrate-remove-folio_migrate_copy +++ a/include/linux/migrate.h @@ -76,7 +76,6 @@ int migrate_huge_page_move_mapping(struc void migration_entry_wait_on_locked(swp_entry_t entry, spinlock_t *ptl) __releases(ptl); void folio_migrate_flags(struct folio *newfolio, struct folio *folio); -void folio_migrate_copy(struct folio *newfolio, struct folio *folio); int folio_migrate_mapping(struct address_space *mapping, struct folio *newfolio, struct folio *folio, int extra_count); --- a/mm/migrate.c~mm-migrate-remove-folio_migrate_copy +++ a/mm/migrate.c @@ -659,13 +659,6 @@ void folio_migrate_flags(struct folio *n } EXPORT_SYMBOL(folio_migrate_flags); -void folio_migrate_copy(struct folio *newfolio, struct folio *folio) -{ - folio_copy(newfolio, folio); - folio_migrate_flags(newfolio, folio); -} -EXPORT_SYMBOL(folio_migrate_copy); - /************************************************************ * Migration functions ***********************************************************/ _ Patches currently in -mm which might be from wangkefeng.wang@huawei.com are fs-proc-task_mmu-use-folio-api-in-pte_is_pinned.patch mm-remove-page_maybe_dma_pinned.patch mm-remove-page_maybe_dma_pinned-fix.patch fb_defio-use-a-folio-in-fb_deferred_io_work.patch mm-remove-page_mkclean.patch mm-memory-convert-clear_huge_page-to-folio_zero_user.patch mm-memory-use-folio-in-struct-copy_subpage_arg.patch mm-memory-improve-copy_user_large_folio.patch mm-memory-rename-pages_per_huge_page-to-nr_pages.patch mm-move-memory_failure_queue-into-copy_mc__highpage.patch mm-add-folio_mc_copy.patch mm-migrate-split-folio_migrate_mapping.patch mm-migrate-support-poisoned-recover-from-migrate-folio.patch fs-hugetlbfs-support-poisoned-recover-from-hugetlbfs_migrate_folio.patch mm-migrate-remove-folio_migrate_copy.patch