From nobody@FreeBSD.org  Tue May  7 14:04:26 2013
Return-Path: <nobody@FreeBSD.org>
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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd-gnats-submit@FreeBSD.org>; 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 <freebsd@simplerezo.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Add jid to kernel log when a process has been forced closed
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         178396
>Category:       kern
>Synopsis:       [kernel] [patch] 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:  Sun May 12 23:34:14 UTC 2013
>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:

From: Clement Moulin <cmoulin@simplerezo.com>
To: "bug-followup@FreeBSD.org" <bug-followup@FreeBSD.org>
Cc:  
Subject: Re: kern/178396: Add jid to kernel log when a process has been
 forced closed
Date: Tue, 7 May 2013 14:13:36 +0000

 I attached the wrong patch version.
 
 The good one is:
 
 begin-base64 644 kern_sig.c.patch
 LS0tIHN5cy9rZXJuL2tlcm5fc2lnLmMub3JpZwkyMDEzLTA1LTA3IDE1OjU4OjEwLjAwMDAwMDA=
 w
 MCArMDIwMAorKysgc3lzL2tlcm4va2Vybl9zaWcuYwkyMDEzLTA1LTA3IDE1OjU4OjM2LjAwMDA=
 w
 MDAwMCArMDIwMApAQCAtMjg2OCwxMyArMjg2OCwyMyBAQAogCQkgKi8KIAkJaWYgKGNvcmVkdW1=
 w
 KHRkKSA9PSAwKQogCQkJc2lnIHw9IFdDT1JFRkxBRzsKLQkJaWYgKGtlcm5fbG9nc2lnZXhpdCk=
 K
 LQkJCWxvZyhMT0dfSU5GTywKLQkJCSAgICAicGlkICVkICglcyksIHVpZCAlZDogZXhpdGVkIG9=
 u
 IHNpZ25hbCAlZCVzXG4iLAotCQkJICAgIHAtPnBfcGlkLCBwLT5wX2NvbW0sCi0JCQkgICAgdGQ=
 t
 PnRkX3VjcmVkID8gdGQtPnRkX3VjcmVkLT5jcl91aWQgOiAtMSwKLQkJCSAgICBzaWcgJn4gV0N=
 P
 UkVGTEFHLAotCQkJICAgIHNpZyAmIFdDT1JFRkxBRyA/ICIgKGNvcmUgZHVtcGVkKSIgOiAiIik=
 7
 CisJCWlmIChrZXJuX2xvZ3NpZ2V4aXQpIHsKKwkJICAJaWYgKHRkLT50ZF91Y3JlZCAmJiBqYWl=
 s
 ZWQodGQtPnRkX3VjcmVkKSkKKwkJCQlsb2coTE9HX0lORk8sCisJCQkJICAgICJwaWQgJWQgKCV=
 z
 KSwgdWlkICVkLCBqaWQgJWQ6IGV4aXRlZCBvbiBzaWduYWwgJWQlc1xuIiwKKwkJCQkgICAgcC0=
 +
 cF9waWQsIHAtPnBfY29tbSwKKwkJCQkgICAgdGQtPnRkX3VjcmVkLT5jcl91aWQsCisJCQkJICA=
 g
 IHRkLT50ZF91Y3JlZC0+Y3JfcHJpc29uLT5wcl9pZCwKKwkJCQkgICAgc2lnICZ+IFdDT1JFRkx=
 B
 RywKKwkJCQkgICAgc2lnICYgV0NPUkVGTEFHID8gIiAoY29yZSBkdW1wZWQpIiA6ICIiKTsKKwk=
 J
 CWVsc2UKKwkJCQlsb2coTE9HX0lORk8sCisJCQkJICAgICJwaWQgJWQgKCVzKSwgdWlkICVkOiB=
 l
 eGl0ZWQgb24gc2lnbmFsICVkJXNcbiIsCisJCQkJICAgIHAtPnBfcGlkLCBwLT5wX2NvbW0sCis=
 J
 CQkJICAgIHRkLT50ZF91Y3JlZCA/IHRkLT50ZF91Y3JlZC0+Y3JfdWlkIDogLTEsCisJCQkJICA=
 g
 IHNpZyAmfiBXQ09SRUZMQUcsCisJCQkJICAgIHNpZyAmIFdDT1JFRkxBRyA/ICIgKGNvcmUgZHV=
 t
 cGVkKSIgOiAiIik7CisJCX0KIAl9IGVsc2UKIAkJUFJPQ19VTkxPQ0socCk7CiAJZXhpdDEodGQ=
 s
 IFdfRVhJVENPREUoMCwgc2lnKSk7Cg=3D=3D
 =3D=3D=3D=3D
 
>Unformatted:
