From owner-dev-commits-src-all@freebsd.org Wed May 26 10:52:02 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6EEE8639671; Wed, 26 May 2021 10:52:02 +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 4Fqnnt2h77z4kr8; Wed, 26 May 2021 10:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4424B7825; Wed, 26 May 2021 10:52:02 +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 14QAq2b3070432; Wed, 26 May 2021 10:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14QAq285070431; Wed, 26 May 2021 10:52:02 GMT (envelope-from git) Date: Wed, 26 May 2021 10:52:02 GMT Message-Id: <202105261052.14QAq285070431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 905d192d6f16 - main - Unstaticize parts of coredumping code MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 905d192d6f161496c26db29d0d429525166bfff7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 10:52:02 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=905d192d6f161496c26db29d0d429525166bfff7 commit 905d192d6f161496c26db29d0d429525166bfff7 Author: Edward Tomasz Napierala AuthorDate: 2021-05-26 09:23:37 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-05-26 10:51:57 +0000 Unstaticize parts of coredumping code This makes it possible to call __elfN(size_segments) and __elfN(puthdr) from Linux coredump code. Reviewed By: kib Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30455 --- sys/kern/imgact_elf.c | 23 ++++++++++++----------- sys/sys/imgact_elf.h | 8 ++++++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 15976d143988..57e9ac18e63b 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1434,12 +1434,6 @@ struct phdr_closure { Elf_Off offset; /* Offset of segment in core file */ }; -/* Closure for cb_size_segment(). */ -struct sseg_closure { - int count; /* Count of writable segments. */ - size_t size; /* Total size of all writable segments. */ -}; - typedef void (*outfunc_t)(void *, struct sbuf *, size_t *); struct note_info { @@ -1463,7 +1457,6 @@ static int __elfN(corehdr)(struct coredump_params *, int, void *, size_t, struct note_info_list *, size_t, int); static void __elfN(prepare_notes)(struct thread *, struct note_info_list *, size_t *); -static void __elfN(puthdr)(struct thread *, void *, size_t, int, size_t, int); static void __elfN(putnote)(struct note_info *, struct sbuf *); static size_t register_note(struct note_info_list *, int, outfunc_t, void *); @@ -1508,9 +1501,7 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags) TAILQ_INIT(¬elst); /* Size the program segments. */ - seginfo.count = 0; - seginfo.size = 0; - each_dumpable_segment(td, cb_size_segment, &seginfo, flags); + __elfN(size_segments)(td, &seginfo, flags); /* * Collect info about the core file header area. @@ -1645,6 +1636,16 @@ cb_size_segment(vm_map_entry_t entry, void *closure) ssc->size += entry->end - entry->start; } +void +__elfN(size_segments)(struct thread *td, struct sseg_closure *seginfo, + int flags) +{ + seginfo->count = 0; + seginfo->size = 0; + + each_dumpable_segment(td, cb_size_segment, seginfo, flags); +} + /* * For each writable segment in the process's memory map, call the given * function with a pointer to the map entry and some arbitrary @@ -1803,7 +1804,7 @@ __elfN(prepare_notes)(struct thread *td, struct note_info_list *list, *sizep = size; } -static void +void __elfN(puthdr)(struct thread *td, void *hdr, size_t hdrsize, int numsegs, size_t notesz, int flags) { diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index ca95798c7288..f0c112b2bcdc 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -100,6 +100,12 @@ __ElfType(Brandinfo); #define MAX_BRANDS 8 +/* Closure for __elfN(size_segments)(). */ +struct sseg_closure { + int count; /* Count of writable segments. */ + size_t size; /* Total size of all writable segments. */ +}; + int __elfN(brand_inuse)(Elf_Brandinfo *entry); int __elfN(insert_brand_entry)(Elf_Brandinfo *entry); int __elfN(remove_brand_entry)(Elf_Brandinfo *entry); @@ -108,6 +114,8 @@ int __elfN(coredump)(struct thread *, struct vnode *, off_t, int); size_t __elfN(populate_note)(int, void *, void *, size_t, void **); void __elfN(stackgap)(struct image_params *, uintptr_t *); int __elfN(freebsd_copyout_auxargs)(struct image_params *, uintptr_t); +void __elfN(puthdr)(struct thread *, void *, size_t, int, size_t, int); +void __elfN(size_segments)(struct thread *, struct sseg_closure *, int); /* Machine specific function to dump per-thread information. */ void __elfN(dump_thread)(struct thread *, void *, size_t *);