[PATCH] tools/runqslower: Change state to __state

[PATCH] tools/runqslower: Change state to __state

[Jiri Olsa]

The task_struct state got renamed to __state, causing
compile fail:

  runqslower.bpf.c:77:12: error: no member named 'state' in 'struct task_struct'
        if (prev->state == TASK_RUNNING)

As this is tracing prog, I think we don't need to use
READ_ONCE to access __state.

Fixes: 2f064a59a11f ("sched: Change task_struct::state")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/bpf/runqslower/runqslower.bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bpf/runqslower/runqslower.bpf.c b/tools/bpf/runqslower/runqslower.bpf.c
index 645530ca7e98..ab9353f2fd46 100644
--- a/tools/bpf/runqslower/runqslower.bpf.c
+++ b/tools/bpf/runqslower/runqslower.bpf.c
@@ -74,7 +74,7 @@ int handle__sched_switch(u64 *ctx)
 	u32 pid;
 
 	/* ivcsw: treat like an enqueue event and store timestamp */
-	if (prev->state == TASK_RUNNING)
+	if (prev->__state == TASK_RUNNING)
 		trace_enqueue(prev);
 
 	pid = next->pid;
-- 
2.31.1

Re: [PATCH] tools/runqslower: Change state to __state

[Song Liu]

On Tue, Jul 6, 2021 at 1:40 PM Jiri Olsa <jolsa@redhat.com> wrote:
>
> The task_struct state got renamed to __state, causing
> compile fail:
>
>   runqslower.bpf.c:77:12: error: no member named 'state' in 'struct task_struct'
>         if (prev->state == TASK_RUNNING)
>
> As this is tracing prog, I think we don't need to use
> READ_ONCE to access __state.
>
> Fixes: 2f064a59a11f ("sched: Change task_struct::state")
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Acked-by: Song Liu <songliubraving@fb.com>

Re: [PATCH] tools/runqslower: Change state to __state

[Song Liu]

On Tue, Jul 6, 2021 at 3:53 PM Song Liu <song@kernel.org> wrote:
>
> On Tue, Jul 6, 2021 at 1:40 PM Jiri Olsa <jolsa@redhat.com> wrote:
> >
> > The task_struct state got renamed to __state, causing
> > compile fail:
> >
> >   runqslower.bpf.c:77:12: error: no member named 'state' in 'struct task_struct'
> >         if (prev->state == TASK_RUNNING)
> >
> > As this is tracing prog, I think we don't need to use
> > READ_ONCE to access __state.
> >
> > Fixes: 2f064a59a11f ("sched: Change task_struct::state")
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
>
> Acked-by: Song Liu <songliubraving@fb.com>

Just realized there is another thread fixing the same error.

Thanks,
Song

Re: [PATCH] tools/runqslower: Change state to __state

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf.git (refs/heads/master):

On Tue,  6 Jul 2021 22:40:05 +0200 you wrote:
> The task_struct state got renamed to __state, causing
> compile fail:
> 
>   runqslower.bpf.c:77:12: error: no member named 'state' in 'struct task_struct'
>         if (prev->state == TASK_RUNNING)
> 
> As this is tracing prog, I think we don't need to use
> READ_ONCE to access __state.
> 
> [...]

Here is the summary with links:
  - tools/runqslower: Change state to __state
    https://git.kernel.org/bpf/bpf/c/cced7490b172

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html