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 50DCFC83F03 for ; Sun, 6 Jul 2025 19:32:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE4AC6B03FE; Sun, 6 Jul 2025 15:32:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D938F6B03FF; Sun, 6 Jul 2025 15:32:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5BF46B0400; Sun, 6 Jul 2025 15:32:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id AE42B6B03FE for ; Sun, 6 Jul 2025 15:32:19 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 38C4780210 for ; Sun, 6 Jul 2025 19:32:19 +0000 (UTC) X-FDA: 83634835998.15.25B838F Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf27.hostedemail.com (Postfix) with ESMTP id 8214D4000F for ; Sun, 6 Jul 2025 19:32:17 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A6xH6Ldd; spf=pass (imf27.hostedemail.com: domain of sj@kernel.org designates 172.234.252.31 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=1751830337; 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:in-reply-to:references:references:dkim-signature; bh=pAZQRY4lmOwPQL4rK3aKA52OiGb8a+feBdfafDtNeO4=; b=nE0AaTIg39Sr8aJRmQi76BR3Uqx/A44EyuVA8FfYVVUicFfHRYpBXWdaH4luoIbn3kpwnn 8n2nzXH9hSUhh744Ofgur6uNzLZwj/1p13WGZcFO6Qv0Kq3u6RwxngPnrDcB0CQYJhtHsd gdPvGoout50QYlDEbHtSijamfYDikxs= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A6xH6Ldd; spf=pass (imf27.hostedemail.com: domain of sj@kernel.org designates 172.234.252.31 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=1751830337; a=rsa-sha256; cv=none; b=Y2nDALqH70l749UEPg+PZ/kOMkd5KoxW7X9hFfY+2YQqdQI1HTt796XSMaI8mA9xElq8EZ Y6/1yBp4CDTn+HJCkQmXP2JGh3BPnExynpwVQcXHK2hfldpQiEN0vNupI1GVzBjMn9kfbR 2JlfzlqEcaKGTrD6gXpWbUwzD4HdPfg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 8DB0F45F1B; Sun, 6 Jul 2025 19:32:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A1CCC4CEED; Sun, 6 Jul 2025 19:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751830336; bh=BX6VH3nU4cicI6oNo09G9KGanoMTvjCG3WQxbqMleEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A6xH6LddAHfbhNHvwE1DttcsqSYZdbyBn1mryhXPADkEC8ig/ZF+axPAA2AXwhrg7 g0OpHpG5Ekz82QauJzzA1ucDI7H31lcjXxxanhyZ1L7E0FUs0R5IFZqdSLTTxWrtwZ 97x+YOiZHThAP/9fxJ/Buq2KXJ3eoC5a6gLbDBqdU+kiPeJBOVLrFSSotnNo4K1SEr WQUmT8TpfrS+w4XQvkHzjqRCcMrPXKkKzi83j9edkjMYrbrLcQiCWC8XY3V8mFP+eu kF19WeZDtg72x+ZZJBT+CwWUQtL7tstsD1zlSqiKSRPZasBvtvtNnV3V81VN+wKHCX oM7tzV/f1hPVQ== 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 Subject: [PATCH 5/6] mm/damon/lru_sort: reset enabled when DAMON start failed Date: Sun, 6 Jul 2025 12:32:06 -0700 Message-Id: <20250706193207.39810-6-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250706193207.39810-1-sj@kernel.org> References: <20250706193207.39810-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: jaqdeasfw4kpjjbfkgm74fdwwa9dogzk X-Rspamd-Queue-Id: 8214D4000F X-Rspamd-Server: rspam11 X-Rspam-User: X-HE-Tag: 1751830337-646150 X-HE-Meta: U2FsdGVkX18gLGhgPK3sLauZrSa7ZzlAbCfiN/dLE6frnqrnpgWZeWgxRSaZZLtVfl4lyifV3iprX/IWMjNPIBYBfZppgvfgEUn7vwzhKSAAG/Gyh1GgQbyMcl2at66GkpgFTlZqcwzhs7wceGfl50Qwu2BBrDSHHsm6K5TLVOuRK4khYiH/IerV5fCdSVtp4o4Dc/O8WsmKAuQZQqU/G5WMKRQlgYh2HOx+zZIsLCcM1XJVuO1zESSUGmAQe6xIbzcdbfMNS5CF9loQsBM4SOucNrfcbZcxM2G4b7+JCc6t7nMdL0OcGM1AVXYeqcMzbQlk7kTFvzM/5kroGIebLJWFzbc9NxATtsS7+avJyR4z9iJx40BpXbQg66TD6RoNpwrjhffehvqhQsskje9D0elC1hZpan6Dsx5R/R4R/5jNqf+krRhJS99//7mUMniW44FnCH5B0lF3xgwqHN/TYae3C37/ufqUzB5tNvUkSNnZ6qhmZ7LI+WySqIHfHxUBV2cYLGQgbUQLYy0J2U/nngeQ99eCgNym+cdYpK5M2Y2HgD9RF8eiUDeHECOovXYfxLpzIAMBsNkyLOSxcCtlWiQU9BrTZe0/EaFS/qBGrE/RabMomhqR3RMjzs0Jf+a6j30QtX+8V7Ys+qoeFIEPIrtDOfncHyj91En6pY0U+vdpqp2yT5+6ZWZAjSLJxR8kWesUEFdkyHeq6sN4VOUky7TEfFyt5qAklvKeWL4WdgeHe+jl0bvD3TMf/EgLpSI/N6kny7RLlhoX6c5ybunPqvHqs/6p4ZqaWHVHBeoiBdLlB2YtcXgmyz3SMlW+ua+WTa91zSZhOKwoYO03iO/DN8DwfpDdjmXj2p8zxeZK+jNyxDswGtuvRrkVSKIwtLEWSDSWp1YnJrENgLzL3RTOKcdF6u9LtfURujd9R5CG+eIs0gkSDNxVqsnNAMVxQezzUlsh2HbXlaiA+8A2A3B 6XmmcjQf OMO4r1vD9iVF2AZMhJW3SH6rmIRo8pTo0EJJY1NKbpGxjgl90VPfsmnBvw/Wg2LK2+UfVYfkKrVhfXhqkZg8deQb4HgV1y0hLZ2H2070B7cIMXdHlRwk7ihN4sEpJX5FcL3Dc2nWDn7ATvasS60j7mBuFpYdN0MFWsjB1SXde0SBppSdYSgRpeLtkofc5lfLKDkPVKORluPygQ26nPNX6mN9a3/zWh5GhnO1ghEaKZyLk+kXAJ0JsO2Sfcm9+9D+++DxzJqfSOcIydu36RCgwdRx2+Q== 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: When the startup fails, 'enabled' parameter is not reset. As a result, users show the parameter 'Y' while it is not really working. Fix it by resetting 'enabled' to 'false' when the work is failed. Fixes: 7a034fbba336 ("mm/damon/lru_sort: enable and disable synchronously") Signed-off-by: SeongJae Park --- mm/damon/lru_sort.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/damon/lru_sort.c b/mm/damon/lru_sort.c index 4af8fd4a390b..9bd8a1a115e0 100644 --- a/mm/damon/lru_sort.c +++ b/mm/damon/lru_sort.c @@ -325,7 +325,7 @@ static int __init damon_lru_sort_init(void) int err = damon_modules_new_paddr_ctx_target(&ctx, &target); if (err) - return err; + goto out; ctx->callback.after_wmarks_check = damon_lru_sort_after_wmarks_check; ctx->callback.after_aggregation = damon_lru_sort_after_aggregation; @@ -334,6 +334,9 @@ static int __init damon_lru_sort_init(void) if (enabled) err = damon_lru_sort_turn(true); +out: + if (err && enabled) + enabled = false; return err; } -- 2.39.5