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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12A26ECAAA1 for ; Fri, 9 Sep 2022 09:25:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CBCE8D0005; Fri, 9 Sep 2022 05:25:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B8B68D0007; Fri, 9 Sep 2022 05:25:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 559B48D0005; Fri, 9 Sep 2022 05:25:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 42DA68D0002 for ; Fri, 9 Sep 2022 05:25:30 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 14E6E1C6364 for ; Fri, 9 Sep 2022 09:25:30 +0000 (UTC) X-FDA: 79892014020.02.7C46331 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf08.hostedemail.com (Postfix) with ESMTP id 3ED15160087 for ; Fri, 9 Sep 2022 09:25:29 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MP9VN2BY0zmVDv; Fri, 9 Sep 2022 17:21:48 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 9 Sep 2022 17:25:25 +0800 From: Miaohe Lin To: CC: , , , , Subject: [PATCH 01/16] mm/page_alloc: ensure kswapd doesn't accidentally go to sleep Date: Fri, 9 Sep 2022 17:24:36 +0800 Message-ID: <20220909092451.24883-2-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220909092451.24883-1-linmiaohe@huawei.com> References: <20220909092451.24883-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662715529; a=rsa-sha256; cv=none; b=Zp9sZnj8XTO75yqqm9LzK5/Jj+hyxi3vPdRcWzZH2gILa8Z4fpbM9qs0oLUNzo4QbyWWi2 JROOGd8oPr3BTJAS+ReGwL5fw1kV7gy1danm/GjXhUsFoPNUy8806xm+tpn2Nq8Q3vVAAN 4PEYQEkpWNbHUqMARwWZ+OQMebcrdKw= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662715529; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=daC2cXG7zrZFjqSO0XVftvX+386KNf8k7c3qi0Xnvxw=; b=t/cKRwl5+pBpbb/Lmtu7igiBHmQuexMvomTZo+u/xDjf9yIvn5Up05SDd2nEatuIT4IYJO cSR20tfgPwFy46cTPuIr2CtqYZQi+qE4J7NVzRtdEPINoo4ln8N+4v5UVcrIFelgkETuU1 KzecHQ/w9yJ7wyRM3iIOLG87klJVL0s= Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com X-Stat-Signature: aps33c1n361i8mdfrh5dzkd481a1un7c X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 3ED15160087 X-HE-Tag: 1662715529-526881 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 ALLOC_KSWAPD is set, wake_all_kswapds() will be called to ensure kswapd doesn't accidentally go to sleep. But when reserve_flags is set, alloc_flags will be overwritten and ALLOC_KSWAPD is thus lost. Preserve the ALLOC_KSWAPD flag in alloc_flags to ensure kswapd won't go to sleep accidentally. Fixes: 0a79cdad5eb2 ("mm: use alloc_flags to record if kswapd can wake") Signed-off-by: Miaohe Lin --- mm/page_alloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ba5c9402a5cb..4b97a03fa2dd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5147,7 +5147,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, reserve_flags = __gfp_pfmemalloc_flags(gfp_mask); if (reserve_flags) - alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, reserve_flags); + alloc_flags = gfp_to_alloc_flags_cma(gfp_mask, reserve_flags) | + (alloc_flags & ALLOC_KSWAPD); /* * Reset the nodemask and zonelist iterators if memory policies can be -- 2.23.0