From nobody Mon Apr 21 04:00:04 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zgs8P34Rdz5sr3H; Mon, 21 Apr 2025 04:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zgs8P01skz3T0T; Mon, 21 Apr 2025 04:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ti4A0vrco7NAkumnvWbXgtNHUj4gnySxbD2YkVvtt2E=; b=X9sflT5eHgxV4hTQ8QYs4JS2Wzqm1CamRUtE7UGLMH1vyzTsPe7CmV2pjHjOP+0Z89CJRn 8FHwk8vwvnc2qxotKd4opgXjW5fALTW0ErDTOAMZNxaIX1PgxDJFvCjgjI7ugVR3BiFUwQ HhZfl21SgHiomyerKzOoyczSvc5jic5eYDRrmAo/T2oUyWCLv9++fgZ/mjqWac01QdxBOe ISZYUW8qq4YSk0jZydFBMEl5bwffZ5ThPEH5a0Be7MJsMAcEOZZuaNbDxs542N7mfbuydY h5ZL3eFxYd5VW7UPm7bBGoo8zZjIuGRtfsqPidmr+xAy9AjmVQZUbNiabw74nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745208005; a=rsa-sha256; cv=none; b=fOGSwxzHwt6lRdSnUDEDWThSk2Kz2OBXKRG9B/NE6znAb2qMNtOKzrkQh/UdTxsL+SBFJU lbAWfT2eYHfIKjQE+HUkPQfzRo7BPQ57xWhTRCfSmBGdgueGVSJe5M23x+uOsru9cQW73p dej3sPUbpt6etGXXAmZaT4avDX0Q9RquGfHbNKXTUHE/Z5IuxeJzfOh3WumgZ0zIvOLEt0 101w2FpoKicHbJIkQl1l8k+ef9QdxQqcAnJY94tH4tcOLiP+3XdXJGgGpSEhws30FFOtGL gP71LkFHRPNFWpQ/gLdwCi38V7XqgspmIMsTwq5gj27gBCbQFfe1Gkhe4XwJhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745208005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ti4A0vrco7NAkumnvWbXgtNHUj4gnySxbD2YkVvtt2E=; b=B7aarsxiWixpiU03p9DnTQvNdEpGtNYbRnD+uRrjNSWkc20lbyxW8Eg81nq6S4xTZ9wtko 5RiGlWuuOrNGN7qaDslcZ6dZXc5kOpWuvn04dbhnUnXkplL0zTG35hYAQmlVOP96aAIgMz vQDU5wx16FwCW9QvkTmxkMn4u996Tq4+yva5m45vs0U8DUtuUfE2ATPEU9SJAiqp3R7H0G iJtbvxZsh5HHPHy3UzhPDg/KhfY96v4oE3xEgdgjB56tdeoTq4nb6mPzxZe6fq77/KgSWI VVfDezJz9cvi8hvGl6t2X6oU2MRPJM7YECyUq0hocYrnFZnhYIetHQXJc8GwKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zgs8N6TBrzZTY; Mon, 21 Apr 2025 04:00:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53L404nu085011; Mon, 21 Apr 2025 04:00:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53L404YU085007; Mon, 21 Apr 2025 04:00:04 GMT (envelope-from git) Date: Mon, 21 Apr 2025 04:00:04 GMT Message-Id: <202504210400.53L404YU085007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 77721403c91d - main - libpmcstat: fix pmcstat -G on older-ish -CURRENT w/ drm-kmod List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77721403c91d67dbfd5a2c5c667e7f5d87acb3f6 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=77721403c91d67dbfd5a2c5c667e7f5d87acb3f6 commit 77721403c91d67dbfd5a2c5c667e7f5d87acb3f6 Author: Kyle Evans AuthorDate: 2025-04-21 04:00:01 +0000 Commit: Kyle Evans CommitDate: 2025-04-21 04:00:01 +0000 libpmcstat: fix pmcstat -G on older-ish -CURRENT w/ drm-kmod The linuxkpi_gplv2.ko module on older-ish -CURRENT had absolutely no .text contents, but it was still loaded. Instead of hitting the later assertion because 0 is not less than 0, we can just skip images like this as we should not have any samples from them. Reviewed by: gallatin Differential Revision: https://reviews.freebsd.org/D39875 --- lib/libpmcstat/libpmcstat_image.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libpmcstat/libpmcstat_image.c b/lib/libpmcstat/libpmcstat_image.c index 414ba133590b..69274dca31e8 100644 --- a/lib/libpmcstat/libpmcstat_image.c +++ b/lib/libpmcstat/libpmcstat_image.c @@ -193,6 +193,14 @@ pmcstat_image_link(struct pmcstat_process *pp, struct pmcstat_image *image, assert(image->pi_type != PMCSTAT_IMAGE_UNKNOWN && image->pi_type != PMCSTAT_IMAGE_INDETERMINABLE); + /* + * It's possible to have images with nothing of value in .text + * legitimately. We shouldn't have any samples from this image, so + * don't bother with a map entry either. + */ + if (image->pi_start == 0 && image->pi_end == 0) + return; + if ((pcmnew = malloc(sizeof(*pcmnew))) == NULL) err(EX_OSERR, "ERROR: Cannot create a map entry");