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=-2.6 required=3.0 tests=DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,T_DKIM_INVALID, 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 004ECC6778C for ; Fri, 29 Jun 2018 20:55:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C5C427ECE for ; Fri, 29 Jun 2018 20:55:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="V/2PE+cQ"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="XEzIOVFx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C5C427ECE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965414AbeF2Uzr (ORCPT ); Fri, 29 Jun 2018 16:55:47 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:36628 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935367AbeF2Uzq (ORCPT ); Fri, 29 Jun 2018 16:55:46 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 68E3A606FC; Fri, 29 Jun 2018 20:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530305745; bh=gA/kPjPELSX2SceOdc5Ath9eFmCbah6z1PbNCGTfPuU=; h=From:To:Cc:Subject:Date:From; b=V/2PE+cQ1X2UlV8DkIpJ2gSsB3hcydrO1LhEOvyMMCfch0QcZxigHvCB6WktDi8Ab nsbwRINhcmS7RrQRJydN9KHU4/QfzDjofpiEIwgxWI+hrtTonnhtu6s9upqIiKfZUA m1C01RZ/UCB1D3Ts7/vqqN7wrxkpJrOe7xkLTA7I= Received: from isaacm-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: isaacm@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4C2BD6031A; Fri, 29 Jun 2018 20:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1530305744; bh=gA/kPjPELSX2SceOdc5Ath9eFmCbah6z1PbNCGTfPuU=; h=From:To:Cc:Subject:Date:From; b=XEzIOVFx/fMOvOEmhSre5UTtV6iRDx+V4WZniS/rff2YhSdJM3a6vbiJFXEc4WpIB 82SIIEeybEnCvEam+GiX6zbmmt0rvnERk/W1Lvypx2CD67XjEix1NO3RyEZ8+T5tGI iK65cYozyyIMbq+7mCrOg3JodaotOHj9hhaqMIHs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4C2BD6031A Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=isaacm@codeaurora.org From: "Isaac J. Manjarres" To: peterz@infradead.org, matt@codeblueprint.co.uk, mingo@kernel.org, tglx@linutronix.de, bigeasy@linutronix.de Cc: "Isaac J. Manjarres" , linux-kernel@vger.kernel.org, psodagud@codeaurora.org, pkondeti@codeaurora.org Subject: [PATCH v2] stop_machine: Disable preemption when waking two stopper threads Date: Fri, 29 Jun 2018 13:55:12 -0700 Message-Id: <1530305712-16416-1-git-send-email-isaacm@codeaurora.org> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When cpu_stop_queue_two_works() begins to wake the stopper threads, it does so without preemption disabled, which leads to the following race condition: The source CPU calls cpu_stop_queue_two_works(), with cpu1 as the source CPU, and cpu2 as the destination CPU. When adding the stopper threads to the wake queue used in this function, the source CPU stopper thread is added first, and the destination CPU stopper thread is added last. When wake_up_q() is invoked to wake the stopper threads, the threads are woken up in the order that they are queued in, so the source CPU's stopper thread is woken up first, and it preempts the thread running on the source CPU. The stopper thread will then execute on the source CPU, disable preemption, and begin executing multi_cpu_stop(), and wait for an ack from the destination CPU's stopper thread, with preemption still disabled. Since the worker thread that woke up the stopper thread on the source CPU is affine to the source CPU, and preemption is disabled on the source CPU, that thread will never run to dequeue the destination CPU's stopper thread from the wake queue, and thus, the destination CPU's stopper thread will never run, causing the source CPU's stopper thread to wait forever, and stall. Disable preemption when waking the stopper threads in cpu_stop_queue_two_works() to ensure that the worker thread that is waking up the stopper threads isn't preempted by the source CPU's stopper thread, and permanently scheduled out, leaving the remaining stopper thread asleep in the wake queue. Co-developed-by: Pavankumar Kondeti Signed-off-by: Prasad Sodagudi Signed-off-by: Pavankumar Kondeti Signed-off-by: Isaac J. Manjarres --- kernel/stop_machine.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index f89014a..1ff523d 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -270,7 +270,11 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1, goto retry; } - wake_up_q(&wakeq); + if (!err) { + preempt_disable(); + wake_up_q(&wakeq); + preempt_enable(); + } return err; } -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project