From fc33d333af384737e4454dedd9239f2edfa22055 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 4 May 2017 16:32:46 +0300 Subject: [PATCH] criu: Move mod preload into kdat Modules pre-load is also slow, but guarding this code with the presence of criu.kdat cache file seems reasonable. Or course, one may unload the needed modules by hands, but such smart user may as well remove the /run/criu.kdat file :) Signed-off-by: Pavel Emelyanov Signed-off-by: Andrei Vagin --- criu/crtools.c | 6 ------ criu/kerndat.c | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/criu/crtools.c b/criu/crtools.c index ba805b9cc..6cc6cf3ea 100644 --- a/criu/crtools.c +++ b/criu/crtools.c @@ -25,11 +25,9 @@ #include "crtools.h" #include "cr_options.h" #include "external.h" -#include "sockets.h" #include "files.h" #include "sk-inet.h" #include "net.h" -#include "netfilter.h" #include "version.h" #include "page-xfer.h" #include "tty.h" @@ -700,9 +698,6 @@ int main(int argc, char *argv[], char *envp[]) pr_info("Will do snapshot from %s\n", opts.img_parent); if (!strcmp(argv[optind], "dump")) { - preload_socket_modules(); - preload_netfilter_modules(); - if (!tree_id) goto opt_pid_missing; return cr_dump_tasks(tree_id); @@ -716,7 +711,6 @@ int main(int argc, char *argv[], char *envp[]) } if (!strcmp(argv[optind], "restore")) { - preload_netfilter_modules(); if (tree_id) pr_warn("Using -t with criu restore is obsoleted\n"); diff --git a/criu/kerndat.c b/criu/kerndat.c index f946cef78..354fb672b 100644 --- a/criu/kerndat.c +++ b/criu/kerndat.c @@ -29,6 +29,7 @@ #include "sk-inet.h" #include #include +#include "netfilter.h" struct kerndat_s kdat = { }; @@ -647,6 +648,9 @@ int kerndat_init(void) if (ret <= 0) return ret; + preload_socket_modules(); + preload_netfilter_modules(); + ret = check_pagemap(); if (!ret) ret = kerndat_get_shmemdev();