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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CB96C4332F for ; Mon, 7 Feb 2022 16:01:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1386917AbiBGQBn (ORCPT ); Mon, 7 Feb 2022 11:01:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350663AbiBGP7p (ORCPT ); Mon, 7 Feb 2022 10:59:45 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C03BC0401D5 for ; Mon, 7 Feb 2022 07:59:44 -0800 (PST) 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 2AD6461515 for ; Mon, 7 Feb 2022 15:59:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97C42C340F3; Mon, 7 Feb 2022 15:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644249583; bh=TPKKeEGOrqR+X2YLdEaXENJC6749BoVZ0uCtQo07pYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L1g69Va2WuBl3UIzqBDK08oUzBc7Q3fC1wysIdXxK6sSWxZP4T13KrQN8jaCiEqj3 OX2yKEwcC6isxpzkcB95u/b/0iox6kgC8sQlJxagjVOt9WlaGJcvxTzVLwcoKp6Z6M Y24+fEbb6ciNol/8HVyOoFdMU/arSk7U+5g2bUlABaSsqW+U1c3UypuToO2YwXQ/Vc xDmdvtjGvZ8SX1q9BIu+W7B0U33wVNVsIgVdEx5JrLK+eC3tCJdNSF4nzjjb5tJ7Fl BBywy0/piEIswQRWFwsBw7ApcImf+XD38cfGPQnPsJbcuRQYh21qtCoAashnWgCnoW cSlBXD+huhFCg== From: Frederic Weisbecker To: Peter Zijlstra Cc: LKML , Frederic Weisbecker , Tejun Heo , Christoph Lameter , Juri Lelli , Alex Belits , Nitesh Lal , Thomas Gleixner , Paul Gortmaker , Nicolas Saenz , "Paul E . McKenney" , Phil Auld , Marcelo Tosatti , Zefan Li Subject: [PATCH 7/8] sched/isolation: Fix housekeeping_mask memory leak Date: Mon, 7 Feb 2022 16:59:09 +0100 Message-Id: <20220207155910.527133-8-frederic@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220207155910.527133-1-frederic@kernel.org> References: <20220207155910.527133-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If "nohz_full=" or "isolcpus=nohz" are called with CONFIG_NO_HZ_FULL=n, housekeeping_mask doesn't get freed despite it being unused if housekeeping_setup() is called for the first time. Check this scenario first to fix this, so that no useless allocation is performed. Reviewed-by: Juri Lelli Reviewed-by: Paul E. McKenney Reviewed-by: Phil Auld Signed-off-by: Frederic Weisbecker Cc: Thomas Gleixner Cc: Juri Lelli Cc: Marcelo Tosatti Cc: Nitesh Lal Cc: Nicolas Saenz Cc: Peter Zijlstra Cc: Christoph Lameter Cc: Tejun Heo Cc: Zefan Li Cc: Alex Belits Cc: Paul Gortmaker --- kernel/sched/isolation.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c index 828dacec483e..883eee9fae22 100644 --- a/kernel/sched/isolation.c +++ b/kernel/sched/isolation.c @@ -94,6 +94,14 @@ static int __init housekeeping_setup(char *str, enum hk_flags flags) cpumask_var_t non_housekeeping_mask, housekeeping_staging; int err = 0; + if ((flags & HK_FLAG_TICK) && !(housekeeping_flags & HK_FLAG_TICK)) { + if (!IS_ENABLED(CONFIG_NO_HZ_FULL)) { + pr_warn("Housekeeping: nohz unsupported." + " Build with CONFIG_NO_HZ_FULL\n"); + return 0; + } + } + alloc_bootmem_cpumask_var(&non_housekeeping_mask); if (cpulist_parse(str, non_housekeeping_mask) < 0) { pr_warn("Housekeeping: nohz_full= or isolcpus= incorrect CPU range\n"); @@ -123,15 +131,8 @@ static int __init housekeeping_setup(char *str, enum hk_flags flags) } } - if ((flags & HK_FLAG_TICK) && !(housekeeping_flags & HK_FLAG_TICK)) { - if (IS_ENABLED(CONFIG_NO_HZ_FULL)) { - tick_nohz_full_setup(non_housekeeping_mask); - } else { - pr_warn("Housekeeping: nohz unsupported." - " Build with CONFIG_NO_HZ_FULL\n"); - goto free_housekeeping_staging; - } - } + if ((flags & HK_FLAG_TICK) && !(housekeeping_flags & HK_FLAG_TICK)) + tick_nohz_full_setup(non_housekeeping_mask); housekeeping_flags |= flags; err = 1; -- 2.25.1