From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 695163BCD1C for ; Fri, 29 May 2026 09:31:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780047115; cv=none; b=Ef+WTFPpgG30csJDw0nfORi2uh+RKGFUthwP9aYBjCU5+98Q1LpNo+SKD/YuT+z0GXY3lWsk5sl8mc4znGcxCUjuTEq/0OykdvVpdghTI/mKV5Mtu4ikR3+pCKYZWNhGcIKYDyh9NnMwRcwT+Mh6YIoIX4DC59a4cjcg/2L04WY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780047115; c=relaxed/simple; bh=X31hwU/W1+w6coSj7aO7Nv8kRxibj0glKaqW0VcC39w=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Ud4MWxuJP1cxQZtM+ZsEKw4uWmzIQC3uPScEcuQkDdoOUk7uSlk2lEClEjmt/IskJqb2VYeuXqHkiVjQjAay8yjnCY9URcTAxL4nwvDV1LQTzgZGkv2iPqJUCXXpdInrrj8hjv+RM0V6eWCld1l5OQj4r+T70xJ/Ozssqc6/EhY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=L3v2gBiV; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="L3v2gBiV" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4905e190c71so63361915e9.3 for ; Fri, 29 May 2026 02:31:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1780047113; x=1780651913; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=J3QH1JdOLE0AFKliWzrTEO0D9n2KH8w2Vf/pq2j5CMc=; b=L3v2gBiVYdgVZX4TMOdrogYVzlFc/75rKTQjpwGfnUhhjMUSz+j1/ZjNdSl5x/LAGB OPpFe65Bc/FLitJrXB3JkuuDlYoQWHZDjbUKOFiYNAhx2L7v+XGuyUbf0GVss6FlxcPn 0cRYFDK2o7/UHY5TCASAdYyBE24/B9b8OAUwkw0lH9Xb6pCmiFAS47FPkZvcUF/d0pVE o2eMkp45v6BPkpVjBmBbTYfpvtGiT68tgszxZl44ijvYpSLN8L4nqRl636ZMohmqqmKE 4beelargo9ibWZIWw30v2rOy6FoZXPThDu87bf9P/sPE+tLRAQTZITUkC+nm2WB/ya27 YmdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780047113; x=1780651913; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=J3QH1JdOLE0AFKliWzrTEO0D9n2KH8w2Vf/pq2j5CMc=; b=Dd4ADGqIaKMS0b8M7P8oSBVIj6T+7tz2tm8Nayy1SIu9UOf3+Luhi/eoNKp/YiZyyt DE+o0TRJSRv32tUyvO+pPljAZ5D5j06epQn8JmaTzq75lZnGqZgRSBwB1TzFU58qSXHb 3d0bfvP24hu44o71QgNIo8EkD0zN1zp8v8aCodcPKNcUZfq1GtqtmaCaIwnWXrKhP4En el8oHXrdstQdhqNji6PLii3r6IFqyFyWOcjIselADhSBtJSgoNxvx494G4aa95gWI7h9 V0NmyZeCGMlJSyhLoPQoQs0WmuRbplE6oOWROBm09HfOZSvlew1noBkoci3TSg+k5KaS jT3A== X-Forwarded-Encrypted: i=1; AFNElJ+VDmTnpOP4zjgmGZHuRaNS3MLAmbpHespKv6vNQm+VTk3iOU+xT6kgS1mbok3aUZMMyxz5RxLgNG3lsuI=@vger.kernel.org X-Gm-Message-State: AOJu0YyQhpFqZy/RAbLTcj2T8r820ukLCAf/onxUXXlCUpPF2nmw07qD HC0LhWFL2+yQAAIEX4byTEYqqCCbbgm7cpBV/lcJ5mWeim2lEd8besHZ8+1x0ZhRz64= X-Gm-Gg: Acq92OGKqSDTbH2DuJ+rcr47+j0TBgiy6GqD2TscN/uLOz0iTke3bG8FBylY82wwVwL 2L1soGKRakShPOpSZyPSKqXxHpmig6oDIoROkiJt0cLVHIODyJat0HA3DXnCWx0e7t2VUhctR8n 3BGok3tfC/aFMge28Cmutc2VHCesAdEW98GY4DeLfUFBB6sq36IwB1cE4dplCpQfLIFZzw6b6r1 q1RxS+fw/n1pUFQaQ1SoqjPibVY6xS0iKKM/41rPhRGCDOKJGGuSTQPnPvCReh5bMQujA56OjKw gNW+8GYbJCpFX05jPh0sRei76PZ7WqTfvI6NFNbi2kvDMm35j4xAa8t0J7BbovMUyRcT3wOnfpz wNEQTmEFrDTWSQL49S0nWv3yC8qHPRi4PrGSwrAUGQDDSmxTdvvTj3RzBTJjyRw2+IwQIY3iOO3 ex4WrRcqyYFbJmtS0i9BOfyVqL7SkrcIg5So7w/5wIqo2VCfiIVg== X-Received: by 2002:a05:600c:a08c:b0:490:9d1b:2033 with SMTP id 5b1f17b1804b1-4909d1b228fmr36218915e9.9.1780047112792; Fri, 29 May 2026 02:31:52 -0700 (PDT) Received: from [192.168.1.3] ([185.48.77.170]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45ef3559645sm2294640f8f.26.2026.05.29.02.31.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 29 May 2026 02:31:52 -0700 (PDT) Message-ID: <1749d7b0-c3ed-47b7-b14c-6acbcc763aa0@linaro.org> Date: Fri, 29 May 2026 10:31:51 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] perf annotate: Fix crashes on empty annotate windows To: Namhyung Kim Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260420-james-perf-annotate-assert-v1-1-ddf04d640569@linaro.org> Content-Language: en-US From: James Clark In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 22/04/2026 3:15 am, Namhyung Kim wrote: > On Mon, Apr 20, 2026 at 12:52:17PM +0100, James Clark wrote: >> Annotate can open with an empty window if the disassembly tool fails. >> After the linked change, the TUI started assuming there was a current >> annotation line and could assert or segfault in the seek, refresh, and >> source-toggle paths. >> >> Handle empty annotate windows explicitly: set the asm entry count before >> resetting the browser, return early when refreshing an empty list, and >> ignore source line toggle when there is no current annotation line. >> >> Fixes the following when opening an annotation: >> >> perf: ui/browser.c:125: ui_browser__list_head_seek: Assertion `pos != NULL' failed. >> Aborted >> >> Fixes: e201757f7a0a ("perf annotate: Fix source code annotate with objdump") >> Assisted-by: GitHub Copilot:GPT-5.4 >> Signed-off-by: James Clark > > Acked-by: Namhyung Kim > > Thanks, > Namhyung > Ping, I think this one might have been missed. Thanks James >> --- >> tools/perf/ui/browser.c | 3 +++ >> tools/perf/ui/browsers/annotate.c | 5 ++++- >> 2 files changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c >> index dc88427b4ae5..321187b204d3 100644 >> --- a/tools/perf/ui/browser.c >> +++ b/tools/perf/ui/browser.c >> @@ -513,6 +513,9 @@ unsigned int ui_browser__list_head_refresh(struct ui_browser *browser) >> struct list_head *head = browser->entries; >> int row = 0; >> >> + if (browser->nr_entries == 0) >> + return 0; >> + >> if (browser->top == NULL || browser->top == browser->entries) >> browser->top = ui_browser__list_head_filter_entries(browser, head->next); >> >> diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c >> index ea17e6d29a7e..0261cd922183 100644 >> --- a/tools/perf/ui/browsers/annotate.c >> +++ b/tools/perf/ui/browsers/annotate.c >> @@ -449,6 +449,9 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser, >> struct annotation_line *al; >> off_t offset = browser->b.index - browser->b.top_idx; >> >> + if (browser->b.nr_entries == 0) >> + return false; >> + >> browser->b.seek(&browser->b, offset, SEEK_CUR); >> al = list_entry(browser->b.top, struct annotation_line, node); >> >> @@ -542,8 +545,8 @@ static void annotate_browser__show_full_location(struct ui_browser *browser) >> static void ui_browser__init_asm_mode(struct ui_browser *browser) >> { >> struct annotation *notes = browser__annotation(browser); >> - ui_browser__reset_index(browser); >> browser->nr_entries = notes->src->nr_asm_entries; >> + ui_browser__reset_index(browser); >> } >> >> static int sym_title(struct symbol *sym, struct map *map, char *title, >> >> --- >> base-commit: 841dbf4871c57ce2da18c4ea7ffac5487d0eda16 >> change-id: 20260417-james-perf-annotate-assert-20f520eeb35b >> >> Best regards, >> -- >> James Clark >>