Received-SPF: pass (google.com: domain of linux-kernel+bounces-62551-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <ef94259e139e4579ee27db99975dc4cf397e2a06.camel@linux.intel.com>
Subject: Re: [PATCH] tracing: Have saved_cmdlines arrays all in one
 allocation
From: Tim Chen <tim.c.chen@linux.intel.com>
To: Steven Rostedt <rostedt@goodmis.org>, LKML
 <linux-kernel@vger.kernel.org>,  Linux Trace Kernel
 <linux-trace-kernel@vger.kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>, Mathieu Desnoyers
 <mathieu.desnoyers@efficios.com>, Mark Rutland <mark.rutland@arm.com>, 
 Vincent Donnefort <vdonnefort@google.com>, Sven Schnelle
 <svens@linux.ibm.com>, Mete Durlu <meted@linux.ibm.com>
Date: Mon, 12 Feb 2024 15:39:03 -0800
In-Reply-To: <20240212180941.379c419b@gandalf.local.home>
References: <20240212180941.379c419b@gandalf.local.home>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) 
Precedence: bulk
MIME-Version: 1.0

On Mon, 2024-02-12 at 18:09 -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
>=20
> The saved_cmdlines have three arrays for mapping PIDs to COMMs:
>=20
>  - map_pid_to_cmdline[]
>  - map_cmdline_to_pid[]
>  - saved_cmdlines
>=20
> The map_pid_to_cmdline[] is PID_MAX_DEFAULT in size and holds the index
> into the other arrays. The map_cmdline_to_pid[] is a mapping back to the
> full pid as it can be larger than PID_MAX_DEFAULT. And the
> saved_cmdlines[] just holds the COMMs associated to the pids.
>=20
> Currently the map_pid_to_cmdline[] and saved_cmdlines[] are allocated
> together (in reality the saved_cmdlines is just in the memory of the
> rounding of the allocation of the structure as it is always allocated in
> powers of two). The map_cmdline_to_pid[] array is allocated separately.
>=20
> Since the rounding to a power of two is rather large (it allows for 8000
> elements in saved_cmdlines), also include the map_cmdline_to_pid[] array.
> (This drops it to 6000 by default, which is still plenty for most use
> cases). This saves even more memory as the map_cmdline_to_pid[] array
> doesn't need to be allocated.


This patch does make better use of the extra space and make the
previous change better.

Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
=20
>=20
> Link: https://lore.kernel.org/linux-trace-kernel/20240212174011.068211d9@=
gandalf.local.home/
>=20
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
>  kernel/trace/trace_sched_switch.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)
>=20
> diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched=
_switch.c
> index e4fbcc3bede5..210c74dcd016 100644
> --- a/kernel/trace/trace_sched_switch.c
> +++ b/kernel/trace/trace_sched_switch.c
> @@ -201,7 +201,7 @@ static struct saved_cmdlines_buffer *allocate_cmdline=
s_buffer(unsigned int val)
>  	int order;
> =20
>  	/* Figure out how much is needed to hold the given number of cmdlines *=
/
> -	orig_size =3D sizeof(*s) + val * TASK_COMM_LEN;
> +	orig_size =3D sizeof(*s) + val * (TASK_COMM_LEN + sizeof(int));

Strictly speaking, *map_cmdline_to_pid is unsigned int so it is more consis=
tent
to use sizeof(unsigned) in line above.  But I'm nitpicking and I'm fine to
leave it as is.

>  	order =3D get_order(orig_size);
>  	size =3D 1 << (order + PAGE_SHIFT);
>  	page =3D alloc_pages(GFP_KERNEL, order);
> @@ -212,16 +212,11 @@ static struct saved_cmdlines_buffer *allocate_cmdli=
nes_buffer(unsigned int val)
>  	memset(s, 0, sizeof(*s));
> =20
>  	/* Round up to actual allocation */
> -	val =3D (size - sizeof(*s)) / TASK_COMM_LEN;
> +	val =3D (size - sizeof(*s)) / (TASK_COMM_LEN + sizeof(int));
>  	s->cmdline_num =3D val;
> =20
> -	s->map_cmdline_to_pid =3D kmalloc_array(val,
> -					      sizeof(*s->map_cmdline_to_pid),
> -					      GFP_KERNEL);
> -	if (!s->map_cmdline_to_pid) {
> -		free_saved_cmdlines_buffer(s);
> -		return NULL;
> -	}
> +	/* Place map_cmdline_to_pid array right after saved_cmdlines */
> +	s->map_cmdline_to_pid =3D (unsigned *)&s->saved_cmdlines[val * TASK_COM=
M_LEN];
> =20
>  	s->cmdline_idx =3D 0;
>  	memset(&s->map_pid_to_cmdline, NO_CMDLINE_MAP,