Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3707587pxv; Mon, 28 Jun 2021 10:47:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfFs9voRhKdX6X/EtR3HFP1d81YqO8P0hvnv/Gsb4HosBNQzdMKtEj9ZkGlN4N2ciOPHmP X-Received: by 2002:a92:8708:: with SMTP id m8mr19877493ild.295.1624902475441; Mon, 28 Jun 2021 10:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624902475; cv=none; d=google.com; s=arc-20160816; b=lBuJZCWZm4a4JprPY5DVF3OAFeIrgC60iIHJtyapGYrtJiNASSZWgBBF5BBgfFZV1E RK3Hfywl4XxZKq7vGAZJ7GU+3lz0eXnkGJF15KAYOagDamlfdZcsx2F3FSnt2GZd3xRB 8i+kpnpr3tgZSgV2ZTBotrSbiwVitl8UERZC18l9Nsrh3ce+PfXs20h/LacYo+OUfO+E sIW/gad6WbDwr7+yjZmHB/RGRDx8ILJWsualLqs4yaCRCq97HmAB6PlnloUUOpNwKTts 0GKaQVFpZyWWgPYUtwtD3Ql4dJyRQazDOuWFBgKpXYyVlxoqE8143ZC7/KPmhoWNTGmu fhBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9Ae936gBRv1nA/SnvtEDFgi+7/h3AahXJ0QDXyz6MZQ=; b=0m8T3gimJHzRR5zK5xHCJPyYDzxaEnXz6o1xvnDQcweR3yr85l/8SmMfuKR+dgIb1z 43/Ck+OSllWFPMX0QbNtMCRXzycs2o2hgReS1iI+STGU2TflGQiuvNQigUbD8o4//C3R uWHuL/RgRi2JSuLeOeK9xybr+QRtgEz8BGd5r8ATJQEQMG8b4nLPfXGOx+4pS+3ahPat tNAdwCHsBBMW88v4i3DZgjC04cvX7f+NXwvHFwvw18QZ5lXuCx+nLEciSnKihpr0ZC/2 JPrKgvXqd53ikO/lw89+WXRg4vxwClJWdB+zplAwZPPeOOFEOb7L/axgzH1x65Di99OS 0ZoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TRejAwDp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z13si18642790ill.61.2021.06.28.10.47.43; Mon, 28 Jun 2021 10:47:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TRejAwDp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234044AbhF1O1o (ORCPT + 99 others); Mon, 28 Jun 2021 10:27:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:55090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233468AbhF1OWb (ORCPT ); Mon, 28 Jun 2021 10:22:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AAF9361C80; Mon, 28 Jun 2021 14:19:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624889981; bh=htFouwDU49Hg58PZKfIaEb0mYpEQylauarQdq7GrLR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TRejAwDpRhBkv7tqrJb55g8tQJLxvpkhAq8FTLyB8h7ERxeZy3iGkcsyDxxBR5DXE Edu0EW5x0RKBPsUaod5dVO/uOUn0cPpmiunj+/8nWvmiPQYNPTkPaFeCJYZ3uy+Mfh 1k1+SmzM081JgIlwBLFPSIIrVRO++sqJYCgLdtUYVAgjpDiiI7xs4w5mpKr6ED/uYm 65iEO4Op8lOdiwdMGp+GOdY2XLw5UfQy14D/lDhnxy9C/dCFyn24NPA22CLOzbJkPq Ws0szrvxCxghUfm1kDFoDNGCcR2yerCFX1RrH7lUm7vEJkmizeSnpIWlq0lEO0IHVG gDfhkFdXFBuPA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xu Yu , Hugh Dickins , Gang Deng , "Kirill A . Shutemov" , Matthew Wilcox , Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 5.12 082/110] mm, thp: use head page in __migration_entry_wait() Date: Mon, 28 Jun 2021 10:18:00 -0400 Message-Id: <20210628141828.31757-83-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628141828.31757-1-sashal@kernel.org> References: <20210628141828.31757-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.14-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.12.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.12.14-rc1 X-KernelTest-Deadline: 2021-06-30T14:18+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xu Yu commit ffc90cbb2970ab88b66ea51dd580469eede57b67 upstream. We notice that hung task happens in a corner but practical scenario when CONFIG_PREEMPT_NONE is enabled, as follows. Process 0 Process 1 Process 2..Inf split_huge_page_to_list unmap_page split_huge_pmd_address __migration_entry_wait(head) __migration_entry_wait(tail) remap_page (roll back) remove_migration_ptes rmap_walk_anon cond_resched Where __migration_entry_wait(tail) is occurred in kernel space, e.g., copy_to_user in fstat, which will immediately fault again without rescheduling, and thus occupy the cpu fully. When there are too many processes performing __migration_entry_wait on tail page, remap_page will never be done after cond_resched. This makes __migration_entry_wait operate on the compound head page, thus waits for remap_page to complete, whether the THP is split successfully or roll back. Note that put_and_wait_on_page_locked helps to drop the page reference acquired with get_page_unless_zero, as soon as the page is on the wait queue, before actually waiting. So splitting the THP is only prevented for a brief interval. Link: https://lkml.kernel.org/r/b9836c1dd522e903891760af9f0c86a2cce987eb.1623144009.git.xuyu@linux.alibaba.com Fixes: ba98828088ad ("thp: add option to setup migration entries during PMD split") Suggested-by: Hugh Dickins Signed-off-by: Gang Deng Signed-off-by: Xu Yu Acked-by: Kirill A. Shutemov Acked-by: Hugh Dickins Cc: Matthew Wilcox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/migrate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/migrate.c b/mm/migrate.c index 773622cffe77..40455e753c5b 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -322,6 +322,7 @@ void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep, goto out; page = migration_entry_to_page(entry); + page = compound_head(page); /* * Once page cache replacement of page migration started, page_count -- 2.30.2