From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37E30C4332F for ; Mon, 28 Feb 2022 18:41:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240553AbiB1Slz (ORCPT ); Mon, 28 Feb 2022 13:41:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238986AbiB1SlS (ORCPT ); Mon, 28 Feb 2022 13:41:18 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C8B51CFE6 for ; Mon, 28 Feb 2022 10:35:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C41B361507 for ; Mon, 28 Feb 2022 18:35:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C53DC340E7; Mon, 28 Feb 2022 18:35:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1646073337; bh=tBABNfWjWJx9XAKAvWvLbtJOqoX7pgjwIZd0AYeMTsI=; h=Date:To:From:Subject:From; b=f9/gUQkXmQOWplBqlFNgdj/2J50orxjfBfoN0HMRwyEuIif/Ckti0Zz5FsUeBS0hg SERR+L6SDcRH6GisO3l0yjH7L9taUike8PlHBlzx3Is51E9SB/AV0drGeWx2lIXs45 oHjXICATs696MSIVLOKqT3plus4SOFBuIXZ9XF1c= Date: Mon, 28 Feb 2022 10:35:36 -0800 To: mm-commits@vger.kernel.org, naoya.horiguchi@nec.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-memory-failurec-fix-wrong-user-reference-report.patch added to -mm tree Message-Id: <20220228183537.2C53DC340E7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/memory-failure.c: fix wrong user reference report has been added to the -mm tree. Its filename is mm-memory-failurec-fix-wrong-user-reference-report.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-memory-failurec-fix-wrong-user-reference-report.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-memory-failurec-fix-wrong-user-reference-report.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin Subject: mm/memory-failure.c: fix wrong user reference report The dirty swapcache page is still residing in the swap cache after it's hwpoisoned. So there is always one extra refcount for swap cache. Link: https://lkml.kernel.org/r/20220228140245.24552-3-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Cc: Naoya Horiguchi Signed-off-by: Andrew Morton --- mm/memory-failure.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/mm/memory-failure.c~mm-memory-failurec-fix-wrong-user-reference-report +++ a/mm/memory-failure.c @@ -983,7 +983,6 @@ static int me_pagecache_dirty(struct pag static int me_swapcache_dirty(struct page_state *ps, struct page *p) { int ret; - bool extra_pins = false; ClearPageDirty(p); /* Trigger EIO in shmem: */ @@ -992,10 +991,7 @@ static int me_swapcache_dirty(struct pag ret = delete_from_lru_cache(p) ? MF_FAILED : MF_DELAYED; unlock_page(p); - if (ret == MF_DELAYED) - extra_pins = true; - - if (has_extra_refcount(ps, p, extra_pins)) + if (has_extra_refcount(ps, p, true)) ret = MF_FAILED; return ret; _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-memremap-avoid-calling-kasan_remove_zero_shadow-for-device-private-memory.patch filemap-remove-find_get_pages.patch mm-writeback-minor-clean-up-for-highmem_dirtyable_memory.patch mm-use-helper-function-range_in_vma.patch mm-use-helper-macro-min-and-max-in-unmap_mapping_range_tree.patch mm-sparse-make-mminit_validate_memmodel_limits-static.patch mm-vmalloc-remove-unneeded-function-forward-declaration.patch mm-mmzoneh-remove-unused-macros.patch mm-memory-failurec-minor-clean-up-for-memory_failure_dev_pagemap.patch mm-memory-failurec-catch-unexpected-efault-from-vma_address.patch mm-memory-failurec-rework-the-signaling-logic-in-kill_proc.patch mm-memory-failurec-fix-race-with-changing-page-more-robustly.patch mm-memory-failurec-remove-pageslab-check-in-hwpoison_filter_dev.patch mm-memory-failurec-rework-the-try_to_unmap-logic-in-hwpoison_user_mappings.patch mm-memory-failurec-remove-obsolete-comment-in-__soft_offline_page.patch mm-memory-failurec-remove-unnecessary-pagetranstail-check.patch mm-hwpoison-inject-support-injecting-hwpoison-to-free-page.patch mm-memory-failurec-fix-race-with-changing-page-compound-again.patch mm-memory-failurec-fix-wrong-user-reference-report.patch mm-memory-failurec-avoid-calling-invalidate_inode_page-with-unexpected-pages.patch mm-memory-failurec-fix-potential-vm_bug_on_page-in-split_huge_page_to_list.patch mm-hugetlb-use-helper-macro-__attr_rw.patch mm-oom_kill-remove-unneeded-is_memcg_oom-check.patch mm-ksm-use-helper-macro-__attr_rw.patch mm-balloon_compaction-make-balloon-page-compaction-callbacks-static.patch mm-memory_hotplug-remove-obsolete-comment-of-__add_pages.patch mm-memory_hotplug-avoid-calling-zone_intersects-for-zone_normal.patch mm-memory_hotplug-clean-up-try_offline_node.patch mm-memory_hotplug-fix-misplaced-comment-in-offline_pages.patch mm-highmem-remove-unnecessary-done-label.patch mm-hmmc-remove-unneeded-local-variable-ret.patch kernel-ksysfsc-use-helper-macro-__attr_rw.patch kernel-resource-fix-kfree-of-bootmem-memory-again.patch