From nobody Tue Jan 24 22:10:19 2023 X-Original-To: dev-commits-src-branches@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 4P1h3v2yKQz3bdqX; Tue, 24 Jan 2023 22:10:19 +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 4P1h3v23tgz4JrK; Tue, 24 Jan 2023 22:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598219; 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=CIExv7kV83R1urCKpAW8KXH+j06yB6aZJVO/DmNNfVQ=; b=ZXT2+GhoYUqWiZ5DMriR97PNFL6H1cOzdBupOc75mcsxhXF2Mh5Fls9qbvBVFNFA3pPWTq oiaRjIpkKXYUrAKk91IlIfGDi5auRgbH77RVnpbr2M1X7ZHfF3IPda10AQ2MujUj9PG5dy +kAfdD+/9JZHVBiA2TjjAQdfIcP8KAdAHmI25ZBGMkK4IiaKi99x4gwhtXta9aPB8KV99U ggVkLAZCEO88K1LOGb0lye61M5HlenvhTF7J+8lXZSKDKub6SE8cgp4LQRSdVX0vDpB8vC c0fqFzIZN+0fJxlbr7ChdNwv4C1sdPa4J1xz+IdEL6qnN+JAbPuNSL9fBDSLYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598219; 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=CIExv7kV83R1urCKpAW8KXH+j06yB6aZJVO/DmNNfVQ=; b=YmwRZWCIHKBaqLeLGdVrPcXIsqeKRQLnMwXKT1twNoqYFPNfii11JnsBfW3vgyFqcM/j2k xhUKHC3DbxJ6Xn/89ddez2m5IxEtyBQhxZD1PPAn5choXLDYr1DN7R+vOqhFXYQTrRraFf czkBoIoN+r4c3D8nCX1tOiCJH8EcotpoCncD6cS116Ji1/xG4Rezlz9COXHqx+iR5/o+qa JErNHsetuOwC5aJrCH7mM3T5r6IatPP3UQZtCfMI8Y8JbCoh+hRw3cwLBw2cqPryxtPvyw XqgP7+R6PkNZ9kLCtnmYODV6JyWhfY2JILgGpFhfx18rvNXgXENYesS+o2sqWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598219; a=rsa-sha256; cv=none; b=EQulB/gkKH4OlgvJO/J+bj0HohoJ6FXHJM0CdbMVpAuzPHyzIepThrBQoqskYbIS4Fd3yZ BFX74WTPcFO1hpBHPAFLpYRHA/CPZrFfpd6qq7lFPMLUDax2+L2D9SFRW1vSV1++lvMur0 h0sD1srDYeM2DD7moPj/pKszDd/B6tOxtVvhaLwe7W1zGq+9+EKtwlvUWHyx1/Ruj33Gx4 95p9bQALTzoJKChE9gvPRQG+w1xdqd8rsWwLiBhKKateSH1exoZqtMhYnZ0DUHtBWkb75B kMBkNgrH+QgpNLo3g1x2wFfrhlC0maVsW1yRW5/mUhvrOQHrgyYbdWRaUwQLcw== 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 4P1h3v19DyzQLx; Tue, 24 Jan 2023 22:10:19 +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 30OMAJqb079875; Tue, 24 Jan 2023 22:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAJNv079874; Tue, 24 Jan 2023 22:10:19 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:19 GMT Message-Id: <202301242210.30OMAJNv079874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 501a337902f8 - stable/13 - Add support for module_verbose List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 501a337902f80cee1c84554e5222172dc809ac4b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=501a337902f80cee1c84554e5222172dc809ac4b commit 501a337902f80cee1c84554e5222172dc809ac4b Author: Simon J. Gerraty AuthorDate: 2022-02-13 20:45:57 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:20 +0000 Add support for module_verbose Set module_verbose to control the printing of information about loaded modules and kernel: 0 MODULE_VERBOSE_SILENT None 1 MODULE_VERBOSE_SIZE Pathname and size 2 MODULE_VERBOSE_TWIDDLE as for 1 but also twiddle for progress 3 MODULE_VERBOSE_FULL extra detail When the loader is verifying modules we already have a running indication of progress and module_verbose=0 makes sense. Reviewed by: rpokala Differential Revision: https://reviews.freebsd.org/D34245 (cherry picked from commit ec042f46e9bbd195e1f7c8151df5d280a2a4d069) --- stand/common/bootstrap.h | 8 ++++ stand/common/console.c | 29 ++++++++++- stand/common/load_elf.c | 114 ++++++++++++++++++++++---------------------- stand/common/load_elf_obj.c | 9 ++-- 4 files changed, 98 insertions(+), 62 deletions(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 42b2c73f5774..9c62a49b0da7 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -124,6 +124,14 @@ void cons_probe(void); bool cons_update_mode(bool); void autoload_font(bool); +extern int module_verbose; +enum { + MODULE_VERBOSE_SILENT, /* say nothing */ + MODULE_VERBOSE_SIZE, /* print name and size */ + MODULE_VERBOSE_TWIDDLE, /* show progress */ + MODULE_VERBOSE_FULL, /* all we have */ +}; + /* * Plug-and-play enumerator/configurator interface. */ diff --git a/stand/common/console.c b/stand/common/console.c index ff864276f96c..08d0dc40e3a9 100644 --- a/stand/common/console.c +++ b/stand/common/console.c @@ -41,6 +41,28 @@ static int cons_check(const char *string); static int cons_change(const char *string); static int twiddle_set(struct env_var *ev, int flags, const void *value); +#ifndef MODULE_VERBOSE +# define MODULE_VERBOSE MODULE_VERBOSE_TWIDDLE +#endif +int module_verbose = MODULE_VERBOSE; + +static int +module_verbose_set(struct env_var *ev, int flags, const void *value) +{ + u_long v; + char *eptr; + + v = strtoul(value, &eptr, 0); + if (*(const char *)value == 0 || *eptr != 0) { + printf("invalid module_verbose '%s'\n", (const char *)value); + return (CMD_ERROR); + } + module_verbose = (int)v; + env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); + + return (CMD_OK); +} + /* * Detect possible console(s) to use. If preferred console(s) have been * specified, mark them as active. Else, mark the first probed console @@ -52,10 +74,15 @@ cons_probe(void) int cons; int active; char *prefconsole; + char module_verbose_buf[8]; TSENTER(); - /* We want a callback to install the new value when this var changes. */ + /* We want a callback to install the new value when these vars change. */ + snprintf(module_verbose_buf, sizeof(module_verbose_buf), "%d", + module_verbose); + env_setenv("module_verbose", EV_VOLATILE, module_verbose_buf, + module_verbose_set, env_nounset); env_setenv("twiddle_divisor", EV_VOLATILE, "16", twiddle_set, env_nounset); diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index f3192c1c94fa..99ebace012ea 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -462,13 +462,17 @@ __elfN(loadfile_raw)(char *filename, uint64_t dest, else fp->f_type = strdup("elf multiboot kernel"); -#ifdef ELF_VERBOSE - if (ef.kernel) - printf("%s entry at 0x%jx\n", filename, - (uintmax_t)ehdr->e_entry); -#else - printf("%s ", filename); -#endif + if (module_verbose >= MODULE_VERBOSE_FULL) { + if (ef.kernel) + printf("%s entry at 0x%jx\n", filename, + (uintmax_t)ehdr->e_entry); + } else if (module_verbose > MODULE_VERBOSE_SILENT) + printf("%s ", filename); + + if (module_verbose < MODULE_VERBOSE_TWIDDLE) { + /* A hack for now; we do not want twiddling */ + twiddle_divisor(UINT_MAX); + } fp->f_size = __elfN(loadimage)(fp, &ef, dest); if (fp->f_size == 0 || fp->f_addr == 0) @@ -579,9 +583,10 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) off += 0x01000000; } ehdr->e_entry += off; -#ifdef ELF_VERBOSE - printf("Converted entry 0x%jx\n", (uintmax_t)ehdr->e_entry); -#endif + if (module_verbose >= MODULE_VERBOSE_FULL) + printf("Converted entry 0x%jx\n", + (uintmax_t)ehdr->e_entry); + #elif defined(__arm__) && !defined(EFI) /* * The elf headers in arm kernels specify virtual addresses in @@ -603,10 +608,9 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) */ off -= ehdr->e_entry & ~PAGE_MASK; ehdr->e_entry += off; -#ifdef ELF_VERBOSE - printf("ehdr->e_entry 0x%jx, va<->pa off %llx\n", - (uintmax_t)ehdr->e_entry, off); -#endif + if (module_verbose >= MODULE_VERBOSE_FULL) + printf("ehdr->e_entry 0x%jx, va<->pa off %llx\n", + (uintmax_t)ehdr->e_entry, off); #else off = 0; /* other archs use direct mapped kernels */ #endif @@ -631,22 +635,22 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) if (phdr[i].p_type != PT_LOAD) continue; -#ifdef ELF_VERBOSE - printf("Segment: 0x%lx@0x%lx -> 0x%lx-0x%lx", - (long)phdr[i].p_filesz, (long)phdr[i].p_offset, - (long)(phdr[i].p_vaddr + off), - (long)(phdr[i].p_vaddr + off + phdr[i].p_memsz - 1)); -#else - if ((phdr[i].p_flags & PF_W) == 0) { - printf("text=0x%lx ", (long)phdr[i].p_filesz); - } else { - printf("data=0x%lx", (long)phdr[i].p_filesz); - if (phdr[i].p_filesz < phdr[i].p_memsz) - printf("+0x%lx", (long)(phdr[i].p_memsz - - phdr[i].p_filesz)); - printf(" "); + if (module_verbose >= MODULE_VERBOSE_FULL) { + printf("Segment: 0x%lx@0x%lx -> 0x%lx-0x%lx", + (long)phdr[i].p_filesz, (long)phdr[i].p_offset, + (long)(phdr[i].p_vaddr + off), + (long)(phdr[i].p_vaddr + off + phdr[i].p_memsz - 1)); + } else if (module_verbose > MODULE_VERBOSE_SILENT) { + if ((phdr[i].p_flags & PF_W) == 0) { + printf("text=0x%lx ", (long)phdr[i].p_filesz); + } else { + printf("data=0x%lx", (long)phdr[i].p_filesz); + if (phdr[i].p_filesz < phdr[i].p_memsz) + printf("+0x%lx", (long)(phdr[i].p_memsz - + phdr[i].p_filesz)); + printf(" "); + } } -#endif fpcopy = 0; if (ef->firstlen > phdr[i].p_offset) { fpcopy = ef->firstlen - phdr[i].p_offset; @@ -665,18 +669,16 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) } /* clear space from oversized segments; eg: bss */ if (phdr[i].p_filesz < phdr[i].p_memsz) { -#ifdef ELF_VERBOSE - printf(" (bss: 0x%lx-0x%lx)", - (long)(phdr[i].p_vaddr + off + phdr[i].p_filesz), - (long)(phdr[i].p_vaddr + off + phdr[i].p_memsz -1)); -#endif - + if (module_verbose >= MODULE_VERBOSE_FULL) { + printf(" (bss: 0x%lx-0x%lx)", + (long)(phdr[i].p_vaddr + off + phdr[i].p_filesz), + (long)(phdr[i].p_vaddr + off + phdr[i].p_memsz -1)); + } kern_bzero(phdr[i].p_vaddr + off + phdr[i].p_filesz, phdr[i].p_memsz - phdr[i].p_filesz); } -#ifdef ELF_VERBOSE - printf("\n"); -#endif + if (module_verbose >= MODULE_VERBOSE_FULL) + printf("\n"); if (archsw.arch_loadseg != NULL) archsw.arch_loadseg(ehdr, phdr + i, off); @@ -766,12 +768,10 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) goto nosyms; /* Ok, committed to a load. */ -#ifndef ELF_VERBOSE - printf("syms=["); -#endif + if (module_verbose >= MODULE_VERBOSE_FULL) + printf("syms=["); ssym = lastaddr; for (i = symtabindex; i >= 0; i = symstrindex) { -#ifdef ELF_VERBOSE char *secname; switch(shdr[i].sh_type) { @@ -785,23 +785,21 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) secname = "WHOA!!"; break; } -#endif size = shdr[i].sh_size; archsw.arch_copyin(&size, lastaddr, sizeof(size)); lastaddr += sizeof(size); -#ifdef ELF_VERBOSE - printf("\n%s: 0x%jx@0x%jx -> 0x%jx-0x%jx", secname, - (uintmax_t)shdr[i].sh_size, (uintmax_t)shdr[i].sh_offset, - (uintmax_t)lastaddr, - (uintmax_t)(lastaddr + shdr[i].sh_size)); -#else - if (i == symstrindex) - printf("+"); - printf("0x%lx+0x%lx", (long)sizeof(size), (long)size); -#endif - + if (module_verbose >= MODULE_VERBOSE_FULL) { + printf("\n%s: 0x%jx@0x%jx -> 0x%jx-0x%jx", secname, + (uintmax_t)shdr[i].sh_size, (uintmax_t)shdr[i].sh_offset, + (uintmax_t)lastaddr, + (uintmax_t)(lastaddr + shdr[i].sh_size)); + } else if (module_verbose > MODULE_VERBOSE_SILENT) { + if (i == symstrindex) + printf("+"); + printf("0x%lx+0x%lx", (long)sizeof(size), (long)size); + } if (VECTX_LSEEK(VECTX_HANDLE(ef), (off_t)shdr[i].sh_offset, SEEK_SET) == -1) { printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not seek for symbols - skipped!"); @@ -828,15 +826,15 @@ __elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) symstrindex = -1; } esym = lastaddr; -#ifndef ELF_VERBOSE - printf("]"); -#endif + if (module_verbose >= MODULE_VERBOSE_FULL) + printf("]"); file_addmetadata(fp, MODINFOMD_SSYM, sizeof(ssym), &ssym); file_addmetadata(fp, MODINFOMD_ESYM, sizeof(esym), &esym); nosyms: - printf("\n"); + if (module_verbose > MODULE_VERBOSE_SILENT) + printf("\n"); ret = lastaddr - firstaddr; fp->f_addr = firstaddr; diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c index f3c84cf31368..ed202e08b780 100644 --- a/stand/common/load_elf_obj.c +++ b/stand/common/load_elf_obj.c @@ -184,7 +184,8 @@ __elfN(obj_loadfile)(char *filename, uint64_t dest, fp->f_name = strdup(filename); fp->f_type = strdup(__elfN(obj_moduletype)); - printf("%s ", filename); + if (module_verbose > MODULE_VERBOSE_SILENT) + printf("%s ", filename); fp->f_size = __elfN(obj_loadimage)(fp, &ef, dest); if (fp->f_size == 0 || fp->f_addr == 0) @@ -378,10 +379,12 @@ __elfN(obj_loadimage)(struct preloaded_file *fp, elf_file_t ef, uint64_t off) ret = lastaddr - firstaddr; fp->f_addr = firstaddr; - printf("size 0x%lx at 0x%lx", (u_long)ret, (u_long)firstaddr); + if (module_verbose > MODULE_VERBOSE_SILENT) + printf("size 0x%lx at 0x%lx", (u_long)ret, (u_long)firstaddr); out: - printf("\n"); + if (module_verbose > MODULE_VERBOSE_SILENT) + printf("\n"); return ret; }