From patchwork Wed Mar 20 02:42:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaiyang Zhao X-Patchwork-Id: 13597224 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 06A59C54E71 for ; Wed, 20 Mar 2024 02:42:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21F936B0093; Tue, 19 Mar 2024 22:42:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D0696B0095; Tue, 19 Mar 2024 22:42:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 049546B0096; Tue, 19 Mar 2024 22:42:27 -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 E41966B0093 for ; Tue, 19 Mar 2024 22:42:27 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B4B174030E for ; Wed, 20 Mar 2024 02:42:27 +0000 (UTC) X-FDA: 81915868734.01.9D546D9 Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by imf30.hostedemail.com (Postfix) with ESMTP id 1FBF58000C for ; Wed, 20 Mar 2024 02:42:25 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=cs.cmu.edu header.s=google-2021 header.b=BrTpeNGK; dmarc=pass (policy=none) header.from=cs.cmu.edu; spf=pass (imf30.hostedemail.com: domain of kaiyang2@andrew.cmu.edu designates 209.85.160.181 as permitted sender) smtp.mailfrom=kaiyang2@andrew.cmu.edu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710902546; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WzVosZB8NV09/ZiVxYfUQEEiRP/cgORaiI2cKH0KzxM=; b=1uZANdcjalblLlqZvxQVhjhEh3fQwcNfg/l2Rhx1jg5xfHf9s3g2jOVBKu7DH0EbnCUG4e 3MbBBHYUgWFrpHglwexqIFh9RA1D2m9TJ6+5kW1XLL+z4WOjHy/PBrOs01EmGTW/KgHwhX qJ/KV0iLfm+QZFnkiI4JnVTu2eBZPkY= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=cs.cmu.edu header.s=google-2021 header.b=BrTpeNGK; dmarc=pass (policy=none) header.from=cs.cmu.edu; spf=pass (imf30.hostedemail.com: domain of kaiyang2@andrew.cmu.edu designates 209.85.160.181 as permitted sender) smtp.mailfrom=kaiyang2@andrew.cmu.edu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710902546; a=rsa-sha256; cv=none; b=4FB0AGHsWjYcItLb1lPejbA3evk0sYj+uez+8E15BUZAyj3P9gyApEv08tVwaCBXHf063Y sTaiq3Ds4ezKVitVm/iyZUkYA3Vl5oXnp4UGanQheHXoHodCuGwLAob+iydVkTpjs/tpwX i3EFM2LnGW3RwHxma/XUxYNbP1bwEbU= Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-430ccb3d65eso20002841cf.2 for ; Tue, 19 Mar 2024 19:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.cmu.edu; s=google-2021; t=1710902545; x=1711507345; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=WzVosZB8NV09/ZiVxYfUQEEiRP/cgORaiI2cKH0KzxM=; b=BrTpeNGK4HpNiDUjkQCasZRRf0kObmlN4ZYBoZb2ogi3pkiLqjVAYEFGhJPtvr8EZp Zjgs1IKNEPHs6Oj83i0JiWgO7PZ0krG6PhKxxTmYse6FeoXDaeJYZe27LTDAhFjhe78W lZoIN1R03MoDQBJtMR7efFtdy8g4q4TlNO0woasU22HXM8ZKWcaPvDBgyIEhNm3P0+gv aFsiaBbwn8pfcYacXLdS9HGEZv7nRxczry3JnhAJVO3Gg9lW79T2aeYbFczL31spD/Fb FrAPe9Np7W5Szfz7um54XbLXx4zdWtSTPn74k1RfEuj8Jxxyv2V7EwFiZ7Qw3NWa9vsZ +nVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710902545; x=1711507345; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WzVosZB8NV09/ZiVxYfUQEEiRP/cgORaiI2cKH0KzxM=; b=wTKGgWgUso96VrSpPvJWEylQxgchJWhLuzwZKfD+ZMs+kjhd07Vtwv6kwvrKItyeVn AFKjTTL4tbx4eiWiAZ5Gw5s3IRV2KUGPFAbGobNJ4RsfMapBHJjNbWzGbw3DVc7h2xnZ tOu/xJw8PYw0o48lxYiU5qxXPbPEigfXQVmUoxTR9yYHk8nTTSaAzvsdWplrntmkrZCg MXnpHGkHh17Syvm6yFwyfB/mhj+KIZI4a+WM0qFG7Kb9RBjd2nBHKkyRN+hMHKsO6BQf eNe788cfTdfzLBDX87dAXVQJhwzpidovi3IJCn6eXAk+WG1Nmkpn9TD4JcLyrCjEgtD1 OaiA== X-Gm-Message-State: AOJu0YxSEj+uE6T2YrTvu+wav9xlexm9o+SPk9tvStOCrCAqPpWVFuVf bGIXlZ347JcV7pSwoW+6WVf0v9mtw14ZdhFD69CgWwrfn2o7cNR4LbWpEog39UMoZZzoFoMRdtr Qkay+l61ZZgAIHbKY+YqEEOJNBNJoyPg/OyxwAuw/dkTRSdxQ3zJiYjEE3ar0rq0iWOjbhcuft4 lmSc73yhc3iCwQMYmYpbQk1O0Hf5eMr6J6I1Q= X-Google-Smtp-Source: AGHT+IGEfbBr6cutAmN+mlO7n/aShmIQU3GTmhE5CM9Lh4mCEbZf0tbj0IjwPIaD6NVNuXa3bBmlRg== X-Received: by 2002:a05:622a:110a:b0:431:baa:ab0c with SMTP id e10-20020a05622a110a00b004310baaab0cmr135047qty.50.1710902544986; Tue, 19 Mar 2024 19:42:24 -0700 (PDT) Received: from localhost (pool-74-98-221-57.pitbpa.fios.verizon.net. [74.98.221.57]) by smtp.gmail.com with UTF8SMTPSA id fg14-20020a05622a580e00b00430bddc75a5sm4582852qtb.23.2024.03.19.19.42.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Mar 2024 19:42:24 -0700 (PDT) From: kaiyang2@cs.cmu.edu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Kaiyang Zhao , hannes@cmpxchg.org, ziy@nvidia.com, dskarlat@cs.cmu.edu Subject: [RFC PATCH 6/7] pass gfp mask of the allocation that waked kswapd to track number of pages scanned on behalf of each alloc type Date: Wed, 20 Mar 2024 02:42:17 +0000 Message-Id: <20240320024218.203491-7-kaiyang2@cs.cmu.edu> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240320024218.203491-1-kaiyang2@cs.cmu.edu> References: <20240320024218.203491-1-kaiyang2@cs.cmu.edu> Reply-To: Kaiyang Zhao MIME-Version: 1.0 X-Rspamd-Queue-Id: 1FBF58000C X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: mi49jk5hh1ctngbfjfx9emokwojmgge5 X-HE-Tag: 1710902545-722042 X-HE-Meta: U2FsdGVkX18Qzq2ePisLP/+4dIAwkwRaVbd9iPGMvlxnpOn+WEwlvyWw7SDqCU3njcEkXszcCyyeCI2lTMKieym3lbhhvlikjUEh5OVC8xvs3BRRoft5K7q34f/rML1oRJzXQB+FORgg8SgrdilQOgTPd7BDYVC8faWFyPimaFUts7mQ9Va/fTktBjOdN7J596zqjoZbq0xVfbY70wA5x4Wu6Yb+lxC0wG57Hhg1ybjeSISZat9jB3yuPo/VYMOD6JO4gCQKsGrRGdfOlmx0Jd1BpRcm4Y3lJkFRhg0EzzyApXPdy//frKhCBvaWiOiDqgAKOC0zcMno052chFLa6QryDllkTI0fZ+g/pg2WZ04/7eSgYybrbUrtXW65K5Y+laUuA1PrkjAVDDLKWdifv+BDn0lptG4jVH+Imx+c7lN4ML26cI176O/coznnpmxdOfmRjgv9AQjIl1uLPSTmYY4FMSHF1WwzB1sCpmj70HsVTaYfNqqOpso1MY2l3uHb5UtEOr3bJGahAboJ97eliJT2N2eJ14cbIygJL4Ua77ZGdxQjIiy6zKUDRvV9rLcJn3silBR6GamyCyA19DhBcwgkRqaVqWmE5Xg+ZjFLfypta9Mbe4oMTedcTa82d8R19w2xF48Qpy3IJgYumBy10ig9cIWki2d31G4gdvOoip1rOPzXDPHjFjK+qMp/80ToUbgaluMmTXN8EpER7iUL6yrUmpNuuFt+Jx9YWW1+CEod9PlHIuQhAkbQ10FQN7u2IjC7zoixnBx8lmD4X8S0zR1MqMl7FxXoQ+vilajS+Xxtze0tg3kBS61EZNLV01wXm0ujxZpL+ewqnX4OIvb4SDRjbhzcFsofLmvjAA251ldse8k60+5DwvV7NOSqA29p6BKIlu7kiMydwc6WnE1gnRNIuFLazeiSpwK0FXSD3kRdo7KF3DFDmZ+T3zpndb/e6a1Q5CrQkLpw8Ko9UHq +qa19Ccy qcIyJ33CZQJEnagWxblhKksunwwoe4JopAgjXKeLA/XCmh//N0gmfRpKvHSVXapCQwvoT3ov85eOq9E4ov8EA75x4IKpGENveLbsPq+DpayY3QzBS7kaaHbNct4989+NN585G/8wqVleGluI1SDT2aRZVnEihzWWTdj8tyybP05UpJoehGOPN4ggmtsLFR3wRTIR1sW7zUHuxq8whkwwYFW4UYTcQ2aWcYE3IBh3QlVwnpPWlJS4IiIIpRJV+XvOLvt5wklsuCacDcebNbNoNPtuK8TKow4WXhUIV6XLlteffem+SH7/joluCW4pJWTGnkoEdivBwF86v94E= X-Bogosity: Ham, tests=bogofilter, spamicity=0.002856, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Kaiyang Zhao In preparation for exporting the number of pages scanned for each alloc type Signed-off-by: Kaiyang Zhao --- include/linux/mmzone.h | 1 + mm/vmscan.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index a4889c9d4055..abc9f1623c82 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1288,6 +1288,7 @@ typedef struct pglist_data { struct task_struct *kswapd; /* Protected by kswapd_lock */ int kswapd_order; enum zone_type kswapd_highest_zoneidx; + gfp_t kswapd_gfp; int kswapd_failures; /* Number of 'reclaimed == 0' runs */ diff --git a/mm/vmscan.c b/mm/vmscan.c index aa21da983804..ed0f47e2e810 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -7330,7 +7330,7 @@ clear_reclaim_active(pg_data_t *pgdat, int highest_zoneidx) * or lower is eligible for reclaim until at least one usable zone is * balanced. */ -static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) +static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx, gfp_t gfp_mask) { int i; unsigned long nr_soft_reclaimed; @@ -7345,6 +7345,8 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx) .order = order, .may_unmap = 1, }; + if (is_migrate_movable(gfp_migratetype(gfp_mask))) + sc.gfp_mask |= __GFP_MOVABLE; set_task_reclaim_state(current, &sc.reclaim_state); psi_memstall_enter(&pflags); @@ -7659,6 +7661,7 @@ static int kswapd(void *p) pg_data_t *pgdat = (pg_data_t *)p; struct task_struct *tsk = current; const struct cpumask *cpumask = cpumask_of_node(pgdat->node_id); + gfp_t gfp_mask; if (!cpumask_empty(cpumask)) set_cpus_allowed_ptr(tsk, cpumask); @@ -7680,6 +7683,7 @@ static int kswapd(void *p) WRITE_ONCE(pgdat->kswapd_order, 0); WRITE_ONCE(pgdat->kswapd_highest_zoneidx, MAX_NR_ZONES); + WRITE_ONCE(pgdat->kswapd_gfp, 0); atomic_set(&pgdat->nr_writeback_throttled, 0); for ( ; ; ) { bool ret; @@ -7687,6 +7691,7 @@ static int kswapd(void *p) alloc_order = reclaim_order = READ_ONCE(pgdat->kswapd_order); highest_zoneidx = kswapd_highest_zoneidx(pgdat, highest_zoneidx); + gfp_mask = READ_ONCE(pgdat->kswapd_gfp); kswapd_try_sleep: kswapd_try_to_sleep(pgdat, alloc_order, reclaim_order, @@ -7696,8 +7701,10 @@ static int kswapd(void *p) alloc_order = READ_ONCE(pgdat->kswapd_order); highest_zoneidx = kswapd_highest_zoneidx(pgdat, highest_zoneidx); + gfp_mask = READ_ONCE(pgdat->kswapd_gfp); WRITE_ONCE(pgdat->kswapd_order, 0); WRITE_ONCE(pgdat->kswapd_highest_zoneidx, MAX_NR_ZONES); + WRITE_ONCE(pgdat->kswapd_gfp, 0); ret = try_to_freeze(); if (kthread_should_stop()) @@ -7721,7 +7728,7 @@ static int kswapd(void *p) trace_mm_vmscan_kswapd_wake(pgdat->node_id, highest_zoneidx, alloc_order); reclaim_order = balance_pgdat(pgdat, alloc_order, - highest_zoneidx); + highest_zoneidx, gfp_mask); if (reclaim_order < alloc_order) goto kswapd_try_sleep; } @@ -7759,6 +7766,8 @@ void wakeup_kswapd(struct zone *zone, gfp_t gfp_flags, int order, if (READ_ONCE(pgdat->kswapd_order) < order) WRITE_ONCE(pgdat->kswapd_order, order); + WRITE_ONCE(pgdat->kswapd_gfp, gfp_flags); + if (!waitqueue_active(&pgdat->kswapd_wait)) return;