From patchwork Sun Aug 14 14:05:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Haiyue" X-Patchwork-Id: 12942890 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 680B7C282E7 for ; Sun, 14 Aug 2022 14:05:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C94746B0074; Sun, 14 Aug 2022 10:05:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B81036B0075; Sun, 14 Aug 2022 10:05:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9AB688D0002; Sun, 14 Aug 2022 10:05:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 87D796B0074 for ; Sun, 14 Aug 2022 10:05:28 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 575581C62F0 for ; Sun, 14 Aug 2022 14:05:28 +0000 (UTC) X-FDA: 79798370736.05.CF49718 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by imf31.hostedemail.com (Postfix) with ESMTP id A7706201A6 for ; Sun, 14 Aug 2022 14:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660485927; x=1692021927; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zhvtJYb4P/ZP4YvSDNGhpQBQKTQTa0qMRAb90jH3p+0=; b=L8Hf4WKScUieojWmYyPMjUGqafiaS7CFtocssi13OaNpvf2w1jznjgqL QKqicCkk9L+v9JoV3k6y75WWVJBgrIpTct6Zt3VK7FOmHQAxMvPX9qhMf xBOjMjp2b/wEyLVFJjCpIyWYx3QIRG39FVHR8cu1FEdxWzhDeRc9HGOBY pLSAAkgpZc7jW2dBeBYGL09I1p1PuNNnOzSyf8aF1BYigxYs45dBCBBvu 6717H0Zdl45aSHY5WkqXpcwVWRy9Vpn91MSITkEn+nkPeDkQpbn3AVChz kmkRV81v9UCAOJcM2dDjFIWaLTHoavm2V96ffux+QuqFwByelIg0WLA8E Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10439"; a="378117186" X-IronPort-AV: E=Sophos;i="5.93,236,1654585200"; d="scan'208";a="378117186" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2022 07:05:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,236,1654585200"; d="scan'208";a="639385167" Received: from sse-cse-haiyue-nuc.sh.intel.com ([10.239.241.114]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2022 07:05:23 -0700 From: Haiyue Wang To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, david@redhat.com, linmiaohe@huawei.com, ying.huang@intel.com, songmuchun@bytedance.com, naoya.horiguchi@linux.dev, alex.sierra@amd.com, Haiyue Wang Subject: [PATCH v2 1/3] mm: revert handling Non-LRU pages returned by follow_page Date: Sun, 14 Aug 2022 22:05:32 +0800 Message-Id: <20220814140534.363348-2-haiyue.wang@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220814140534.363348-1-haiyue.wang@intel.com> References: <20220812084921.409142-1-haiyue.wang@intel.com> <20220814140534.363348-1-haiyue.wang@intel.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660485928; a=rsa-sha256; cv=none; b=z//IrdVt1NkTI5VTNeGrzm6TPENeXDk7GNacYyQVv2c9dbJgSIkTPoT5xENeSu8v+cITBb ZQVy/haP+PuMHFnFUWRnIykWSLihNPvqc+juS/EdGzpom3Sh1sRKHekoS4YT4OY5idKoB1 pKoaukJrmDZ2qXMs0raEx4R7qZGrbvo= ARC-Authentication-Results: i=1; imf31.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=L8Hf4WKS; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf31.hostedemail.com: domain of haiyue.wang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=haiyue.wang@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660485928; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=J+S6pIlZku8L8LtpK3tsboBhq9+RRLfluWoWCo3uDJs=; b=P0MRoyFPN1Lt1PT0s2ZzAjW+H98ezj45x8JYTMLOsU8YX4pUZ5KQObFGwjf8+dr4qm5DGU fam10jnNlgXX1EJ54HzlKv8UBFgV74NtasGvuk7aCPKhd9x4RiNW4tWMd1qmNITqnLQaGQ jDZBKEB8kKfbEULiwDsUDJb8gOSrHY8= X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A7706201A6 Authentication-Results: imf31.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=L8Hf4WKS; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf31.hostedemail.com: domain of haiyue.wang@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=haiyue.wang@intel.com X-Rspam-User: X-Stat-Signature: hjpt93i7y6mdsxa64w5s9dedu6mn9tjh X-HE-Tag: 1660485927-755350 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The commit 3218f8712d6b ("mm: handling Non-LRU pages returned by vm_normal_pages") doesn't handle the follow_page with flag FOLL_GET correctly, this will do get_page on page, it shouldn't just return directly without put_page. So revert the related fix to prepare for clean patch to handle Non-LRU pages returned by follow_page. Signed-off-by: Haiyue Wang --- mm/huge_memory.c | 2 +- mm/ksm.c | 6 +++--- mm/migrate.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8a7c1b344abe..2ee6d38a1426 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2963,7 +2963,7 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, /* FOLL_DUMP to ignore special (like zero) pages */ page = follow_page(vma, addr, FOLL_GET | FOLL_DUMP); - if (IS_ERR_OR_NULL(page) || is_zone_device_page(page)) + if (IS_ERR_OR_NULL(page)) continue; if (!is_transparent_hugepage(page)) diff --git a/mm/ksm.c b/mm/ksm.c index 42ab153335a2..fe3e0a39f73a 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -475,7 +475,7 @@ static int break_ksm(struct vm_area_struct *vma, unsigned long addr) cond_resched(); page = follow_page(vma, addr, FOLL_GET | FOLL_MIGRATION | FOLL_REMOTE); - if (IS_ERR_OR_NULL(page) || is_zone_device_page(page)) + if (IS_ERR_OR_NULL(page)) break; if (PageKsm(page)) ret = handle_mm_fault(vma, addr, @@ -560,7 +560,7 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item) goto out; page = follow_page(vma, addr, FOLL_GET); - if (IS_ERR_OR_NULL(page) || is_zone_device_page(page)) + if (IS_ERR_OR_NULL(page)) goto out; if (PageAnon(page)) { flush_anon_page(vma, page, addr); @@ -2308,7 +2308,7 @@ static struct rmap_item *scan_get_next_rmap_item(struct page **page) if (ksm_test_exit(mm)) break; *page = follow_page(vma, ksm_scan.address, FOLL_GET); - if (IS_ERR_OR_NULL(*page) || is_zone_device_page(*page)) { + if (IS_ERR_OR_NULL(*page)) { ksm_scan.address += PAGE_SIZE; cond_resched(); continue; diff --git a/mm/migrate.c b/mm/migrate.c index 6a1597c92261..3d5f0262ab60 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1672,7 +1672,7 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr, goto out; err = -ENOENT; - if (!page || is_zone_device_page(page)) + if (!page) goto out; err = 0; @@ -1863,7 +1863,7 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages, if (IS_ERR(page)) goto set_status; - if (page && !is_zone_device_page(page)) { + if (page) { err = page_to_nid(page); put_page(page); } else {