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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 362A9C433B4 for ; Tue, 18 May 2021 10:07:23 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD38E61185 for ; Tue, 18 May 2021 10:07:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD38E61185 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=br9qTpv+UvD00yFIFP2iik7pT33uOoAd89HloO6q9HU=; b=OyhfGY0WL6MeFixrqjRBk+qJe v6TQ+aL/UstdPbXsRwlFz+CjGyYKwFI/KJwzxjgCxfBvwvcW1RrG7Q1a1yy07itCfwVcHWMTLNDHB FZ5raX7C80uQUJFjVIKcITxwFH4lpqMORmjVjKdDWbxEjtQBrS+mNYWUfqsE5cP9EyU5xQXAbvqs3 nE9ks2vmN4NA0zqYW5vyBib/Z5W+vuUfambhP5bnvacwqXYbp5bCo2dJbK3p3kOpGxskqxK3/AKHU 1sm3x1aaow2amnpNUxfwrmmIuHz8xFWr6sVx9gAU357t0HZI7DOjEyM+NTLuOOowUYj5O762goKP/ pDd9+bvDw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liwav-000H4v-An; Tue, 18 May 2021 10:04:57 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liwL5-000E0R-Ii for linux-arm-kernel@desiato.infradead.org; Tue, 18 May 2021 09:48:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=O4M1tuPpeMcv+HwLI+koJa4o1Si/SzgLQivtStAuziI=; b=o6flcBM2I8zjvaJoS4Up7B10cu hNb+5jiGv9ByMp043EBPbd/vRqd6At+e5CDD2KjmeVTBTxOLVeX/tA3Br2lK7+eXmuq5up6Dg+K6T f0jPThCcrjtCO7JRCZdd8lbsSozPDpRFAPlAs+OyVn/oSllnKKM4VXBkQCu1+kUlhsFX9mhaVFPTF 8UPdpkhy+xJ1DOqP/mnZ4jQR2FXge3c0b++zXK23EjSkyRaYw3QRJ4OEcL9JmoID8r/OoqwD4WoKZ gPlC+eXVt7DAkGEhG6yhTsMg93AcoooNiSnIgMp8ahTaJBxWebauYeSluwKB0O/ZQC+8caFELWsBI lfdefrHA==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liwL1-00EWlU-IK for linux-arm-kernel@lists.infradead.org; Tue, 18 May 2021 09:48:34 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 23B95613F1; Tue, 18 May 2021 09:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621331311; bh=44h3JsYZ/KIsAP+Upj/qBCyu3PQIrAfBaeDZkj8kEHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MMayGdvqj7sLozMbYFnwY2WFufoESelFZSH8VuLRTDX3yLwAATjm9J81bgPDOuugT hCTg2WgfvbgkYufvVeb6qBR1RxTWc5mKSSyDGC2a+ksgEFM/o4wU3UPORukgbOdirx XS1frfOXkyKZnlH/Ii+ARG8h7cFNv7BP21kof+VBHR5KYXRVQ6IRHC3tLCeC1xp1Wg 0s3eWa2ZL08a+qhYd73PdJwGSwbR9dYH3QW3noMKqynRPt+Jqgh18gDZMgfE+s9fIc ydGY2gtkHFAEJ3Rl/mLyW7P4N5vPGXKWmjuSWk3RRTWvkiytoyFyj12egmW3tIMlSu Gd2JZAmEk6fsg== From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Will Deacon , Catalin Marinas , Marc Zyngier , Greg Kroah-Hartman , Peter Zijlstra , Morten Rasmussen , Qais Yousef , Suren Baghdasaryan , Quentin Perret , Tejun Heo , Li Zefan , Johannes Weiner , Ingo Molnar , Juri Lelli , Vincent Guittot , "Rafael J. Wysocki" , kernel-team@android.com Subject: [PATCH v6 15/21] sched: Defer wakeup in ttwu() for unschedulable frozen tasks Date: Tue, 18 May 2021 10:47:19 +0100 Message-Id: <20210518094725.7701-16-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210518094725.7701-1-will@kernel.org> References: <20210518094725.7701-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_024831_664087_04C88BF7 X-CRM114-Status: GOOD ( 21.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Asymmetric systems may not offer the same level of userspace ISA support across all CPUs, meaning that some applications cannot be executed by some CPUs. As a concrete example, upcoming arm64 big.LITTLE designs do not feature support for 32-bit applications on both clusters. Although we take care to prevent explicit hot-unplug of all 32-bit capable CPUs on such a system, this is required when suspending on some SoCs where the firmware mandates that the suspend/resume operation is handled by CPU 0, which may not be capable of running 32-bit tasks. Consequently, there is a window on the resume path where no 32-bit capable CPUs are available for scheduling and waking up a 32-bit task will result in a scheduler BUG() due to failure of select_fallback_rq(): | kernel BUG at kernel/sched/core.c:2858! | Internal error: Oops - BUG: 0 [#1] PREEMPT SMP | ... | Call trace: | select_fallback_rq+0x4b0/0x4e4 | try_to_wake_up.llvm.4388853297126348405+0x460/0x5b0 | default_wake_function+0x1c/0x30 | autoremove_wake_function+0x1c/0x60 | __wake_up_common.llvm.11763074518265335900+0x100/0x1b8 | __wake_up+0x78/0xc4 | ep_poll_callback+0x20c/0x3fc Prevent wakeups of unschedulable frozen tasks in ttwu() and instead defer the wakeup to __thaw_tasks(), which runs only once all the secondary CPUs are back online. Signed-off-by: Will Deacon --- kernel/freezer.c | 10 +++++++++- kernel/sched/core.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/kernel/freezer.c b/kernel/freezer.c index dc520f01f99d..8f3d950c2a87 100644 --- a/kernel/freezer.c +++ b/kernel/freezer.c @@ -11,6 +11,7 @@ #include #include #include +#include /* total number of freezing conditions in effect */ atomic_t system_freezing_cnt = ATOMIC_INIT(0); @@ -146,9 +147,16 @@ bool freeze_task(struct task_struct *p) void __thaw_task(struct task_struct *p) { unsigned long flags; + const struct cpumask *mask = task_cpu_possible_mask(p); spin_lock_irqsave(&freezer_lock, flags); - if (frozen(p)) + /* + * Wake up frozen tasks. On asymmetric systems where tasks cannot + * run on all CPUs, ttwu() may have deferred a wakeup generated + * before thaw_secondary_cpus() had completed so we generate + * additional wakeups here for tasks in the PF_FREEZER_SKIP state. + */ + if (frozen(p) || (frozen_or_skipped(p) && mask != cpu_possible_mask)) wake_up_process(p); spin_unlock_irqrestore(&freezer_lock, flags); } diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d7d058fc012e..f5ff55786344 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3525,6 +3525,19 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) if (!(p->state & state)) goto unlock; +#ifdef CONFIG_FREEZER + /* + * If we're going to wake up a thread which may be frozen, then + * we can only do so if we have an active CPU which is capable of + * running it. This may not be the case when resuming from suspend, + * as the secondary CPUs may not yet be back online. See __thaw_task() + * for the actual wakeup. + */ + if (unlikely(frozen_or_skipped(p)) && + !cpumask_intersects(cpu_active_mask, task_cpu_possible_mask(p))) + goto unlock; +#endif + trace_sched_waking(p); /* We're going to change ->state: */ -- 2.31.1.751.gd2f1c929bd-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel