From patchwork Thu May 20 02:59:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12268807 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,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 550CCC433B4 for ; Thu, 20 May 2021 03:02:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A85DA610CD for ; Thu, 20 May 2021 03:02:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A85DA610CD 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 E01C36B006C; Wed, 19 May 2021 23:02:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB2A56B006E; Wed, 19 May 2021 23:02:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C052A6B0070; Wed, 19 May 2021 23:02:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0018.hostedemail.com [216.40.44.18]) by kanga.kvack.org (Postfix) with ESMTP id 8D15B6B006C for ; Wed, 19 May 2021 23:02:39 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 256E5B7A6 for ; Thu, 20 May 2021 03:02:39 +0000 (UTC) X-FDA: 78160111638.32.77716A1 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by imf03.hostedemail.com (Postfix) with ESMTP id 1078EC001C77 for ; Thu, 20 May 2021 03:02:36 +0000 (UTC) Received: by mail-pf1-f178.google.com with SMTP id c17so11310864pfn.6 for ; Wed, 19 May 2021 20:02:37 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=l7sRv5owrkchidf6i75q7ysNXdO5li1djMK8IkkLhxM=; b=xify1oc/CJei7iJHIXxgMVklJY5mW8ywxu92nfb2xy50ya/4F8u4mDf3kOnJxjGCff ihRQnjLq7fcxOab1VMv7229A/MdXg2LBamZCXC0vviNaYHLWS0p+/ylKarJUhSh0qmeN QUq5P1jZwjGPDxfbbVDNrZlLhNTzQBuLGuiL22jv/puda/rJtvD6tpeRZUocQm+tq0Jg jHbMlQeg88dTvh/H1XxSkwHIYrv45p6kSmhmQddHmibU7B9y8L17CRrsxru50C/YpRTK 4txAq6aZlPs4xa+PsfTQglnihkybgW3HDZvaBZpqLkhsVHgfbiMuNUwxJdbcfkGtNV7h gPVA== 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:mime-version :content-transfer-encoding; bh=l7sRv5owrkchidf6i75q7ysNXdO5li1djMK8IkkLhxM=; b=P3bIUgEdWw8HY8kkYVpW71AG8PARtp6t+0MWou9TLn5Qv3O3N1Xbr9aO4G7r8gNj8l dxM/M60vS6cUHrmb8tOmpPqm7ZgsT8YoXVwkbYaNQ6nI+sYRxSedR1WTomUjgmQ4DLq8 bWTxyFrLHUixBmcRWf696+4drNPhUVBDnkzFPmaEd0f6QXdgeG/cvColJMln0F+fpUxV SW+LcPbLOOLnUhxjW3b6V6d0xHWXcXzl7t+Anpo41SAlYRLxcn8euTYiOc/SyDltnC2Z py66TSHJkgKzUnuVn4tqS4cTvs7RZscyqQzGlMmCdmK/j++WVa1xJIHGJLirdHp0JjL8 XFHA== X-Gm-Message-State: AOAM5300xWVRpo6aEzIsQbrcBXvtvSb+zqL8GhDBT3D+CKnWO44INVL9 GCow1HvQEj7g4kOVL0eFYvYzCQ== X-Google-Smtp-Source: ABdhPJzzmIcMrIqVz5QBGc8xv1956TeOI/klyV1+Ji5lpIPTUYGqo/E3QMkVskXOdQGu2hM37TFBOQ== X-Received: by 2002:a63:4f4a:: with SMTP id p10mr2359694pgl.384.1621479756818; Wed, 19 May 2021 20:02:36 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.232]) by smtp.gmail.com with ESMTPSA id l18sm5124806pjq.33.2021.05.19.20.02.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 May 2021 20:02:36 -0700 (PDT) From: Muchun Song To: akpm@linux-foundation.org, osalvador@suse.de, mike.kravetz@oracle.com, mhocko@suse.com, david@redhat.com, willy@infradead.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com, zhengqi.arch@bytedance.com, fam.zheng@bytedance.com, Muchun Song , Anshuman Khandual Subject: [PATCH] mm: migrate: fix missing update page_private to hugetlb_page_subpool Date: Thu, 20 May 2021 10:59:49 +0800 Message-Id: <20210520025949.1866-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) MIME-Version: 1.0 Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b="xify1oc/"; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf03.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.210.178 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 1078EC001C77 X-Stat-Signature: gpntzbtchxa13h16z9awym163gs9gukb X-HE-Tag: 1621479756-890021 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: Since commit d6995da31122 ("hugetlb: use page.private for hugetlb specific page flags") converts page.private for hugetlb specific page flags. We should use hugetlb_page_subpool() to get the subpool pointer instead of page_private(). The commit forgot to update it in the page migration routine. So fix it. Fixes: d6995da31122 ("hugetlb: use page.private for hugetlb specific page flags") Reported-by: Anshuman Khandual Signed-off-by: Muchun Song Reviewed-by: Mike Kravetz --- mm/migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/migrate.c b/mm/migrate.c index e7a173da74ec..43419c4bb097 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1290,7 +1290,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, * page_mapping() set, hugetlbfs specific move page routine will not * be called and we could leak usage counts for subpools. */ - if (page_private(hpage) && !page_mapping(hpage)) { + if (hugetlb_page_subpool(hpage) && !page_mapping(hpage)) { rc = -EBUSY; goto out_unlock; }