Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp193940lqp; Wed, 20 Mar 2024 19:27:52 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWCs8Mzys6RYhrgg808dzKWTOjp7sltkH/nGtUd6RUR0Ha3PfsE4HdseTbKtKpVc75ftNj2cwgc1wnSN6aGvZZc5mWM3FzERqIMBFDzGA== X-Google-Smtp-Source: AGHT+IEfFMXz58wAvwxn55lms3lvRm8ue6svYygmzdJmDYlo1mscIBUuxk2nYrR9vvkOkYu3lwTi X-Received: by 2002:a05:6214:413:b0:696:2fef:7b6e with SMTP id z19-20020a056214041300b006962fef7b6emr2569413qvx.2.1710988071827; Wed, 20 Mar 2024 19:27:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710988071; cv=pass; d=google.com; s=arc-20160816; b=bp1EbMgaR1hkmE4jd2yzzK7wwaZeD3IaJ65F50Yt7usRx8VlsBAlzaeeeRHfnEh0LY WYQA65cfK1ySihD+0rtNgoW6npQq00GtLppkagxJtMi8BS0CmJM7PpTwC25NJGB/REeR KCqQXD8qqkyGjLHY8KHfPkk3Up+AXg1fhJD/9VbvqqpCLOXyDGREzQUDGLSsyTyvJ7Y2 cmxjylzbmy/XuhsQA3ozpMlc56UCFkXxXKL4c5590NTaR1iSwwyaszxPC8u0Pat60igQ ZJZT5Rnxa+z8i3C/fRPki6uGV5iOdd7wCe/E16zIapUvw+WKxX9UDv6TIueEMI2Pw+33 wxSA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=TYAsZDZr5jfTiZce3j9HNKh22++CXatgn55+7wzibz4=; fh=qHCRA4TnzMBEE6omRnMmvafBBXnpRKK6O+as6iMLK88=; b=SzMuyqfDG79XOg5YxnhXbEtUQzf0kLH9qKhLdiWpLwwh9fsYfrq2pAASpcfDT9/rD9 Y2Oj8iY+a4C5Ni4PDTr76xlt5W2hhOU6sl/GPmQJp8SaTU+Np2WfmIluTovSt2KmzLK9 ue8zwAqyAPId6zQtcTtIsWMxTIK4uXGe95uGX8QyDmJJxEGU3X4tbNZteSQoVKFs/0V5 3l3r5OEuEBdNTA/pKa81BQpSPNXI4Xff6nrqSsqgKUTCJ2pdOJ2n5gdXPGo7dfM9SrIb xfvgYYrAfldRkBTMqG99BhGD845u2km1Dp9flb1zAu+3YJ8G/j5oYC+yFQyN/b3p5haX rPaQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=h3c.com); spf=pass (google.com: domain of linux-kernel+bounces-109591-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-109591-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id gv12-20020a056214262c00b0068c3d2d61f1si14538737qvb.120.2024.03.20.19.27.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 19:27:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-109591-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=h3c.com); spf=pass (google.com: domain of linux-kernel+bounces-109591-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-109591-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 8B8F51C21007 for ; Thu, 21 Mar 2024 02:27:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41B3353A1; Thu, 21 Mar 2024 02:27:45 +0000 (UTC) Received: from h3cspam02-ex.h3c.com (smtp.h3c.com [60.191.123.50]) (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 4E7961FA2; Thu, 21 Mar 2024 02:27:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.191.123.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710988064; cv=none; b=kQOqiiKP27wOl7Uz0SdCbCv0bPRQZcRvFg/ttaxeFjoZi5L/1ea1DNlX9RDAX3zs94diNh2SZrMWD5lvlTArojNzLWBNmHy0xjtUt+UNP1SQhNqvR8cJP5GqfqAOxLRi5FVRBVkECOUnzf+ebPXPuzJlUyZV1gxJGgiTTdBqz00= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710988064; c=relaxed/simple; bh=kUGM3RqmdsB+yW5YZb0pn/TfJFz/XiJ08dFJogY+zFw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rRKvjVTyZd7OwQldYnDV7uzX8MYnEdjm00upo6bN565qHFw4jBCnC+pqW9+WuvT+FRBIaBZZnPsWYvmgsBKcE90uCAgTGjrEl8e3wOew2LEM5cWUU11XyFsAf+Tmr2tN5xFR+szKelEZ3d3LiSRvzujTVK2ycm4KQRoxZdv1X/g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=h3c.com; spf=pass smtp.mailfrom=h3c.com; arc=none smtp.client-ip=60.191.123.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=h3c.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=h3c.com Received: from mail.maildlp.com ([172.25.15.154]) by h3cspam02-ex.h3c.com with ESMTP id 42L2QBln090865; Thu, 21 Mar 2024 10:26:11 +0800 (GMT-8) (envelope-from liu.yeC@h3c.com) Received: from DAG6EX02-IMDC.srv.huawei-3com.com (unknown [10.62.14.11]) by mail.maildlp.com (Postfix) with ESMTP id 201322006135; Thu, 21 Mar 2024 10:27:51 +0800 (CST) Received: from localhost.localdomain (10.114.186.34) by DAG6EX02-IMDC.srv.huawei-3com.com (10.62.14.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.1258.27; Thu, 21 Mar 2024 10:26:10 +0800 From: To: CC: , , , , , , , , LiuYe Subject: [PATCH V3] kdb: Fix the deadlock issue in KDB debugging. Date: Thu, 21 Mar 2024 10:26:04 +0800 Message-ID: <20240321022604.4088438-1-liu.yec@h3c.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240320162802.GA22198@aspen.lan> References: <20240320162802.GA22198@aspen.lan> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BJSMTP01-EX.srv.huawei-3com.com (10.63.20.132) To DAG6EX02-IMDC.srv.huawei-3com.com (10.62.14.11) X-DNSRBL: X-SPAM-SOURCE-CHECK: pass X-MAIL:h3cspam02-ex.h3c.com 42L2QBln090865 From: LiuYe Currently, if CONFIG_KDB_KEYBOARD is enabled, then kgdboc will attempt to use schedule_work() to provoke a keyboard reset when transitioning out of the debugger and back to normal operation. This can cause deadlock because schedule_work() is not NMI-safe. The stack trace below shows an example of the problem. In this case the master cpu is not running from NMI but it has parked the slave CPUs using an NMI and the parked CPUs is holding spinlocks needed by schedule_work(). example: BUG: spinlock lockup suspected on CPU#0, namex/10450 lock: 0xffff881ffe823980, .magic: dead4ead, .owner: namexx/21888, .owner_cpu: 1 ffff881741d00000 ffff881741c01000 0000000000000000 0000000000000000 ffff881740f58e78 ffff881741cffdd0 ffffffff8147a7fc ffff881740f58f20 Call Trace: [] ? __schedule+0x16d/0xac0 [] ? schedule+0x3c/0x90 [] ? schedule_hrtimeout_range_clock+0x10a/0x120 [] ? mutex_unlock+0xe/0x10 [] ? ep_scan_ready_list+0x1db/0x1e0 [] ? schedule_hrtimeout_range+0x13/0x20 [] ? ep_poll+0x27a/0x3b0 [] ? wake_up_q+0x70/0x70 [] ? SyS_epoll_wait+0xb8/0xd0 [] ? entry_SYSCALL_64_fastpath+0x12/0x75 CPU: 0 PID: 10450 Comm: namex Tainted: G O 4.4.65 #1 Hardware name: Insyde Purley/Type2 - Board Product Name1, BIOS 05.21.51.0036 07/19/2019 0000000000000000 ffff881ffe813c10 ffffffff8124e883 ffff881741c01000 ffff881ffe823980 ffff881ffe813c38 ffffffff810a7f7f ffff881ffe823980 000000007d2b7cd0 0000000000000001 ffff881ffe813c68 ffffffff810a80e0 Call Trace: <#DB> [] dump_stack+0x85/0xc2 [] spin_dump+0x7f/0x100 [] do_raw_spin_lock+0xa0/0x150 [] _raw_spin_lock+0x15/0x20 [] try_to_wake_up+0x176/0x3d0 [] wake_up_process+0x15/0x20 [] insert_work+0x81/0xc0 [] __queue_work+0x135/0x390 [] queue_work_on+0x46/0x90 [] kgdboc_post_exp_handler+0x48/0x70 [] kgdb_cpu_enter+0x598/0x610 [] kgdb_handle_exception+0xf2/0x1f0 [] __kgdb_notify+0x71/0xd0 [] kgdb_notify+0x35/0x70 [] notifier_call_chain+0x4a/0x70 [] notify_die+0x3d/0x50 [] do_int3+0x89/0x120 [] int3+0x44/0x80 Signed-off-by: LiuYe Co-authored-by: Daniel Thompson Signed-off-by: Daniel Thompson --- drivers/tty/serial/kgdboc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c index 7ce7bb164..161b25ecc 100644 --- a/drivers/tty/serial/kgdboc.c +++ b/drivers/tty/serial/kgdboc.c @@ -22,6 +22,7 @@ #include #include #include +#include #define MAX_CONFIG_LEN 40 @@ -99,10 +100,17 @@ static void kgdboc_restore_input_helper(struct work_struct *dummy) static DECLARE_WORK(kgdboc_restore_input_work, kgdboc_restore_input_helper); +static void kgdboc_queue_restore_input_helper(struct irq_work *unused) +{ + schedule_work(&kgdboc_restore_input_work); +} + +static DEFINE_IRQ_WORK(kgdboc_restore_input_irq_work, kgdboc_queue_restore_input_helper); + static void kgdboc_restore_input(void) { if (likely(system_state == SYSTEM_RUNNING)) - schedule_work(&kgdboc_restore_input_work); + irq_work_queue(&kgdboc_restore_input_irq_work); } static int kgdboc_register_kbd(char **cptr) @@ -133,6 +141,7 @@ static void kgdboc_unregister_kbd(void) i--; } } + irq_work_sync(&kgdboc_restore_input_irq_work); flush_work(&kgdboc_restore_input_work); } #else /* ! CONFIG_KDB_KEYBOARD */ -- 2.25.1