Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp134229pxb; Mon, 13 Sep 2021 15:07:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxMfB+MlxTt66I7bmwmoHjz06C+Ohjm42KY7D01c6MsLrLHsNdyhvkgeFBKbhtiUM2SxIz X-Received: by 2002:a05:6e02:20cd:: with SMTP id 13mr9887258ilq.156.1631570826495; Mon, 13 Sep 2021 15:07:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631570826; cv=none; d=google.com; s=arc-20160816; b=x6PYmgsNneprbZIAR8HUW/z3MBfFeLQ0r16I8PVNkRHhLnJ+OcQPQ092gdYItvk7V5 8YkDwhXrH4FH6fcNCSzdbNZsYenpJKi/I4vitw85ocBrkmb1LOskAi46LYSu4qxfgWvU fFitt3VXWpRO0KMcKE6JmAm4Y+Vm8AnMtswEDIUQY2teyb7qtilrhXCCRgcBaJDDnYab wLChrgTuy2rCGdEfg1wrJLtQQSfgzRda0abePB958/vxskeVUhUBbUYDCV3M7Kpl4b8Q cxdtjxCBtJawNnfdc4Rd5e/EzrsFRvQR4SEqNI9XzO3Bn69nmw6FINJHdAhrIjk4DAFF bLyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=a8JoyltYYRz1e3KWJp19B5/4hEKN47mhnQylPoDurmg=; b=naCsc8z8931Eq6mk//kiQ9U5YgdNdaNf9lgGH8ION6Im5jZU5irbyg7vH7sOJcjM/v b8IK7zBBNjiASJiGPiV0FKpv1rvZ5ub6KmPGAJ59NDRwscaSczn4YKcGsYRP2hI9sP4y k333p29EcqclGMjyBcGlP3a1RLax0Aa1iKgKpkG5eX2JmpiGRHE0oY0x44yUQ94bs4Xi 8SdaVg8YgC+NGCpRra+REkk8NrucLMT31ZVOLf0iKVe/rwmt/TSrDYKLIS969XmP5Qbe H9s6sTgcp766LRa9aEVsRDDYA9m+Z06mcvAAaTFvuSXvCBBkElmIW9A64RbACKCLlpex cAug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UHwKSxSu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n7si8179699ilj.150.2021.09.13.15.06.54; Mon, 13 Sep 2021 15:07:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UHwKSxSu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244450AbhIMN5r (ORCPT + 99 others); Mon, 13 Sep 2021 09:57:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:34740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245507AbhIMNyn (ORCPT ); Mon, 13 Sep 2021 09:54:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A4E3A6124F; Mon, 13 Sep 2021 13:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540127; bh=jgOIDr5IeFUVpjWtco33yuanNhwwD/tQC0IdBtSBabQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UHwKSxSuzjJD+pEUqQ9j0hf/eE6mmyaFkj8sBx56AiykyUp15QyLv9+xWyn3DWKaJ fiIx9IRcYUxPUn1UozriZJbeQa15cFRWLorl6TS3a4Zu0NiZIM4vptsfOD2Ne2A0wF qiNMTQe4Z7iawgtJortPlNwBfbHw6EDNy2zpj70M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qais Yousef , Yanfei Xu , "Paul E. McKenney" , Sasha Levin Subject: [PATCH 5.13 055/300] rcu: Fix stall-warning deadlock due to non-release of rcu_node ->lock Date: Mon, 13 Sep 2021 15:11:56 +0200 Message-Id: <20210913131111.219104675@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yanfei Xu [ Upstream commit dc87740c8a6806bd2162bfb441770e4e53be5601 ] If rcu_print_task_stall() is invoked on an rcu_node structure that does not contain any tasks blocking the current grace period, it takes an early exit that fails to release that rcu_node structure's lock. This results in a self-deadlock, which is detected by lockdep. To reproduce this bug: tools/testing/selftests/rcutorture/bin/kvm.sh --allcpus --duration 3 --trust-make --configs "TREE03" --kconfig "CONFIG_PROVE_LOCKING=y" --bootargs "rcutorture.stall_cpu=30 rcutorture.stall_cpu_block=1 rcutorture.fwd_progress=0 rcutorture.test_boost=0" This will also result in other complaints, including RCU's scheduler hook complaining about blocking rather than preemption and an rcutorture writer stall. Only a partial RCU CPU stall warning message will be printed because of the self-deadlock. This commit therefore releases the lock on the rcu_print_task_stall() function's early exit path. Fixes: c583bcb8f5ed ("rcu: Don't invoke try_invoke_on_locked_down_task() with irqs disabled") Tested-by: Qais Yousef Signed-off-by: Yanfei Xu Signed-off-by: Paul E. McKenney Signed-off-by: Sasha Levin --- kernel/rcu/tree_stall.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/rcu/tree_stall.h b/kernel/rcu/tree_stall.h index f1e011d4a899..c615fd153cb2 100644 --- a/kernel/rcu/tree_stall.h +++ b/kernel/rcu/tree_stall.h @@ -269,8 +269,10 @@ static int rcu_print_task_stall(struct rcu_node *rnp, unsigned long flags) struct task_struct *ts[8]; lockdep_assert_irqs_disabled(); - if (!rcu_preempt_blocked_readers_cgp(rnp)) + if (!rcu_preempt_blocked_readers_cgp(rnp)) { + raw_spin_unlock_irqrestore_rcu_node(rnp, flags); return 0; + } pr_err("\tTasks blocked on level-%d rcu_node (CPUs %d-%d):", rnp->level, rnp->grplo, rnp->grphi); t = list_entry(rnp->gp_tasks->prev, -- 2.30.2