From nobody Fri Apr 8 01:25:29 2022 X-Original-To: dev-commits-src-all@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 1B1BB1A837E3; Fri, 8 Apr 2022 01:25:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZLCt31Rzz3FdS; Fri, 8 Apr 2022 01:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649381130; 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=ZBI11i1uFIwn5xtJ1O44Z5NH1g5721teudgTwK/2c5g=; b=aTEo6+RH1mylGkjKUrYyeRWcHdWYKFM1sYXpytGWMOqKkunn0oLZBMI1Bw6i/mpNIxD47k h6jiegSgb+3uDva1TPHaITeghNoFkrq6zasNyHvI3YNmqiJxLLLwpPlBS4in84fy5kFpL9 4rVxXChPTMEVxbNMeenKMWyZ89Lbb1fpRRchIb2+Yb51o+ouHrjmI0CzT+XlS10fMeyXVw ShCb16ULIUEQcxMDW/FH6vZ+gbaPm+6cnlUCYuU+tlJeJzPDhKKI5VfaJgd+uJ0jbGLHH7 oggx5BbtpISraMfJAD5dxi/98Lbn/MsQiAo3t7XazUw1O1nbZAjrMJbTaPsOBQ== 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 0CFCC1B534; Fri, 8 Apr 2022 01:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2381PTRM095215; Fri, 8 Apr 2022 01:25:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2381PTGX095214; Fri, 8 Apr 2022 01:25:29 GMT (envelope-from git) Date: Fri, 8 Apr 2022 01:25:29 GMT Message-Id: <202204080125.2381PTGX095214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c193f01267d7 - stable/13 - rtld: trace preloaded objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c193f01267d76729ed9cd928038680868d24761d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649381130; 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=ZBI11i1uFIwn5xtJ1O44Z5NH1g5721teudgTwK/2c5g=; b=D1hL1zoA43W6HhtKlnW4hTF8TEoxvoChnZwtkvyCdaRv93pYTHqfuuJ885uls+ELF9kLXg au9kjW20mm6ISLqazeMBD6t8UoT7d/PqqgU1CacddlA5t0zJFxMSSDuZ0JYkfSDXiaEogY Jd2h2p6i/SUm/PsUuS4dLbDsNK0PYGq29NLqmJsnq9E2OyLUjIQ8GUKDbRdwzhZu0sbrVf obz3prWD2ou6dG4/Y+LKXMfzbsPHs6cv+QFE0NHPaWrsTWONqAWUf8pmR2C/mEwT/Gw9x+ HDl6VazmQVYn7OezB9kdbSUt9mxEkWm9y62J1/A64dJ6tYKKDT3qXJXO8ZUP/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649381130; a=rsa-sha256; cv=none; b=yRPCGv1jQ2Xe0wvIOnFA7Qnq44i8UKbj4DWUusy0S8Agf8URy9CqTmPrXw5VO7/tLErx5r LPLD4vJe4VE3gz+PTSdF0i1TbayPVa8C1A1FcnPjW27/q/ITJNfWSUzNScqutXtPhz7VDR jfkRNrjLZNB2UoMhuBVbID6+ccHIcjnWzPbQhYO60zBZxLmI+Ub9o/LAAR9eGT/fscrhKo VHAl/ZWmqfNka36EXxo5dNwTR46ue6biax4IqepIaXVgQ4RHUfsXVZZIhG/rPOT2mG3LmD Bs/4C1b2AGZ499HE9yuYkwoCTxs0ira4OyEkSx4545VEmNOgfBYPyDa627YTfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c193f01267d76729ed9cd928038680868d24761d commit c193f01267d76729ed9cd928038680868d24761d Author: Konstantin Belousov AuthorDate: 2022-03-30 21:01:54 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-08 01:25:17 +0000 rtld: trace preloaded objects (cherry picked from commit 0913953c9ed0f6ac3dd57aa06e1d7c8a1a6c5530) --- libexec/rtld-elf/rtld.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index dea6e3c8c037..1b874327ce0c 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -172,7 +172,7 @@ static int symlook_needed(SymLook *, const Needed_Entry *, DoneList *); static int symlook_obj1_sysv(SymLook *, const Obj_Entry *); static int symlook_obj1_gnu(SymLook *, const Obj_Entry *); static void *tls_get_addr_slow(Elf_Addr **, int, size_t, bool) __noinline; -static void trace_loaded_objects(Obj_Entry *); +static void trace_loaded_objects(Obj_Entry *, bool); static void unlink_object(Obj_Entry *); static void unload_object(Obj_Entry *, RtldLockState *lockstate); static void unref_dag(Obj_Entry *); @@ -872,7 +872,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) dump_auxv(aux_info); if (ld_tracing) { /* We're done */ - trace_loaded_objects(obj_main); + trace_loaded_objects(obj_main, true); exit(0); } @@ -3878,7 +3878,7 @@ dlopen_object(const char *name, int fd, Obj_Entry *refobj, int lo_flags, lock_release(rtld_bind_lock, lockstate); return (obj); trace: - trace_loaded_objects(obj); + trace_loaded_objects(obj, false); if (lockstate == &mlockstate) lock_release(rtld_bind_lock, lockstate); exit(0); @@ -5038,17 +5038,17 @@ trace_print_obj(Obj_Entry *obj, const char *name, const char *path, } static void -trace_loaded_objects(Obj_Entry *obj) +trace_loaded_objects(Obj_Entry *obj, bool show_preload) { const char *fmt1, *fmt2, *main_local; - bool list_containers; + const char *name, *path; + bool first_spurious, list_containers; trace_calc_fmts(&main_local, &fmt1, &fmt2); list_containers = ld_get_env_var(LD_TRACE_LOADED_OBJECTS_ALL) != NULL; for (; obj != NULL; obj = TAILQ_NEXT(obj, next)) { Needed_Entry *needed; - const char *name, *path; if (obj->marker) continue; @@ -5068,6 +5068,23 @@ trace_loaded_objects(Obj_Entry *obj) fmt1, fmt2); } } + + if (show_preload) { + first_spurious = true; + TAILQ_FOREACH(obj, &obj_list, next) { + if (obj->marker || obj == obj_main || obj->traced) + continue; + + if (first_spurious) { + rtld_printf("[preloaded]\n"); + first_spurious = false; + } + Name_Entry *fname = STAILQ_FIRST(&obj->names); + name = fname == NULL ? "" : fname->name; + trace_print_obj(obj, name, obj->path, main_local, + fmt1, fmt2); + } + } } /*