From nobody Sat Oct 4 00:31:20 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B52012E03E8 for ; Thu, 21 Aug 2025 16:38:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794312; cv=none; b=FTGR4C04NYjbrRE/L74UJZyKEH7Zz+rKdEE5HtlI6ubehoV80mn1cWByg+DSisYp29x+NWophVAOjRhgAjWYKWyyqKPDfkA0CzmTnsGnwg5YH38G8LVRsyrnliEYh7G+GdFprHlwOlsnWAaWux1CrparMWEOkYJFW+L+Kcjb+H4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794312; c=relaxed/simple; bh=8n1sV62Nfazy06tMYoFP1zPSTaaez+AvZXx0FOsaOao=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=rnOdnGy1FIQFqEBKpekrDFJrmZvsVBbNygzkBJkm+JcZzFCERmqgyOePRI3htqw7mc9v3u8Y5yvdan57tI2XWqVKVFNXNUWcAM2J9zixTqRFngxdVu8wi379zxnIXsm2fwWxdXp+QZ+GNCR0Sv/r0m+pLZKoUw+n9GaPdgaB2mE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=MLH6AIb8; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MLH6AIb8" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-324f2d61681so1100255a91.1 for ; Thu, 21 Aug 2025 09:38:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755794310; x=1756399110; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=PUbXtlHAwgGqqJx9+B1gHsCORD+CThrnBxlTMp4vr6o=; b=MLH6AIb8TBJAtYXywWGfcAhiNB0/0JPrFpbFlvXpXtc4z1OPaaWjTcUl+wKTs+ADh4 FaLq4POAYL7oh2RHHoUHwFaAgwQXvrQSNMIfpCPqxJ6+ThOKGfthY0Mwk+t7x6rwxWY6 0DfmmRAm9OuYG6zjxySTzfddLllUe56KNpGqmZL1vcAQfBhGQaB7I1vfRq46mMKGFp3j JqNlLwdtTwOvzdD7G9EXAvzO58kkP6FEEBd8yph3Vj6ZQnuuiu+TMGfsAzgvpxavHOge esnEkCTXieqFcdYHA5cg4VAHFETvcbwotNdl6c20Iz3Bo34h7QUEGcNozFr6gnPsPKNr Xamg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755794310; x=1756399110; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PUbXtlHAwgGqqJx9+B1gHsCORD+CThrnBxlTMp4vr6o=; b=oUza46Uvl8qT59VFezaxdWieYNbg42YL4uNvpuCAD4QXeokDaw4lxtW/XNA6KVH7r4 V9yoeIdt0mhbcUskA7mMKw1lIIbXPb+o0Q8d++UJZcGwnpmcgumh0pS+hKJiChXYonUS K2WYwIY0YUw9lzOvJ5YjWrkq5rdFykqfjqEbTLOrFq2UJ+OYXG0MHzV1mS6tkkB9Q/LN mwkbYgXDe4cX5je+0wbEhKIdJAqG786UVQUdKuad42FlEE45sWdxikzj6wDgkHI9DxUd VVcMXglYXQzYv34IJmcd6Q/iHvl8+XzpbuK1gykZeBIbUjduUEx1safYq1fpu8vA8ohK NZlw== X-Forwarded-Encrypted: i=1; AJvYcCUxvHXvdwC4+CkVb4GIR72EAhAxfGEGqFURF0wG/6CZCX96MpKQqHCXvewYxtnbCWS0kXskneTI6V/oa+Q=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2wtioVbEOhB1SWfowVr+z7ZvX/p9spYo78s1sQK2qQCJYwV6a aIce/j6MfTUcw1WG0IiK/ztHCAmdj+8E69Ce83KNZWzYCRw7LfeRp1LzWMnThHx2Jtu5ymhPyTb fNh89s2x8JQ== X-Google-Smtp-Source: AGHT+IFC0FPH58EcxYNCNsDlbFVM2eQ7zXRysU3PWwwtUJGNFehDhJ+ieRWR9RCSFQjUoENWksgGJ4sctYWc X-Received: from pjvb16.prod.google.com ([2002:a17:90a:d890:b0:31e:c1fb:dbb2]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2644:b0:31f:335d:3424 with SMTP id 98e67ed59e1d1-32517c23cfcmr166650a91.27.1755794310098; Thu, 21 Aug 2025 09:38:30 -0700 (PDT) Date: Thu, 21 Aug 2025 09:38:15 -0700 In-Reply-To: <20250821163820.1132977-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250821163820.1132977-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.rc1.193.gad69d77794-goog Message-ID: <20250821163820.1132977-2-irogers@google.com> Subject: [PATCH v2 1/5] perf disasm: Avoid undefined behavior in incrementing NULL From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Chun-Tse Shao , Blake Jones , James Clark , Jan Polensky , Collin Funk , Howard Chu , Thomas Gleixner , Nam Cao , Li Huafei , "Steinar H. Gunderson" , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Incrementing NULL is undefined behavior and triggers ubsan during the perf annotate test. Split a compound statement over two lines to avoid this. Fixes: 98f69a573c66 ("perf annotate: Split out util/disasm.c") Signed-off-by: Ian Rogers Acked-by: Namhyung Kim Reviewed-by: Collin Funk Reviewed-by: James Clark --- tools/perf/util/disasm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index b1e4919d016f..e257bd918c89 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -390,13 +390,16 @@ static int jump__parse(struct arch *arch, struct ins_= operands *ops, struct map_s * skip over possible up to 2 operands to get to address, e.g.: * tbnz w0, #26, ffff0000083cd190 */ - if (c++ !=3D NULL) { + if (c !=3D NULL) { + c++; ops->target.addr =3D strtoull(c, NULL, 16); if (!ops->target.addr) { c =3D strchr(c, ','); c =3D validate_comma(c, ops); - if (c++ !=3D NULL) + if (c !=3D NULL) { + c++; ops->target.addr =3D strtoull(c, NULL, 16); + } } } else { ops->target.addr =3D strtoull(ops->raw, NULL, 16); --=20 2.51.0.rc1.193.gad69d77794-goog From nobody Sat Oct 4 00:31:20 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0EA502E0903 for ; Thu, 21 Aug 2025 16:38:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794314; cv=none; b=ChHTyKkOIIdUeWLqhYVadTX1tJWS6sixVHI44xJggDW6+qY0VCRm59PXEG519abJ7rW8TPOivjGHboX+88Fs4gxTOfliMOpmwYFO/MckpfFL5kHA0zfuuXHwfkCM4RC3x7RzRzsqYf90XVqA6P1TkdbzT4//Q+CE2irLTgBsQ4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794314; c=relaxed/simple; bh=eyA829iLXKDV2aXN/zMNIAyNupu1EE+3JDyACL8MmxA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=nfsUAlmq/ZcK1EWo/NlzA8GdyeMiqDVa4LRXD36RdldaXArbdAMVnqTG/pkM654XEcIakYzeC3uNGGCKDs78XifqPSwZvrPfWz1mvCS/th0SNg5E5iJMjxs54Lbyc/NUB7AbauGDpvs65MhSN+dIK5RsnnrP+Wo8bhk6XYfkrso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=pYLRkxMi; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pYLRkxMi" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2445806eab4so14450315ad.1 for ; Thu, 21 Aug 2025 09:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755794312; x=1756399112; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=TzxYkTMP6IjvFIINqgjg2uV8ks/7NGouvlIDUbYRfdg=; b=pYLRkxMiuNnaubXwwWYnth9NbT/d1s9oNEmb1qokkQQY+bhZGdM69/p0XtFQOpcydh Ows8UEFpDc8TujZdSyRY7pivo5GCF/NO3FSKo9ChGw4eXirXCwDuby0HxhPslTOTsjs5 enOmaTheMHMdXCrOUF3Cmrs0/Pqwmrm+2wVS3RjB2GptyqUwJ2ZZ18WF7RN0rBnUYfM9 /TyBhnwdePFCKRVGK+MhAb1TBjV/L2Zqg/L2pZ1Nd816cR68aU7ycFhzEK58304jbESp jgbNX+p8ZikHcVYC8SLlatBiz8ij7BFAGehYd95vxjTqLE24q6m+42R8/H60iFCF9VC2 3e6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755794312; x=1756399112; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TzxYkTMP6IjvFIINqgjg2uV8ks/7NGouvlIDUbYRfdg=; b=nDVsixvS5BAwZwNLN+XEZ2+NAKnhKjWLP30iEivcszA8mUJOXLTUHLI5Iu9Lkf7bN1 jgRK/wMWUW9Z6QdC5XibxYwFRGhodeFwKsfBeV7GUuGo6wYvsJxzmNCvjz3MZWibzN5W 3gweMVjT4AOzGwVMmgssGy1V+JvN7yf8DYX5v0P1lpYVup40Ex8k1VlRHJZRfasersa8 2swfl2wOv6MQ4G4gyJYlCYuCm0aG9w6FUKz4Ac/xCme5g1FQlW+OyCasXHFKLfyYOEOv pAghEEa8TjuQYR0Rs3MiyB1F0yUOCxTZEbU8IAhg2CsvwCoTh5UswOFpyni4OWnLEX0/ IUUQ== X-Forwarded-Encrypted: i=1; AJvYcCXM9k1u73g2Nu3roxBl6Ch5kk9Z+5gf7mLpq/khZbjA6k76Wkzey5oMXicoxld/v8sI1cHilY90CcOqBR0=@vger.kernel.org X-Gm-Message-State: AOJu0YyGcs17TXoogLh4ZodmHh4R/bmNcQ9brQtqzUC1q4M45QHsptBP wrLMTPmfGv1cNtNvTEGlmniS8qDCuYO5TmXGloY7pRbBbWEo9xldPAHT7/mdHObEWFy+ZCCtWTN Yw2/dtlbARA== X-Google-Smtp-Source: AGHT+IFuEyc/k68SiPnvKZHreOAHcRO5VQTmY+lSWGvRBKsZHoGobugZ/jQ8sxPqHUjGsGhHdE3Org0x44xq X-Received: from plxm13.prod.google.com ([2002:a17:902:db0d:b0:246:17d2:ab51]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:db0a:b0:242:c66f:9f87 with SMTP id d9443c01a7336-245ff87a0acmr33871625ad.51.1755794312333; Thu, 21 Aug 2025 09:38:32 -0700 (PDT) Date: Thu, 21 Aug 2025 09:38:16 -0700 In-Reply-To: <20250821163820.1132977-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250821163820.1132977-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.rc1.193.gad69d77794-goog Message-ID: <20250821163820.1132977-3-irogers@google.com> Subject: [PATCH v2 2/5] perf test trace_btf_enum: Skip if permissions are insufficient From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Chun-Tse Shao , Blake Jones , James Clark , Jan Polensky , Collin Funk , Howard Chu , Thomas Gleixner , Nam Cao , Li Huafei , "Steinar H. Gunderson" , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Modify test behavior to skip if BPF calls fail with "Operation not permitted". Fixes: d66763fed30f ("perf test trace_btf_enum: Add regression test for the= BTF augmentation of enums in 'perf trace'") Signed-off-by: Ian Rogers Acked-by: Namhyung Kim Reviewed-by: James Clark --- tools/perf/tests/shell/trace_btf_enum.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/perf/tests/shell/trace_btf_enum.sh b/tools/perf/tests/sh= ell/trace_btf_enum.sh index 572001d75d78..03e9f680a4a6 100755 --- a/tools/perf/tests/shell/trace_btf_enum.sh +++ b/tools/perf/tests/shell/trace_btf_enum.sh @@ -23,6 +23,14 @@ check_vmlinux() { fi } =20 +check_permissions() { + if perf trace -e $syscall $TESTPROG 2>&1 | grep -q "Operation not permit= ted" + then + echo "trace+enum test [Skipped permissions]" + err=3D2 + fi +} + trace_landlock() { echo "Tracing syscall ${syscall}" =20 @@ -56,6 +64,9 @@ trace_non_syscall() { } =20 check_vmlinux +if [ $err =3D 0 ]; then + check_permissions +fi =20 if [ $err =3D 0 ]; then trace_landlock --=20 2.51.0.rc1.193.gad69d77794-goog From nobody Sat Oct 4 00:31:20 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 798382E172B for ; Thu, 21 Aug 2025 16:38:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794316; cv=none; b=k9WTaUzPXH23FTbgtP1Wl/UrNVxNFKw+34iVr6fCZEqoLKWLHDV5II7RyI87QkZxVlMwV+dTF+jdz6uZkeF4llr8st6fDo5RrfGh9TpLhU7leJe6Hjb5+6eU+xYBDsVdBF4UGJKylp40IY7IEDj3ourj2SDdY7Q4+Ro5g2SzndY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794316; c=relaxed/simple; bh=/XHeoHniz2hBdtYofNudV0JeJY6QjauvRcJwRTYu2UE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=VOA2zwikB2Xgk8kW+Or042Q08RnsmU/LVHv1sc3QmEJUFx03wEzMxxQBISt19ItFduwgE0CRrKpgNZaKwdKugonSUQbTmX4krZ3nZsazO+5b66BGNRWPHUCs3l/ugGeLaJvl7JdJUjt8Ev3d44mwLy6YgAzt/hYiEnPmus6JY+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hNduSHfc; arc=none smtp.client-ip=209.85.210.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hNduSHfc" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-76e2eb47455so2394384b3a.3 for ; Thu, 21 Aug 2025 09:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755794315; x=1756399115; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=A7qhyTA0zygdF9hzKzi42ziwY4qouIjpoYn63u/5P6Y=; b=hNduSHfcpDFXohBpbRAecXoPxwbpSflX2EJpyIwQZSA8VCdT/hnc2n2Ly73mKmKQWF 6PcU4s3SqPau0p9TeLLPixBWINb6cOj2BIvnTH4QJeE77/5539Gf4bHOEt50iZ2JrwWN /LvtRKKFi4jordhuYzdjI1NCCmHujEkkkHahYdYbpLQrgV4oFHspSvvL+KSInxo0b3YM sxMo2fe75jSRFqsEmKqwhO6tUwUY9+hGmT4IFeihayK/0Bul2t9O/KzEhRQTid/mQsDx QdPHcfYDwfIswxwkqPCsG+jFHNf2yyHRm0emMwpAqT3d7SmD+P/Z2qy43smlq9AnWQSa mJbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755794315; x=1756399115; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=A7qhyTA0zygdF9hzKzi42ziwY4qouIjpoYn63u/5P6Y=; b=L96GbvxW4U1han3ekKEFMtNrgAf4bGN5lskhdLPyfe/8JWnA0IZGv/xlbrV8MgaS7W iu7XZX4hsL92n8vWICL2FGXgJNQFHPfyzUZTeaWdVgcfW7lGt0Co1YlWJT9vS8WqmYRZ aNBhOGl/QXC8NdIWEkvQqJBXcpZ49VOzsVKRKTcXfYxcjOfcfDOVbJxUxRg3ehXmkcSk wZV2ms3SN0gxtgsj5briAAPpLQX9zcJC7T+/mLyIDn2rznvtzn10X8droIPASm6hQcuH gBS4qMZfEJBl+dpavO4VIh2YBS68EH2PLT0IKEcQIj7VjHcB3FOmgkTjA14gzHFZwRqt /Evg== X-Forwarded-Encrypted: i=1; AJvYcCUBPVVCVGvBL5deQfg/99c7Iinyk8wLi0buof8qNe8l51/oNgC7z6Ebc2MEVotTQUzytVrjroF8hwjHYbI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3i6BDUco1WGQTjf9gxUu82/3EPMNxOpMQUaN8+YfsrChX7jkK XXwIoueKQajp3VStYjDnLGdr38wf+7ycXFYkBP1y9HaYsKAAGKKcU8guWa/j2cMmhHHDFwy28OQ Se3ePRzOvcA== X-Google-Smtp-Source: AGHT+IHIkd9mETHe77XFTQ371bKp8jF0bgpsL3CAoJoJulWTHQL0Nn0cdjJMp2YVLIScwYqmgUFadePBjTzM X-Received: from pfbkx15.prod.google.com ([2002:a05:6a00:6f0f:b0:767:efa:8329]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4b0f:b0:76e:8b0e:bfff with SMTP id d2e1a72fcca58-7702fa07addmr56400b3a.13.1755794314448; Thu, 21 Aug 2025 09:38:34 -0700 (PDT) Date: Thu, 21 Aug 2025 09:38:17 -0700 In-Reply-To: <20250821163820.1132977-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250821163820.1132977-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.rc1.193.gad69d77794-goog Message-ID: <20250821163820.1132977-4-irogers@google.com> Subject: [PATCH v2 3/5] perf evsel: Avoid container_of on a NULL leader From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Chun-Tse Shao , Blake Jones , James Clark , Jan Polensky , Collin Funk , Howard Chu , Thomas Gleixner , Nam Cao , Li Huafei , "Steinar H. Gunderson" , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" An evsel should typically have a leader of itself, however, in tests like 'Sample parsing' a NULL leader may occur and the container_of will return a corrupt pointer. Avoid this with an explicit NULL test. Signed-off-by: Ian Rogers Fixes: fba7c86601e2 ("libperf: Move 'leader' from tools/perf to perf_evsel:= :leader") Acked-by: Namhyung Kim Reviewed-by: James Clark --- tools/perf/util/evsel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d264c143b592..496f42434327 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3935,6 +3935,8 @@ bool evsel__is_hybrid(const struct evsel *evsel) =20 struct evsel *evsel__leader(const struct evsel *evsel) { + if (evsel->core.leader =3D=3D NULL) + return NULL; return container_of(evsel->core.leader, struct evsel, core); } =20 --=20 2.51.0.rc1.193.gad69d77794-goog From nobody Sat Oct 4 00:31:20 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED8C72E175C for ; Thu, 21 Aug 2025 16:38:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794318; cv=none; b=T12jygBfh3M6UvXraA7fBhLEqloHr/uBHrcPgqjB/RQ01Xl+NCR7bFnS9O3yhMW3HqWAHMdaI7y+00RY/5nNI5J8qQugZvinsP7gtDacvrDBeU3TK7ESAK1cYfKuAgjKUapmCvBWzo8aP1NPI6frSo4/8duzx4Vs/YyaNIihonM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794318; c=relaxed/simple; bh=NTnQ9k5u7R42OUwbz6h2J8KHt5rVMSa96bg96BbPHI8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=qdst/Us9P0RIG+aKY0ARR+NwS51npZxjgFRFUVu+1xxeUskAvXzOWMhRgYhSZsMxrxhRaqaG8L/Y2nsWsjklWbu4ZFy5Fts9xG5vyBrwGLuZIvV/q27ZKN25EJqMHMSbjiKfAeiTyHFZ+yU4zqi9WLkyy+RJkPY/uv3Cp3exlbw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Mmf703Z9; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Mmf703Z9" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b4716fc08abso985239a12.0 for ; Thu, 21 Aug 2025 09:38:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755794316; x=1756399116; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=MCudO0lfsSIQDEPb/Z/odYNnD8Vvb98DSCImnP79+vg=; b=Mmf703Z9tiWAt8POjfmeVU2aeqvya8mb5rML1vBKQtoTyk4DJeoGONgorCcfWzztKZ p2pge+KSqNx4esEH6zMedLU8xj8/hAM2Utv/asf3jGrs/A2fgjWHJZ/Maht3F3XWRH9W 5bEMCWC6pCAGGHqG3KYKmuVHLKoj4yZv1de0dumuSuAaOA9+HBjZ5HwLxpqsH/vI1XAb CsHxqGH+4n4DV7mlOGJIYCYscagF84riFScDQ2BSMXT1xtMqU+iCO2tUft1w9wGEvUJ4 mYBLcpxaj++jgWPjtaTwg+icnXfsxFpDmmx1YI6yS8jf1fg0lvAS2qaB7u3x3IRM5Yqy F/Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755794316; x=1756399116; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MCudO0lfsSIQDEPb/Z/odYNnD8Vvb98DSCImnP79+vg=; b=iNAR4xo4v+gwSv2c9oJ69MST6o9sQka4D78V4n4vzForM2O7OdwvwN9PYyh05FqmCV C7rPFAmlwlwCl8ZgjkVirIfWTf480kwkvvdxDNAgjLk64SnNlSYy6z1fwMR8yslIDTTA BiyqWQhND0eDAujAeJIRKN4+cHERoQGWO+TkE9hjwt6KU3REMqqHNjCKs6/CCsF/Tphe W8EBfgC3oyfFTLelSEsMRAgaOB9TJ5WNpWpGM5xdWP2VYy6pesISMdorU5C4aSS8OMU2 MJGt4ghk2WF8KyihWgThEA626hF8sAlGAHXFwG0IrE/ObgkD2RvFSRwn7WT3w2Ic/1QN w4Lg== X-Forwarded-Encrypted: i=1; AJvYcCUHXJctFWII+eZCmO/ERry4a/DC6tFAxS0lqFILHTagwWxVjjlarIS8VLO/uoKMli79VyBxHbIw0pqZ8As=@vger.kernel.org X-Gm-Message-State: AOJu0YzgkweA2NMfMVso/5o8iRiXWAOKzyOMkdud1198icjb4viIBae/ 8Xp0BuS85x3iiW82XQUB7AaadXQD2DclXq18I2owFjCBOsnJmILkdlE7qvuDuYgNIl50+CE9W8Y /9upxnsvRjg== X-Google-Smtp-Source: AGHT+IEeCnJ7b7Yhroqp8lnq2iRmwlgzQFOIRcCjMoaZ7MBplMnR6IPn6gc3uaSySrJy+SPVwdt4sO/70rsg X-Received: from pgbfm17.prod.google.com ([2002:a05:6a02:4991:b0:b47:68a7:75e3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:7d9b:b0:232:e6ab:8de8 with SMTP id adf61e73a8af0-24330890004mr4446962637.18.1755794316246; Thu, 21 Aug 2025 09:38:36 -0700 (PDT) Date: Thu, 21 Aug 2025 09:38:18 -0700 In-Reply-To: <20250821163820.1132977-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250821163820.1132977-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.rc1.193.gad69d77794-goog Message-ID: <20250821163820.1132977-5-irogers@google.com> Subject: [PATCH v2 4/5] perf test shell lock_contention: Extra debug diagnostics From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Chun-Tse Shao , Blake Jones , James Clark , Jan Polensky , Collin Funk , Howard Chu , Thomas Gleixner , Nam Cao , Li Huafei , "Steinar H. Gunderson" , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In test_record_concurrent, as stderr is sent to /dev/null, error messages are hidden. Change this to gather the error messages and dump them on failure. Some minor sh->bash changes to add some more diagnostics in trap_cleanup. Signed-off-by: Ian Rogers Acked-by: Namhyung Kim Reviewed-by: James Clark --- tools/perf/tests/shell/lock_contention.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/tests/shell/lock_contention.sh b/tools/perf/tests/s= hell/lock_contention.sh index d33d9e4392b0..7248a74ca2a3 100755 --- a/tools/perf/tests/shell/lock_contention.sh +++ b/tools/perf/tests/shell/lock_contention.sh @@ -7,14 +7,17 @@ set -e err=3D0 perfdata=3D$(mktemp /tmp/__perf_test.perf.data.XXXXX) result=3D$(mktemp /tmp/__perf_test.result.XXXXX) +errout=3D$(mktemp /tmp/__perf_test.errout.XXXXX) =20 cleanup() { rm -f ${perfdata} rm -f ${result} + rm -f ${errout} trap - EXIT TERM INT } =20 trap_cleanup() { + echo "Unexpected signal in ${FUNCNAME[1]}" cleanup exit ${err} } @@ -75,10 +78,12 @@ test_bpf() test_record_concurrent() { echo "Testing perf lock record and perf lock contention at the same time" - perf lock record -o- -- perf bench sched messaging -p 2> /dev/null | \ + perf lock record -o- -- perf bench sched messaging -p 2> ${errout} | \ perf lock contention -i- -E 1 -q 2> ${result} if [ "$(cat "${result}" | wc -l)" !=3D "1" ]; then echo "[Fail] Recorded result count is not 1:" "$(cat "${result}" | wc -l= )" + cat ${errout} + cat ${result} err=3D1 exit fi --=20 2.51.0.rc1.193.gad69d77794-goog From nobody Sat Oct 4 00:31:20 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2359C275AF8 for ; Thu, 21 Aug 2025 16:38:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794334; cv=none; b=cJFEwaFEfQNH6sZ8Ql8bpqyi+yLBIb7TZhODTkcLrGsoA5NBCyWX6V2NPH9FU/ZmAnfqDRVZBvg89iVsYKF4Z4q573gAG8p9DI2Klsnukp8MeMcxMJyWBwCX5yk3y+G8TKlScf1Zc2PlT82cMVV/rwF3qt2Ps0sDxcT51hfnQw4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755794334; c=relaxed/simple; bh=3YKELvxuxV1PLL+vU0ZK9NzmOjLBL5HGYpAzwG/O+C8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Rv/rBaGrnGq/sIB91MnNJUWkp0CYht2gfd6z0EI3i+5pgzRS6sOZ8VdIvcKXeiZdpjfXA5V6zZeWfVxYFFrQfVcuupKroktWqmp7eRd1mySTDJsfh1Xad9Tby+lMY4Mvfn4Li8FM9B6k7vydwz87q8IkxM4/EzSY7V6fBHw7KqQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RQ6cb4Oc; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RQ6cb4Oc" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2449b4f316fso10074665ad.3 for ; Thu, 21 Aug 2025 09:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755794332; x=1756399132; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=HBnlfMNnAXJvRMri5tmfNXUyqLPNFnaI1ehQvuqCmqU=; b=RQ6cb4OcYVTVdMBxN2oZGQXvq56q+jDOYtBsiXaPozHpckbPSlj3/kubP729gDMIev Ph1pOBd2uJqeC3hVwAjGe7QHGvQg//CVVjjoO36/wEjVNCLFaETJpv/88yj7gAMsd+V/ Tg3M2ydxSp5SuQX4ppBZ+bzaWigpDbvFizISWfldt25PBJPTMa95SO+62Ii3FoALDRNt LYRxaEWVkZu2YzrLJiD/9mp/QY0hZgvWHmT9faOEbHhN7pHaeUJ1zZw+PgjxnYNz/ZI3 89KLApcgmS3aOQL4OtbeR5lsZkJplGrTlSLobVc2acXs+sfn5QioN1/4CVJwA1zXySw/ gK/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755794332; x=1756399132; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HBnlfMNnAXJvRMri5tmfNXUyqLPNFnaI1ehQvuqCmqU=; b=JEGqbo0n/OXrm/BEzJQ/FTJNJ7m56MiR28qMCwbDkvu0KnlTTeJt1uUdwPGIeChLEz 6W4jWohOjxde/tUS5KLtFpkPz/gtrBmGs+yaWVbog3fC/tZVFaTWIhPjE0bMHeW7nt+Z YdPvojqxqAfFTPlAeFwodxXWWdwRXONbySkiG+YYuSopbAOHWTw2L9wbJCqNZf85UCfp 3cw7yWearat6+yDlsKuNRLbstXrKPDrtWWOYETv/UbylRjyfO9sZyOTud/jjgtVCKWnH 4X+p6ZJheYdG2PkItelKQYiZ1czLYF5gVKxb4HdN5bLWNokC5XaOhtQaSbQiEUvGPGOR KHMA== X-Forwarded-Encrypted: i=1; AJvYcCXAzDTJxwvInUs3JPlamLeCHoAILok9w1X17TDmlU4pABwlwfM2zXMByIeOtd8M4ucg5pGFc13qM2Sb9/o=@vger.kernel.org X-Gm-Message-State: AOJu0YyT7Sb2wenGTzu5stJLhC9p7H2exKMIjx4mOJDEVO7VIwYX7k/N 98YC6q88QMRgYc3kT5tmPbjWhDzvPoHXMI3EoIVuzJsXN9BalDrxFi1ZyBalMEudBhdXm6TajfD dr3uXXyFDjg== X-Google-Smtp-Source: AGHT+IHvI/QHnU0J+1JnVYyGfrBbKwfv6jXDDIgr4Q/WIz4zqzZnImtQy88yiDm7axpXD3oCDs3aSJ3xNyFN X-Received: from pfbhc8.prod.google.com ([2002:a05:6a00:6508:b0:76e:7044:f5e6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:a106:b0:238:3f54:78e7 with SMTP id adf61e73a8af0-24330b219f1mr4841106637.45.1755794332330; Thu, 21 Aug 2025 09:38:52 -0700 (PDT) Date: Thu, 21 Aug 2025 09:38:19 -0700 In-Reply-To: <20250821163820.1132977-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250821163820.1132977-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.rc1.193.gad69d77794-goog Message-ID: <20250821163820.1132977-6-irogers@google.com> Subject: [PATCH v2 5/5] libperf event: Ensure tracing data is multiple of 8 sized From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Chun-Tse Shao , Blake Jones , James Clark , Jan Polensky , Collin Funk , Howard Chu , Thomas Gleixner , Nam Cao , Li Huafei , "Steinar H. Gunderson" , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Perf's synthetic-events.c will ensure 8-byte alignment of tracing data, writing it after a perf_record_header_tracing_data event. Add padding to struct perf_record_header_tracing_data to make it 16-byte rather than 12-byte sized. Fixes: 055c67ed3988 ("perf tools: Move event synthesizing routines to separ= ate .c file") Signed-off-by: Ian Rogers Acked-by: Namhyung Kim Reviewed-by: James Clark --- tools/lib/perf/include/perf/event.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/p= erf/event.h index 6608f1e3701b..aa1e91c97a22 100644 --- a/tools/lib/perf/include/perf/event.h +++ b/tools/lib/perf/include/perf/event.h @@ -291,6 +291,7 @@ struct perf_record_header_event_type { struct perf_record_header_tracing_data { struct perf_event_header header; __u32 size; + __u32 pad; }; =20 #define PERF_RECORD_MISC_BUILD_ID_SIZE (1 << 15) --=20 2.51.0.rc1.193.gad69d77794-goog