diff mbox series

fix for "lib/stackdepot: allow users to evict stack traces"

Message ID 20231026223340.333159-1-andrey.konovalov@linux.dev
State New
Headers
Series fix for "lib/stackdepot: allow users to evict stack traces" |

Commit Message

andrey.konovalov@linux.dev Oct. 26, 2023, 10:33 p.m. UTC 
  From: Andrey Konovalov <andreyknvl@google.com>

Commit "lib/stackdepot: allow users to evict stack traces" adds another
user for depot_fetch_stack, which holds a write lock. Thus, we need to
update the lockdep annotation.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
 lib/stackdepot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrew Morton Oct. 26, 2023, 11:07 p.m. UTC | #1 
On Fri, 27 Oct 2023 00:33:40 +0200 andrey.konovalov@linux.dev wrote:

> From: Andrey Konovalov <andreyknvl@google.com>
> 
> Commit "lib/stackdepot: allow users to evict stack traces" adds another
> user for depot_fetch_stack, which holds a write lock. Thus, we need to
> update the lockdep annotation.
> 

We're at -rc7, which is rather late to be merging material such as this
patchset.  Please resend it all after -rc1 and include this fixup,
thanks.
Andrey Konovalov Oct. 26, 2023, 11:20 p.m. UTC | #2 
On Fri, Oct 27, 2023 at 1:07 AM Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Fri, 27 Oct 2023 00:33:40 +0200 andrey.konovalov@linux.dev wrote:
>
> > From: Andrey Konovalov <andreyknvl@google.com>
> >
> > Commit "lib/stackdepot: allow users to evict stack traces" adds another
> > user for depot_fetch_stack, which holds a write lock. Thus, we need to
> > update the lockdep annotation.
> >
>
> We're at -rc7, which is rather late to be merging material such as this
> patchset.  Please resend it all after -rc1 and include this fixup,
> thanks.

Ack.

I might send a few more additions to the series for review before
then, but then resend everything together after rc1.
diff mbox series

Patch

diff --git a/lib/stackdepot.c b/lib/stackdepot.c
index 3a8f045696fd..cf707ff32d7d 100644
--- a/lib/stackdepot.c
+++ b/lib/stackdepot.c
@@ -388,7 +388,7 @@  static struct stack_record *depot_fetch_stack(depot_stack_handle_t handle)
 	size_t offset = parts.offset << DEPOT_STACK_ALIGN;
 	struct stack_record *stack;
 
-	lockdep_assert_held_read(&pool_rwlock);
+	lockdep_assert_held(&pool_rwlock);
 
 	if (parts.pool_index > pools_num) {
 		WARN(1, "pool index %d out of bounds (%d) for stack id %08x\n",