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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 7487CC433E2 for ; Fri, 28 Aug 2020 12:33:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 447722078A for ; Fri, 28 Aug 2020 12:33:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598618037; bh=WvxkFkOfBaPTf/dDBte0XHK6N1Je6i9pdrVmXsZV7WM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Sb4PzSsPv75K02b8q2Eqjm8uFk/AssO9NPtZfv9Wv4aFyQ0UI1vSNmZnrQP7zU+EN +/01GEoG9FjDtZKC3mbRYXEzfl8B1FoqnMKt3dKUlEI/eg8yvJ1IxcjOdo+NUp0Can 4vXQGPscsjUGWN3hExdURP/HcKLKpiPvn5wLKFok= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729421AbgH1Mdz (ORCPT ); Fri, 28 Aug 2020 08:33:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:41036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729343AbgH1MaB (ORCPT ); Fri, 28 Aug 2020 08:30:01 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (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 AD57F20848; Fri, 28 Aug 2020 12:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598617801; bh=WvxkFkOfBaPTf/dDBte0XHK6N1Je6i9pdrVmXsZV7WM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zz2ERIeuxbVfy22lKFlOv0Zdtdb0qba5qRMyj49OjUkwZmHx9wrobBJ7p9gs9pYih 5RTrpTp3bsd5SJnT5eGccGTO8weU+lwj5Glt1e3EAXse/AT+gBSjXgtMh/o2ddqu4+ rfJi/eP2HSuoqySgdR1WHR+FPqA/I/EMvQMGV0ik= From: Masami Hiramatsu To: linux-kernel@vger.kernel.org, Peter Zijlstra Cc: Eddy_Wu@trendmicro.com, x86@kernel.org, davem@davemloft.net, rostedt@goodmis.org, naveen.n.rao@linux.ibm.com, anil.s.keshavamurthy@intel.com, linux-arch@vger.kernel.org, cameron@moodycamel.com, oleg@redhat.com, will@kernel.org, paulmck@kernel.org, mhiramat@kernel.org Subject: [PATCH v4 18/23] sched: Fix try_invoke_on_locked_down_task() semantics Date: Fri, 28 Aug 2020 21:29:55 +0900 Message-Id: <159861779482.992023.8503137488052381952.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <159861759775.992023.12553306821235086809.stgit@devnote2> References: <159861759775.992023.12553306821235086809.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra Signed-off-by: Peter Zijlstra (Intel) --- kernel/sched/core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2d95dc3f4644..13b0db2d0be2 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3006,15 +3006,14 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) */ bool try_invoke_on_locked_down_task(struct task_struct *p, bool (*func)(struct task_struct *t, void *arg), void *arg) { - bool ret = false; struct rq_flags rf; + bool ret = false; struct rq *rq; - lockdep_assert_irqs_enabled(); - raw_spin_lock_irq(&p->pi_lock); + raw_spin_lock_irqsave(&p->pi_lock, rf.flags); if (p->on_rq) { rq = __task_rq_lock(p, &rf); - if (task_rq(p) == rq) + if (task_rq(p) == rq && rq->curr != p) ret = func(p, arg); rq_unlock(rq, &rf); } else { @@ -3028,7 +3027,7 @@ bool try_invoke_on_locked_down_task(struct task_struct *p, bool (*func)(struct t ret = func(p, arg); } } - raw_spin_unlock_irq(&p->pi_lock); + raw_spin_unlock_irqrestore(&p->pi_lock, rf.flags); return ret; }