[CRIU] Final (hopefully) inherit-fd patch series

Andrei Vagin avagin at virtuozzo.com
Mon Aug 6 23:08:45 MSK 2018


On Mon, Aug 06, 2018 at 04:54:56PM +0000, Adrian Reber wrote:
> This got more complicated as expected. See patch number 4 for details.
> 
> runc was using inherit-fd to send 'FDs' but it was actually just sending
> numbers in the protobuf messages. It worked as it was always 0, 1, 2 and
> nothing else.

It works because it was designed to work this way;). When we discussed
with you, I forgot that inherit-fd is used in runc.

> 
> To not break runc CRIU still treats FDs with 0, 1, 2 special.
> 
> I have the necessary runc patches to use inherit-fd with the external
> network namespace feature and I have also verified that existing runc
> test cases do not break.
> 
> 		Adrian
> 
> 
>  criu/action-scripts.c         | 19 ++++++++-----------
>  criu/cr-check.c               | 17 +++++++++++++++++
>  criu/cr-service.c             | 38 +++++++++++++++++++++++++++++++++++---
>  criu/files.c                  | 10 ++++++++++
>  criu/include/action-scripts.h |  5 +++--
>  criu/include/files.h          |  1 +
>  criu/tty.c                    |  2 +-
>  images/rpc.proto              |  6 ++++++
>  8 files changed, 81 insertions(+), 17 deletions(-)
> 
> 


More information about the CRIU mailing list