From: Marco Elver <elver@google.com>
To: elver@google.com, glider@google.com, akpm@linux-foundation.org,
catalin.marinas@arm.com, cl@linux.com, rientjes@google.com,
iamjoonsoo.kim@lge.com, mark.rutland@arm.com, penberg@kernel.org
Cc: hpa@zytor.com, paulmck@kernel.org, andreyknvl@google.com,
aryabinin@virtuozzo.com, luto@kernel.org, bp@alien8.de,
dave.hansen@linux.intel.com, dvyukov@google.com,
edumazet@google.com, gregkh@linuxfoundation.org,
mingo@redhat.com, jannh@google.com, corbet@lwn.net,
keescook@chromium.org, peterz@infradead.org, cai@lca.pw,
tglx@linutronix.de, will@kernel.org, x86@kernel.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org,
linux-mm@kvack.org
Subject: [PATCH RFC 08/10] kfence, lockdep: make KFENCE compatible with lockdep
Date: Mon, 7 Sep 2020 15:40:53 +0200 [thread overview]
Message-ID: <20200907134055.2878499-9-elver@google.com> (raw)
In-Reply-To: <20200907134055.2878499-1-elver@google.com>
Lockdep checks that dynamic key registration is only performed on keys
that are not static objects. With KFENCE, it is possible that such a
dynamically allocated key is a KFENCE object which may, however, be
allocated from a static memory pool (if HAVE_ARCH_KFENCE_STATIC_POOL).
Therefore, ignore KFENCE-allocated objects in static_obj().
Co-developed-by: Alexander Potapenko <glider@google.com>
Signed-off-by: Alexander Potapenko <glider@google.com>
Signed-off-by: Marco Elver <elver@google.com>
---
kernel/locking/lockdep.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 54b74fabf40c..0cf5d5ecbd31 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -38,6 +38,7 @@
#include <linux/seq_file.h>
#include <linux/spinlock.h>
#include <linux/kallsyms.h>
+#include <linux/kfence.h>
#include <linux/interrupt.h>
#include <linux/stacktrace.h>
#include <linux/debug_locks.h>
@@ -755,6 +756,13 @@ static int static_obj(const void *obj)
if (arch_is_kernel_initmem_freed(addr))
return 0;
+ /*
+ * KFENCE objects may be allocated from a static memory pool, but are
+ * not actually static objects.
+ */
+ if (is_kfence_address(obj))
+ return 0;
+
/*
* static variable?
*/
--
2.28.0.526.ge36021eeef-goog
next prev parent reply other threads:[~2020-09-07 17:23 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-07 13:40 [PATCH RFC 00/10] KFENCE: A low-overhead sampling-based memory safety error detector Marco Elver
2020-09-07 13:40 ` [PATCH RFC 01/10] mm: add Kernel Electric-Fence infrastructure Marco Elver
2020-09-07 15:41 ` Jonathan Cameron
2020-09-07 16:38 ` Marco Elver
2020-09-10 14:57 ` Dmitry Vyukov
2020-09-10 15:06 ` Marco Elver
2020-09-10 15:48 ` Dmitry Vyukov
2020-09-10 16:22 ` Marco Elver
2020-09-10 15:42 ` Dmitry Vyukov
2020-09-10 16:19 ` Alexander Potapenko
2020-09-10 17:11 ` Dmitry Vyukov
2020-09-10 17:41 ` Marco Elver
2020-09-10 20:25 ` Paul E. McKenney
2020-09-15 13:57 ` SeongJae Park
2020-09-15 14:14 ` Marco Elver
2020-09-15 14:26 ` SeongJae Park
2020-09-07 13:40 ` [PATCH RFC 02/10] x86, kfence: enable KFENCE for x86 Marco Elver
2020-09-07 13:40 ` [PATCH RFC 03/10] arm64, kfence: enable KFENCE for ARM64 Marco Elver
2020-09-09 15:13 ` Marco Elver
2020-09-07 13:40 ` [PATCH RFC 04/10] mm, kfence: insert KFENCE hooks for SLAB Marco Elver
2020-09-11 7:17 ` Dmitry Vyukov
2020-09-11 12:24 ` Marco Elver
2020-09-11 13:03 ` Dmitry Vyukov
2020-09-07 13:40 ` [PATCH RFC 05/10] mm, kfence: insert KFENCE hooks for SLUB Marco Elver
2020-09-07 13:40 ` [PATCH RFC 06/10] kfence, kasan: make KFENCE compatible with KASAN Marco Elver
2020-09-11 7:04 ` Dmitry Vyukov
2020-09-11 13:00 ` Marco Elver
2020-09-07 13:40 ` [PATCH RFC 07/10] kfence, kmemleak: make KFENCE compatible with KMEMLEAK Marco Elver
2020-09-08 11:53 ` Catalin Marinas
2020-09-08 12:29 ` Alexander Potapenko
2020-09-07 13:40 ` Marco Elver [this message]
2020-09-07 13:40 ` [PATCH RFC 09/10] kfence, Documentation: add KFENCE documentation Marco Elver
2020-09-07 15:33 ` Andrey Konovalov
2020-09-07 16:33 ` Marco Elver
2020-09-07 17:55 ` Andrey Konovalov
2020-09-07 18:16 ` Marco Elver
2020-09-08 15:54 ` Dave Hansen
2020-09-08 16:14 ` Marco Elver
2020-09-11 7:14 ` Dmitry Vyukov
2020-09-11 7:46 ` Marco Elver
2020-09-07 13:40 ` [PATCH RFC 10/10] kfence: add test suite Marco Elver
2020-09-08 11:48 ` [PATCH RFC 00/10] KFENCE: A low-overhead sampling-based memory safety error detector Vlastimil Babka
2020-09-08 12:16 ` Alexander Potapenko
2020-09-08 14:40 ` Vlastimil Babka
2020-09-08 15:21 ` Marco Elver
[not found] ` <e399d8d5-03c2-3c13-2a43-3bb8e842c55a@intel.com>
2020-09-08 15:31 ` Marco Elver
2020-09-08 15:36 ` Vlastimil Babka
2020-09-08 15:56 ` Marco Elver
2020-09-11 7:35 ` Dmitry Vyukov
2020-09-11 12:03 ` Marco Elver
2020-09-11 13:09 ` Dmitry Vyukov
2020-09-11 13:33 ` Marco Elver
2020-09-11 16:33 ` Marco Elver
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200907134055.2878499-9-elver@google.com \
--to=elver@google.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=aryabinin@virtuozzo.com \
--cc=bp@alien8.de \
--cc=cai@lca.pw \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=dvyukov@google.com \
--cc=edumazet@google.com \
--cc=glider@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=jannh@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=paulmck@kernel.org \
--cc=penberg@kernel.org \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).