From patchwork Wed Jun 13 12:17:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juri Lelli X-Patchwork-Id: 138444 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp644754lji; Wed, 13 Jun 2018 05:17:36 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIINU8aMpoZzuaY9pMZ9ydqdr1AyrW9Pm08fx+9bX4DaNG2eu/6GCbSNr1gEuvy8ofw+5N5 X-Received: by 2002:a17:902:a610:: with SMTP id u16-v6mr4937052plq.195.1528892256420; Wed, 13 Jun 2018 05:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528892256; cv=none; d=google.com; s=arc-20160816; b=0lVe4bHQLEZlG6uFeLXLTZrX31w8kyeaPyipaIX2M8KXmbpTo5jYPrPReWgDFNpEcG HsFFbGL4vcBOCXeaC0KbjdzIaiVlrQaMWXSmrFy6hmQBzyht4I0FR05SqdX3d9WIOF81 trGq3rG7ryCXEEHR6W2mfboRjblfTRFuXZYIM/LZvgUATSe5LcB19dfwBvOBO6x/9HuW PW5hlfTsmS8fje2z8xkj0X1sje4tA2SNGB+Zhni84kfU8mUBHpb5vx4WrY33Mm+hjO7r yPj0Qg5jRMnx1KS9tD3fzERIoy9zJLLSSlSvRydxXu2okYV3W+bB9yQR8QyahubIbGKz xB4g== 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:arc-authentication-results; bh=6SMVSyv+4v+rxLRex8lkbAGAQgAUiM++vv/TY3cqMeI=; b=dENh9drb/Ve1X5WeOqMAVarlmzI3WOfXUGEy5Eaobwc9musmj6h4zN/QqkPA4OHrsA 5+hEZrRjsQzzYzZpTnIbWibqwGNnfJQFwAdj8ZTukaLwaOQi15xXCe5EQPzP3mI5C/Wm I5NRBm3fYejcNXgCf/Q2yiO0T6ndLeoM6KnLCq/efucX+kqIgwbO9WnCfjyMGsdKvsZ2 Yl037yPVadctzYjL+EH9I4X2hc77RjXycWZ52q01a3r+UZKXRoLlJFgnqavPokqODjdR e5QTglxGkE6WTkB8NTSrR36GwQIpEb1zooPdXOKKeXuTcqyuWYvoVUWyuekplRWN9x7i HgLg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w12-v6si2643607pld.367.2018.06.13.05.17.36; Wed, 13 Jun 2018 05:17:36 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935553AbeFMMRc (ORCPT + 30 others); Wed, 13 Jun 2018 08:17:32 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:52421 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935510AbeFMMRa (ORCPT ); Wed, 13 Jun 2018 08:17:30 -0400 Received: by mail-wm0-f65.google.com with SMTP id p126-v6so4355006wmb.2 for ; Wed, 13 Jun 2018 05:17:29 -0700 (PDT) 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=6SMVSyv+4v+rxLRex8lkbAGAQgAUiM++vv/TY3cqMeI=; b=Gg1MB1dsAAogV+kyQuqgwb1toy6M+yReE7CIa2N2fyGlW1ek+FrolvsPhQwxtIWUU3 jIsrz2rbxy+pwxf0m1k4sjKwMIdS7wsqyY+fNL89hbtDN8R3PCSrSXGQCZ6Nro3xAzIc D9FzUNFre+mnB2Ul4NNGwwJ9yGPOIjEDTi5RuGz66ROxd1RIsO4DxQtQXihdGulgFp7n sk8RnFGQPptHKh22XEnD/3onjvU0gzhjgmKaSB71cPDrY0zOYHqH+TQBvmULpcCdabA1 hCsL9u7cT5kLD+cKIaTisAiBeQHEzWXHpQTiV5+KE17wbl7PUQv9W/mcx3ybOCdhnz3G dqdw== X-Gm-Message-State: APt69E1H+rUy1sOKVr+6cdy5tlrfk1zcyRt5pJmQIDH/M06MRCguXgal fVdkHmCIV+dS7tAf/SxSwtX3Rg== X-Received: by 2002:a1c:3fc2:: with SMTP id m185-v6mr3233832wma.37.1528892248719; Wed, 13 Jun 2018 05:17:28 -0700 (PDT) Received: from localhost.localdomain.com ([151.15.207.242]) by smtp.gmail.com with ESMTPSA id 137-v6sm4943673wmv.28.2018.06.13.05.17.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Jun 2018 05:17:28 -0700 (PDT) From: Juri Lelli To: peterz@infradead.org, mingo@redhat.com, rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, luca.abeni@santannapisa.it, claudio@evidence.eu.com, tommaso.cucinotta@santannapisa.it, bristot@redhat.com, mathieu.poirier@linaro.org, lizefan@huawei.com, cgroups@vger.kernel.org Subject: [PATCH v4 2/5] sched/topology: Adding function partition_sched_domains_locked() Date: Wed, 13 Jun 2018 14:17:08 +0200 Message-Id: <20180613121711.5018-3-juri.lelli@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180613121711.5018-1-juri.lelli@redhat.com> References: <20180613121711.5018-1-juri.lelli@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mathieu Poirier 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. No change of functionality is introduced by this patch. Signed-off-by: Mathieu Poirier --- include/linux/sched/topology.h | 10 ++++++++++ kernel/sched/topology.c | 18 ++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) -- 2.14.3 diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h index 26347741ba50..57997caf61b6 100644 --- a/include/linux/sched/topology.h +++ b/include/linux/sched/topology.h @@ -162,6 +162,10 @@ 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 +210,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 96eee22fafe8..25a5727d3b48 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1850,16 +1850,16 @@ 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; lockdep_assert_cpus_held(); - 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(); @@ -1924,6 +1924,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) +{ + lockdep_assert_cpus_held(); + mutex_lock(&sched_domains_mutex); + partition_sched_domains_locked(ndoms_new, doms_new, dattr_new); mutex_unlock(&sched_domains_mutex); }