From patchwork Tue Aug 23 07:50:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 12951830 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 3A43CC32789 for ; Tue, 23 Aug 2022 07:50:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB6A16B007D; Tue, 23 Aug 2022 03:50:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C9B96B007E; Tue, 23 Aug 2022 03:50:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F7346B0080; Tue, 23 Aug 2022 03:50:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 69BA16B007D for ; Tue, 23 Aug 2022 03:50:21 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 477BD409AD for ; Tue, 23 Aug 2022 07:50:21 +0000 (UTC) X-FDA: 79830084642.11.58DB21F Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by imf09.hostedemail.com (Postfix) with ESMTP id 71A8F14003F for ; Tue, 23 Aug 2022 07:50:20 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VN0l0NV_1661241016; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VN0l0NV_1661241016) by smtp.aliyun-inc.com; Tue, 23 Aug 2022 15:50:16 +0800 From: Baolin Wang To: akpm@linux-foundation.org, songmuchun@bytedance.com, mike.kravetz@oracle.com Cc: baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] mm/hugetlb: add FOLL_MIGRATION validation before waiting for a migration entry Date: Tue, 23 Aug 2022 15:50:05 +0800 Message-Id: <2aa2856012baa9f7251c993ee0f1406a51185a83.1661240170.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661241020; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to:in-reply-to: references:references:references; bh=2C7YTbTQkBY6EHwaiMA6P10lGvhEfSZEECYlfbhGS7E=; b=z8fX0fa5SViCs+NTlf8QIew4jM+phwKGyitMQ3xPGPbQ5SQd/iqy01ZWDKdufpGHIq4xEs aTiP/0Lsh3+6+K/Qk5AsuGq+8iR5RE0cCahcPX/aVtu4LuZDxAqs9RgmswU1/mfEp8U4rB OEyl4TeP12UXjih0OzS2l94B/loxFWA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.56 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661241020; a=rsa-sha256; cv=none; b=bHs7++OZuN/cm7r1FS/0ipeS+3DVCZ5nE+PELZySAD0yAvdnt6yfaM5Yoc3kGm9i1Hgbik dZgZSgGMlPnl4Gi8CtfQjGd/4i7R7cp/8HD3SDkCHtsuJ9F7j5fnT4kPVKRGRg85wnkoJn JZsX7eP3EanvRK3eaLPCrpUpdvx0E1Y= X-Stat-Signature: cmjkd47qewi35rux57xh7rcmazhrt58c Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.56 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 71A8F14003F X-Rspam-User: X-HE-Tag: 1661241020-586452 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 hugetlb should keep the same logics with normal page when waiting for a migration pte entry, that means we should also validate if the FOLL_MIGRATION flag is set before waiting for a migration pte entry of a hugetlb page. Signed-off-by: Baolin Wang --- mm/hugetlb.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 2c4048a..6430b74 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -7075,6 +7075,11 @@ struct page * __weak goto out; } } else { + if (!(flags & FOLL_MIGRATION)) { + page = NULL; + goto out; + } + if (is_hugetlb_entry_migration(pte)) { spin_unlock(ptl); __migration_entry_wait_huge((pte_t *)pmd, ptl); @@ -7113,6 +7118,11 @@ struct page * __weak goto out; } } else { + if (!(flags & FOLL_MIGRATION)) { + page = NULL; + goto out; + } + if (is_hugetlb_entry_migration(pte)) { spin_unlock(ptl); __migration_entry_wait(mm, (pte_t *)pud, ptl);