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 551E61420D0 for ; Fri, 16 Aug 2024 21:42: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=1723844578; cv=none; b=lSkHPp2KCXfPvrF+BIXSkwI+MSi750tRYBiIv9nqrCXdUyGPZvT+BnAFNy0YxRLB7cBFq8LCsB+IZFU9gvVTwxYAfN5J6PXgJOOnBpX26D5omNrQ3lz9z9V/5t1CGceNQax9nBHIQ730gVnuDzHnC+Q5rRuBQKthlbwFu94POfA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723844578; c=relaxed/simple; bh=6f71g/0gTRcccjfQmwhQU3JXEmPEEnT/V3i9XfePIls=; h=Date:To:From:Subject:Message-Id; b=WY+QOFYyxVUcO6pxIvcbqY6cFKToTrQRQHushtwsyXRDfDQghm40UeFl4wJ2+8QttmvZnMboiIHu0/sXorzRPsEFTz4q7hCjIDiLeIfirIttEobjO0GqFCuovbKLeTMzkh225eA9ui1g2532Bxqb2VFH28qsNxlIaEbj5PqWFAw= 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=j3Esl3OS; 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="j3Esl3OS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0684CC32782; Fri, 16 Aug 2024 21:42:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1723844578; bh=6f71g/0gTRcccjfQmwhQU3JXEmPEEnT/V3i9XfePIls=; h=Date:To:From:Subject:From; b=j3Esl3OSvErhRf+gkdkiIOr24ygIxL64LMBBjMvUWHxBBKd113O9oQYWRBSSibzcE kIdaZMO6hQKzUBqtiD/txUnPI8pc0tA/G+aAuKuYMMHdvOnnlCMgsv9KaubzE6/uhw QuVty/AWjF2r4Gh9DzZMm8lNrfakYTBMlhJyBG50= Date: Fri, 16 Aug 2024 14:42:57 -0700 To: mm-commits@vger.kernel.org,osalvador@suse.de,nao.horiguchi@gmail.com,linmiaohe@huawei.com,david@redhat.com,wangkefeng.wang@huawei.com,akpm@linux-foundation.org From: Andrew Morton Subject: + mm-memory-failure-add-unmap_posioned_folio.patch added to mm-unstable branch Message-Id: <20240816214258.0684CC32782@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: mm: memory-failure: add unmap_posioned_folio() has been added to the -mm mm-unstable branch. Its filename is mm-memory-failure-add-unmap_posioned_folio.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-memory-failure-add-unmap_posioned_folio.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: memory-failure: add unmap_posioned_folio() Date: Fri, 16 Aug 2024 17:04:32 +0800 Add unmap_posioned_folio() helper which will be reused by do_migrate_range() from memory hotplug soon. Link: https://lkml.kernel.org/r/20240816090435.888946-3-wangkefeng.wang@huawei.com Signed-off-by: Kefeng Wang Acked-by: David Hildenbrand Cc: Miaohe Lin Cc: Naoya Horiguchi Cc: Oscar Salvador Signed-off-by: Andrew Morton --- mm/internal.h | 9 ++++++++ mm/memory-failure.c | 43 +++++++++++++++++++++++++----------------- 2 files changed, 35 insertions(+), 17 deletions(-) --- a/mm/internal.h~mm-memory-failure-add-unmap_posioned_folio +++ a/mm/internal.h @@ -1048,6 +1048,8 @@ static inline int find_next_best_node(in /* * mm/memory-failure.c */ +#ifdef CONFIG_MEMORY_FAILURE +int unmap_posioned_folio(struct folio *folio, enum ttu_flags ttu); void shake_folio(struct folio *folio); extern int hwpoison_filter(struct page *p); @@ -1068,6 +1070,13 @@ void add_to_kill_ksm(struct task_struct unsigned long ksm_addr); unsigned long page_mapped_in_vma(struct page *page, struct vm_area_struct *vma); +#else +static inline int unmap_posioned_folio(struct folio *folio, enum ttu_flags ttu) +{ + return 0; +} +#endif + extern unsigned long __must_check vm_mmap_pgoff(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); --- a/mm/memory-failure.c~mm-memory-failure-add-unmap_posioned_folio +++ a/mm/memory-failure.c @@ -1554,6 +1554,30 @@ static int get_hwpoison_page(struct page return ret; } +int unmap_posioned_folio(struct folio *folio, enum ttu_flags ttu) +{ + if (folio_test_hugetlb(folio) && !folio_test_anon(folio)) { + struct address_space *mapping; + /* + * For hugetlb pages in shared mappings, try_to_unmap + * could potentially call huge_pmd_unshare. Because of + * this, take semaphore in write mode here and set + * TTU_RMAP_LOCKED to indicate we have taken the lock + * at this higher level. + */ + mapping = hugetlb_folio_mapping_lock_write(folio); + if (!mapping) + return -EAGAIN; + + try_to_unmap(folio, ttu|TTU_RMAP_LOCKED); + i_mmap_unlock_write(mapping); + } else { + try_to_unmap(folio, ttu); + } + + return 0; +} + /* * Do all that is necessary to remove user space mappings. Unmap * the pages and send SIGBUS to the processes if the data was dirty. @@ -1615,23 +1639,8 @@ static bool hwpoison_user_mappings(struc */ collect_procs(folio, p, &tokill, flags & MF_ACTION_REQUIRED); - if (folio_test_hugetlb(folio) && !folio_test_anon(folio)) { - /* - * For hugetlb pages in shared mappings, try_to_unmap - * could potentially call huge_pmd_unshare. Because of - * this, take semaphore in write mode here and set - * TTU_RMAP_LOCKED to indicate we have taken the lock - * at this higher level. - */ - mapping = hugetlb_folio_mapping_lock_write(folio); - if (mapping) { - try_to_unmap(folio, ttu|TTU_RMAP_LOCKED); - i_mmap_unlock_write(mapping); - } else - pr_info("%#lx: could not lock mapping for mapped huge page\n", pfn); - } else { - try_to_unmap(folio, ttu); - } + if (unmap_posioned_folio(folio, ttu)) + pr_info("%#lx: could not lock mapping for mapped huge page\n", pfn); unmap_success = !folio_mapped(folio); if (!unmap_success) _ Patches currently in -mm which might be from wangkefeng.wang@huawei.com are mm-hugetlb-remove-left-over-comment-about-follow_huge_foo.patch mm-memory_hotplug-remove-head-variable-in-do_migrate_range.patch mm-memory-failure-add-unmap_posioned_folio.patch mm-memory_hotplug-check-hwpoisoned-page-firstly-in-do_migrate_range.patch mm-migrate-add-isolate_folio_to_list.patch mm-memory_hotplug-unify-huge-lru-non-lru-movable-folio-isolation.patch