From patchwork Mon Sep 14 13:01:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 249761 Delivered-To: patches@linaro.org Received: by 2002:a92:5ad1:0:0:0:0:0 with SMTP id b78csp1614495ilg; Mon, 14 Sep 2020 06:02:04 -0700 (PDT) X-Received: by 2002:adf:e3cf:: with SMTP id k15mr14941670wrm.291.1600088524421; Mon, 14 Sep 2020 06:02:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600088524; cv=none; d=google.com; s=arc-20160816; b=Gp0jRAaaUe8/5m72ofGaHo0u75cxCVAxXaj/6Ku2n9fgCUjy+7SFVkFQxvw6ctZpIa JfUgbObKSNyrb/2urnSBpQx9R9mwer9STRtHRIQq4D99Y1UHAaJTgESx/NfaXsknhD5v tq0YL2GPHf3k/aKSk9xyqh+DPAszo+xoSm1NFZnS2dLt5NS0gpVycmV+vmXWI6clJQSC nbgNlF7JbakI4oK1VHLLbBY8UUQ5GeWelMOR/U4PbjKJK4GCpu1EMF7UpzHOLevCNEYh n+EeeEVpSotxlMVI4s8cEz7WrANR3TBueMdIpML9SVG6mN0GPsciApcFJhS0H6i2KiGK C4zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NBc+524mNMySIXGyBF0ZKFskAXcAly2eLLkxj4mn+0Q=; b=WXOa0Pwlu2n64QLbilCpWiJF+J9yxf3IPkLwGOMEFX/G7MwJ7tCH+bG7l+6AYem2XR 8sc0q7Sn3J9qHVTl5+n6b9Q7P9zxH35rfXHaCuN90cE664Pe9qePUd79cmP54NuNSTwS SOEHY7WQUraSZjuMmqqpyiORa/9DewzXpQx0wI2WAEje0ZorziYIlEmAZOzSA2cZV/M3 dnNOaEWMJVf+gFlgm9UeAXab54kHY5KzqzlAzDqHn1rJzDGeTH9jIomGFXhT2AnpIy2h jUTYQgmQAF7rmuOXCHbInChe3BVlIv6xsCE2hE92puPnrI0AlxnQnQkQVFhUaGU0ITJS 3Qnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wW//ZSe6"; spf=pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=daniel.thompson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c17sor5030624wre.28.2020.09.14.06.02.04 for (Google Transport Security); Mon, 14 Sep 2020 06:02:04 -0700 (PDT) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="wW//ZSe6"; spf=pass (google.com: domain of daniel.thompson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=daniel.thompson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NBc+524mNMySIXGyBF0ZKFskAXcAly2eLLkxj4mn+0Q=; b=wW//ZSe6q99e6l33yqQ0bv9yrvassnq7qwZRgFmB3tl5KWNCuLqKteAKnwijt+a7M4 RSOJCituZMcaXRkqRQ+SRT6J4ASyMHxdQFmS0L5pfONjKlLWGM+zXRYRhQT/7Vn9Xkxw 1aIZa7RfhcW39YkRlDXTFvXugx0sEaAKqJGvaN+UVce/RUL+FahnGAm2Iyop8CYrrqZx bk8iZ5tUfH+ksOynOz+ZqTp7aa8Qm5MMTOSsq09VpPAI9wOpC0jz6sSRG45t+kGtsJCE mVNE6KEkrQTEeNSJRDmweR9U7pDvTGTCHcKTdrLTfkkmuyrlKyYey17h6QfKd1CDKBcW H4Kg== 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=NBc+524mNMySIXGyBF0ZKFskAXcAly2eLLkxj4mn+0Q=; b=toTXuxCC4zGIp72gmtFTOFqVJdhRPsqm5uUAbbkMO5ghIvxku9xGA3NyKUEr62s5sh 5dtlrU3SA77L5Wk6LdV/qE+ddh+dX3PITvKCZIZp79MXOa6EadIw3BxrPoOVniVwUSGQ gHW+CdZfSrO1BU6nDkMSvPb4zqkzTmFG07b3P22199RQWwBlvOjgavpoVQiqj+jviVym 7w1aGwYYw9TfL/7HxdlT3bhe4QGwvnUkjeNyKc+3X+ICcxS7qYKA/uQ5/931nMk9+uLl XG21JC++2yPnCQsnWwDeX/H5aVqwcR3fpfTqTu6Zd2KTgd+KKFsBB5eFs6qMwv3mo47v U5JA== X-Gm-Message-State: AOAM531uWAJsTSESED5UsVY7ZJdoXRB3TTK6z5TI/bOhPvpe17mmSutu TcPcBQvzWoGJw+UBCEu6ZH3koRz1 X-Google-Smtp-Source: ABdhPJx0l/sd/ukowq4I6JNlM0FlvEF8p/b6PwzlqUyLsn2dcKfjzKGIpoDUNVbkTK7sLhad++59xw== X-Received: by 2002:adf:9b8b:: with SMTP id d11mr8024287wrc.71.1600088524074; Mon, 14 Sep 2020 06:02:04 -0700 (PDT) Return-Path: Received: from wychelm.lan (cpc141216-aztw34-2-0-cust174.18-1.cable.virginm.net. [80.7.220.175]) by smtp.gmail.com with ESMTPSA id t6sm23420983wre.30.2020.09.14.06.02.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 06:02:03 -0700 (PDT) From: Daniel Thompson To: Jason Wessel , Douglas Anderson Cc: Daniel Thompson , Peter Zijlstra , sumit.garg@linaro.org, pmladek@suse.com, sergey.senozhatsky@gmail.com, will@kernel.org, Masami Hiramatsu , kgdb-bugreport@lists.sourceforge.net, linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH v3 2/3] kgdb: Add NOKPROBE labels on the trap handler functions Date: Mon, 14 Sep 2020 14:01:42 +0100 Message-Id: <20200914130143.1322802-3-daniel.thompson@linaro.org> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200914130143.1322802-1-daniel.thompson@linaro.org> References: <20200914130143.1322802-1-daniel.thompson@linaro.org> MIME-Version: 1.0 Currently kgdb honours the kprobe blocklist but doesn't place its own trap handling code on the list. Add labels to discourage attempting to use kgdb to debug itself. Not every functions that executes from the trap handler needs to be marked up: relatively early in the trap handler execution (just after we bring the other CPUs to a halt) all breakpoints are replaced with the original opcodes. This patch marks up code in the debug_core that executes between trap entry and the breakpoints being deactivated and, also, code that executes between breakpoint activation and trap exit. To be clear these changes are not sufficient to make recursive trapping impossible since cover all the library calls made during kgdb's entry/exit logic. However going much further whilst we are sharing the kprobe blocklist risks reducing the capabilities of kprobe and this would be a bad trade off (especially so given kgdb's users are currently conditioned to avoid recursive traps). Signed-off-by: Daniel Thompson --- kernel/debug/debug_core.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.25.4 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index b1277728a835..9618c1e2faf6 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c @@ -177,12 +177,14 @@ int __weak kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE); return err; } +NOKPROBE_SYMBOL(kgdb_arch_set_breakpoint); int __weak kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) { return copy_to_kernel_nofault((char *)bpt->bpt_addr, (char *)bpt->saved_instr, BREAK_INSTR_SIZE); } +NOKPROBE_SYMBOL(kgdb_arch_remove_breakpoint); int __weak kgdb_validate_break_address(unsigned long addr) { @@ -302,6 +304,7 @@ static void kgdb_flush_swbreak_addr(unsigned long addr) /* Force flush instruction cache if it was outside the mm */ flush_icache_range(addr, addr + BREAK_INSTR_SIZE); } +NOKPROBE_SYMBOL(kgdb_flush_swbreak_addr); /* * SW breakpoint management: @@ -329,6 +332,7 @@ int dbg_activate_sw_breakpoints(void) } return ret; } +NOKPROBE_SYMBOL(dbg_activate_sw_breakpoints); int dbg_set_sw_break(unsigned long addr) { @@ -392,6 +396,7 @@ int dbg_deactivate_sw_breakpoints(void) } return ret; } +NOKPROBE_SYMBOL(dbg_deactivate_sw_breakpoints); int dbg_remove_sw_break(unsigned long addr) { @@ -560,6 +565,7 @@ static int kgdb_reenter_check(struct kgdb_state *ks) return 1; } +NOKPROBE_SYMBOL(kgdb_reenter_check); static void dbg_touch_watchdogs(void) { @@ -567,6 +573,7 @@ static void dbg_touch_watchdogs(void) clocksource_touch_watchdog(); rcu_cpu_stall_reset(); } +NOKPROBE_SYMBOL(dbg_touch_watchdogs); static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs, int exception_state) @@ -798,6 +805,7 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs, return kgdb_info[cpu].ret_state; } +NOKPROBE_SYMBOL(kgdb_cpu_enter); /* * kgdb_handle_exception() - main entry point from a kernel exception @@ -842,6 +850,7 @@ kgdb_handle_exception(int evector, int signo, int ecode, struct pt_regs *regs) arch_kgdb_ops.enable_nmi(1); return ret; } +NOKPROBE_SYMBOL(kgdb_handle_exception); /* * GDB places a breakpoint at this function to know dynamically loaded objects. @@ -876,6 +885,7 @@ int kgdb_nmicallback(int cpu, void *regs) #endif return 1; } +NOKPROBE_SYMBOL(kgdb_nmicallback); int kgdb_nmicallin(int cpu, int trapnr, void *regs, int err_code, atomic_t *send_ready) @@ -901,6 +911,7 @@ int kgdb_nmicallin(int cpu, int trapnr, void *regs, int err_code, #endif return 1; } +NOKPROBE_SYMBOL(kgdb_nmicallin); static void kgdb_console_write(struct console *co, const char *s, unsigned count)