trace: Reduce the number of function sites

Given that the compiler adds two function calls into each function, the
current spacing is overkill. Drop it down to 16 bytes per function, which
is still plenty. This saves some space in the trace buffer.

Also move the calculation into a function, so it is common code. Add a
check for gd->mon_len being unset, which breaks tracing.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2023-01-15 14:15:47 -07:00
committed by Tom Rini
parent d9044e5363
commit c3d91812a2
2 changed files with 21 additions and 4 deletions

View File

@@ -321,6 +321,17 @@ void notrace trace_set_enabled(int enabled)
trace_enabled = enabled != 0;
}
static int get_func_count(void)
{
/* Detect no support for mon_len since this means tracing cannot work */
if (IS_ENABLED(CONFIG_SANDBOX) && !gd->mon_len) {
puts("Tracing is not supported on this board\n");
return -ENOTSUPP;
}
return gd->mon_len / FUNC_SITE_SIZE;
}
/**
* trace_init() - initialize the tracing system and enable it
*
@@ -330,10 +341,12 @@ void notrace trace_set_enabled(int enabled)
*/
int notrace trace_init(void *buff, size_t buff_size)
{
ulong func_count = gd->mon_len / FUNC_SITE_SIZE;
int func_count = get_func_count();
size_t needed;
int was_disabled = !trace_enabled;
if (func_count < 0)
return func_count;
trace_save_gd();
if (!was_disabled) {
@@ -393,10 +406,12 @@ int notrace trace_init(void *buff, size_t buff_size)
*/
int notrace trace_early_init(void)
{
ulong func_count = gd->mon_len / FUNC_SITE_SIZE;
int func_count = get_func_count();
size_t buff_size = CONFIG_TRACE_EARLY_SIZE;
size_t needed;
if (func_count < 0)
return func_count;
/* We can ignore additional calls to this function */
if (trace_enabled)
return 0;