- fix pin memory pin failure caused by no pagemap-read - fix taint error msg Signed-off-by: fu.lin <fulin10@huawei.com> --- test/zdtm.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/zdtm.py b/test/zdtm.py index 2a29400..ad9ad3c 100755 --- a/test/zdtm.py +++ b/test/zdtm.py @@ -2006,6 +2006,9 @@ class Launcher: elif not self.check_module(mod): subprocess.check_call(["modprobe", "pin_memory"]) + cmd = [opts["criu_bin"], "init-pagemap-read"] + subprocess.check_call(cmd, shell=False) + def build_and_load_mod(self, target, kdir): if platform.machine() != "aarch64" or not target: return @@ -2039,9 +2042,10 @@ class Launcher: with open("/proc/sys/kernel/tainted") as taintfd: taint = taintfd.read() # 0x1000 means the out of tree module has been loaded - if self.__taint != taint and (int(self.__taint) | 0x1000) != int(taint): + # 0x2000 means the unsigned module was loaded + if self.__taint != taint and (int(self.__taint) | 0x3000) != int(taint): raise Exception("The kernel is tainted: %r (%r)" % - (taint, self.__taint)) + (taint, str(int(self.__taint) | 0x3000))) if test_flag(desc, 'excl'): self.wait_all() -- 2.27.0