From patchwork Wed Oct 19 00:13:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 4369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp48154wrs; Tue, 18 Oct 2022 17:14:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5g6JCvkwobJk2kZznQ3vWMG5uppz7QYcWAkWGNmRbzmwmoWw4Y4Wm6bk3dlvpcmOvLLaf/ X-Received: by 2002:a17:906:4786:b0:78d:c3c0:1508 with SMTP id cw6-20020a170906478600b0078dc3c01508mr4411428ejc.211.1666138479153; Tue, 18 Oct 2022 17:14:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666138479; cv=none; d=google.com; s=arc-20160816; b=E8ZUCQZDwHkMJ4H6oCldY60ZxNW32ahcMxflLk36uxYvHGGiEoamWO1XWlXmYGD71i Ri9PUBd3r3nh31NVH234UP2EdTMgKm/DfXgGE01iaPDT43wZqprsPoKHZ+GXFPwiCg/4 hWRttJKPem6Y26IV8tMMEF6SXnyI3SWEq7ALLlV3Ex8JC9iYcWtXXHoqrZsrLOXnM6A2 Kxt+fTxEc8UYgEPxqLKbMoWcFL1BpG76zRgUoJ5Zl+c5HhVTuhA+r7uYTN4AfZmljeJ0 nmZabEC0qsogX0qZd0UiClKq7nYUNRMZZx2pdvJa4fbVeuTJbrYMl2m7LVF3cRTp3I/9 4xlw== 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=WhTs1GMlAAQv7tjdy1pjiToh243+dI/h9WmrUyp0/D8=; b=J2fETnQzHQBK8T5U+K3sfpADWdKnUP8PEHd9nT4XFZ9PuejXDbBJ2M4n5cHT3BarpG dJHMWqFF2HmkzmfK9JBF2VRrPetnYiNlREDGFaUDD8VLLS7iCuxv37M1bThc+POA+Kao hdOuI2hv4iWKjQCzvehZx8E49vlX37ZKY2os3AJrzHeaC7y+zXM/LPQJPx1C7p95XaqM J8BLvAqea0/cYJ8HzHlJbjQevaf1ois9d5oqUrWYfcVmEUePBfe6Ba6HZWQ3qtDF0PVJ BpvlSoRAE/k+NLvcG+zevn9f8+2pSloi374o82Uxj2veIlZnKJLHh6ROgLb4nxm3IHuX n4RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ug6HpD5i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dd10-20020a1709069b8a00b00781e6ba94ffsi16568482ejc.126.2022.10.18.17.14.14; Tue, 18 Oct 2022 17:14:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ug6HpD5i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S229787AbiJSAN2 (ORCPT + 99 others); Tue, 18 Oct 2022 20:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbiJSANZ (ORCPT ); Tue, 18 Oct 2022 20:13:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E30B9CF180 for ; Tue, 18 Oct 2022 17:13:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 820FD6173A for ; Wed, 19 Oct 2022 00:13:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A9ABC43142; Wed, 19 Oct 2022 00:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666138403; bh=1PZhYb2ct7QtSd832MWJk12aifdWGZyOJZXRFYNpxhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ug6HpD5ixrzIHdVNt9lbr/v3kE1mGDH632DKUWiyPrjBgl7ZZqNTEywNC/aqwyl9R zmUlUVtmoAKzLtYiMpjnHwgf8OmCAvoA/gps+1L9E0IdiF0AZCMp2z1kXuhSdnmvXd qwhoWIU7FjR9fCEMPISHdd7+H/P7NwSotYlbswao0K4EJyDCpLjDEQRocU5HKM1eHJ /zMubd9+qc6Vyr46S464kK8w+U32OUBHVPxcwhwXcTmmOeM9O/6jCE/+facsH7VMUd 2MJtlxY1adVMGH3tU92HQHFvu73Wd0FApIe58+QWBxMtomzDlhQplFKq4fOePAFk2L 6QpZiGegrrmNA== From: SeongJae Park To: SeongJae Park , Andrew Morton Cc: damon@lists.linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 02/18] mm/damon/core: split out DAMOS-charged region skip logic into a new function Date: Wed, 19 Oct 2022 00:13:01 +0000 Message-Id: <20221019001317.104270-3-sj@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221019001317.104270-1-sj@kernel.org> References: <20221019001317.104270-1-sj@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747072822276535552?= X-GMAIL-MSGID: =?utf-8?q?1747072822276535552?= The DAMOS action applying function, 'damon_do_apply_schemes()', is quite long and not easy to read. Split out the already quota-charged region skip code into a new function with some comments for better readability. Signed-off-by: SeongJae Park --- mm/damon/core.c | 89 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 31 deletions(-) diff --git a/mm/damon/core.c b/mm/damon/core.c index 36d098d06c55..eec258b3e57b 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -694,6 +694,60 @@ static bool damos_valid_target(struct damon_ctx *c, struct damon_target *t, return c->ops.get_scheme_score(c, t, r, s) >= s->quota.min_score; } +/* + * damos_skip_charged_region() - Check if the given region or starting part of + * it is already charged for the DAMOS quota. + * @t: The target of the region. + * @rp: The pointer to the region. + * @s: The scheme to be applied. + * + * If the scheme has applied to only a part of the memory regions fulfilling + * the access pattern due to the charge limit, we start from the memory region + * of the access pattern after already charged one. For this, this function + * checks if current region should be skipped or not. If only the starting + * part of the region is previously charged, this function splits the region + * into two, so that the second one can start DAMOS, and saves the second + * region in *rp. + */ +static bool damos_skip_charged_region(struct damon_target *t, + struct damon_region **rp, struct damos *s) +{ + struct damon_region *r = *rp; + struct damos_quota *quota = &s->quota; + unsigned long sz_to_skip; + + /* Skip previously charged regions */ + if (quota->charge_target_from) { + if (t != quota->charge_target_from) + return true; + if (r == damon_last_region(t)) { + quota->charge_target_from = NULL; + quota->charge_addr_from = 0; + return true; + } + if (quota->charge_addr_from && + r->ar.end <= quota->charge_addr_from) + return true; + + if (quota->charge_addr_from && r->ar.start < + quota->charge_addr_from) { + sz_to_skip = ALIGN_DOWN(quota->charge_addr_from - + r->ar.start, DAMON_MIN_REGION); + if (!sz_to_skip) { + if (damon_sz_region(r) <= DAMON_MIN_REGION) + return true; + sz_to_skip = DAMON_MIN_REGION; + } + damon_split_region_at(t, r, sz_to_skip); + r = damon_next_region(r); + *rp = r; + } + quota->charge_target_from = NULL; + quota->charge_addr_from = 0; + } + return false; +} + static void damon_do_apply_schemes(struct damon_ctx *c, struct damon_target *t, struct damon_region *r) @@ -702,7 +756,7 @@ static void damon_do_apply_schemes(struct damon_ctx *c, damon_for_each_scheme(s, c) { struct damos_quota *quota = &s->quota; - unsigned long sz = damon_sz_region(r); + unsigned long sz; struct timespec64 begin, end; unsigned long sz_applied = 0; @@ -713,41 +767,14 @@ static void damon_do_apply_schemes(struct damon_ctx *c, if (quota->esz && quota->charged_sz >= quota->esz) continue; - /* Skip previously charged regions */ - if (quota->charge_target_from) { - if (t != quota->charge_target_from) - continue; - if (r == damon_last_region(t)) { - quota->charge_target_from = NULL; - quota->charge_addr_from = 0; - continue; - } - if (quota->charge_addr_from && - r->ar.end <= quota->charge_addr_from) - continue; - - if (quota->charge_addr_from && r->ar.start < - quota->charge_addr_from) { - sz = ALIGN_DOWN(quota->charge_addr_from - - r->ar.start, DAMON_MIN_REGION); - if (!sz) { - if (damon_sz_region(r) <= - DAMON_MIN_REGION) - continue; - sz = DAMON_MIN_REGION; - } - damon_split_region_at(t, r, sz); - r = damon_next_region(r); - sz = damon_sz_region(r); - } - quota->charge_target_from = NULL; - quota->charge_addr_from = 0; - } + if (damos_skip_charged_region(t, &r, s)) + continue; if (!damos_valid_target(c, t, r, s)) continue; /* Apply the scheme */ + sz = damon_sz_region(r); if (c->ops.apply_scheme) { if (quota->esz && quota->charged_sz + sz > quota->esz) {