Add PD_KILL option to prison_deref()
ClosedPublic
Actions

Authored by jamie on Feb 3 2021, 9:43 PM.

Details

Reviewers: None
Commits: rG246339530348: MFC jail: Add PD_KILL to remove a prison in prison_deref().
rG811e27fa3c44: jail: Add PD_KILL to remove a prison in prison_deref().

Summary

Add the PD_KILL flag that instruction prison_deref() to take steps to actively kill a prison, namely clearing its PR_PERSIST flag and killing any attached processes.

This replaces a similar loop in sys_jail_remove(), bringing the operation under the same single hold on allprison_lock that it already has. It also replaces a bit of one-off code in kern_jail_set() to handle the destruction of almost-finished prisons.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

jamie requested review of this revision.Feb 3 2021, 9:43 PM

jamie created this revision.

jamie mentioned this in D28515: Don't allow jail "accidental" resurrection of dead jails..Feb 6 2021, 9:21 PM

jamie mentioned this in D28150: jail: Don't allow resurrection of dead jails.Feb 8 2021, 2:11 AM

Updated for cc7b73065302 and d4380c0cdd05.

This revision was not accepted when it landed; it landed in state Needs Review.Feb 22 2021, 8:28 PM

Closed by commit rG811e27fa3c44: jail: Add PD_KILL to remove a prison in prison_deref(). (authored by jamie). · Explain Why

This revision was automatically updated to reflect the committed changes.

jamie added a commit: rG811e27fa3c44: jail: Add PD_KILL to remove a prison in prison_deref()..

After this commit running cd /usr/tests/lib/libc/sys && kyua test cpuset_test renders the entire system unusable (and in Jenkins it's triggering a kernel panic)

Reverting 811e27fa3c445664e36071a7d08228fc7fb85676 fixes this problem.

jamie added a reverting change: rGddfffb41a22d: jail: back out 811e27fa3c44 until it doesn't break Jenkins.Feb 25 2021, 5:12 AM

Sorry I took so long - I confused your note that it should be reverted with a note that it *had been* reverted.

jamie added a reverting change: rG246339530348: MFC jail: Add PD_KILL to remove a prison in prison_deref()..Mar 12 2021, 6:49 PM

jamie added a commit: rG246339530348: MFC jail: Add PD_KILL to remove a prison in prison_deref()..