From nobody Mon Feb 9 23:15:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 3F26E154BE4 for ; Thu, 6 Mar 2025 14:11:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741270261; cv=none; b=cz/aM4qKgX4/0qiEa8sfWQPR2EKhE+Y86e+BXJHCSTMzHACqS9m3u8OkT9m21LW8Wb6ltXchMfNXfXLxboWalkLa6jabdyUqRXVoDWDbhKd5UgbXxB3a7ox2wQcj0ow3htlCWCG4cOcp1hkgPY66UTnCsyuPgOGrUpwu+aSuc98= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741270261; c=relaxed/simple; bh=ii6TTr/Kfs0THoD/TLkO2GrRbGTYaTjd5DJR+PvNb0A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EKFK9wsBRWaxfb6vDFo5mCmXT3zViNq0lNnfoZyHI6ZEY2MsVB7i7PVe6iRXBoGeiKcGGJN9fkWXO90GU71Pron0sKjtd1cpCOZP8rQ+7slkjB5OoQz7TW58u1wwHZ1zndojVS4SNzH07qnJopmfMGf0BKUdS2/8Unc2dYzJ27w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dxa05Lfx; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dxa05Lfx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741270259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q7oYHBUSYWKBFrKzxLyJf0TyZmdB6vfG7gH9DRnS/aE=; b=dxa05LfxZZ2mLsvGhsj9ne+oq2RbVAh8MvfDsugSwf75qeBDbAEM3mKE3yCS3yd0xVLY+F 5Wu16ZBYLdOYLhrZIs2BlQ1kBTyucpJ5dko6n3aIrkQAz9iXu39Xew8Y0IS3pHBYCH4xe/ Wgmr1fy/mfXXTg31jVMpFukjqUtgy8I= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-182-6spfb9PqPVG4znaQjaf-Mg-1; Thu, 06 Mar 2025 09:10:53 -0500 X-MC-Unique: 6spfb9PqPVG4znaQjaf-Mg-1 X-Mimecast-MFC-AGG-ID: 6spfb9PqPVG4znaQjaf-Mg_1741270252 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c0922c5cfdso127764385a.3 for ; Thu, 06 Mar 2025 06:10:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741270250; x=1741875050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q7oYHBUSYWKBFrKzxLyJf0TyZmdB6vfG7gH9DRnS/aE=; b=Z3blYLmT/EhA6Ik20GNVXznPzT7Dl5+7g6PfeEZyAkgbmxXMqJUVMQGiOd+LUYyUSP 4NSy/SGBqr0TR5/gOQiWV1PqTN4NsNOlZHtO4KHDHgbnL0FA3LzQacJzgjGX1IBgP9h4 IQlpyJYiVeDyhV3/mMYFFmYKh0JcUpHMPMyxvn0DcFqHrvNYzCgAUnIAQmuwa5MUfuvE dLlnDdhXIgo2OWQZOF0F8aCCmYJ/KgrVB6NfGBMV2wA+iVC1Db68fc0jUoFoCtpLkevu 8paiTunDumRcu3/pFbNM/oDOdVAwKkW8+84kwVxOfHLHImAXxdlqE+Y1GV1MgZvkmvD2 PYwg== X-Gm-Message-State: AOJu0YyY8ghCdAiRsN6f12KkFi3Iz2U1QDvCGD5cRGJFCje+3IFclAL4 cIHYo7grvzWhjXSQ7QVYK7XI+Y42EZk9nsa1H6GwUOP7EYhQUZUh+gYtTK0yGYKDkt03iRPAa06 2XpLrv6YdU0+cAETmOJIAnOZJn5fXcNgC0zcvav7yxo5nVj3JvU7+eUAbONQo6Y6Cf+WrfWpUOU CVSOAL7LujQPeWR7bLu3GWdmi6HCcmPGlug2sV3m25bPw+WLNBJ+A= X-Gm-Gg: ASbGncuIUuP9gE4HJ+CTP64dQSPWc0EptOCoBc3MiQlV8Pss3y3uqVpn2f9WQ6KKLpR UwF7l2eB8g5WsVkabaCfXvMLQz/qZZScdrczQKmQsg6C5E7DbYNfpbxjThQ/8OCLyDOg9rXnH1o nqbijLkbCGRiCsUsvFby7dILFcr8SoDoSkb7OBtMcmLRRiTjY79CVWGmzsrzcK+1rZkGZYy6i/t zFa5RIygFZwROjdd53jNW9c1SXEKwqG3FT7KmHuMXkcsDasfLkSy0Em4hSmTBehxL+qKFNlJJcA unn45ckbzN5nsiFXQRhLYrjN61zTfMOZ4UDh8ukvhb8y81IHHD4jkMx45cE8eZ0KbznVuXzvevd Sx9DA X-Received: by 2002:a05:620a:4895:b0:7c0:c891:1e77 with SMTP id af79cd13be357-7c3d8e6f70bmr1208831785a.49.1741270250449; Thu, 06 Mar 2025 06:10:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEapf8emAvcjT0ZEquex2SbAKsDJBQjnPQ+wdDeLlrDgq2lW0+5MJIRR1jizGu94GkTg7cprg== X-Received: by 2002:a05:620a:4895:b0:7c0:c891:1e77 with SMTP id af79cd13be357-7c3d8e6f70bmr1208825085a.49.1741270250020; Thu, 06 Mar 2025 06:10:50 -0800 (PST) Received: from jlelli-thinkpadt14gen4.remote.csb (host-89-240-117-139.as13285.net. [89.240.117.139]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c3e551119fsm93658985a.108.2025.03.06.06.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 06:10:44 -0800 (PST) From: Juri Lelli To: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Waiman Long , Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Qais Yousef , Sebastian Andrzej Siewior , Swapnil Sapkal , Shrikanth Hegde , Phil Auld , luca.abeni@santannapisa.it, tommaso.cucinotta@santannapisa.it, Jon Hunter Subject: [PATCH v2 2/8] sched/topology: Wrappers for sched_domains_mutex Date: Thu, 6 Mar 2025 14:10:10 +0000 Message-ID: <20250306141016.268313-3-juri.lelli@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250306141016.268313-1-juri.lelli@redhat.com> References: <20250306141016.268313-1-juri.lelli@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Create wrappers for sched_domains_mutex so that it can transparently be used on both CONFIG_SMP and !CONFIG_SMP, as some function will need to do. Reported-by: Jon Hunter Fixes: 53916d5fd3c0 ("sched/deadline: Check bandwidth overflow earlier for = hotplug") Signed-off-by: Juri Lelli Reviewed-by: Shrikanth Hegde --- v1 -> v2: Remove wrappers for the !SMP case as all users are not defined either in that case --- include/linux/sched.h | 2 ++ kernel/cgroup/cpuset.c | 4 ++-- kernel/sched/core.c | 4 ++-- kernel/sched/debug.c | 8 ++++---- kernel/sched/topology.c | 12 ++++++++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 9632e3318e0d..d5f8c161d852 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -383,6 +383,8 @@ enum uclamp_id { extern struct root_domain def_root_domain; extern struct mutex sched_domains_mutex; #endif +extern void sched_domains_mutex_lock(void); +extern void sched_domains_mutex_unlock(void); =20 struct sched_param { int sched_priority; diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 0f910c828973..f87526edb2a4 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -994,10 +994,10 @@ static void partition_and_rebuild_sched_domains(int ndoms_new, cpumask_var_t doms_new[= ], struct sched_domain_attr *dattr_new) { - mutex_lock(&sched_domains_mutex); + sched_domains_mutex_lock(); partition_sched_domains_locked(ndoms_new, doms_new, dattr_new); dl_rebuild_rd_accounting(); - mutex_unlock(&sched_domains_mutex); + sched_domains_mutex_unlock(); } =20 /* diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 67189907214d..58593f4d09a1 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -8424,9 +8424,9 @@ void __init sched_init_smp(void) * CPU masks are stable and all blatant races in the below code cannot * happen. */ - mutex_lock(&sched_domains_mutex); + sched_domains_mutex_lock(); sched_init_domains(cpu_active_mask); - mutex_unlock(&sched_domains_mutex); + sched_domains_mutex_unlock(); =20 /* Move init over to a non-isolated CPU */ if (set_cpus_allowed_ptr(current, housekeeping_cpumask(HK_TYPE_DOMAIN)) <= 0) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index ef047add7f9e..a0893a483d35 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -292,7 +292,7 @@ static ssize_t sched_verbose_write(struct file *filp, c= onst char __user *ubuf, bool orig; =20 cpus_read_lock(); - mutex_lock(&sched_domains_mutex); + sched_domains_mutex_lock(); =20 orig =3D sched_debug_verbose; result =3D debugfs_write_file_bool(filp, ubuf, cnt, ppos); @@ -304,7 +304,7 @@ static ssize_t sched_verbose_write(struct file *filp, c= onst char __user *ubuf, sd_dentry =3D NULL; } =20 - mutex_unlock(&sched_domains_mutex); + sched_domains_mutex_unlock(); cpus_read_unlock(); =20 return result; @@ -515,9 +515,9 @@ static __init int sched_init_debug(void) debugfs_create_u32("migration_cost_ns", 0644, debugfs_sched, &sysctl_sche= d_migration_cost); debugfs_create_u32("nr_migrate", 0644, debugfs_sched, &sysctl_sched_nr_mi= grate); =20 - mutex_lock(&sched_domains_mutex); + sched_domains_mutex_lock(); update_sched_domain_debugfs(); - mutex_unlock(&sched_domains_mutex); + sched_domains_mutex_unlock(); #endif =20 #ifdef CONFIG_NUMA_BALANCING diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index c49aea8c1025..296ff2acfd32 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -6,6 +6,14 @@ #include =20 DEFINE_MUTEX(sched_domains_mutex); +void sched_domains_mutex_lock(void) +{ + mutex_lock(&sched_domains_mutex); +} +void sched_domains_mutex_unlock(void) +{ + mutex_unlock(&sched_domains_mutex); +} =20 /* Protected by sched_domains_mutex: */ static cpumask_var_t sched_domains_tmpmask; @@ -2791,7 +2799,7 @@ void partition_sched_domains_locked(int ndoms_new, cp= umask_var_t doms_new[], void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[], struct sched_domain_attr *dattr_new) { - mutex_lock(&sched_domains_mutex); + sched_domains_mutex_lock(); partition_sched_domains_locked(ndoms_new, doms_new, dattr_new); - mutex_unlock(&sched_domains_mutex); + sched_domains_mutex_unlock(); } --=20 2.48.1