From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74DED1DF254; Sat, 2 May 2026 03:03:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777690992; cv=none; b=JpfAMuXDbAd3EIHxQoeDcZHvLFPgvTgMbVSDOj1t0zqSw+weX4i3zTUrzJMOoRxrpe0dTiKVAz7FwaPTk5QIKwC7R0I8vPXQuNkLC/2ncTzM108eSMJv6ATaeR/3HWutnlr1ceOxUO7qzf2l2zJhGFK8+500zTX01sko+rRLZa0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777690992; c=relaxed/simple; bh=j83UTaRXI02JJLNVmbvlpCUXJZPlMChkl8adf2Y/198=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LlFUCPfjxAsDMNriG6uMJHicdAGz3FCpsx5YNqCpcDicMU7A25K+IYgmAFbbK5kasjVtANaq8f9UqYvM5cCsv5HgSf7rQTTcG4zJbq1IxnEjQoeqGBsVN3jqllRaO7IERNGarp2zCWY/xEXb6IfmDjb/51FBwYR5g0oPTiYXjA8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TZnbe85Q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TZnbe85Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29B1CC2BCB7; Sat, 2 May 2026 03:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777690992; bh=j83UTaRXI02JJLNVmbvlpCUXJZPlMChkl8adf2Y/198=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TZnbe85QwIbcyqshk/kh8m/RHQ1ydTddBX/sfXjXtTVa391EXXLcMUnxMdgue3WHf i5NS3PSntkY2usvAuoTFSGoHRFBmH/ISefNXLkF/3ZC5yVVFrsVYkdK1VBCnl2rjG+ 4mnUstiaur0aDgDxN/v1D0UIVA3ED1lquHH/Sv9iM4YHk8lrdz6hvB5kAaHgqDKFPi dcY3QnMA/tJgW3eHikFxaqR20IHfNAIssZx7k8y2xoZ3NRtnBZVMDbycbAanziMibl jM9FZTPFrTVSlKxvNRlBBzOvp605bDnqh8E7FjolORsCOmEfMfkDFbUTZ4aHZb+asg IBcAk+hwohMbw== From: SeongJae Park To: stable@vger.kernel.org Cc: damon@lists.linux.dev, SeongJae Park , Andrew Morton Subject: [PATCH 2/2] mm/damon/core: fix damos_walk() vs kdamond_fn() exit race Date: Fri, 1 May 2026 20:02:57 -0700 Message-ID: <20260502030257.127460-2-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260502030257.127460-1-sj@kernel.org> References: <2026050141-likewise-trapeze-f1cc@gregkh> <20260502030257.127460-1-sj@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When kdamond_fn() main loop is finished, the function cancels remaining damos_walk() request and unset the damon_ctx->kdamond so that API callers and API functions themselves can show the context is terminated. damos_walk() adds the caller's request to the queue first. After that, it shows if the kdamond of the damon_ctx is still running (damon_ctx->kdamond is set). Only if the kdamond is running, damos_walk() starts waiting for the kdamond's handling of the newly added request. The damos_walk() requests registration and damon_ctx->kdamond unset are protected by different mutexes, though. Hence, damos_walk() could race with damon_ctx->kdamond unset, and result in deadlocks. For example, let's suppose kdamond successfully finished the damow_walk() request cancelling. Right after that, damos_walk() is called for the context. It registers the new request, and shows the context is still running, because damon_ctx->kdamond unset is not yet done. Hence the damos_walk() caller starts waiting for the handling of the request. However, the kdamond is already on the termination steps, so it never handles the new request. As a result, the damos_walk() caller thread infinitely waits. Fix this by introducing another damon_ctx field, namely walk_control_obsolete. It is protected by the damon_ctx->walk_control_lock, which protects damos_walk() request registration. Initialize (unset) it in kdamond_fn() before letting damon_start() returns and set it just before the cancelling of the remaining damos_walk() request is executed. damos_walk() reads the obsolete field under the lock and avoids adding a new request. After this change, only requests that are guaranteed to be handled or cancelled are registered. Hence the after-registration DAMON context termination check is no longer needed. Remove it together. The issue is found by sashiko [1]. Link: https://lore.kernel.org/20260327233319.3528-3-sj@kernel.org Link: https://lore.kernel.org/20260325141956.87144-1-sj@kernel.org [1] Fixes: bf0eaba0ff9c ("mm/damon/core: implement damos_walk()") Signed-off-by: SeongJae Park Cc: # 6.14.x Signed-off-by: Andrew Morton (cherry picked from commit 33c3f6c2b48cd84b441dba1ee3e62290e53930f4) Signed-off-by: SeongJae Park --- include/linux/damon.h | 1 + mm/damon/core.c | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/linux/damon.h b/include/linux/damon.h index 6fe6f7fcf83d8..40ac2d13f2279 100644 --- a/include/linux/damon.h +++ b/include/linux/damon.h @@ -785,6 +785,7 @@ struct damon_ctx { struct mutex call_controls_lock; struct damos_walk_control *walk_control; + bool walk_control_obsolete; struct mutex walk_control_lock; /* diff --git a/mm/damon/core.c b/mm/damon/core.c index 3fb199a47fa9e..a7234afadcd9a 100644 --- a/mm/damon/core.c +++ b/mm/damon/core.c @@ -1495,6 +1495,10 @@ int damon_call(struct damon_ctx *ctx, struct damon_call_control *control) * passed at least one &damos->apply_interval_us, kdamond marks the request as * completed so that damos_walk() can wakeup and return. * + * Note that this function should be called only after damon_start() with the + * @ctx has succeeded. Otherwise, this function could fall into an indefinite + * wait. + * * Return: 0 on success, negative error code otherwise. */ int damos_walk(struct damon_ctx *ctx, struct damos_walk_control *control) @@ -1502,19 +1506,16 @@ int damos_walk(struct damon_ctx *ctx, struct damos_walk_control *control) init_completion(&control->completion); control->canceled = false; mutex_lock(&ctx->walk_control_lock); + if (ctx->walk_control_obsolete) { + mutex_unlock(&ctx->walk_control_lock); + return -ECANCELED; + } if (ctx->walk_control) { mutex_unlock(&ctx->walk_control_lock); return -EBUSY; } ctx->walk_control = control; mutex_unlock(&ctx->walk_control_lock); - if (!damon_is_running(ctx)) { - mutex_lock(&ctx->walk_control_lock); - if (ctx->walk_control == control) - ctx->walk_control = NULL; - mutex_unlock(&ctx->walk_control_lock); - return -EINVAL; - } wait_for_completion(&control->completion); if (control->canceled) return -ECANCELED; @@ -2620,6 +2621,9 @@ static int kdamond_fn(void *data) mutex_lock(&ctx->call_controls_lock); ctx->call_controls_obsolete = false; mutex_unlock(&ctx->call_controls_lock); + mutex_lock(&ctx->walk_control_lock); + ctx->walk_control_obsolete = false; + mutex_unlock(&ctx->walk_control_lock); complete(&ctx->kdamond_started); kdamond_init_ctx(ctx); @@ -2733,6 +2737,9 @@ static int kdamond_fn(void *data) ctx->call_controls_obsolete = true; mutex_unlock(&ctx->call_controls_lock); kdamond_call(ctx, true); + mutex_lock(&ctx->walk_control_lock); + ctx->walk_control_obsolete = true; + mutex_unlock(&ctx->walk_control_lock); pr_debug("kdamond (%d) finishes\n", current->pid); mutex_lock(&ctx->kdamond_lock); -- 2.47.3