From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753023AbcG2QEJ (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 Jul 2016 12:04:09 -0400
Received: from mail.kernel.org ([198.145.29.136]:50370 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751563AbcG2QEF (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 Jul 2016 12:04:05 -0400
Date: Sat, 30 Jul 2016 01:03:59 +0900
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com>
Cc: linux-kernel@vger.kernel.org, ltc-kernel@rdgml.intra.hitachi.co.jp,
        masumi.moritani.ju@hitachi.com, Jiri Olsa <jolsa@kernel.org>,
        David Ahern <dsahern@gmail.com>, Namhyung Kim <namhyung@kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Masami Hiramatsu <mhiramat@kernel.org>
Subject: Re: [PATCH v3] perf sched: fix wrong conversion of task state
Message-Id: <20160730010359.1f6ceb6d9ce4ee4497753929@kernel.org>
In-Reply-To: <1469764808-26348-1-git-send-email-tomoki.sekiyama.qu@hitachi.com>
References: <1469764808-26348-1-git-send-email-tomoki.sekiyama.qu@hitachi.com>
X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.30; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 29 Jul 2016 13:00:08 +0900
Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com> wrote:

> sched_out_state() converts the prev_state u64 bitmask to a char in
> a wrong way, which may cause invalid memory access.
> TASK_STATE_TO_CHAR_STR should also be fixed to adapt current
> kernel's sched.h.

This still have 2 things...

> 
> Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Masami Hiramatsu <mhiramat@kernel.org>
> ---
>  tools/perf/builtin-sched.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
> index 0dfe8df..5776263 100644
> --- a/tools/perf/builtin-sched.c
> +++ b/tools/perf/builtin-sched.c
> @@ -70,7 +70,7 @@ struct sched_atom {
>  	struct task_desc	*wakee;
>  };
>  
> -#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKWP"
> +#define TASK_STATE_TO_CHAR_STR "RSDTtXZxKWPNn"
>  
>  enum thread_state {
>  	THREAD_SLEEPING = 0,
> @@ -897,9 +897,10 @@ static int thread_atoms_insert(struct perf_sched *sched, struct thread *thread)
>  
>  static char sched_out_state(u64 prev_state)
>  {
> -	const char *str = TASK_STATE_TO_CHAR_STR;
> +	const char str[] = TASK_STATE_TO_CHAR_STR;
> +	unsigned int bit = prev_state ? __ffs(prev_state) + 1 : 0;
>  
> -	return str[prev_state];
> +	return bit < ARRAY_SIZE(str) - 1 ? str[bit] : '?';
>  }
>  
>  static int
> -- 
> 2.7.4
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>