From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34FD9485951; Mon, 19 Oct 2026 05:53:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792389244; cv=none; b=V35KCrhrIovTwV0DJtlL7e+x+g+sUwjyzcqoKjVnhuLiPznbwHSNgjf8clfXZD++VWvehyAopU3hG3UDnGmxJPs2Nwfg/Duwd2COpHOOmUf74/ybBj2pF1SqjmQeK72QRUmaoPvV2M2nGOxzda6Wq8mg0qmp7mYczhG8v+w0MJM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792389244; c=relaxed/simple; bh=uj9A+c5kfjIvcMbbgVyihaMKrMW6fwebWz6zn9kg+R0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZP/pItmyz72ZPN2ro87SzUsl6L17H/XnhYxE+ZIyhpaPNRRNaCM76uRk0jnrTRGqYTPgOHm6O1FNKwto2sQPdV8KfRkrVuca2EUd3AnwuX9ftKjr5fzRtR6UMR36AoQi9bDH1vSe5qiojkeDUnZS1A6YyDO5GwyjDUaaPJ8tSNc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DHWb+8Ew; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DHWb+8Ew" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9948E1F000CC; Mon, 19 Oct 2026 05:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792389136; bh=yfQXNl4spCjUw5duq24peQ2bo0xChCAcWB0T5tm+w9g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DHWb+8EwyRM+lWpHgC0bhRSFCyHoXW5bzlWUCintkDgRrZDG/pvVe0dS5bA6Fe26E SNpd42NQkQZ6T+YqVokaKNmlCoNWqBwaqz25lu0OmqKA46GT0hV9IzlE5wngFn8quo h8gGYGJFZW6ituOWQR6/eNeCUB4vFaIsPqsF5woZr93dp+GRnM5V6VJbtCaxyNIluy 3fHYKWZSxz73n/1cuIgt8qAU3BkDAUF8NTaqQR70kyg6JBnsBxloWxr1x4pD3fzheJ 0vceVO65eaudjriC8VKwkGgyBlkY0kGw19/imcs8VI3WoKzsUiWEAAJDbmSc1J/ir8 hIzSvMJl4HAEQ== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , James Clark Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org Subject: [PATCH v2 3/5] perf tools: Remove NULL check for maps__machine() Date: Sun, 18 Oct 2026 22:52:05 -0700 Message-ID: <20261019055207.39325-4-namhyung@kernel.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261019055207.39325-1-namhyung@kernel.org> References: <20261019055207.39325-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Now maps should have a machine, let's get rid of checks for the return value. There are already many places to assume it returns non-NULL, so having this kind of check could give confusion that it can return NULL (which is not true anymore). Signed-off-by: Namhyung Kim --- tools/perf/util/dlfilter.c | 3 +-- tools/perf/util/event.c | 3 --- tools/perf/util/map.c | 9 +++------ tools/perf/util/python.c | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/dlfilter.c b/tools/perf/util/dlfilter.c index e11e144af62bb979..7e179d1d84d78358 100644 --- a/tools/perf/util/dlfilter.c +++ b/tools/perf/util/dlfilter.c @@ -233,8 +233,7 @@ static const __u8 *dlfilter__insn(void *ctx, __u32 *len) if (thread__maps(al->thread)) { struct machine *machine = maps__machine(thread__maps(al->thread)); - if (machine) - perf_sample__fetch_insn(d->sample, al->thread, machine); + perf_sample__fetch_insn(d->sample, al->thread, machine); } } diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index ea75816d126a14be..2f80e364659fea71 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -706,9 +706,6 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr, al->cpumode = cpumode; al->filtered = 0; - if (machine == NULL) - return NULL; - if (cpumode == PERF_RECORD_MISC_KERNEL && perf_host) { al->level = 'k'; maps = machine__kernel_maps(machine); diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 41cdddc987eee710..d5319ffa88a7477c 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -538,13 +538,10 @@ u64 map__rip_2objdump(const struct map *map, u64 rip) */ if (kmap && is_entry_trampoline(kmap->name) && kmap->kmaps) { struct machine *machine = maps__machine(kmap->kmaps); + struct map *kernel_map = machine__kernel_map(machine); - if (machine) { - struct map *kernel_map = machine__kernel_map(machine); - - if (kernel_map) - map = kernel_map; - } + if (kernel_map) + map = kernel_map; } if (!dso__adjust_symbols(dso)) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 60dbe2dad5eb8073..42c587cd54a527a4 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -4536,7 +4536,7 @@ static PyObject *pyrf_call_return__new(struct call_return *cr) if (cr->thread) { struct maps *maps = thread__maps(cr->thread); - pevent->machine_pid = maps && maps__machine(maps) ? maps__machine(maps)->pid : 0; + pevent->machine_pid = maps ? maps__machine(maps)->pid : 0; pevent->pid = thread__pid(cr->thread); pevent->tid = thread__tid(cr->thread); } else { -- 2.56.0