perf: Small fixes and new tests

[PATCH v1 01/17] perf kvm: Fix debug assertion

Posted by Ian Rogers 1 week, 2 days ago

There are 2 slots left for kvm_add_default_arch_event, fix the
assertion so that debug builds don't fail the assert and to agree with
the comment.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/builtin-kvm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index f0f285763f19..c61369d54dd9 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -2014,7 +2014,7 @@ static int __cmd_record(const char *file_name, int argc, const char **argv)
 	for (j = 1; j < argc; j++, i++)
 		rec_argv[i] = STRDUP_FAIL_EXIT(argv[j]);
 
-	BUG_ON(i != rec_argc);
+	BUG_ON(i + 2 != rec_argc);
 
 	ret = kvm_add_default_arch_event(&i, rec_argv);
 	if (ret)
-- 
2.52.0.rc2.455.g230fcf2819-goog

Re: [PATCH v1 01/17] perf kvm: Fix debug assertion

Posted by Namhyung Kim 5 days, 18 hours ago

On Sat, Nov 22, 2025 at 12:19:13AM -0800, Ian Rogers wrote:
> There are 2 slots left for kvm_add_default_arch_event, fix the
> assertion so that debug builds don't fail the assert and to agree with
> the comment.
> 
> Signed-off-by: Ian Rogers <irogers@google.com>

Fixes: 45ff39f6e70aa55d0 ("perf tools kvm: Fix the potential out of range memory access issue")

Thanks,
Namhyung

> ---
>  tools/perf/builtin-kvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
> index f0f285763f19..c61369d54dd9 100644
> --- a/tools/perf/builtin-kvm.c
> +++ b/tools/perf/builtin-kvm.c
> @@ -2014,7 +2014,7 @@ static int __cmd_record(const char *file_name, int argc, const char **argv)
>  	for (j = 1; j < argc; j++, i++)
>  		rec_argv[i] = STRDUP_FAIL_EXIT(argv[j]);
>  
> -	BUG_ON(i != rec_argc);
> +	BUG_ON(i + 2 != rec_argc);
>  
>  	ret = kvm_add_default_arch_event(&i, rec_argv);
>  	if (ret)
> -- 
> 2.52.0.rc2.455.g230fcf2819-goog
>