From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D85B193081; Tue, 10 Sep 2024 10:07:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962855; cv=none; b=H756IS7vwtEl+P6LcRBheFbAnQHuui88xZoP5379MScjl0yhV515o7dhuguhKfafeCXI9SEgsHeYNfpEXy+oBxWmMyxo9AT7dDyTV6MQS+Fx1qCvX+U0KdPHIiX1zHtxxmqisTaMOUu1Szw8GeYDAbvdJ1BEiTx9tX/BfrG/Y9Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962855; c=relaxed/simple; bh=lV+ScZxPAPd8ZRa5xb+KqxQpMXUZ2SWZOgX/rLsfNNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GH8EBxSkfUV8yL3lDGVg319kj9MozIhTkNHVp6s0pVhe/EUk49CoKYKr3IUeil6Vj2L/NWuUeHdiGH5iAVIqCwDbCV/3QZGyfqbfodnZhjoeaLMt/sSji/wZCINyL7/y4jtab+T2RFWPHPKfhD/1VnJzb0WW4Wwggyl4WQHqvEY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FgXZkjHZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FgXZkjHZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41147C4CEC3; Tue, 10 Sep 2024 10:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725962854; bh=lV+ScZxPAPd8ZRa5xb+KqxQpMXUZ2SWZOgX/rLsfNNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FgXZkjHZJIklZ+U9bcwpSfaLLZMRcRJM/g7n78kTweQntRwM197c43idRdTYsP4kg sfwDcoroylnm21Mde67HBfDTrCwXJ0nBtwrnMnf+tek/C4PIJLsp12rdle+mH7i890 bcGOUORbfLb2MuL0AlbkcUBXY18l7iUX6FOfWi9M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Roland Xu , Thomas Gleixner Subject: [PATCH 6.1 016/192] rtmutex: Drop rt_mutex::wait_lock before scheduling Date: Tue, 10 Sep 2024 11:30:40 +0200 Message-ID: <20240910092558.618456053@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092557.876094467@linuxfoundation.org> References: <20240910092557.876094467@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Roland Xu commit d33d26036a0274b472299d7dcdaa5fb34329f91b upstream. rt_mutex_handle_deadlock() is called with rt_mutex::wait_lock held. In the good case it returns with the lock held and in the deadlock case it emits a warning and goes into an endless scheduling loop with the lock held, which triggers the 'scheduling in atomic' warning. Unlock rt_mutex::wait_lock in the dead lock case before issuing the warning and dropping into the schedule for ever loop. [ tglx: Moved unlock before the WARN(), removed the pointless comment, massaged changelog, added Fixes tag ] Fixes: 3d5c9340d194 ("rtmutex: Handle deadlock detection smarter") Signed-off-by: Roland Xu Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://lore.kernel.org/all/ME0P300MB063599BEF0743B8FA339C2CECC802@ME0P300MB0635.AUSP300.PROD.OUTLOOK.COM Signed-off-by: Greg Kroah-Hartman --- kernel/locking/rtmutex.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1624,6 +1624,7 @@ static int __sched rt_mutex_slowlock_blo } static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock, + struct rt_mutex_base *lock, struct rt_mutex_waiter *w) { /* @@ -1636,10 +1637,10 @@ static void __sched rt_mutex_handle_dead if (build_ww_mutex() && w->ww_ctx) return; - /* - * Yell loudly and stop the task right here. - */ + raw_spin_unlock_irq(&lock->wait_lock); + WARN(1, "rtmutex deadlock detected\n"); + while (1) { set_current_state(TASK_INTERRUPTIBLE); schedule(); @@ -1693,7 +1694,7 @@ static int __sched __rt_mutex_slowlock(s } else { __set_current_state(TASK_RUNNING); remove_waiter(lock, waiter); - rt_mutex_handle_deadlock(ret, chwalk, waiter); + rt_mutex_handle_deadlock(ret, chwalk, lock, waiter); } /*