From patchwork Thu Mar 28 04:47:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandrasekhar L X-Patchwork-Id: 10874465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DDD0F139A for ; Thu, 28 Mar 2019 04:47:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEAB628B24 for ; Thu, 28 Mar 2019 04:47:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B247028B38; Thu, 28 Mar 2019 04:47:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 43E1928B24 for ; Thu, 28 Mar 2019 04:47:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=FcRmyMPjuslx2ALL3THORMg0yzLQFok/+5u5+JEHf58=; b=ggpR7ldkkBmZiE JIJfBtgbCY4BMZ7ys1DKrSM4GAQMO4pnlzQeiftmzz4nv0ZFQrd49Z9yKgFjHWzqfiXTswQo2qO4f Cp1/6PtAEOSjydeQKXu6MT+HtK9OXSvbsPhSsmdGE+9CDqMQDI6lktNRtF1nORGNT3GSnkhTcy6sm C89maaBe5Z6/FSQSgfvyM2HkIWB+/1XiTrg2kYTDTGLxwd87mFbsDj3byqIIMEQ5HpvuRPtLaH8L2 /z/YEFPC+O4A4CynyKSDoJ6/uRuWsp1sOjfgd/PcNC6oPWJGu5meLsKQvvuQdgoQLQUfqbpMEsifi fgSnT56geLaesO8/3KFg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9Mwp-0004nH-Ds; Thu, 28 Mar 2019 04:47:27 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9Mwl-0004mb-NQ for linux-arm-kernel@lists.infradead.org; Thu, 28 Mar 2019 04:47:25 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 285CA606AC; Thu, 28 Mar 2019 04:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553748439; bh=E/Kj+m5Iz2fY4+uTj+tjvg8EY5eik+6c4Lu0MYkKzU4=; h=From:To:Cc:Subject:Date:From; b=buNzBGJPGK9g3f5TY2QiGmLbwiQopmH0vQ3F1nFh0thXPJAwNTI6nkCZcqzmqW5Zg 5+Qa7aurjxYJsy0eB/BjAwFSFG+pLNH3FxJt0+qhchBLGNsCcMF+DjPJCBGDLJSCs2 OM9BXVgInemkdhODXIv82MjbS7VbmYHaVbWLxg2o= Received: from lingutla-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: clingutla@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 31E88602FC; Thu, 28 Mar 2019 04:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1553748438; bh=E/Kj+m5Iz2fY4+uTj+tjvg8EY5eik+6c4Lu0MYkKzU4=; h=From:To:Cc:Subject:Date:From; b=GmkKPNbBofhsMeokyue3kRToxttyxM/X4zd0yNCL/RF3IjeJoyesvTIBg57zvOuPQ nbyxf4MvBOycIp8lT8capG7AUMYCb0xi1yQZhb33c01Hctvoa4fC+rODyD4DOZwmCu yntxYIuEpvE+JtcF3I2SLuPQw9/+amsJOw727oaE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 31E88602FC Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=clingutla@codeaurora.org From: Lingutla Chandrasekhar To: gregkh@linuxfoundation.org, quentin.perret@arm.com, sudeep.holla@arm.com, dietmar.eggemann@arm.com Subject: [PATCH v2] arch_topology: Make cpu_capacity sysfs node as ready-only Date: Thu, 28 Mar 2019 10:17:05 +0530 Message-Id: <20190328044705.16838-1-clingutla@codeaurora.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190327_214723_799998_C2A39B77 X-CRM114-Status: GOOD ( 12.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lingutla Chandrasekhar , catalin.marinas@arm.com, linux-kernel@vger.kernel.org, jeremy.linton@arm.com, linux-arm-kernel@lists.infradead.org, juri.lelli@gmail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP If user updates any cpu's cpu_capacity, then the new value is going to be applied to all its online sibling cpus. But this need not to be correct always, as sibling cpus (in ARM, same micro architecture cpus) would have different cpu_capacity with different performance characteristics. So, updating the user supplied cpu_capacity to all cpu siblings is not correct. And another problem is, current code assumes that 'all cpus in a cluster or with same package_id (core_siblings), would have same cpu_capacity'. But with commit '5bdd2b3f0f8 ("arm64: topology: add support to remove cpu topology sibling masks")', when a cpu hotplugged out, the cpu information gets cleared in its sibling cpus. So, user supplied cpu_capacity would be applied to only online sibling cpus at the time. After that, if any cpu hotplugged in, it would have different cpu_capacity than its siblings, which breaks the above assumption. So, instead of mucking around the core sibling mask for user supplied value, use device-tree to set cpu capacity. And make the cpu_capacity node as read-only to know the asymmetry between cpus in the system. While at it, remove cpu_scale_mutex usage, which used for sysfs write protection. Tested-by: Dietmar Eggemann Tested-by: Quentin Perret Reviewed-by: Quentin Perret Acked-by: Sudeep Holla Signed-off-by: Lingutla Chandrasekhar diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index edfcf8d982e4..1739d7e1952a 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -7,7 +7,6 @@ */ #include -#include #include #include #include @@ -31,7 +30,6 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, per_cpu(freq_scale, i) = scale; } -static DEFINE_MUTEX(cpu_scale_mutex); DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE; void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity) @@ -51,37 +49,7 @@ static ssize_t cpu_capacity_show(struct device *dev, static void update_topology_flags_workfn(struct work_struct *work); static DECLARE_WORK(update_topology_flags_work, update_topology_flags_workfn); -static ssize_t cpu_capacity_store(struct device *dev, - struct device_attribute *attr, - const char *buf, - size_t count) -{ - struct cpu *cpu = container_of(dev, struct cpu, dev); - int this_cpu = cpu->dev.id; - int i; - unsigned long new_capacity; - ssize_t ret; - - if (!count) - return 0; - - ret = kstrtoul(buf, 0, &new_capacity); - if (ret) - return ret; - if (new_capacity > SCHED_CAPACITY_SCALE) - return -EINVAL; - - mutex_lock(&cpu_scale_mutex); - for_each_cpu(i, &cpu_topology[this_cpu].core_sibling) - topology_set_cpu_scale(i, new_capacity); - mutex_unlock(&cpu_scale_mutex); - - schedule_work(&update_topology_flags_work); - - return count; -} - -static DEVICE_ATTR_RW(cpu_capacity); +static DEVICE_ATTR_RO(cpu_capacity); static int register_cpu_capacity_sysctl(void) { @@ -141,7 +109,6 @@ void topology_normalize_cpu_scale(void) return; pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale); - mutex_lock(&cpu_scale_mutex); for_each_possible_cpu(cpu) { pr_debug("cpu_capacity: cpu=%d raw_capacity=%u\n", cpu, raw_capacity[cpu]); @@ -151,7 +118,6 @@ void topology_normalize_cpu_scale(void) pr_debug("cpu_capacity: CPU%d cpu_capacity=%lu\n", cpu, topology_get_cpu_scale(NULL, cpu)); } - mutex_unlock(&cpu_scale_mutex); } bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)