From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f13.google.com (mail-pj2-f13.google.com [74.125.227.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F2CED3F88B8 for ; Thu, 24 Sep 2026 04:27:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790224055; cv=none; b=rdcfNBI64xE8IEuxRhRFVevsd1Bi7uDhWf4//fRgW5rHkTgGoYtO6o9/Xmpdt8HG03cSPrioZpBZcuc0oL5L04zb9jGnbEwmz5y3y1p7LOFKNnkUi87xLIr3P933PrEy2h3PXng8/0inxOhWPK6FnzVOmNSRkn7LeiY9PmOcT+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790224055; c=relaxed/simple; bh=SlPzGPDevJ712yV3K8dLA8Akc44d66oXNW6JLxeKPxg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gSRs4H26qXHpIVznEHD6fJBdM3Owxm48441e8Cjzfvu3uK8lV4cvsr6pifXi2vYvUmH1wmPsdJhIoTR9irF3zU5GwOzjANNgApDhva8rTO+kkhuMlQ+CHS3WOGPW3DXooVPnV71+sz2N85Iu31pL04H7SNZ+s6jiXTmh+5ziO1s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MR2PlY+h; arc=none smtp.client-ip=74.125.227.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MR2PlY+h" Received: by mail-pj2-f13.google.com with SMTP id d9443c01a7336-2dd4b43b20bso8288035ad.1 for ; Wed, 23 Sep 2026 21:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790224053; x=1790828853; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=dF6lxsisMCHm/KxhSC1onb0PhKT95yZ7vVRGieeLH5c=; b=MR2PlY+haYYzIFjabcl3HIPSmBOFopJfZpkMUrd5tIrFmuoOdT/QKNp5mPzvpVfNgZ ck4DOOH8HhQ+l50epqiUcqMmggFbcU2RAQnXCWeqf1YOu2M12EdZW3sDv+voJm3/yXa1 lHGCXBtcyT9Ttwcs25vJFpYdUBzd7QFEHLh3Gr+liLau8VxDgmPI+RK+SfExHiYHGzh1 pvG6Enk5ggT+xdlYAuR0foDzCPqzhmWAFioOCaKMWOy6EZN20X4epoSRroQw6jwAZd3/ kpv1tPoPSry5nXA2Chcfn39m+k655KPVFoHXq88a2QSCAIyeWpZoLsjZXHt9OnRhPtAU zPyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790224053; x=1790828853; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=dF6lxsisMCHm/KxhSC1onb0PhKT95yZ7vVRGieeLH5c=; b=otnKK+CNysy3fR9j1KIVxV4pDiyX4lhF4HDMRcuu+CKB10et0ArGrg+6Z3xG2yDUxu cXi1W8Ak7NGLLWWHmG+fV7wgZETHbRTaClvcB33ud6OOanlyY2jGo+R3Tk+QcOBdkdPV IF2VeMoZJBtoYfaJsXJhvMGkjDq1P3GZCfqcQwOKq7pI+9h54ZONpy48OUAo/FqrMc5O PjTDQPIi2mj6GahX5k+XqoY/JgmpqPskxt2r9V3aXJAIyVwqe/HS8G0Y+QpN7J75hH0n uG7jqP5e/2B0W1CgX0jo1QwZaE38Tfj0QTCsSJZ/4yrxuOZuGMmED3EOAVsZYGZRcgzH RZKQ== X-Forwarded-Encrypted: i=1; AKwUvBzsUAf1XsLxFTo9PiubKpcXTfyIq8ywLWrouHtnU3dCbjCeH2tdmTgS5kEIwAuBwt7Pc40hEvr3@vger.kernel.org X-Gm-Message-State: AFuF++lRFMu/3lR19ezFMa+y01HCx/QmYjIncG5Fe9vyjsEV9JXTibo2 td3ESjlCjAu+RE/PlBjr+5ezE9M9W9VVDXe5PBuwAaFoSJBqbUPv+lt5 X-Gm-Gg: AYBFou16Taw22CXL+GQnAhC7HW4gFA6RnFv1963e51R+ZXROx1JgU+dQiyPQi35EnkU uT0VSavv2unoUaSlAyIBUdW46DwmTAZSp2cZniBIP9mKz/wHxGFrjiUxC4tUjBNJS2u33xw8JAj M9vINfSfkVjFzIHd0EFX5Dby+ZfPaTiDiDFV64joBPiUSME5TZWJkgEdhjGouwuRrTcsx2tuKVZ zG+KFJaJGvRWR0mTP7CCdwKnvV4l8eWmZwU6fcXOVIHDgMS9JBGaW56KOihu8orHZluSPvV12Up MLD/bYYI4mp/UL0D2ZcwfVQ77g0CuCHHprRBE32TRjYl13Tqs9EWxJgtT0KS9OevFDdWUdWgmk1 Dp7U7n/6EtrdU/xLLNjHxVzH9+S84MI3oqTB9NLuqdBWTrxtOOp5LRIMrrregd8ugrAqRszKWXa PzjuI/bdAeRsG1DXnQaC0BLwcSPtXoT+r+A5SL25WUPceSzGuSHjLEpg3MhwijV5LOCljS0cqi0 NFEODMI8yHXOd2hbPleu65dcQ8YU+OGlDnXU3rAaMHnlclCQsDVUi57+eORdo5IYV5dyF8g/BKa MTxu9+CrbA== X-Received: by 2002:a17:902:d481:b0:2dd:b83b:fe1e with SMTP id d9443c01a7336-2df7de9309fmr10196965ad.22.1790224053300; Wed, 23 Sep 2026 21:27:33 -0700 (PDT) Received: from phui-2.c.googlers.com.com (67.51.127.34.bc.googleusercontent.com. [34.127.51.67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2df6a5a4997sm19710685ad.27.2026.09.23.21.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 21:27:33 -0700 (PDT) From: Hui Peng To: Waiman Long , Ridong Chen , Guopeng Zhang , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= Cc: Shuah Khan , Chen Ridong , cgroups@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Hui Peng , stable@vger.kernel.org Subject: [PATCH v4 3/3] cgroup/cpuset: check sibling effective_xcpus in cpus_excl_conflict() Date: Thu, 24 Sep 2026 04:27:29 +0000 Message-ID: <20260924042729.1908863-4-benquike@gmail.com> X-Mailer: git-send-email 2.56.0.rc1.310.g51773c2048-goog In-Reply-To: <20260924042729.1908863-1-benquike@gmail.com> References: <20260924042729.1908863-1-benquike@gmail.com> Precedence: bulk X-Mailing-List: cgroups@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In cpus_excl_conflict(), when a valid local partition A1 uses implicit exclusive CPUs (cpuset.cpus set without cpuset.cpus.exclusive, so sibling->exclusive_cpus is empty while sibling->effective_xcpus is populated), a sibling cgroup B1 can still set cpuset.cpus.exclusive on the same CPUs because cpus_excl_conflict() only checks sibling->exclusive_cpus. Fall back to sibling->effective_xcpus in cpus_excl_conflict() when sibling->exclusive_cpus is empty, and add a regression test case to tools/testing/selftests/cgroup/test_cpuset_prs.sh. Tested in QEMU on Linux 7.3.0-rc3 using tools/testing/selftests/cgroup/test_cpuset_prs.sh. Fixes: 2a3602030d80 ("cgroup/cpuset: Don't invalidate sibling partitions on cpuset.cpus conflict") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Hui Peng --- kernel/cgroup/cpuset.c | 5 ++++- tools/testing/selftests/cgroup/test_cpuset_prs.sh | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 7c5b4a8f1f3a..f46a51f07938 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -713,7 +713,10 @@ static inline bool cpus_excl_conflict(struct cpuset *trial, struct cpuset *sibli return true; /* Exclusive_cpus cannot intersect */ - return cpumask_intersects(trial->exclusive_cpus, sibling->exclusive_cpus); + return cpumask_intersects(trial->exclusive_cpus, + cpumask_empty(sibling->exclusive_cpus) + ? sibling->effective_xcpus + : sibling->exclusive_cpus); } static inline bool mems_excl_conflict(struct cpuset *cs1, struct cpuset *cs2) diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh index f4d1822d4e21..f62155cf6162 100755 --- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh +++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh @@ -445,6 +445,7 @@ TEST_MATRIX=( # Changes to cpuset.cpus.exclusive that violate exclusivity rule is rejected " C0-3 . . C4-5 X0-3 . . X3-5 1 A1:0-3|B1:4-5" + " C0-3:P1 . . C4-5 . . . X3-5 1 A1:0-3|B1:4-5 A1:P1|B1:P0" # cpuset.cpus.exclusive cannot be set to a superset of sibling's cpuset.cpus " C0-3 . . C4-5 X3-5 . . . 1 A1:0-3|B1:4-5" -- 2.49.0