From nobody Fri Aug 22 14:35:29 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 4c7jQn6F71z65vjZ; Fri, 22 Aug 2025 14:35:29 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7jQn3Ml8z3GNw; Fri, 22 Aug 2025 14:35:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873329; 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=k6brm99bH7BEyNlhRJSu5t7il6KLNPL3nU2JoK/Zp2Y=; b=vECTa4KL+JGU/KhalVYcZKumTdQGyrnDZmSFPkXprr7EhDlu9YS4490mpUCkx2dumkkvoL sICgKjNlbGYaYp4iAFtiG9ygD0sYlCjpvTYQ1f4BFs/N/350Oedr4cpDMu0cHkAMz8T4YH 4kTl3VzXnCn7hs6yss+LRU3rD/+SJOz+206vnJM16HcYiMyDXT1B0cYbfwiKXGI98VsvJB tcrYm4AzgvY9r2eZOXmOFmY7XfhJShRezYCSPBzScApwNC+UhCNP8qXq3r2boayrJwWFL/ 0ekGPbGb+DhbAddcmvgl/zUftHQsX+uoCyQZFAp9v+dN18a3YktZbuYrPqvK1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755873329; 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=k6brm99bH7BEyNlhRJSu5t7il6KLNPL3nU2JoK/Zp2Y=; b=mqPxRZ8CqgGhllfhDwhO0tmSCkV22sIJ7qCbu6OiFnkSB5w+zyl2edw8ZD05lrmKgg/AqC SpHPe3C67ndBRqG9Y8MzQyrz/FxNBQvBurYb9gn/GWNlT02blOVjAKxEHd5wBTxD2Z9yhm X1FWhe2aQgpCsZAs6lQzGFIc6+jQfOfluCJgJtn86SJquuwgGVcyJzkCLOKoBTQd7cf9FA 0neIVoy9EJIfcl+keBYoB0H3jrI/Qcl60pVklvbIBF7IT5f/qlE5f/3vCuHZEu0qjoQWi8 73wousueOqnRP+UODDrOtKjOx9NhOx+XTv7+AFrZEmoiWsKjaqFFq0P92v0gKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755873329; a=rsa-sha256; cv=none; b=HRIhJWO6rdbWGkhA5bxsavhXSsUAgf+Ywu8f/8pcsIQ4hvEt6jKRXolh+w/vsIEOG9arcX bHyYJ8lAMLOz5BsqI/dwwiX55yLDgJBVp2rwIqKLFHl6ByLA4U1QQtDu6JDUf9902QABUV U+9DrdjWLWs9hWMMZpmPCDFQOMNB6FE2DyFKwTc0Ymlu+h6SJ9UNQM2+PaNolRPnZnthct v63rLf7wiizGth11E5ho35YjGmhUyEEKPInBVRPCfp3Kw6O34mKJynztcEiTqgI9zbmuPC aKQ9YfqJMectHJKHPw9TjndGw5/xPoP9RpDIYbYthrrezRzJc7DLEGfc9K88uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7jQn2lgJzqRx; Fri, 22 Aug 2025 14:35:29 +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 57MEZTCK016275; Fri, 22 Aug 2025 14:35:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57MEZTYM016272; Fri, 22 Aug 2025 14:35:29 GMT (envelope-from git) Date: Fri, 22 Aug 2025 14:35:29 GMT Message-Id: <202508221435.57MEZTYM016272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7d6b5a918a5b - main - rtld: Add UTRACE_LOAD_OBJECT traces for rtld and the main binary 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d6b5a918a5b09ae62a87c331092ffae0fd0fa7b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7d6b5a918a5b09ae62a87c331092ffae0fd0fa7b commit 7d6b5a918a5b09ae62a87c331092ffae0fd0fa7b Author: John Baldwin AuthorDate: 2025-08-22 13:59:22 +0000 Commit: John Baldwin CommitDate: 2025-08-22 13:59:22 +0000 rtld: Add UTRACE_LOAD_OBJECT traces for rtld and the main binary These two objects are loaded by the kernel not rtld, but adding these two traces means that UTRACE_LOAD_OBJECT traces now describe the mappings for all executables and DSOs in a process' address space. Reviewed by: kib Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D52034 --- libexec/rtld-elf/rtld.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index a8a2a0fa5a07..d27af520c21d 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -859,6 +859,10 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) linkmap_add(obj_main); linkmap_add(&obj_rtld); + LD_UTRACE(UTRACE_LOAD_OBJECT, obj_main, obj_main->mapbase, + obj_main->mapsize, 0, obj_main->path); + LD_UTRACE(UTRACE_LOAD_OBJECT, &obj_rtld, obj_rtld.mapbase, + obj_rtld.mapsize, 0, obj_rtld.path); /* Link the main program into the list of objects. */ TAILQ_INSERT_HEAD(&obj_list, obj_main, next);