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 542D3C433EF for ; Wed, 1 Jun 2022 22:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232445AbiFAW66 (ORCPT ); Wed, 1 Jun 2022 18:58:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232443AbiFAW66 (ORCPT ); Wed, 1 Jun 2022 18:58:58 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D190BDFF5C; Wed, 1 Jun 2022 15:58:56 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 53D28B81D66; Wed, 1 Jun 2022 22:58:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE672C385A5; Wed, 1 Jun 2022 22:58:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1654124334; bh=9ajCwnOexhHk2pPAYCe80fKbdInI/macylxwi087kg0=; h=Date:To:From:Subject:From; b=YicPnKsbPzlMTepXqx9wpKU214E+YBpxUO4+MA7F114YTZ/j2AYqilSqEy+q0wkeZ sVjIfjjnFOuq+XLNoGtPLdL/BQGMblgKFFGf1oby0ADuQQuhnHXu2mF0YLf/A2ztME nrENlhv6cT6tBg2iIG9Qy52sAm4tHeVkQJVDrDbg= Date: Wed, 01 Jun 2022 15:58:53 -0700 To: mm-commits@vger.kernel.org, stable@vger.kernel.org, songmuchun@bytedance.com, osalvador@suse.de, david@redhat.com, anshuman.khandual@arm.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] mm-memremap-fix-missing-call-to-untrack_pfn-in-pagemap_range.patch removed from -mm tree Message-Id: <20220601225853.EE672C385A5@smtp.kernel.org> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The quilt patch titled Subject: mm/memremap: fix missing call to untrack_pfn() in pagemap_range() has been removed from the -mm tree. Its filename was mm-memremap-fix-missing-call-to-untrack_pfn-in-pagemap_range.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Miaohe Lin Subject: mm/memremap: fix missing call to untrack_pfn() in pagemap_range() Date: Tue, 31 May 2022 20:26:43 +0800 We forget to call untrack_pfn() to pair with track_pfn_remap() when range is not allowed to hotplug. Fix it by jump err_kasan. Link: https://lkml.kernel.org/r/20220531122643.25249-1-linmiaohe@huawei.com Fixes: bca3feaa0764 ("mm/memory_hotplug: prevalidate the address range being added with platform") Signed-off-by: Miaohe Lin Reviewed-by: David Hildenbrand Acked-by: Muchun Song Cc: Anshuman Khandual Cc: Oscar Salvador Cc: Signed-off-by: Andrew Morton --- mm/memremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/memremap.c~mm-memremap-fix-missing-call-to-untrack_pfn-in-pagemap_range +++ a/mm/memremap.c @@ -214,7 +214,7 @@ static int pagemap_range(struct dev_page if (!mhp_range_allowed(range->start, range_len(range), !is_private)) { error = -EINVAL; - goto err_pfn_remap; + goto err_kasan; } mem_hotplug_begin(); _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-shmemc-clean-up-comment-of-shmem_swapin_folio.patch mm-reduce-the-rcu-lock-duration.patch mm-migration-remove-unneeded-lock-page-and-pagemovable-check.patch mm-migration-return-errno-when-isolate_huge_page-failed.patch mm-migration-fix-potential-pte_unmap-on-an-not-mapped-pte.patch