Page MenuHomeFreeBSD
Differential D18618

Make kernel print jail ID when logging a process exit.
ClosedPublic
Actions

Authored by marieheleneka_gmail.com on Dec 20 2018, 10:46 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 31, 10:46 AM
Unknown Object (File)
Sun, Mar 30, 11:41 PM
Unknown Object (File)
Thu, Mar 20, 12:20 PM
Unknown Object (File)
Sun, Mar 16, 8:45 PM
Unknown Object (File)
Sun, Mar 16, 8:44 PM
Unknown Object (File)
Feb 10 2025, 12:42 AM
Unknown Object (File)
Feb 10 2025, 12:41 AM
Unknown Object (File)
Feb 10 2025, 12:36 AM
View All Files
Subscribers
imp
mjg

Details

Reviewers
kp
Commits
rS342591: Make kernel print jail ID when logging a process exit
Summary

Previously, when a process was killed (ex: core dumped), the kernel would log a message like this:
pid 74906 (top), uid 0: exited on signal 11 (core dumped)

The message now looks like this:
pid 66526 (top), jid: 1, uid 0: exited on signal 11 (core dumped)

"jid" will be 0 for processes not running in a jail, which is in line with other parts of the system. (ex: "ps -J 0" to show unjailed processes)
"jid" will be -1 if the jid information is unavailable for some reason. (this should ordinarily not happen, but I've not dug enough in the code to guarantee it won't ever happen.)

Suggested commit message:
Kernel now includes jail ID when logging a process exit. jid is 0 for unjailed processes.

Submitted by: Marie Helene Kvello-Aune <freebsd@mhka.no>
Sponsored by: Modirum MDPay
relnotes: yes

Test Plan

Apply patch, build & install kernel.
Spin up a few jails
Check dmesg output after running "kill -11" on a few jailed and unjailed processes.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 21758
Build 21034: arc lint + arc unit

Event Timeline

marieheleneka_gmail.com created this revision.Dec 20 2018, 10:46 AM
Herald added a subscriber: imp. · View Herald TranscriptDec 20 2018, 10:46 AM
Harbormaster completed remote builds in B21656: Diff 52191.Dec 20 2018, 10:46 AM
marieheleneka_gmail.com updated this revision to Diff 52192.Dec 20 2018, 10:55 AM

Fix whitespace

Harbormaster completed remote builds in B21657: Diff 52192.Dec 20 2018, 10:55 AM
mjg added a subscriber: mjg.Dec 20 2018, 11:29 AM

See this review https://reviews.freebsd.org/D27

marieheleneka_gmail.com updated this revision to Diff 52193.Dec 20 2018, 11:53 AM

Added jid to log message for sigexit as well.
Made formatting more consistent (removed a colon)

Harbormaster completed remote builds in B21658: Diff 52193.Dec 20 2018, 11:53 AM
marieheleneka_gmail.com added a comment.Dec 20 2018, 11:55 AM
In D18618#397024, @mjg wrote:

See this review https://reviews.freebsd.org/D27

That diff looks interesting, and it made me realize I had missed sigexit. That's fixed now.

I much prefer D27's way of formatting things, but it seems to me it's dead in the water.

marieheleneka_gmail.com updated this revision to Diff 52389.Dec 29 2018, 11:47 AM

Made code a bit more readable by storing jid as a variable, instead of double ?: syntax.
Fixed trailing whitespace.

Harbormaster completed remote builds in B21758: Diff 52389.Dec 29 2018, 11:47 AM
This revision was not accepted when it landed; it landed in state Needs Review.Dec 29 2018, 2:49 PM
Closed by commit rS342591: Make kernel print jail ID when logging a process exit (authored by kp). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
sys/
kern/
17 lines

Diff 52389

View Options

sys/kern/kern_sig.c

PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
# $FreeBSD$
PORTNAME= pyfda
PORTVERSION= 0.1
DISTVERSIONSUFFIX= rc6
CATEGORIES= cad python devel
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= yuri@FreeBSD.org
COMMENT= GUI tool for designing and analysing discrete time filters
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
USES= python:3.4+ pyqt:5
USE_PYTHON= distutils autoplist noflavors
matUnsubmitted
Not Done
Inline Actions

Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is empty, thus, it makes this port broken because the dependencies line end with @ with no flavor.

mat: Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is…
yuriAuthorUnsubmitted
Not Done
Inline Actions

But this is an app, not a library. Shouldn't python apps all be noflavors?

yuri: But this is an app, not a library. Shouldn't python apps all be `noflavors`?
matUnsubmitted
Not Done
Inline Actions

this has a PKGNAMEPREFIX, nothing against it having noflavors.

mat: this has a PKGNAMEPREFIX, nothing against it having noflavors.
USE_PYQT= core_run gui_run widgets_run
NO_ARCH= yes
post-extract:
@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample
post-patch:
@${REINPLACE_CMD} -e " \
s|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',|package_data={'pyfda': [|; \
s|data_files = \[|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])|" \
${WRKSRC}/setup.py
@${REINPLACE_CMD} -e " \
s|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))|" \
${WRKSRC}/pyfda/pyfdax.py
@${REINPLACE_CMD} -e " \
s|'pyfda.log'|'/tmp/pyfda.log'|" \
${WRKSRC}/pyfda/*.conf.sample
post-stage:
@${REINPLACE_CMD} -E " \
s|(.*\.sample)$$|@sample \1|" \
${WRKDIR}/.PLIST.pymodtmp
.include <bsd.port.mk>