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 5B82AC83F27 for ; Sat, 19 Jul 2025 18:19:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 706F76B0088; Sat, 19 Jul 2025 14:19:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DEB16B008C; Sat, 19 Jul 2025 14:19:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61C3A6B0092; Sat, 19 Jul 2025 14:19:38 -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 531786B0088 for ; Sat, 19 Jul 2025 14:19:38 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C08DBB91DB for ; Sat, 19 Jul 2025 18:19:37 +0000 (UTC) X-FDA: 83681827194.14.6FEE02B Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf27.hostedemail.com (Postfix) with ESMTP id 47C4B4000A for ; Sat, 19 Jul 2025 18:19:36 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sgsiqDsA; spf=pass (imf27.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752949176; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=BTFcDgyC7vkxJobiRhXT8tUpCWgbUT5z/QzRNSBQEqA=; b=Lmfh2hIjvYpt+crPJFiKIdoXA2kB7XzidOodordm3P6Teyd/7G7zvBfyPjY24lV9lOL7ze N9ZjN1cVkFfgx6vsUf/EWyhy7w4xwAAy5PlFq7RyOuNu8M+7Rf5h+7qX/gm/Yqw0iDmgBg EXopHluj9K8t9f9HS5ZWW3aXHJKCf9M= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sgsiqDsA; spf=pass (imf27.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752949176; a=rsa-sha256; cv=none; b=zeXbKLUlZWDmgF5Vk8YLUT7bwi3Df9Aa3HebKuLE35P32tvAhR+8WNBWCyJ+XGqje0yxWP Rgx3tPvGTTHqh9xFany6/33zDF3vTKE1Kd0Dn+NHTSLVDpHo+fG9LeUtcnwtP9S9zhkLti FlKIJCJRwl+NWkA99x2TXxZZ2MiErck= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 98F55A40AAB; Sat, 19 Jul 2025 18:19:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1743CC4CEE3; Sat, 19 Jul 2025 18:19:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752949175; bh=UT44bjgcgNEzmE3niHBCySJwkb/IEGsOxx/0/fOEM0A=; h=From:To:Cc:Subject:Date:From; b=sgsiqDsAWgDB2f/86RmWgWg/MfpsuzSilW3zHhfN3YS7aCJUpJXp9fciRHErMQfqH kDg4b+jA/y9TaVKbVEG8MJW66qlsw4/8cjvBoahgF1TGKypL4XfEHQ3T883CH0j4Lc Cf2l6EFuqYSVl+MJAMSnE+jBgn/w3bu1e5F1k9Sgy+OJ66AJ2txKDzKDeblcjMkXJX ESPvp5Km5l971cSnykqQZw/3L0HpP5kP4IgFS+ka3Ss62HgUprZW0bK7xXTRNZSNgt bWx2HiWrqmJzQk81C21oePRNbxlMJQTcX470meUI1prI4fbLRAmDifgB2JK1SDi67c xoQ4iCSYbSp7g== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , damon@lists.linux.dev, kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org Subject: [PATCH] mm/damon/core: commit damos_quota_goal->nid Date: Sat, 19 Jul 2025 11:19:32 -0700 Message-Id: <20250719181932.72944-1-sj@kernel.org> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 47C4B4000A X-Rspamd-Server: rspam06 X-Stat-Signature: sssmr8pjprhszifnozqdeku3qdj9wehh X-HE-Tag: 1752949176-672365 X-HE-Meta: U2FsdGVkX1+ZKvwnX8B4e/KBfCYCgeD3/W8haEguAr8xyuBRk7pOKIRDJq255SHikLULMZv08JeC0C3WCBN7XV36S8fQnw0VchDqUd2ae1jSuGcgBp0RUl8LCAT0xOqRrqd3SovFK9hJWqrWUI4/8auhQjar5nVbB9lA/spNpwitup5yIclgfYQC/bPvUn9ZGAIWR+42aGrPjN3iweU+juIUfBjCjxCrkhfAKok4Hp8CNLZNRMBwSWdPEtfaUuIjDD/YVhXtyLCqPSR3gVpNtCPmwY1Oi2g4apGPThm6SxMtpHZnpK1WsH8RUQv+kophA/S1mov6TL/9jbXyAx5rN99CsA8KraIlGDYXAuc1JYzTfvGhvlVHbe2xg/M4ekCfsVXOaKi46y6gz8C/FZO4TVGpWXaxDWs38mZkunpsC10HMCM03duMmuj/TzYoJaWD5U6HxUmy+Ax2jzBuwUEJoboXykoo3+/oXFhdfwuEhQ2mK/kA0KpwTFT6mIWyZyM84JJVcQZkzHP4XS/q+4PzzLdZsE+co+UafCvM2SrNI4ZZrE8eoQT18lsQeXzpTEe4pAD41L8I3NMQHoN+Or1Bq5eLJVRSKt7kR55XUV/7UHhpkgzTkJ4LAuLTYf9g1gGEZDvN7/GUbhrMW/Zd3JN08JjxoA1197HEkoWsY8LEs7wobFZw4ASlyHDqMA+oPoIULazar3RRawYbHFNY86A9LRndJr+vMC52VSky8yvxZ2jsuAnp3dy3mJ96Y+uu8ycv8l7rRQFyRRpbJ6HIVhi5dgm2RLZcosU1LuVixhbySRE+xarWi3qrbtNZx7oQ/r3A3vnOMoQEwez9X+24Ic6Yi99oBuNCHVB/CbCUwgfQmPhnxrUcvThUOinTeBDQF2qlGbdMdEGNL2ac1kaeJ8aE0hVdZkSJzHNTh2RYiZdYl+8nnu/gPbpln0QWHVUZvQVgndvo4bPgKYpCTi0U52h x63+GzG+ Ie9ZLV0/SBCaYtwjc7M9RqNsuMnoPGFykQ1QE/iqM5FOfzOyhSZ53zMJoO6+v32E8vtjTaLA9Jd0PcYrwY/m3T0mbBNLs1J+KGjlAVZFOUe4eiZaIucukocpkR0NLAEdgFMpZPBkLj0QvTVy1p0XDU6XcWLk8jPHMbsLSKIWy8pt46UvWu0vSL4hu3CW8J7lux1hLnL/INwFpNSAxUxnUhXSb3dR0hkR4069Wrj0P3TxnMltS5bjBgi5VIjn6YpvHtcyuqFPOdO2eGCvRKzzDOEb21fQNvyinCpunjnKV9dJbKKFFsjTCjhaWqg== 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: List-Subscribe: List-Unsubscribe: DAMOS quota goal uses 'nid' field when the metric is DAMOS_QUOTA_NODE_MEM_{USED,FREE}_BP. But the goal commit function is not updating the goal's nid field. Fix it. Fixes: 0e1c773b501f ("mm/damon/core: introduce damos quota goal metrics for memory node utilization") # 6.16.x Cc: stable@vger.kernel.org Signed-off-by: SeongJae Park --- mm/damon/core.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/mm/damon/core.c b/mm/damon/core.c index f3ec3bd736ec..52a48c9316bc 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -756,6 +756,19 @@ static struct damos_quota_goal *damos_nth_quota_goal( return NULL; } +static void damos_commit_quota_goal_union( + struct damos_quota_goal *dst, struct damos_quota_goal *src) +{ + switch (dst->metric) { + case DAMOS_QUOTA_NODE_MEM_USED_BP: + case DAMOS_QUOTA_NODE_MEM_FREE_BP: + dst->nid = src->nid; + break; + default: + break; + } +} + static void damos_commit_quota_goal( struct damos_quota_goal *dst, struct damos_quota_goal *src) { @@ -764,6 +777,7 @@ static void damos_commit_quota_goal( if (dst->metric == DAMOS_QUOTA_USER_INPUT) dst->current_value = src->current_value; /* keep last_psi_total as is, since it will be updated in next cycle */ + damos_commit_quota_goal_union(dst, src); } /** @@ -797,6 +811,7 @@ int damos_commit_quota_goals(struct damos_quota *dst, struct damos_quota *src) src_goal->metric, src_goal->target_value); if (!new_goal) return -ENOMEM; + damos_commit_quota_goal_union(new_goal, src_goal); damos_add_quota_goal(dst, new_goal); } return 0; base-commit: 5d6176edfeb848b1039a1a2c9c1c36dd7f83150f -- 2.39.5