Received: by 2002:a17:90a:37e8:0:0:0:0 with SMTP id v95csp381389pjb; Fri, 4 Oct 2019 00:48:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzxBmpRN93bEzs9MH66f8YIKsCKX3CnxdH3NxuAIpUrHloWbkMYPTKdWb4uvgj47cougkNf X-Received: by 2002:a17:906:f08:: with SMTP id z8mr11482765eji.18.1570175322494; Fri, 04 Oct 2019 00:48:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570175322; cv=none; d=google.com; s=arc-20160816; b=Y5Cql7HeWZIylFmgfxhrjH/BQS1tJCJDhDlG86pySWj15ZWPA/exEEZu8MgDFC9DsM E3Rd6Jno/HKU+5LTZDLBRtLoHxbvCTLLySzQHSRdSRvgBsk/qP99ecRI0wkjEXILoksB KVQw6s9BeqXnetwN+aNFPZacwrnhTaYZ1zajTugUEYmmlFELRGFXsqac8wIX85QH5kXC svcRBPd3jkATFLNAiOEuGW0hipRmK9UXLkgr228OpSViULnFDorQs3kSG8nOUE7pU9Cf ENZyABH0KR9MhzAo8Q8gyEWFf+EgiYhraAAEb90xEHLioDQ8sjjmrYKmD/SI6VmrInU9 Vjsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pZK0w2b4erKd/e8ROSamoBX4PuMHp18vIxATYiudH00=; b=Tpt0bbk4nVcdy7ftxn9affl0o7ad00cEy7HMPT87y4D9SAnhi+DIqKwDnyKpCzLqN8 g3g0br4Dh99BpuVzvDGhMlfnPzfELJ5YXJZ+n0Velip3yNPSf0vBp/hYjtamsMyYT6CG I89w6pKJWbahiGpgI0KMt1zrNchIMqWlQHuYMp35oEEQLEgky5ybzirF7uyaLkAgmO79 Wd3lis+gBikD74bBH6++JXo9IBwwISd/srP2qeO3Kr5UhfZ70zxlE5dz6q9DW2tDFFGv 07XRn2uMgSp1qovvGtVzn7BI3b0V47fRraJvc71MknCLkTI3eHbcbOd7elr7FF3rsjQG 8KIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ktjoXLJh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 4si2438154ejc.382.2019.10.04.00.48.18; Fri, 04 Oct 2019 00:48:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ktjoXLJh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732710AbfJDBUt (ORCPT + 99 others); Thu, 3 Oct 2019 21:20:49 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46744 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732433AbfJDBUq (ORCPT ); Thu, 3 Oct 2019 21:20:46 -0400 Received: by mail-wr1-f68.google.com with SMTP id o18so4888204wrv.13 for ; Thu, 03 Oct 2019 18:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pZK0w2b4erKd/e8ROSamoBX4PuMHp18vIxATYiudH00=; b=ktjoXLJh3whler9EKApcW1gsz2MSKZzvoGKH/tAZa72yLxqF3z/rOD/4rg562y/oZT JgdjFCmzZh60hL9PKvp0LX0HNpXaSGbJifteFnKvdm++55HB1g5qXyHQRF2deyQ6JfPj MNRAdfaBzdu02TjsKNa4trY/aJmokBTct5PB3axt+s2fvwp3k72iK9QsFqBeAg7PFC0i U78lNhc6oPkiFtYOuj+26QUSj9J03ABBds3BoJoLFolx29WkeuRYJqgwjf62FXlCauqA g5SpyHnue5Qdz7fY3QsPR57fm+zI3iuDMPGCaF6zx07p5jkD57odqji/RXWLh2aUdq3I ZUOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pZK0w2b4erKd/e8ROSamoBX4PuMHp18vIxATYiudH00=; b=W56DgXOwWNqEeH8PenkeVQg13DoS+0lIazHBH7+UBJk/abOL158w9S5jNDs2EpDKKe Or9MtK6+DAEoPyjw27zPEmABgMvXTZsShkFb+ebQlZZlgOWI1SiUQjSQV/iMiz+53mAN PIEZpAOfiQyLZeFNji3SLjm8N7X8gkfL32LsvK3CQpPqFWCKthg2L9pdqekzPMwL/npv q/M1SGCuvvM9J6BTUw56acddUaIqzyOIGWcXbw6evjhTZYzicXWVLUuLBLy7AjgcGy/f WQckRKWj6R6j94XtDxlKrUPX2JZBQ8siwnthjR1CN9UiUE8xNELbe0xR/4Wh9nu+wnst jb/g== X-Gm-Message-State: APjAAAV2KinLqvQuFiPI+ajYdCv4m2A4/Hkart8Ot9vZ9ghmtPDt3Yb0 kPbgzblrf+eWz9RxXc8tk169FnGOG61WiA== X-Received: by 2002:adf:ee05:: with SMTP id y5mr8846845wrn.291.1570152044620; Thu, 03 Oct 2019 18:20:44 -0700 (PDT) Received: from localhost.localdomain ([104.238.174.53]) by smtp.gmail.com with ESMTPSA id a4sm4097404wmm.10.2019.10.03.18.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2019 18:20:44 -0700 (PDT) From: Changbin Du To: Andrew Morton Cc: Randy Dunlap , Thomas Gleixner , Masahiro Yamada , linux-kernel@vger.kernel.org, Changbin Du Subject: [RESEND PATCH v3 5/9] hacking: Move Oops into 'Lockups and Hangs' Date: Fri, 4 Oct 2019 09:20:06 +0800 Message-Id: <20191004012010.11287-6-changbin.du@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191004012010.11287-1-changbin.du@gmail.com> References: <20191004012010.11287-1-changbin.du@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org They are similar options so place them together. Signed-off-by: Changbin Du Acked-by: Randy Dunlap Tested-by: Randy Dunlap --- lib/Kconfig.debug | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 9911e5c6eafa..389876ee49d8 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -775,7 +775,35 @@ config DEBUG_SHIRQ Drivers ought to be able to handle interrupts coming in at those points; some don't and need to be caught. -menu "Debug Lockups and Hangs" +menu "Debug Oops, Lockups and Hangs" + +config PANIC_ON_OOPS + bool "Panic on Oops" + help + Say Y here to enable the kernel to panic when it oopses. This + has the same effect as setting oops=panic on the kernel command + line. + + This feature is useful to ensure that the kernel does not do + anything erroneous after an oops which could result in data + corruption or other issues. + + Say N if unsure. + +config PANIC_ON_OOPS_VALUE + int + range 0 1 + default 0 if !PANIC_ON_OOPS + default 1 if PANIC_ON_OOPS + +config PANIC_TIMEOUT + int "panic timeout" + default 0 + help + Set the timeout value (in seconds) until a reboot occurs when the + the kernel panics. If n = 0, then we wait forever. A timeout + value n > 0 will wait n seconds before rebooting, while a timeout + value n < 0 will reboot immediately. config LOCKUP_DETECTOR bool @@ -933,34 +961,6 @@ config WQ_WATCHDOG endmenu # "Debug lockups and hangs" -config PANIC_ON_OOPS - bool "Panic on Oops" - help - Say Y here to enable the kernel to panic when it oopses. This - has the same effect as setting oops=panic on the kernel command - line. - - This feature is useful to ensure that the kernel does not do - anything erroneous after an oops which could result in data - corruption or other issues. - - Say N if unsure. - -config PANIC_ON_OOPS_VALUE - int - range 0 1 - default 0 if !PANIC_ON_OOPS - default 1 if PANIC_ON_OOPS - -config PANIC_TIMEOUT - int "panic timeout" - default 0 - help - Set the timeout value (in seconds) until a reboot occurs when the - the kernel panics. If n = 0, then we wait forever. A timeout - value n > 0 will wait n seconds before rebooting, while a timeout - value n < 0 will reboot immediately. - config SCHED_DEBUG bool "Collect scheduler debugging info" depends on DEBUG_KERNEL && PROC_FS -- 2.20.1