From owner-dev-commits-src-main@freebsd.org Tue May 25 15:30:47 2021 Return-Path: Delivered-To: dev-commits-src-main@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 1032964EFCB; Tue, 25 May 2021 15:30:47 +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 4FqJ1y74xlz3KmY; Tue, 25 May 2021 15:30:46 +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 DB1E220012; Tue, 25 May 2021 15:30:46 +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 14PFUkQc022387; Tue, 25 May 2021 15:30:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14PFUknu022386; Tue, 25 May 2021 15:30:46 GMT (envelope-from git) Date: Tue, 25 May 2021 15:30:46 GMT Message-Id: <202105251530.14PFUknu022386@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: 3b9971c8da75 - main - Clean up some of the core dumping 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: 3b9971c8da7532462048062d589ef85cbb904f7e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 15:30:47 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9971c8da7532462048062d589ef85cbb904f7e commit 3b9971c8da7532462048062d589ef85cbb904f7e Author: Edward Tomasz Napierala AuthorDate: 2021-05-25 10:48:15 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-05-25 15:30:32 +0000 Clean up some of the core dumping code. No functional changes. Reviewed By: kib Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30397 --- sys/kern/kern_exec.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 709c1b0ff28a..50451c1242eb 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1869,7 +1869,7 @@ exec_unregister(const struct execsw *execsw_arg) * Write out a core segment to the compression stream. */ static int -compress_chunk(struct coredump_params *p, char *base, char *buf, u_int len) +compress_chunk(struct coredump_params *cp, char *base, char *buf, u_int len) { u_int chunk_len; int error; @@ -1884,7 +1884,7 @@ compress_chunk(struct coredump_params *p, char *base, char *buf, u_int len) error = copyin(base, buf, chunk_len); if (error != 0) bzero(buf, chunk_len); - error = compressor_write(p->comp, buf, chunk_len); + error = compressor_write(cp->comp, buf, chunk_len); if (error != 0) break; base += chunk_len; @@ -1894,17 +1894,17 @@ compress_chunk(struct coredump_params *p, char *base, char *buf, u_int len) } int -core_write(struct coredump_params *p, const void *base, size_t len, +core_write(struct coredump_params *cp, const void *base, size_t len, off_t offset, enum uio_seg seg, size_t *resid) { - return (vn_rdwr_inchunks(UIO_WRITE, p->vp, __DECONST(void *, base), + return (vn_rdwr_inchunks(UIO_WRITE, cp->vp, __DECONST(void *, base), len, offset, seg, IO_UNIT | IO_DIRECT | IO_RANGELOCKED, - p->active_cred, p->file_cred, resid, p->td)); + cp->active_cred, cp->file_cred, resid, cp->td)); } int -core_output(char *base, size_t len, off_t offset, struct coredump_params *p, +core_output(char *base, size_t len, off_t offset, struct coredump_params *cp, void *tmpbuf) { vm_map_t map; @@ -1916,10 +1916,10 @@ core_output(char *base, size_t len, off_t offset, struct coredump_params *p, KASSERT((uintptr_t)base % PAGE_SIZE == 0, ("%s: user address %p is not page-aligned", __func__, base)); - if (p->comp != NULL) - return (compress_chunk(p, base, tmpbuf, len)); + if (cp->comp != NULL) + return (compress_chunk(cp, base, tmpbuf, len)); - map = &p->td->td_proc->p_vmspace->vm_map; + map = &cp->td->td_proc->p_vmspace->vm_map; for (; len > 0; base += runlen, offset += runlen, len -= runlen) { /* * Attempt to page in all virtual pages in the range. If a @@ -1937,7 +1937,7 @@ core_output(char *base, size_t len, off_t offset, struct coredump_params *p, } if (success) { - error = core_write(p, base, runlen, offset, + error = core_write(cp, base, runlen, offset, UIO_USERSPACE, &resid); if (error != 0) { if (error != EFAULT) @@ -1960,13 +1960,13 @@ core_output(char *base, size_t len, off_t offset, struct coredump_params *p, } } if (!success) { - error = vn_start_write(p->vp, &mp, V_WAIT); + error = vn_start_write(cp->vp, &mp, V_WAIT); if (error != 0) break; - vn_lock(p->vp, LK_EXCLUSIVE | LK_RETRY); - error = vn_truncate_locked(p->vp, offset + runlen, - false, p->td->td_ucred); - VOP_UNLOCK(p->vp); + vn_lock(cp->vp, LK_EXCLUSIVE | LK_RETRY); + error = vn_truncate_locked(cp->vp, offset + runlen, + false, cp->td->td_ucred); + VOP_UNLOCK(cp->vp); vn_finished_write(mp); if (error != 0) break; @@ -1981,10 +1981,12 @@ core_output(char *base, size_t len, off_t offset, struct coredump_params *p, int sbuf_drain_core_output(void *arg, const char *data, int len) { - struct coredump_params *p; + struct coredump_params *cp; + struct proc *p; int error, locked; - p = (struct coredump_params *)arg; + cp = arg; + p = cp->td->td_proc; /* * Some kern_proc out routines that print to this sbuf may @@ -1994,19 +1996,18 @@ sbuf_drain_core_output(void *arg, const char *data, int len) * can safely release the lock before draining and acquire * again after. */ - locked = PROC_LOCKED(p->td->td_proc); + locked = PROC_LOCKED(p); if (locked) - PROC_UNLOCK(p->td->td_proc); - if (p->comp != NULL) - error = compressor_write(p->comp, __DECONST(char *, data), len); + PROC_UNLOCK(p); + if (cp->comp != NULL) + error = compressor_write(cp->comp, __DECONST(char *, data), len); else - error = core_write(p, __DECONST(void *, data), len, p->offset, + error = core_write(cp, __DECONST(void *, data), len, cp->offset, UIO_SYSSPACE, NULL); if (locked) - PROC_LOCK(p->td->td_proc); + PROC_LOCK(p); if (error != 0) return (-error); - p->offset += len; + cp->offset += len; return (len); } -