From owner-freebsd-bugs@FreeBSD.ORG Tue May 7 14:10:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D0C7CD8A for ; Tue, 7 May 2013 14:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B80B4A44 for ; Tue, 7 May 2013 14:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r47EA0g6048419 for ; Tue, 7 May 2013 14:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r47EA0Zi048418; Tue, 7 May 2013 14:10:00 GMT (envelope-from gnats) Resent-Date: Tue, 7 May 2013 14:10:00 GMT Resent-Message-Id: <201305071410.r47EA0Zi048418@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Clement Moulin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4D13DC2C for ; Tue, 7 May 2013 14:04:26 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.FreeBSD.org (oldred.freebsd.org [8.8.178.121]) by mx1.freebsd.org (Postfix) with ESMTP id 3E63BA00 for ; Tue, 7 May 2013 14:04:26 +0000 (UTC) Received: from oldred.FreeBSD.org ([127.0.1.6]) by oldred.FreeBSD.org (8.14.5/8.14.5) with ESMTP id r47E4PEw099880 for ; Tue, 7 May 2013 14:04:25 GMT (envelope-from nobody@oldred.FreeBSD.org) Received: (from nobody@localhost) by oldred.FreeBSD.org (8.14.5/8.14.5/Submit) id r47E4PlU099879; Tue, 7 May 2013 14:04:25 GMT (envelope-from nobody) Message-Id: <201305071404.r47E4PlU099879@oldred.FreeBSD.org> Date: Tue, 7 May 2013 14:04:25 GMT From: Clement Moulin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: kern/178396: Add jid to kernel log when a process has been forced closed X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 May 2013 14:10:00 -0000 >Number: 178396 >Category: kern >Synopsis: Add jid to kernel log when a process has been forced closed >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 07 14:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Clement Moulin >Release: 9.0 >Organization: SimpleRezo >Environment: FreeBSD XXX.simplerezo.com 9.0-RELEASE-p4 FreeBSD 9.0-RELEASE-p4 #0: Thu Aug 16 12:10:44 CEST 2012 root@XXX.simplerezo.com:/usr/obj/storage/freebsd/src/sys/KERNEL amd64 >Description: When process is forced killed, kernel log "process %pid (%processname), uid %uid: exited on signal %sid". In a system hosting jails, this message, since it is produced by kernel, is logged on the host. I'm suggesting to also log JID for "debugging" purpose: in my case, i have several jails, each with an apache process, and without JID information, i'm not able to find which one is causing "httpd: exiting on signal 10", without reading every apache error logs of each jail... >How-To-Repeat: >Fix: See proposal patch in attachment. Patch attached with submission follows: --- kern_sig.c.orig 2013-05-07 11:11:44.000000000 +0200 +++ kern_sig.c 2013-05-07 11:33:52.000000000 +0200 @@ -2869,12 +2869,21 @@ if (coredump(td) == 0) sig |= WCOREFLAG; if (kern_logsigexit) - log(LOG_INFO, - "pid %d (%s), uid %d: exited on signal %d%s\n", - p->p_pid, p->p_comm, - td->td_ucred ? td->td_ucred->cr_uid : -1, - sig &~ WCOREFLAG, - sig & WCOREFLAG ? " (core dumped)" : ""); + if (p->p_flag & P_JAILED) + log(LOG_INFO, + "pid %d (%s), uid %d, jid %d: exited on signal %d%s\n", + p->p_pid, p->p_comm, + td->td_ucred ? td->td_ucred->cr_uid : -1, + p->p_ucred ? p->p_ucred->cr_prison->pr_id : -1, + sig &~ WCOREFLAG, + sig & WCOREFLAG ? " (core dumped)" : ""); + else + log(LOG_INFO, + "pid %d (%s), uid %d: exited on signal %d%s\n", + p->p_pid, p->p_comm, + td->td_ucred ? td->td_ucred->cr_uid : -1, + sig &~ WCOREFLAG, + sig & WCOREFLAG ? " (core dumped)" : ""); } else PROC_UNLOCK(p); exit1(td, W_EXITCODE(0, sig)); >Release-Note: >Audit-Trail: >Unformatted: