[CRIU] [PATCH 00/11] rework init child-reaper reparent handling for pidnses

Andrew Vagin avagin at virtuozzo.com
Tue Jun 6 20:17:58 MSK 2017


Applied, thanks!

On Fri, May 26, 2017 at 08:02:43PM +0300, Pavel Tikhomirov wrote:
> That is not a CHILD_SUBREAPER case, only handles children
> reparented to the init of pidns.
> 
> Redo re-reparenting of adopted branches from init 'back' to
> their session leaders and helpers. Do it for each pidns.
> 
> First two patches are fixes, 3-6 adding helpers, 7 is main
> thing and 8-10 adding different tests.
> 
> https://jira.sw.ru/browse/PSBM-62139
> 
> Pavel Tikhomirov (11):
>   pstree: use RB_EMPTY_NODE to check that node is not linked
>   restore: fix sys_wait4 error handling in case no child
>   pstree/pid: add helper to get free pids in pidns and all it's
>     ancestors
>   pstree: add helper for_each_pssubtree_item to walk item's subtree
>   pstree: add is_session_leader helper and use it where possible
>   pstree: make equal_pid handle sid comparison between nested pidnses
>   pstree: rework init reparent handling for pid namespaces
>   pstree: enable sid handling back
>   zdtm: add test for new init reparent handling
>   zdtm: test for new init reparent handling with nested pidns
>   zdtm: test for new init reparent handling with tricky setns
> 
>  criu/cr-restore.c               |  14 +-
>  criu/include/pid.h              |  34 ++--
>  criu/include/pstree.h           |   7 +-
>  criu/namespaces.c               |  19 +-
>  criu/pie/restorer.c             |   2 +-
>  criu/pstree.c                   | 299 +++++++++++++++++++--------
>  criu/tty.c                      |   4 +-
>  test/zdtm/static/Makefile       |   1 +
>  test/zdtm/static/session01.c    |  12 +-
>  test/zdtm/static/session04.c    | 434 ++++++++++++++++++++++++++++++++++++++++
>  test/zdtm/static/session04.desc |   1 +
>  11 files changed, 702 insertions(+), 125 deletions(-)
>  create mode 100644 test/zdtm/static/session04.c
>  create mode 100644 test/zdtm/static/session04.desc
> 
> -- 
> 2.9.3
> 


More information about the CRIU mailing list