From patchwork Tue Aug 16 02:21:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Haiyue" X-Patchwork-Id: 12944222 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 C428CC00140 for ; Tue, 16 Aug 2022 02:20:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D27F78D0001; Mon, 15 Aug 2022 22:20:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADF828D0006; Mon, 15 Aug 2022 22:20:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8B8198D0001; Mon, 15 Aug 2022 22:20:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 752928D0003 for ; Mon, 15 Aug 2022 22:20:55 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4B3F7140E5E for ; Tue, 16 Aug 2022 02:20:55 +0000 (UTC) X-FDA: 79803852870.05.367D6A2 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by imf27.hostedemail.com (Postfix) with ESMTP id 8C3F34003A for ; Tue, 16 Aug 2022 02:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660616454; x=1692152454; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OvL9/IKf/g+zRmxGRGIODU/Jn6YGizzjnlk8aW6h8us=; b=AiQG7FC36WaPZBkrbzBDXw6JukTnCXzlsbMcWJTl3fcUCCADoQBdoPD2 aRvY/Slb32K8uv0bNoOi0lad7mQ7eg+xv19twqYr8RuhUTl32Zc/pZMwO AD0ZlWmgCtpa+cTHdOLUQqkfDYxE0Xi3ZidtliOick6eSaC+xSc9xPJC1 swNK60k6SH/L0WdtOVo2vanHjpk7s30Mq/dYPO7DW7H85hckZ+V2xUPKI Ccn4eaRAz40OZvN+W60bw5P8FpUfFt+vOSl54ytRNQTVSxXwRGTUdvLeL mK8NAvzR6MM+ht96zcrPwN2P530Aoz6vhVVoqY84MhhZhHwLRSOotfk+m Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10440"; a="279067288" X-IronPort-AV: E=Sophos;i="5.93,240,1654585200"; d="scan'208";a="279067288" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Aug 2022 19:20:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,240,1654585200"; d="scan'208";a="934706650" Received: from sse-cse-haiyue-nuc.sh.intel.com ([10.239.241.114]) by fmsmga005.fm.intel.com with ESMTP; 15 Aug 2022 19:20:47 -0700 From: Haiyue Wang To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, david@redhat.com, apopple@nvidia.com, linmiaohe@huawei.com, ying.huang@intel.com, songmuchun@bytedance.com, naoya.horiguchi@linux.dev, alex.sierra@amd.com, Haiyue Wang Subject: [PATCH v6 1/2] mm: migration: fix the FOLL_GET failure on following huge page Date: Tue, 16 Aug 2022 10:21:00 +0800 Message-Id: <20220816022102.582865-2-haiyue.wang@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220816022102.582865-1-haiyue.wang@intel.com> References: <20220812084921.409142-1-haiyue.wang@intel.com> <20220816022102.582865-1-haiyue.wang@intel.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660616454; a=rsa-sha256; cv=none; b=s/fhH9QjLMm5Cve8PWq8Emh4DZruCFRNkc9Xeqq+5bl8MCgO4Wu71HTn0EWO1WLLN9D8H5 Lk6uTV44BNHhmnvUnpWp0rlud0LI42mSxRgEgkD/iN2BsKFDhHrG9IUF7pbzV/5hUWx8no x7nF/BP15oFNZW20RcbJ+RJ6LTno28M= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=AiQG7FC3; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf27.hostedemail.com: domain of haiyue.wang@intel.com designates 134.134.136.20 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=1660616454; 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=1NNO30rsohMjoZjTYsz8uAHoqngXjPIKK86JozdGWMM=; b=psu3jTIvNVVt/3gmPY6wldoAf4FE26Pe9696MiQuBWsDWjy89OSIy3GGWytRha/fDdmiP2 sv+ERyGE8c1Hvzn7eLpWjeqhWfbLOQqTc0q8833GddQSmS6l6XN+MO6ZPNX3ORPM/pTyiD p5E7EncnyzDeEAIXTdv4zQqomZ4+YfM= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8C3F34003A X-Rspam-User: Authentication-Results: imf27.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=AiQG7FC3; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf27.hostedemail.com: domain of haiyue.wang@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=haiyue.wang@intel.com X-Stat-Signature: ibrdet4xb6535o6cp1hnn351cqkaads1 X-HE-Tag: 1660616454-683263 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: Not all huge page APIs support FOLL_GET option, so move_pages() syscall will fail to get the page node information for some huge pages. Like x86 on linux 5.19 with 1GB huge page API follow_huge_pud(), it will return NULL page for FOLL_GET when calling move_pages() syscall with the NULL 'nodes' parameter, the 'status' parameter has '-2' error in array. Note: follow_huge_pud() now supports FOLL_GET in linux 6.0. Link: https://lore.kernel.org/all/20220714042420.1847125-3-naoya.horiguchi@linux.dev But these huge page APIs don't support FOLL_GET: 1. follow_huge_pud() in arch/s390/mm/hugetlbpage.c 2. follow_huge_addr() in arch/ia64/mm/hugetlbpage.c It will cause WARN_ON_ONCE for FOLL_GET. 3. follow_huge_pgd() in mm/hugetlb.c This is an temporary solution to mitigate the side effect of the race condition fix by calling follow_page() with FOLL_GET set for huge pages. After supporting follow huge page by FOLL_GET is done, this fix can be reverted safely. Fixes: 4cd614841c06 ("mm: migration: fix possible do_pages_stat_array racing with memory offline") Signed-off-by: Haiyue Wang Reviewed-by: "Huang, Ying" Reviewed-by: Baolin Wang Reviewed-by: Miaohe Lin Signed-off-by: Mike Kravetz Signed-off-by: Gerald Schaefer --- mm/migrate.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 6a1597c92261..581dfaad9257 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1848,6 +1848,7 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages, for (i = 0; i < nr_pages; i++) { unsigned long addr = (unsigned long)(*pages); + unsigned int foll_flags = FOLL_DUMP; struct vm_area_struct *vma; struct page *page; int err = -EFAULT; @@ -1856,8 +1857,12 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages, if (!vma) goto set_status; + /* Not all huge page follow APIs support 'FOLL_GET' */ + if (!is_vm_hugetlb_page(vma)) + foll_flags |= FOLL_GET; + /* FOLL_DUMP to ignore special (like zero) pages */ - page = follow_page(vma, addr, FOLL_GET | FOLL_DUMP); + page = follow_page(vma, addr, foll_flags); err = PTR_ERR(page); if (IS_ERR(page)) @@ -1865,7 +1870,8 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages, if (page && !is_zone_device_page(page)) { err = page_to_nid(page); - put_page(page); + if (foll_flags & FOLL_GET) + put_page(page); } else { err = -ENOENT; }