Received: by 10.223.185.116 with SMTP id b49csp2376833wrg; Thu, 15 Feb 2018 10:39:31 -0800 (PST) X-Google-Smtp-Source: AH8x227HTJSMu2tt2/65lgbsOAlV63vAibN1RJKhwJp+LNVwbpp9bp2Es9EaBjztEuah0cbivs8F X-Received: by 10.99.171.10 with SMTP id p10mr2922424pgf.176.1518719971076; Thu, 15 Feb 2018 10:39:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518719971; cv=none; d=google.com; s=arc-20160816; b=dIFmx5mR2tEC3srf4ZP8GgNfnChcU0EVR12tBcb1woHcsGBmdAJ3vpALJbzf8XeoX4 NxpKyMykOpq+CjJbuUe6LF3QbYDxl+8D09HWQgu+qgCGg+ZoCrUW+k6IYnnOFJXRNkTV qjf1qrbLTnKAd6TVQF/h5e3SiaIaiUdR6vvmEvhODo+hCci0LNpkWeN2IdoaIyhxokQT 0m81HwijQGpFWveusmhb9pWifeuECnzjjQ1L0Mix3hucJoo4VrXMZQ7uty/PVLkNvxc3 xLjvLJ334LTU1SBAiND6NLokAg3WE1Hx/Mr1ygmOifB6I8Q6t4Pvu6831xYQS0k0vnao f6lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=EEqrx9VPEpjFUDJNaFtdc2qD3iYIxBHg+YdgZNoLdmI=; b=wW6a+Z24oKE173GI7pWPWbkpKyLcMfGWO+exQl6eTZymMPuKCMaC+2IjPr4kgszOJL +DYizyOSmQ5BPBJUFhkdMv2bJmI0J/VvA6wI10iW6RosoH4Hpyxgxch4DlJ2nre4dFyB GW/9+W7AOZLj8y9BQMCRij7srmN5YV07+2IFqj3uWC6jZVgSfP8lOrWyg3OA8Wb37jRh smc7iYQWwVxmY4RynWitMGr9vxltZQLU5Ve/5YUN7UYerj547oxEUJWM+Wq3B7chEqnX /dTzxgjHizBjXpvfaQr3yR8gzIN3HK4PdzAcbUdpZvulPuTScUQ+dQHkZdt1bCy7UKgZ mj+Q== 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g7si128183pgp.442.2018.02.15.10.39.16; Thu, 15 Feb 2018 10:39:31 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162853AbeBOPX5 (ORCPT + 99 others); Thu, 15 Feb 2018 10:23:57 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:51576 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162733AbeBOPXp (ORCPT ); Thu, 15 Feb 2018 10:23:45 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 1C3AFE43; Thu, 15 Feb 2018 15:23:25 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavan Kondeti , "Steven Rostedt (VMware)" , "Peter Zijlstra (Intel)" , Andrew Morton , Linus Torvalds , Mike Galbraith , Thomas Gleixner , Ingo Molnar Subject: [PATCH 4.4 050/108] sched/rt: Up the root domain ref count when passing it around via IPIs Date: Thu, 15 Feb 2018 16:16:47 +0100 Message-Id: <20180215151229.400560633@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215151222.267507937@linuxfoundation.org> References: <20180215151222.267507937@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Steven Rostedt (VMware) commit 364f56653708ba8bcdefd4f0da2a42904baa8eeb upstream. When issuing an IPI RT push, where an IPI is sent to each CPU that has more than one RT task scheduled on it, it references the root domain's rto_mask, that contains all the CPUs within the root domain that has more than one RT task in the runable state. The problem is, after the IPIs are initiated, the rq->lock is released. This means that the root domain that is associated to the run queue could be freed while the IPIs are going around. Add a sched_get_rd() and a sched_put_rd() that will increment and decrement the root domain's ref count respectively. This way when initiating the IPIs, the scheduler will up the root domain's ref count before releasing the rq->lock, ensuring that the root domain does not go away until the IPI round is complete. Reported-by: Pavan Kondeti Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Peter Zijlstra (Intel) Cc: Andrew Morton Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 4bdced5c9a292 ("sched/rt: Simplify the IPI based RT balancing logic") Link: http://lkml.kernel.org/r/CAEU1=PkiHO35Dzna8EQqNSKW1fr1y1zRQ5y66X117MG06sQtNA@mail.gmail.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- kernel/sched/core.c | 13 +++++++++++++ kernel/sched/rt.c | 9 +++++++-- kernel/sched/sched.h | 2 ++ 3 files changed, 22 insertions(+), 2 deletions(-) --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5896,6 +5896,19 @@ static void rq_attach_root(struct rq *rq call_rcu_sched(&old_rd->rcu, free_rootdomain); } +void sched_get_rd(struct root_domain *rd) +{ + atomic_inc(&rd->refcount); +} + +void sched_put_rd(struct root_domain *rd) +{ + if (!atomic_dec_and_test(&rd->refcount)) + return; + + call_rcu_sched(&rd->rcu, free_rootdomain); +} + static int init_rootdomain(struct root_domain *rd) { memset(rd, 0, sizeof(*rd)); --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -1916,8 +1916,11 @@ static void tell_cpu_to_push(struct rq * rto_start_unlock(&rq->rd->rto_loop_start); - if (cpu >= 0) + if (cpu >= 0) { + /* Make sure the rd does not get freed while pushing */ + sched_get_rd(rq->rd); irq_work_queue_on(&rq->rd->rto_push_work, cpu); + } } /* Called from hardirq context */ @@ -1947,8 +1950,10 @@ void rto_push_irq_work_func(struct irq_w raw_spin_unlock(&rd->rto_lock); - if (cpu < 0) + if (cpu < 0) { + sched_put_rd(rd); return; + } /* Try the next RT overloaded CPU */ irq_work_queue_on(&rd->rto_push_work, cpu); --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -553,6 +553,8 @@ struct root_domain { }; extern struct root_domain def_root_domain; +extern void sched_get_rd(struct root_domain *rd); +extern void sched_put_rd(struct root_domain *rd); #ifdef HAVE_RT_PUSH_IPI extern void rto_push_irq_work_func(struct irq_work *work);