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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 683C3C3A5A2 for ; Sun, 22 Sep 2019 18:51:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 404F221BE5 for ; Sun, 22 Sep 2019 18:51:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178273; bh=pdMMS9tRmwo2a56ecWxmdKFTESt+E7tmuAeeHjbvlCE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cKS1nRRj7TvqrqifNbPnhGCci8ktAbsXDYXrbJ8UHouXx98rMhhzc1USH3LJthSrP ayl64hITeWVxqwDgdWHZgPemwdt/tk3n70qpA102/TNRZ0M29PLPtHyVq4MaOfCqGC 0wxw9qt/HBffVUfq0Mm3J1FyOalw6jSR/ZCOlxoc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729214AbfIVSvJ (ORCPT ); Sun, 22 Sep 2019 14:51:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:48758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729206AbfIVSvJ (ORCPT ); Sun, 22 Sep 2019 14:51:09 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6BC5621A4C; Sun, 22 Sep 2019 18:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178268; bh=pdMMS9tRmwo2a56ecWxmdKFTESt+E7tmuAeeHjbvlCE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QsCzEsP5wzwCnbXLq9wQjFSHC7NoBjfsW3ViVyR+b3ETKW8yJ2kOaiPc2o/fWJbI9 Jy/arigAdmGkDS7HP3lvUut9tqhxe9OO6niIoyA1VIlDYmdzq4x+IP0NOMcXHU50W/ Hfenotnve+tjfJS0CAH2VwDudNUGexHNIdMikkPk= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Phil Auld , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Vincent Guittot , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 5.2 055/185] sched/fair: Use rq_lock/unlock in online_fair_sched_group Date: Sun, 22 Sep 2019 14:47:13 -0400 Message-Id: <20190922184924.32534-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184924.32534-1-sashal@kernel.org> References: <20190922184924.32534-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Phil Auld [ Upstream commit a46d14eca7b75fffe35603aa8b81df654353d80f ] Enabling WARN_DOUBLE_CLOCK in /sys/kernel/debug/sched_features causes warning to fire in update_rq_clock. This seems to be caused by onlining a new fair sched group not using the rq lock wrappers. [] rq->clock_update_flags & RQCF_UPDATED [] WARNING: CPU: 5 PID: 54385 at kernel/sched/core.c:210 update_rq_clock+0xec/0x150 [] Call Trace: [] online_fair_sched_group+0x53/0x100 [] cpu_cgroup_css_online+0x16/0x20 [] online_css+0x1c/0x60 [] cgroup_apply_control_enable+0x231/0x3b0 [] cgroup_mkdir+0x41b/0x530 [] kernfs_iop_mkdir+0x61/0xa0 [] vfs_mkdir+0x108/0x1a0 [] do_mkdirat+0x77/0xe0 [] do_syscall_64+0x55/0x1d0 [] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Using the wrappers in online_fair_sched_group instead of the raw locking removes this warning. [ tglx: Use rq_*lock_irq() ] Signed-off-by: Phil Auld Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Vincent Guittot Cc: Ingo Molnar Link: https://lkml.kernel.org/r/20190801133749.11033-1-pauld@redhat.com Signed-off-by: Sasha Levin --- kernel/sched/fair.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index f72bf8122fe4e..5a312c030b8d2 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -10569,18 +10569,18 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) void online_fair_sched_group(struct task_group *tg) { struct sched_entity *se; + struct rq_flags rf; struct rq *rq; int i; for_each_possible_cpu(i) { rq = cpu_rq(i); se = tg->se[i]; - - raw_spin_lock_irq(&rq->lock); + rq_lock_irq(rq, &rf); update_rq_clock(rq); attach_entity_cfs_rq(se); sync_throttle(tg, i); - raw_spin_unlock_irq(&rq->lock); + rq_unlock_irq(rq, &rf); } } -- 2.20.1