2023-10-26 22:34:05

by andrey.konovalov

[permalink] [raw]
Subject: [PATCH] fix for "lib/stackdepot: allow users to evict stack traces"

From: Andrey Konovalov <[email protected]>

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 <[email protected]>
---
lib/stackdepot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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",
--
2.25.1


2023-10-26 23:07:32

by Andrew Morton

[permalink] [raw]
Subject: Re: [PATCH] fix for "lib/stackdepot: allow users to evict stack traces"

On Fri, 27 Oct 2023 00:33:40 +0200 [email protected] wrote:

> From: Andrey Konovalov <[email protected]>
>
> 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.

2023-10-26 23:21:36

by Andrey Konovalov

[permalink] [raw]
Subject: Re: [PATCH] fix for "lib/stackdepot: allow users to evict stack traces"

On Fri, Oct 27, 2023 at 1:07 AM Andrew Morton <[email protected]> wrote:
>
> On Fri, 27 Oct 2023 00:33:40 +0200 [email protected] wrote:
>
> > From: Andrey Konovalov <[email protected]>
> >
> > 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.