From patchwork Fri Aug 19 10:12:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 12948679 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 B367DC32772 for ; Fri, 19 Aug 2022 10:13:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 538828D0005; Fri, 19 Aug 2022 06:13:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C2028D0002; Fri, 19 Aug 2022 06:13:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B00D8D0005; Fri, 19 Aug 2022 06:13:13 -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 2AEE08D0002 for ; Fri, 19 Aug 2022 06:13:13 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0119D14025A for ; Fri, 19 Aug 2022 10:13:12 +0000 (UTC) X-FDA: 79815929424.28.263274B Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf24.hostedemail.com (Postfix) with ESMTP id 3B299180025 for ; Fri, 19 Aug 2022 10:13:10 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045192;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VMfcxWM_1660903986; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VMfcxWM_1660903986) by smtp.aliyun-inc.com; Fri, 19 Aug 2022 18:13:07 +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 3/3] mm/hugetlb: add FOLL_MIGRATION validation before waiting for a migration entry Date: Fri, 19 Aug 2022 18:12:58 +0800 Message-Id: <0ec5d75781452af85e6226e1b5940ff557c6f5e7.1660902741.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=1660903991; 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=LY4hC85K4yJkKfzR8/I6etsFIvV6kzER/hMw22TDn/w=; b=kuaS2lOmE8LgSh9NpszQPq9N5vMH/O76Zm6/tticofjxgH2l/cOsON6W5Rk8Lo23w1xH/a d7zMZaHYmVoL0xz88WuG560zLa42RnjkPfxOSQMsoR+14L1QWnLjM+CvWEukvQ3xLNJm7s KyOeCWU0mxQoIbyX9Hdtrc8kKqwPdXg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660903991; a=rsa-sha256; cv=none; b=wPZRsu5DGSd+ovnrE3icFVy9b0Ktwbz3Va/ClE3V2x8sz04s2GSYZEmB5Y+Mkcv/EObJbA rRQTv9fjaRNxe2bgnxcFoHhAUuqYhJU+IgFl2sJfgUJ8UfxF22pMfixgzGybQ043ToBnee lDAzlnPRcZn645cf06l1nJIuyIITp3M= Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf24.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 3B299180025 X-Stat-Signature: zmpfyai56t3erxjguxsc7hhyg7drg46r X-Rspam-User: X-HE-Tag: 1660903990-251992 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 efb53ba..fac1b33 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -7000,6 +7000,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); @@ -7038,6 +7043,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);