From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92B65C43612 for ; Thu, 10 Jan 2019 02:58:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5861721783 for ; Thu, 10 Jan 2019 02:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547089123; bh=cOlAHv51eBswt07zXB4jFJAKiWwANnHtBJxD9PP7ZOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VF1bH3Co9ELkPpPqiFcauQ3+zny0xOwQeJSsXJwV+JqV1QSws8i/qk2Y7ENLELzmf Nz93aVPiaEAreEYmCntYfKJsrtLj6TlXR3ikCryM7UopebMHNSG/7wbhgYPak/JgKd QMJtPxBAn6Zr+32EIQ3QNiXk1p8+6QRngy9zf5gs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727336AbfAJC6m (ORCPT ); Wed, 9 Jan 2019 21:58:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:39544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726458AbfAJC6m (ORCPT ); Wed, 9 Jan 2019 21:58:42 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 66321214DA; Thu, 10 Jan 2019 02:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547089121; bh=cOlAHv51eBswt07zXB4jFJAKiWwANnHtBJxD9PP7ZOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zPq1slVUC5Qh/DRUtGDoId6Al9fstME9ttHKBmo78YsG5Qun2BVsxJjep5oPLSach bdYKkuJfCSLwh+Itk6u09ranUA7mB9ESQYy4CybC29WXcd6Jpu4r3qpaenhdmajaVI /rXMeOTSovVeJg+eRQcl5TfhtKtcQCqZUlBBqZRY= From: Masami Hiramatsu To: Ingo Molnar Cc: Masami Hiramatsu , peterz@infradead.org, Mathieu Desnoyers , linux-kernel , Andrea Righi , Steven Rostedt , stable@vger.kernel.org Subject: [PATCH 9/9] kprobes: Prohibit probing on lockdep functions Date: Thu, 10 Jan 2019 11:58:18 +0900 Message-Id: <154708909849.6325.7064100735504157230.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <154708884117.6325.4454464467156828009.stgit@devbox> References: <154708884117.6325.4454464467156828009.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some lockdep functions can be involved in breakpoint handling and probing on those functions can cause a breakpoint recursion. Prohibit probing on those functions by blacklist. Signed-off-by: Masami Hiramatsu --- kernel/locking/lockdep.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 95932333a48b..bc35a54ae3d4 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -2814,6 +2815,7 @@ void lockdep_hardirqs_on(unsigned long ip) __trace_hardirqs_on_caller(ip); current->lockdep_recursion = 0; } +NOKPROBE_SYMBOL(lockdep_hardirqs_on); /* * Hardirqs were disabled: @@ -2843,6 +2845,7 @@ void lockdep_hardirqs_off(unsigned long ip) } else debug_atomic_inc(redundant_hardirqs_off); } +NOKPROBE_SYMBOL(lockdep_hardirqs_off); /* * Softirqs will be enabled: @@ -3650,7 +3653,8 @@ __lock_release(struct lockdep_map *lock, int nested, unsigned long ip) return 0; } -static int __lock_is_held(const struct lockdep_map *lock, int read) +static nokprobe_inline +int __lock_is_held(const struct lockdep_map *lock, int read) { struct task_struct *curr = current; int i; @@ -3883,6 +3887,7 @@ int lock_is_held_type(const struct lockdep_map *lock, int read) return ret; } EXPORT_SYMBOL_GPL(lock_is_held_type); +NOKPROBE_SYMBOL(lock_is_held_type); struct pin_cookie lock_pin_lock(struct lockdep_map *lock) {