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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43435C433E0 for ; Wed, 13 Jan 2021 05:25:43 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A42D422B37 for ; Wed, 13 Jan 2021 05:25:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A42D422B37 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2F4DC8D000F; Wed, 13 Jan 2021 00:25:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2CB788D0007; Wed, 13 Jan 2021 00:25:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BB008D000F; Wed, 13 Jan 2021 00:25:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id 044AF8D0007 for ; Wed, 13 Jan 2021 00:25:42 -0500 (EST) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id C0E961EE6 for ; Wed, 13 Jan 2021 05:25:41 +0000 (UTC) X-FDA: 77699614482.08.actor44_5804ebb2751b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id A7D111819E772 for ; Wed, 13 Jan 2021 05:25:41 +0000 (UTC) X-HE-Tag: actor44_5804ebb2751b X-Filterd-Recvd-Size: 5317 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Wed, 13 Jan 2021 05:25:40 +0000 (UTC) Received: by mail-pj1-f54.google.com with SMTP id b5so445712pjl.0 for ; Tue, 12 Jan 2021 21:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RQxBzrH/aoWEdG3IjoZ+7PAOMjNKjJoK1+V0rHsE7hs=; b=squ9zmJAhHIGqokb1c1CENeZTx1PBd+M1MWOPjBpY2CspZ7CWbwStQxbPHEkzGDfVw r3GllIzxRSrFSki7Hs7vOhtOSTmatJJybzgdTqoXbnFCV327hVJLS2GNi3Kv1waVcmoM nfuiNcJICOfTESCwE6oXVXep6SiDdNj1CtPav0peKhrYdFCbKaLoqflQDZrBEgbRmG7d gauTrw3fsWXuPN0zQhnuAexRRfzsZPDkbYM9nuIVz52PFAAiHIZBxJ2nMWJ2Raiggkq8 wD08ZfI/qBKg8Jf7EEcspHVrWm+4x2U+v9XYP1386+QaQ0WyKvEtmA4zU/v803Lz/YZG NPNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RQxBzrH/aoWEdG3IjoZ+7PAOMjNKjJoK1+V0rHsE7hs=; b=MnEb1hxy3cbxm4Xr8AmD4OwgnWS54sdfO7tWTMEafBaSEpr/dfJAneMdgTYzrQe5bb 0QgzD4zMXBQ/v/a2eWYdBL87HeJ3roH8mY2dmc9TVlr+2ljTw/CjivJuaqtuAmBby7cn V7CR28BoMoNlLVlnaajns5KHStlhIeihzZ6GwCXW9BbvxWFzETLuClhHeQd0I4G2nVM+ BLZ6qc5RNw01DF8kL/oW6KOd1vlnbdPcSKYBs4kxJO7CIQVQFKtUCi8/tRvsIjvKiCVQ g10/4LThUbR/xSTNptOzahpYTxAUL+DD6HPgaTfnMF5FF6nM7lGHVdxbP5Wl6EvhWGqO Snyg== X-Gm-Message-State: AOAM532Ix4mXQOZqk5m9dl8nzx/nSnKCRizdvXhtYMAVFJ/5cCh7Bjlt wuCFP/MzoHkq28bPkObJgmEVyg== X-Google-Smtp-Source: ABdhPJwg4fxKWfXnYhu4nWUKg61Xld9nJTPPDMfQW0uTj27Vgs5KMWDaoF8RkSjjah+MGrBywkQArQ== X-Received: by 2002:a17:90a:68ce:: with SMTP id q14mr350311pjj.223.1610515539949; Tue, 12 Jan 2021 21:25:39 -0800 (PST) Received: from localhost.localdomain ([139.177.225.247]) by smtp.gmail.com with ESMTPSA id x15sm893081pfa.80.2021.01.12.21.25.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jan 2021 21:25:39 -0800 (PST) From: Muchun Song To: mike.kravetz@oracle.com, akpm@linux-foundation.org Cc: n-horiguchi@ah.jp.nec.com, ak@linux.intel.com, mhocko@suse.cz, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , Michal Hocko , stable@vger.kernel.org Subject: [PATCH v4 2/6] mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page Date: Wed, 13 Jan 2021 13:22:05 +0800 Message-Id: <20210113052209.75531-3-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210113052209.75531-1-songmuchun@bytedance.com> References: <20210113052209.75531-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: If a new hugetlb page is allocated during fallocate it will not be marked as active (set_page_huge_active) which will result in a later isolate_huge_page failure when the page migration code would like to move that page. Such a failure would be unexpected and wrong. Only export set_page_huge_active, just leave clear_page_huge_active as static. Because there are no external users. Fixes: 70c3547e36f5 (hugetlbfs: add hugetlbfs_fallocate()) Signed-off-by: Muchun Song Acked-by: Michal Hocko Reviewed-by: Mike Kravetz Cc: stable@vger.kernel.org --- fs/hugetlbfs/inode.c | 3 ++- include/linux/hugetlb.h | 2 ++ mm/hugetlb.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index b5c109703daa..21c20fd5f9ee 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -735,9 +735,10 @@ static long hugetlbfs_fallocate(struct file *file, i= nt mode, loff_t offset, =20 mutex_unlock(&hugetlb_fault_mutex_table[hash]); =20 + set_page_huge_active(page); /* * unlock_page because locked by add_to_page_cache() - * page_put due to reference from alloc_huge_page() + * put_page() due to reference from alloc_huge_page() */ unlock_page(page); put_page(page); diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index ebca2ef02212..b5807f23caf8 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -770,6 +770,8 @@ static inline void huge_ptep_modify_prot_commit(struc= t vm_area_struct *vma, } #endif =20 +void set_page_huge_active(struct page *page); + #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; =20 diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1f3bf1710b66..4741d60f8955 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1348,7 +1348,7 @@ bool page_huge_active(struct page *page) } =20 /* never called for tail page */ -static void set_page_huge_active(struct page *page) +void set_page_huge_active(struct page *page) { VM_BUG_ON_PAGE(!PageHeadHuge(page), page); SetPagePrivate(&page[1]); --=20 2.11.0