From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE924C4360F for ; Wed, 3 Apr 2019 08:40:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7B2A206B7 for ; Wed, 3 Apr 2019 08:40:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729077AbfDCIkR (ORCPT ); Wed, 3 Apr 2019 04:40:17 -0400 Received: from terminus.zytor.com ([198.137.202.136]:53601 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbfDCIkQ (ORCPT ); Wed, 3 Apr 2019 04:40:16 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x338dJS21775068 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 3 Apr 2019 01:39:19 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x338dJbd1775065; Wed, 3 Apr 2019 01:39:19 -0700 Date: Wed, 3 Apr 2019 01:39:19 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: "tip-bot for Joel Fernandes (Google)" Message-ID: Cc: morten.rasmussen@arm.com, josh@joshtriplett.org, jiangshanlai@gmail.com, mingo@kernel.org, torvalds@linux-foundation.org, joel@joelfernandes.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, efault@gmx.de, mathieu.desnoyers@efficios.com, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, luc.vanoostenryck@gmail.com, paulmck@linux.ibm.com Reply-To: morten.rasmussen@arm.com, mingo@kernel.org, jiangshanlai@gmail.com, josh@joshtriplett.org, torvalds@linux-foundation.org, tglx@linutronix.de, efault@gmx.de, hpa@zytor.com, mathieu.desnoyers@efficios.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, joel@joelfernandes.org, peterz@infradead.org, luc.vanoostenryck@gmail.com, paulmck@linux.ibm.com In-Reply-To: <20190321003426.160260-2-joel@joelfernandes.org> References: <20190321003426.160260-2-joel@joelfernandes.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/cpufreq: Annotate cpufreq_update_util_data pointer with __rcu Git-Commit-ID: 8f9affdf4094bde418a0dbd8b52bb503ee486469 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8f9affdf4094bde418a0dbd8b52bb503ee486469 Gitweb: https://git.kernel.org/tip/8f9affdf4094bde418a0dbd8b52bb503ee486469 Author: Joel Fernandes (Google) AuthorDate: Wed, 20 Mar 2019 20:34:23 -0400 Committer: Ingo Molnar CommitDate: Wed, 3 Apr 2019 09:51:01 +0200 sched/cpufreq: Annotate cpufreq_update_util_data pointer with __rcu Recently I added an RCU annotation check to rcu_assign_pointer(). All pointers assigned to RCU protected data are to be annotated with __rcu inorder to be able to use rcu_assign_pointer() similar to checks in other RCU APIs. This resulted in a sparse error: kernel//sched/cpufreq.c:41:9: sparse: error: incompatible types in comparison expression (different address spaces) Fix this by annotating cpufreq_update_util_data pointer with __rcu. This will also help sparse catch any future RCU misuage bugs. Signed-off-by: Joel Fernandes (Google) [ From an RCU perspective. ] Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Paul E. McKenney Cc: Josh Triplett Cc: Lai Jiangshan Cc: Linus Torvalds Cc: Luc Van Oostenryck Cc: Mathieu Desnoyers Cc: Mike Galbraith Cc: Morten Rasmussen Cc: Peter Zijlstra Cc: Steven Rostedt Cc: Thomas Gleixner Cc: keescook@chromium.org Cc: kernel-hardening@lists.openwall.com Cc: kernel-team@android.com Link: https://lkml.kernel.org/r/20190321003426.160260-2-joel@joelfernandes.org Signed-off-by: Ingo Molnar --- kernel/sched/cpufreq.c | 2 +- kernel/sched/sched.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/cpufreq.c b/kernel/sched/cpufreq.c index 835671f0f917..b5dcd1d83c7f 100644 --- a/kernel/sched/cpufreq.c +++ b/kernel/sched/cpufreq.c @@ -7,7 +7,7 @@ */ #include "sched.h" -DEFINE_PER_CPU(struct update_util_data *, cpufreq_update_util_data); +DEFINE_PER_CPU(struct update_util_data __rcu *, cpufreq_update_util_data); /** * cpufreq_add_update_util_hook - Populate the CPU's update_util_data pointer. diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index efa686eeff26..713715dd00cf 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2185,7 +2185,7 @@ static inline u64 irq_time_read(int cpu) #endif /* CONFIG_IRQ_TIME_ACCOUNTING */ #ifdef CONFIG_CPU_FREQ -DECLARE_PER_CPU(struct update_util_data *, cpufreq_update_util_data); +DECLARE_PER_CPU(struct update_util_data __rcu *, cpufreq_update_util_data); /** * cpufreq_update_util - Take a note about CPU utilization changes.