From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.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 83FC8273D8F for ; Mon, 13 Apr 2026 01:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776043406; cv=none; b=KF/huuvVhvNBrQcWYmmYUUT3RatmhYTK0gcFQtE7CydW6GPRvZkER1UAXE6/OJZCvIr1N1vIkr1m/vCu/dR4ill2Z+APKiCCR7l7zv53WRwwyHI5V73vjJ7NyyNZ7xrMH7jMJTpYZ48B8p8y1HiMYYoaXO7mbPr/K/fwCXeL+yw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776043406; c=relaxed/simple; bh=+R1TjR7D/n+SVy+MvcOVgKHmNVERa5SqQsXwquU4Gqc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aIS5IIfOxAk4yO1ypyL1A08nWDNorZJoaVloky588Lce3Pe2stVAf/l+HMLVjgMFSAnrVPMcJyduKz7niTGJ8YRdmlFoERG9GOuv7s1BBwOO05M67ENDUYs4v3HRR6TZ1tZ4oOZoAffZ2OdbJKMFGJ5snAKuevWO84kNpDt0cto= 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=aruvWU3f; arc=none smtp.client-ip=74.125.82.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="aruvWU3f" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12bf9974587so5571550c88.0 for ; Sun, 12 Apr 2026 18:23:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776043405; x=1776648205; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=I6cwCi85nL+UMzH5dHBjsjgh7zFGt951FXHMXIOHqdc=; b=aruvWU3f5RJfrQ7Fpsp5kNoVwvW2SkPtuvqprWP+BKYdh0epXLLeRtzNIy0YyT6t9h HRyxROjkJ9KwLuowKQRkRSpS6lYnkz/5idJw/rLNQ22UXJXdKKROWtqEVfc5cTR8Q7wW AyyPOXtuCB50bXQ0XNiSwumWF4tLrIJ/CmUs5TSRx7p0krl10HUve+vCZoj6CvWvhwoL 1fPsfWtbGk/29mmBaIvsN8JrqumAGyAIJrsORCpiYEMpFATXZsgqgBLl1cNxv55qZfpe z4p2AeDXt4f6Oj92OwUhs+s8ROgqt5cqrWk2yK6BQphlxocN9sRpyNGmGsJQ4K2y9SyV NqQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776043405; x=1776648205; h=cc: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=I6cwCi85nL+UMzH5dHBjsjgh7zFGt951FXHMXIOHqdc=; b=EGIooy5LyE3w55w4McP24GLDvO02TrydZ/7vmWw/5LlsIe5XEA8t939hkESQHxjzSb cbB2FCXrDz/+JvpN5nOUDjZym9YW4hYjfjA/sqknzoBhMVO5jxbn7PgnvQxmTSrafl4M /NlzcSX07p0KXggvkJqW0yC0F9Ubjt5+yzYm0Zto1SRnj4mlZvy5tew5F5s4aXb1OAb5 Xb2RsjO0zG2KDQ3vCwih6euFmBsqkVUMiKLwIAWKrROQMy2DgWwXZJ+DzFTwwtkKiEfV fcKvFX+CQV6tYv3gfaqmONdDRVb6EO1LwCSxhhLmTNQsSq19s6zwj0PPBdoeXJBM0MLL rM+Q== X-Forwarded-Encrypted: i=1; AJvYcCVM07kYj0yeQlgiKd01VMEWylj7IoGYTN+6Ahqo7CswRhyZFlg1SvwABpzCxL2uRIw81Jq5f7yhlaMc/qQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz41/o9/Eq/52H0VCT/2f5BS6mMN3fNjg5dmHi0QtyEGxjQa05I zzZrWLCawSDIATJEVmLYF6F4XfRtUXbeozWqPixyadMPP2ahtyLJHI9zszlOWGlkSWDV2U1wHAX 0qU1947+8oQ== X-Received: from dlbur20.prod.google.com ([2002:a05:7022:ea54:b0:12b:fc23:6fcb]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:411:b0:128:c9fa:4c32 with SMTP id a92af1059eb24-12c34eec551mr6848923c88.28.1776043404371; Sun, 12 Apr 2026 18:23:24 -0700 (PDT) Date: Sun, 12 Apr 2026 18:22:18 -0700 In-Reply-To: <20260413012227.1089445-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: <20260412020833.641177-1-irogers@google.com> <20260413012227.1089445-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260413012227.1089445-25-irogers@google.com> Subject: [PATCH v11 24/33] perf lock: Avoid segv if event is missing a callchain From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: adrian.hunter@intel.com, ajones@ventanamicro.com, ak@linux.intel.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, anup@brainfault.org, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, blakejones@google.com, ctshao@google.com, dapeng1.mi@linux.intel.com, derek.foreman@collabora.com, dvyukov@google.com, howardchu95@gmail.com, hrishikesh123s@gmail.com, james.clark@linaro.org, jolsa@kernel.org, krzysztof.m.lopatowski@gmail.com, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux@treblig.org, mingo@redhat.com, nichen@iscas.ac.cn, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, ravi.bangoria@amd.com, swapnil.sapkal@amd.com, tanze@kylinos.cn, thomas.falcon@intel.com, tianyou.li@intel.com, yujie.liu@intel.com, zhouquan@iscas.ac.cn Content-Type: text/plain; charset="UTF-8" Sashiko recognized a potential segv if a sample is missing a callchain. Return NULL for this case just as a memory allocation failure does. In the verbose pr_debug output describe the error and rather than fail the entire file just skip the event (return 0 rather than -ENOMEM). Signed-off-by: Ian Rogers --- tools/perf/builtin-lock.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 89a40d385b27..064b3aa4bad7 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -938,9 +938,16 @@ static u64 *get_callstack(struct perf_sample *sample, int max_stack) u64 i; int c; + if (!sample->callchain) { + pr_debug("Sample unexpectedly missing callchain\n"); + return NULL; + } + callstack = calloc(max_stack, sizeof(*callstack)); - if (callstack == NULL) + if (callstack == NULL) { + pr_debug("Failed to allocate callstack\n"); return NULL; + } for (i = 0, c = 0; i < sample->callchain->nr && c < max_stack; i++) { u64 ip = sample->callchain->ips[i]; @@ -1059,7 +1066,7 @@ static int report_lock_contention_begin_event(struct perf_sample *sample) if (needs_callstack()) { u64 *callstack = get_callstack(sample, max_stack_depth); if (callstack == NULL) - return -ENOMEM; + return 0; if (!match_callstack_filter(machine, callstack, max_stack_depth)) { free(callstack); -- 2.53.0.1213.gd9a14994de-goog