From patchwork Wed Aug 16 21:20:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 110279 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1323328qge; Wed, 16 Aug 2017 14:20:57 -0700 (PDT) X-Received: by 10.98.212.27 with SMTP id a27mr2962741pfh.157.1502918457491; Wed, 16 Aug 2017 14:20:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502918457; cv=none; d=google.com; s=arc-20160816; b=pa78/7YXjWth0KC2YZxexq7rntwMGzqI3aFyCUvyzTlMJfgYyRHAUjv5QmwqoSfyOE orxv4z27Lp0YS9VNfv0d1btEhDeJNcu7taUiju/0zwKZIrLMtgFRNI+WHs2ZAkRcmq8A ccaWjV1j14Yts/9LEkqzyCC4l+QxKvkNMFfh2OiuoltbkkzFrDXKVcHqAePwzO0iGrZD tH2dOP8j2cb115snXOsA+OrqYboR+fE+X9KXy/tvdng5EBB8jjiMY2Zs42XqTYXsL/IM rM8aEpurRWTDkiRo/yNk6bP0yC5qm594NfMLB9zOjmoUkXPMcyaCrkusxH0DMwQM3W0u M2Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=A8/Rl7Gv6dCpDF6jdvNDJwYiQdE4TnHJJuO2cjenEjE=; b=twKQ2fdRZWS/vw9hYPrtWOUVKoZAFDSUMQNzntnZi7tCOWsxjWmf8wukk2l8bHHvkM eqP6fdsWRYlG/ap1GWAdS57i6r2sCnSRFy0JBDKUsEtwtDJ4Poe8dLaYpxTPVrBXgNSP YaIEzN5RQxYEdccjAIhq+93pxMgdVrY9Pp98Fof+C4L1aX5WGOcnwoIvjuvQe9t6wVNR SEE6cMhOD+xHi/9U082n3M+LnrZpkvJwmpGcL5E74WxH2/Z7dBUa6wx2cnCaxQbQ05QK uKk7p42aV1hkHBbJjJQrOlanJgAjBRRzwDbaio7Wh0Hj2glLujNJWqVRBIDsNA0Ke+pj EA9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TG0jMdW6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 76si1027203pfw.0.2017.08.16.14.20.57; Wed, 16 Aug 2017 14:20:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TG0jMdW6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752493AbdHPVUy (ORCPT + 26 others); Wed, 16 Aug 2017 17:20:54 -0400 Received: from mail-it0-f47.google.com ([209.85.214.47]:33822 "EHLO mail-it0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbdHPVUt (ORCPT ); Wed, 16 Aug 2017 17:20:49 -0400 Received: by mail-it0-f47.google.com with SMTP id m34so21537117iti.1 for ; Wed, 16 Aug 2017 14:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A8/Rl7Gv6dCpDF6jdvNDJwYiQdE4TnHJJuO2cjenEjE=; b=TG0jMdW6Z96KRPrgJ33PjM0+18CPwLoBKPc9hlWu7KVeMOQRctkQ7BeE6D9OoUmLRG ysKMkgz/V7DHgs66cbKsgIVUvjEBk5ll2Kf7c0sEdWZf273cU23XDKJ5+3zojJE2zBAR QsklZi3/GdC+9tpprrypY2p6FPynw7og/HZCk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=A8/Rl7Gv6dCpDF6jdvNDJwYiQdE4TnHJJuO2cjenEjE=; b=qDAUJ4BQxEDaQQM4XeZjmx4pwfYHIYkqwyzbfsb+IwVoPwb8x82gnkPMhSHnmM0Ziu 0pJ4dGhSnOKeroGDsaKovtLGsykyUyew+a/9bpkpmVDap+WVFZzP8as6tgwqlAO/GCUP eMmH2QhCP82uvs+qjjihE7AFitowJyF/qaS5hS8ZfMGAznaEkoxjH6qntTosM+/2GUuD 4Zu+AVlSnyzjRf3BS5K3XkbthTaBUw6U9eubSRwjxxUQbDIV+ovctC1hJ3Ex30VyRusn FjDGynzHHejYhLz1IlhwXuQsJc47tP1cQQmipWzSpyWDbg48J597Aiogj79rrP5KUPKw R5Jg== X-Gm-Message-State: AHYfb5i5Oj98wxAwr7JYt7P+E9pGGCMgJbPrrmwSn3R4MXLICeUTt5kL 0Bzh9kGW9oSsYeWQ X-Received: by 10.36.43.213 with SMTP id h204mr352881ita.19.1502918448529; Wed, 16 Aug 2017 14:20:48 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id 80sm918281itk.11.2017.08.16.14.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Aug 2017 14:20:47 -0700 (PDT) From: Mathieu Poirier To: mingo@redhat.com, peterz@infradead.org Cc: tj@kernel.org, vbabka@suse.cz, lizefan@huawei.com, akpm@linux-foundation.org, weiyongjun1@huawei.com, juri.lelli@arm.com, rostedt@goodmis.org, claudio@evidence.eu.com, luca.abeni@santannapisa.it, bristot@redhat.com, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH 1/7] sched/topology: Adding function partition_sched_domains_locked() Date: Wed, 16 Aug 2017 15:20:37 -0600 Message-Id: <1502918443-30169-2-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502918443-30169-1-git-send-email-mathieu.poirier@linaro.org> References: <1502918443-30169-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introducing function partition_sched_domains_locked() by taking the mutex locking code out of the original function. That way the work done by partition_sched_domains_locked() can be reused without dropping the mutex lock. This patch doesn't change the functionality provided by the original code. Signed-off-by: Mathieu Poirier --- include/linux/sched/topology.h | 9 +++++++++ kernel/sched/topology.c | 17 +++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 7d065abc7a47..59b568079e05 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -161,6 +161,9 @@ static inline struct cpumask *sched_domain_span(struct sched_domain *sd) return to_cpumask(sd->span); } +extern void partition_sched_domains_locked(int ndoms_new, + cpumask_var_t doms_new[], + struct sched_domain_attr *dattr_new); extern void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[], struct sched_domain_attr *dattr_new); @@ -206,6 +209,12 @@ extern void set_sched_topology(struct sched_domain_topology_level *tl); struct sched_domain_attr; static inline void +partition_sched_domains_locked(int ndoms_new, cpumask_var_t doms_new[], + struct sched_domain_attr *dattr_new) +{ +} + +static inline void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[], struct sched_domain_attr *dattr_new) { diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 9b4f2701ba3c..58133f2ce889 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1840,15 +1840,15 @@ static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur, * ndoms_new == 0 is a special case for destroying existing domains, * and it will not create the default domain. * - * Call with hotplug lock held + * Call with hotplug lock and sched_domains_mutex held */ -void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[], - struct sched_domain_attr *dattr_new) +void partition_sched_domains_locked(int ndoms_new, cpumask_var_t doms_new[], + struct sched_domain_attr *dattr_new) { int i, j, n; int new_topology; - mutex_lock(&sched_domains_mutex); + lockdep_assert_held(&sched_domains_mutex); /* Always unregister in case we don't destroy any domains: */ unregister_sched_domain_sysctl(); @@ -1902,7 +1902,16 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[], ndoms_cur = ndoms_new; register_sched_domain_sysctl(); +} +/* + * Call with hotplug lock held + */ +void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[], + struct sched_domain_attr *dattr_new) +{ + mutex_lock(&sched_domains_mutex); + partition_sched_domains_locked(ndoms_new, doms_new, dattr_new); mutex_unlock(&sched_domains_mutex); }