Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2585647lqp; Mon, 25 Mar 2024 03:36:17 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCViHumj5xoOQlXbUABzDbP51KO+m4RSwKmXwva7m6qaJG53FwYgAg9tf8X7dmQEDZGgNY7Jk0BYf1z+pkEdGaf2Lwrpn7pPTUOjrS21kA== X-Google-Smtp-Source: AGHT+IHiqSsKlJoO6POqCM4bBM2wYQF6kWPtBXNYN/Xg9lv9dEv2KQj6UhfqRa+nRl7LjLZdej/3 X-Received: by 2002:a25:a526:0:b0:dcc:1449:71ea with SMTP id h35-20020a25a526000000b00dcc144971eamr4541725ybi.50.1711362977164; Mon, 25 Mar 2024 03:36:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711362977; cv=pass; d=google.com; s=arc-20160816; b=xdEUEXJ9EdXrrceXJoP8TVcubtuy55szXgPix+RIPah1scVPo1AKYf3apWnAEhhFEV 1vdDzdB/lzcu+JSt9OjOJ2LeJD3VFs6YrNVpNiu6fsKYU5PamA+0faf5LdeQmu9pdcp9 L+nW6zXgmRTfrtM+lRjqCd8s4SMTyQnNamCl+kK5l6WoTS7r4MQu0P3VYctW/LmwpHrf dGf1w/y85eHjiN0b7Fb7hXctB2ZAaOaY2FUi9/mvWJpE9A5PX+tZnQPHtTyk2JzzwFFg b+sXrEzfkG9Pf8w0P73w7fE0TA7IXPmDDusnZ3tmWcHPKik7y4LRA0zaQXv8rG5nQOFm PrzQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=VPiGPlPRLR/2aCpTTxdHzg6XgrjMrSc2xTCWgDo4tBw=; fh=dNXf8WZojBuHGe9DihhuEDz4FlANXzXqYeahQLxxJcc=; b=BxrgHp299jp4gJdXxTciLQ7ACpykcTrsnRmpcgOtkyJDpUGKVLmXgtlDMSYjfpg6J/ ReA0/FP8B/MVM0EQqu4/xp2SeSQADmSyRVps0M23Bpm34Lp/+OR4dI9TW5aULHtDdVCa pGJX9Fu4ku4Y29b8DfaJoF5znRVhxM9fdWcfp8Yw+cERROb5ePl7vc8JrDyQydUuhaow WzSsI1tJvensT8ODmo6X0LjciTXWaZRTM1D5fzmzvUHqIJDC4Gn7GmB7H3A9kbikFbZQ zCU4FWbPflTY4rgH1GcIwTSO/aTYhdzSYRsybLOK5iaCHtsrfXx3n0guLoZ/VCd1D2cl tCDQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G2zbLnis; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115329-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115329-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id gv14-20020a056214262e00b006968fac455fsi1396848qvb.322.2024.03.25.03.36.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 03:36:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115329-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=G2zbLnis; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115329-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115329-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id D0D401C33707 for ; Mon, 25 Mar 2024 10:36:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 199FB1E169C; Mon, 25 Mar 2024 02:32:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G2zbLnis" 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 00F161D1D4C; Sun, 24 Mar 2024 22:48:49 +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=1711320531; cv=none; b=prKENz6XOcm/xKTXm/83VxsrEbG9dxFcd/TbbVyI5gPKGtUNl9huieCK/VOpxyHuKOKbQDwVsrz3Qq19S0cAlp6Dcxu7GNf4OvpBvh/Rw77Z+XMU1tg0iLLxbOvAt5SNqTqWBWTEY5SD4Dkf6a8hK9FhBvCVp+1PpPVFbhSfq+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320531; c=relaxed/simple; bh=kfUHX9dNA6VHlvW4hx4foa6phsP6hWb01o+wTBPm9Go=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GZHdBiVxDNilBG0av1D9jEOdEg/66jiwxYw+v5jiPi1z/jFYB0vOKyJ+/rWeBG5PEIzuaUptYuGvTf6/AMheXaJ0GGW63D4eoGKSYvcDBi3tRZ3Amj06g2kUowyBoitHSiDfQo1BdyDedrWEmeUD43ms0eTNPWTVRHsRndldZeo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G2zbLnis; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D84AFC433C7; Sun, 24 Mar 2024 22:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320529; bh=kfUHX9dNA6VHlvW4hx4foa6phsP6hWb01o+wTBPm9Go=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G2zbLnisKCPx8QmRkESBRKXOA6LyQdlXvV6U4ueTzvKoPpSBFloi4LnvPMuGuaonU I/18z5kt7OpqVOBEh3nQMBMtEUoxTyVscebYSQ/wRHAcgLrmhWJmhaGNlHAZd3QRDv UgGf5gWRXk7aMFYc37Dzn6NpcsGKiF7s3WRi9pkWBro6q9COXL/BN+nxxRMN5uTTNi nDCSATDzueCtEpcDAc18wLwv/oIt5dp1r4SiK2wZ7UwgTESR9Nf9fHnwkHwxjocQt2 hFAfUvl+WfJ7ZQPD6B7PhS2bUtCWh1qaMwKqqFtwGnPHOKADFkzyzpCcCozuuGNu7Q TiQUqC8CvyYSA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tejun Heo , Marek Szyprowski , Nathan Chancellor , Sasha Levin Subject: [PATCH 6.7 091/713] workqueue: Don't call cpumask_test_cpu() with -1 CPU in wq_update_node_max_active() Date: Sun, 24 Mar 2024 18:36:57 -0400 Message-ID: <20240324224720.1345309-92-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Tejun Heo [ Upstream commit 15930da42f8981dc42c19038042947b475b19f47 ] For wq_update_node_max_active(), @off_cpu of -1 indicates that no CPU is going down. The function was incorrectly calling cpumask_test_cpu() with -1 CPU leading to oopses like the following on some archs: Unable to handle kernel paging request at virtual address ffff0002100296e0 .. pc : wq_update_node_max_active+0x50/0x1fc lr : wq_update_node_max_active+0x1f0/0x1fc ... Call trace: wq_update_node_max_active+0x50/0x1fc apply_wqattrs_commit+0xf0/0x114 apply_workqueue_attrs_locked+0x58/0xa0 alloc_workqueue+0x5ac/0x774 workqueue_init_early+0x460/0x540 start_kernel+0x258/0x684 __primary_switched+0xb8/0xc0 Code: 9100a273 35000d01 53067f00 d0016dc1 (f8607a60) ---[ end trace 0000000000000000 ]--- Kernel panic - not syncing: Attempted to kill the idle task! ---[ end Kernel panic - not syncing: Attempted to kill the idle task! ]--- Fix it. Signed-off-by: Tejun Heo Reported-by: Marek Szyprowski Reported-by: Nathan Chancellor Tested-by: Nathan Chancellor Link: http://lkml.kernel.org/r/91eacde0-df99-4d5c-a980-91046f66e612@samsung.com Fixes: 5797b1c18919 ("workqueue: Implement system-wide nr_active enforcement for unbound workqueues") Signed-off-by: Sasha Levin --- kernel/workqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 6b18926cf3523..6f7cb619aa5e4 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -1500,7 +1500,7 @@ static void wq_update_node_max_active(struct workqueue_struct *wq, int off_cpu) lockdep_assert_held(&wq->mutex); - if (!cpumask_test_cpu(off_cpu, effective)) + if (off_cpu >= 0 && !cpumask_test_cpu(off_cpu, effective)) off_cpu = -1; total_cpus = cpumask_weight_and(effective, cpu_online_mask); -- 2.43.0