Received: by 2002:a05:6a10:6d25:0:0:0:0 with SMTP id gq37csp1893011pxb; Mon, 13 Sep 2021 07:39:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxONpIL8k/ceBe/WjayEQc5pLk6X2LOpF9UyVZ0Blz67WuXWit6Cjv8EPaPhMJ8eepZzRq7 X-Received: by 2002:a17:906:9241:: with SMTP id c1mr12993352ejx.125.1631543986606; Mon, 13 Sep 2021 07:39:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631543986; cv=none; d=google.com; s=arc-20160816; b=aZocIdVoImI6BT1YaYbBL0EO/vaDMsbbNhXqr/4tJFyN0dV2hP4S7rIQZzNaP0m4Da pCRxqRbOe0Y5ebuccjNzlrRh4l6UploJ+V2Ywou752ko/h26PIn/A1kWtXnjMhV2AGeC lFo7kq1utiRFppnZnnx+qrqgQOJMit87G9fIJ+OIhbXx/F8GSQwdy3BKM43/RFHORMHp chQZsR6LWJ5U8WGwpoPM3mIEWmI63zRQgN2NXN/NDUVd8FBmrBs1q2/QoSYDrCMZrGIu Hyy/0Ew2FIDBVJRwNGaXUdz0Q9l/HuSo2h/tD6BqvLAZfF/sTo3jwqoMUTA7P8WrX8X3 XIxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+wwzf1reHXxvLQXOtpe6v2UVGrlbOUYuvD3Gh/jCCCc=; b=cg/zoXU7onKQSlLcSb0zNULvqgg3IMHg9EneUWvbjQ2i4i4fO5alvs8KiWhY6EbOeL TJd4F2aD3Sek41DnWD1ZnvKtM4guG0XZj55yxORs5FuGOenhiXXULRtwfxydro69dw81 OweNjpOZPxtirb8Kh043BEzXYTfAcUkLxlqaOcv3UdXsNHD795e2OfjQ8mEscCnFnwlQ JC9IZ56zSLm4fFE/Jnwjz7elzORd15dv1sgqlsV9ZU3C/7SIMVnuqKr/tCFZwzQmaxWG TdM0BE2bxtS+u+Am5j60SU0NnYWNOb59EeSZCz21VhXXDQ65Fl1LGmnNdvQ8PuJp+kQa 2pdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qSqoEinr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jz6si8102770ejc.538.2021.09.13.07.39.19; Mon, 13 Sep 2021 07:39:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=qSqoEinr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347901AbhIMOfj (ORCPT + 99 others); Mon, 13 Sep 2021 10:35:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:52002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347105AbhIMOaO (ORCPT ); Mon, 13 Sep 2021 10:30:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C2F6A61B80; Mon, 13 Sep 2021 13:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631541070; bh=qEk3uD+l+IIHXcQHXoO4etyYJ0jv15YW+EmtSp2e+gU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qSqoEinrUwWdqS7VnmgHSMlIyMGABIxZiCHn6F2qo7gJua4NHaftOIlGR/StNGdam 63X9/0QKzFiPipW3TE/8n1SWc4zzmPr2IcJf1wqkVWz+N4Jq0B7n7SVwf0VE5vIPXj R3fFCaxMovF/EqnZmBluJGP+JvT+nWrNq6J+e9Dk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Waiman Long , Tejun Heo , Sasha Levin Subject: [PATCH 5.14 133/334] cgroup/cpuset: Fix a partition bug with hotplug Date: Mon, 13 Sep 2021 15:13:07 +0200 Message-Id: <20210913131117.866146421@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131113.390368911@linuxfoundation.org> References: <20210913131113.390368911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Waiman Long [ Upstream commit 15d428e6fe77fffc3f4fff923336036f5496ef17 ] In cpuset_hotplug_workfn(), the detection of whether the cpu list has been changed is done by comparing the effective cpus of the top cpuset with the cpu_active_mask. However, in the rare case that just all the CPUs in the subparts_cpus are offlined, the detection fails and the partition states are not updated correctly. Fix it by forcing the cpus_updated flag to true in this particular case. Fixes: 4b842da276a8 ("cpuset: Make CPU hotplug work with partition") Signed-off-by: Waiman Long Signed-off-by: Tejun Heo Signed-off-by: Sasha Levin --- kernel/cgroup/cpuset.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index adb5190c4429..592e9e37542f 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -3168,6 +3168,13 @@ static void cpuset_hotplug_workfn(struct work_struct *work) cpus_updated = !cpumask_equal(top_cpuset.effective_cpus, &new_cpus); mems_updated = !nodes_equal(top_cpuset.effective_mems, new_mems); + /* + * In the rare case that hotplug removes all the cpus in subparts_cpus, + * we assumed that cpus are updated. + */ + if (!cpus_updated && top_cpuset.nr_subparts_cpus) + cpus_updated = true; + /* synchronize cpus_allowed to cpu_active_mask */ if (cpus_updated) { spin_lock_irq(&callback_lock); -- 2.30.2