From: Andrzej Hajda <andrzej.hajda@intel.com>
To: linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, netdev <netdev@vger.kernel.org>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Chris Wilson <chris.p.wilson@intel.com>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Dmitry Vyukov <dvyukov@google.com>
Subject: [Intel-gfx] [PATCH v2 04/11] lib/ref_tracker: add unlocked leak print helper
Date: Tue, 22 Feb 2022 00:16:53 +0100 [thread overview]
Message-ID: <20220221231705.1481059-12-andrzej.hajda@intel.com> (raw)
In-Reply-To: <20220221231705.1481059-1-andrzej.hajda@intel.com>
To have reliable detection of leaks, caller must be able to check under the same
lock both: tracked counter and the leaks. dir.lock is natural candidate for such
lock and unlocked print helper can be called with this lock taken.
As a bonus we can reuse this helper in ref_tracker_dir_exit.
Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Chris Wilson <chris.p.wilson@intel.com>
---
include/linux/ref_tracker.h | 8 +++++
lib/ref_tracker.c | 66 +++++++++++++++++++++----------------
2 files changed, 46 insertions(+), 28 deletions(-)
diff --git a/include/linux/ref_tracker.h b/include/linux/ref_tracker.h
index 9ca353ab712b5..3e9e9df2a41f5 100644
--- a/include/linux/ref_tracker.h
+++ b/include/linux/ref_tracker.h
@@ -36,6 +36,9 @@ static inline void ref_tracker_dir_init(struct ref_tracker_dir *dir,
void ref_tracker_dir_exit(struct ref_tracker_dir *dir);
+void __ref_tracker_dir_print(struct ref_tracker_dir *dir,
+ unsigned int display_limit);
+
void ref_tracker_dir_print(struct ref_tracker_dir *dir,
unsigned int display_limit);
@@ -56,6 +59,11 @@ static inline void ref_tracker_dir_exit(struct ref_tracker_dir *dir)
{
}
+static inline void __ref_tracker_dir_print(struct ref_tracker_dir *dir,
+ unsigned int display_limit)
+{
+}
+
static inline void ref_tracker_dir_print(struct ref_tracker_dir *dir,
unsigned int display_limit)
{
diff --git a/lib/ref_tracker.c b/lib/ref_tracker.c
index dc7b14aa3431e..5e9f90bbf771b 100644
--- a/lib/ref_tracker.c
+++ b/lib/ref_tracker.c
@@ -14,6 +14,38 @@ struct ref_tracker {
depot_stack_handle_t free_stack_handle;
};
+void __ref_tracker_dir_print(struct ref_tracker_dir *dir,
+ unsigned int display_limit)
+{
+ struct ref_tracker *tracker;
+ unsigned int i = 0;
+
+ lockdep_assert_held(&dir->lock);
+
+ list_for_each_entry(tracker, &dir->list, head) {
+ if (i < display_limit) {
+ pr_err("leaked reference.\n");
+ if (tracker->alloc_stack_handle)
+ stack_depot_print(tracker->alloc_stack_handle);
+ i++;
+ } else {
+ break;
+ }
+ }
+}
+EXPORT_SYMBOL(__ref_tracker_dir_print);
+
+void ref_tracker_dir_print(struct ref_tracker_dir *dir,
+ unsigned int display_limit)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave(&dir->lock, flags);
+ __ref_tracker_dir_print(dir, display_limit);
+ spin_unlock_irqrestore(&dir->lock, flags);
+}
+EXPORT_SYMBOL(ref_tracker_dir_print);
+
void ref_tracker_dir_exit(struct ref_tracker_dir *dir)
{
struct ref_tracker *tracker, *n;
@@ -27,13 +59,13 @@ void ref_tracker_dir_exit(struct ref_tracker_dir *dir)
kfree(tracker);
dir->quarantine_avail++;
}
- list_for_each_entry_safe(tracker, n, &dir->list, head) {
- pr_err("leaked reference.\n");
- if (tracker->alloc_stack_handle)
- stack_depot_print(tracker->alloc_stack_handle);
+ if (!list_empty(&dir->list)) {
+ __ref_tracker_dir_print(dir, 16);
leak = true;
- list_del(&tracker->head);
- kfree(tracker);
+ list_for_each_entry_safe(tracker, n, &dir->list, head) {
+ list_del(&tracker->head);
+ kfree(tracker);
+ }
}
spin_unlock_irqrestore(&dir->lock, flags);
WARN_ON_ONCE(leak);
@@ -42,28 +74,6 @@ void ref_tracker_dir_exit(struct ref_tracker_dir *dir)
}
EXPORT_SYMBOL(ref_tracker_dir_exit);
-void ref_tracker_dir_print(struct ref_tracker_dir *dir,
- unsigned int display_limit)
-{
- struct ref_tracker *tracker;
- unsigned long flags;
- unsigned int i = 0;
-
- spin_lock_irqsave(&dir->lock, flags);
- list_for_each_entry(tracker, &dir->list, head) {
- if (i < display_limit) {
- pr_err("leaked reference.\n");
- if (tracker->alloc_stack_handle)
- stack_depot_print(tracker->alloc_stack_handle);
- i++;
- } else {
- break;
- }
- }
- spin_unlock_irqrestore(&dir->lock, flags);
-}
-EXPORT_SYMBOL(ref_tracker_dir_print);
-
int ref_tracker_alloc(struct ref_tracker_dir *dir,
struct ref_tracker **trackerp,
gfp_t gfp)
--
2.25.1
next prev parent reply other threads:[~2022-02-21 23:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 23:16 [Intel-gfx] [PATCH v2 00/11] drm/i915: use ref_tracker library for tracking wakerefs Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 01/11] [DO NOT MERGE] ref_tracker: implement use-after-free detection Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 1/9] lib/ref_tracker: add unlocked leak print helper Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 01/11] ref_tracker: implement use-after-free detection Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 02/11] [DO NOT MERGE] ref_tracker: add a count of untracked references Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 2/9] lib/ref_tracker: compact stacktraces before printing Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 02/11] ref_tracker: add a count of untracked references Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 03/11] [DO NOT MERGE] ref_tracker: remove filter_irq_stacks() call Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 3/9] lib/ref_tracker: __ref_tracker_dir_print improve printing Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 03/11] ref_tracker: remove filter_irq_stacks() call Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 4/9] lib/ref_tracker: add printing to memory buffer Andrzej Hajda
2022-02-21 23:16 ` Andrzej Hajda [this message]
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 5/9] lib/ref_tracker: improve allocation flags Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 05/11] lib/ref_tracker: __ref_tracker_dir_print improve printing Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 6/9] drm/i915: Separate wakeref tracking Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 06/11] lib/ref_tracker: add printing to memory buffer Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 7/9] drm/i915: Track leaked gt->wakerefs Andrzej Hajda
2022-02-21 23:16 ` [Intel-gfx] [PATCH v2 07/11] lib/ref_tracker: remove warnings in case of allocation failure Andrzej Hajda
2022-02-21 23:17 ` [Intel-gfx] [PATCH v2 8/9] drm/i915: Correct type of wakeref variable Andrzej Hajda
2022-02-21 23:17 ` [Intel-gfx] [PATCH v2 08/11] drm/i915: Separate wakeref tracking Andrzej Hajda
2022-02-21 23:17 ` [Intel-gfx] [PATCH v2 9/9] drm/i915: replace Intel internal tracker with kernel core ref_tracker Andrzej Hajda
2022-02-21 23:17 ` [Intel-gfx] [PATCH v2 09/11] drm/i915: Track leaked gt->wakerefs Andrzej Hajda
2022-02-21 23:17 ` [Intel-gfx] [PATCH v2 10/11] drm/i915: Correct type of wakeref variable Andrzej Hajda
2022-02-21 23:17 ` [Intel-gfx] [PATCH v2 11/11] drm/i915: replace Intel internal tracker with kernel core ref_tracker Andrzej Hajda
2022-02-21 23:23 ` [Intel-gfx] [PATCH v2 00/11] drm/i915: use ref_tracker library for tracking wakerefs Andrzej Hajda
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=20220221231705.1481059-12-andrzej.hajda@intel.com \
--to=andrzej.hajda@intel.com \
--cc=chris.p.wilson@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=dvyukov@google.com \
--cc=edumazet@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=netdev@vger.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