[CRIU] [PATCH 00/19] files: Allow to send unix sockets

Andrei Vagin avagin at virtuozzo.com
Wed Feb 7 01:14:56 MSK 2018


Applied, thanks!

On Tue, Jan 30, 2018 at 06:40:53PM +0300, Kirill Tkhai wrote:
> This patchset allow to send unix sockets over unix sockets.
> The main thing, done in it, is plitting restore of unix
> sockets in two stages, e.g., delay the time when receive
> queue is restored. This solves the problem of circular
> dependencies: when we have two stages, and the first stage
> is independent of anything else, we may wait its finish in
> the second stage. E.g., there is a standard scheme: 1)make
> a fle is FLE_OPEN, and 2)everything else.
> 
> https://travis-ci.org/tkhai/criu/builds/335199619
> 
> ---
> 
> Kirill Tkhai (19):
>       zdtm: Add scm05 test
>       files: Allow epolls sent over unix socket
>       unix: Move post_open_unix_sk() to open_unixsk_standalone() and rename it
>       files: Add force_master argument to collect_desc_fle()
>       unix: Generalize get_fle_for_scm()
>       sk-unix: Remove unused code in interconnected_pair()
>       unix: Add fake interconnected sockets
>       files: Export setup_and_serve_out()
>       unix: Rework peer transfer in open_unixsk_pair_master()
>       unix: Move queue restore of interconnected pair to post open
>       unix: Make unix_sk_info::queuer pointer
>       unix: Postpone restore_sk_common() of standalone sockets
>       files: Implement find_unused_file_desc_id()
>       unix: Split collect_one_unixsk()
>       unix: Add fake queuer for standalone stream sockets in established state
>       unix: Add fake queuer for standalone dgram sockets
>       unix: Move dump_sk_queue() before peer resolution
>       files: Allow to send unix sockets over unix sockets
>       zdtm: Add scm06 test
> 
> 
>  criu/cr-restore.c           |    4 
>  criu/files.c                |   37 +++-
>  criu/include/files.h        |    5 -
>  criu/include/sockets.h      |    1 
>  criu/sk-queue.c             |   10 -
>  criu/sk-unix.c              |  386 +++++++++++++++++++++++++++++++------------
>  test/zdtm/static/Makefile   |    2 
>  test/zdtm/static/scm05.c    |  139 +++++++++++++++
>  test/zdtm/static/scm06.c    |  122 ++++++++++++++
>  test/zdtm/static/scm06.desc |    1 
>  10 files changed, 583 insertions(+), 124 deletions(-)
>  create mode 100644 test/zdtm/static/scm05.c
>  create mode 100644 test/zdtm/static/scm06.c
>  create mode 100644 test/zdtm/static/scm06.desc
> 
> --
> Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>


More information about the CRIU mailing list