Message ID | 20170504191450.3844-1-dsafonov@virtuozzo.com |
---|---|
State | Accepted |
Series | "net: suggest enabling NETFILTER_XT_MARK if iptables-restore failed" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 04 May 2017 21:22:06 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp686718pjb; Thu, 4 May 2017 12:22:01 -0700 (PDT) X-Received: by 10.46.84.15 with SMTP id i15mr7444463ljb.38.1493925720889; Thu, 04 May 2017 12:22:00 -0700 (PDT) Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [195.214.232.140]) by mx.google.com with ESMTPS id p197si1754293lfp.321.2017.05.04.12.21.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 May 2017 12:22:00 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v44JJKlG002966; Thu, 4 May 2017 12:21:42 -0700 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp0211.outbound.protection.outlook.com [213.199.154.211]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v44JJIuC002963 for <criu@openvz.org>; Thu, 4 May 2017 12:19:18 -0700 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from dsafonov.sw.ru (195.214.232.6) by VI1PR0801MB1743.eurprd08.prod.outlook.com (10.168.67.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Thu, 4 May 2017 19:19:04 +0000 From: Dmitry Safonov <dsafonov@virtuozzo.com> To: <criu@openvz.org> Date: Thu, 4 May 2017 22:14:50 +0300 Message-ID: <20170504191450.3844-1-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: VI1PR09CA0088.eurprd09.prod.outlook.com (10.174.49.160) To VI1PR0801MB1743.eurprd08.prod.outlook.com (10.168.67.21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe8efe1a-c217-4893-647f-08d493226e31 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:VI1PR0801MB1743; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 3:qswq2Caiy/+qF2I/7iUhMYrlVo08pBjk8B5WVMnKSgHAddi68Byg9TJJqsx/6od9deYXqYlIGJwMNCxM3+XclbgBN/TQPEcHQ+Qp324sN8+2qOos2sj/5NNJNDmD9iM5DQFsTXN9EMRR/PEpkCgkECvK2SUuW9jWoaM+GIx2X1g4/VV7iiJNrGPrfxkrcwhBrW69qlLc9s7ivqu/PuRJhC/zli4ENOk1ZjZhGuYKNaieyoZz4n6XJsIkr+oOS+yQ3yosXKkFwR85ljWC46I6JxAG2TPLGfMYvJ26Hdz5B1kwQ0z2AwNO25PsA+4Zo9GIIQmW+uDxyfuU7Lx1KTyv8g==; 25:9nsN78KnF35GGYvnHzxv4bWkuxK8Gcjmx6i9rOefd/NSH6PJ9rJPrAJl79IkhYhMKBFZlFbDVp3LRsqN/SD8p9v5PqrOLuakmgURBqlGaW/9vLN9+oTE3WFhPf2aHVpQrkkaV5pdEyv5OGcbp9Ldq8YOCsgm0kKQgD7s8w38kO6Pf686OvlQB9sVb6/w11IzQcp1aCwmDgidsL2MBi1Wyq31Pm4yKWcETAUvsdVFm76XcA2U04jMCT/bJvxym+c2IO/tLWQNdRrtS6PclSSsxV2gNdG3756Z6JntSFSH0WN8b1hk76RiQx58IGOUw/ezxjzyzGis6Dmh9CCh6JL+H97sKezBSllUmUnVUEXaXm41fO4Q3BJnTZi3BoO3ng6lFj5CVQnZvn48Pz1fJHADaFN0cVtkBTdK4frCkOYZvwgLNRSl/budBTidTep/4fPx7RVcXxdUnzR1LvSMnteLIe1bZ2H4S7UWi1ripIzSHK0= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 31:5ll3E5DWuzob151VLpi0YsTGmW3E0S7mF1+F0Ogk8k/ac8NQn6uJ0SJfA2fieQPyUnrccUhC17ATtCPmZc+zrxLhykzmNqa9kGe6HTDOE56ski0dhpbiKP40Ezlk0a+UmwLwwjD4T50oYiX96M3GwKStQxDVx9z1Ki3AQ7PWumQgG+N7SFb5T2/RchSzKTJN/iUD2T4xy/Vc+66xThxqt5i/WMbSaE4SzTVRzy0lzZ3Ya5z4CujWxxsfaTyxDpmOryyIXV045ortpeBQpvx3sg==; 20:Uwr136pf/Owx6qqzQQA4VMC+znhZ1Xrf/XAAO9+njBfTKDrmDxgKTTpsgb0Q3m0qPjtR3BQk49pi2F9jkh99nwE/zyf257SiKjaMBpixkMplpmyssD/xut704FMPq5WsB5jh8V3zD/rWpkcTVOB95gUzMbftoveYyy5Xh3Yf1BgfHAwPqILKDriz5nmAsQpFQFGA3khwj3mmvEfi8IM8iwTXKVWiFVHlLyJG0vU8bswNR5IhIuYH6d1n6JXxXxtwU7j2Mv6diUveYXrOD5GVil+8VJ6KNVPaCveJ1AXTi0bPM2Lk7wx5NV7sg2GZXURw4bbLJ/15/UHAvDkzcggpTCaOX0Ar4xN1gD/cHebgYKwXBrfBT6jFfac4ddHmd33WNYyxkUPHtMpSK351927OYOigN4h/+VXum0wcpcw4HDg= X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(601004)(2401047)(8121501046)(3002001)(10201501046)(93006095)(93001095); SRVR:VI1PR0801MB1743; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0801MB1743; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 4:hac7b5uza+P/3e7FpJYOGI57P8UjT3envz2m+Yh0CSUieYlbrKrfNoudzSqFGu8KA5uQEe1QDetWtI2T4K4SBk45zhzpDC4fOec/tcwM3978oc6GD7VtjchbBknDysSRsVFCmwCBtI/8vsYv4mZRIrbxjOWf9UppqFT66WOdPClKKRSCshao0cl4GPVbgCqgsSNWRbcoepux1JvVR7nurqTBMc2qcfn9bAPfNDzNFn95Vv4rkFegLg6DBgdwWP1hmy0N7HGM3bbjmnpgDVd6w/a6YMM3DKiocDOoBOFmrHNJsI54E9ps6izWx1N4X6yDswUVygZ0CRfKgwZ9Ran72DPlun5rzqgtUU0N6uLAK+yYX4+hGxRNr6jxDG2bmoUEK/UZ8lypuL1WpvxBu1qFMgRlCKXZMTS238gghKyKdjOrIzmuSVbfQ3yUWKB/cg0r; 23:PlJiGjIR/7JKaL7rRWHNGoQYf5js0DmWfdXyDusu/ezfDlx6UW5epLmkByUfWDAU4JA2sS0JmCJIe3wmRq/mzBEwUKpzjggGMebPyB+FPdokK1EgpS1XoflLlbPScXRbB3T0fLGTe7lXP4bsmnZuJg== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR0801MB1743; H:dsafonov.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 6:ptSxOV+s+3zzCIjq0OjbucTRGFyCzo1TEBdZZAKkX7UCCMIRXaXHSXpNFXiSVM3q1BQDfJ7N2Iu10CYgTdPlW3ZW20pxaSebygm0xlSmg7EDkTIHJghektFPCUO1oBqJn+LF6XXm1LG36g4eBtC0klhV56f2/m32K7DnmXMWc0Zhp7QZDrmlKhtRSsiRQyp6VzaZW/rMra7kF5z3xik5t24VchngpapuGRTXu1H1yklhMdxbHdqOPSsPeiSuFN6+RUSyzyFayjMXL9kvLkioF2sydlmAMWv9XnRPPW0x05PMZZnZO4VKJJhoA/KMdQPHYO0CtrnyWwytDlXDmFvOMMY4wq5qUAYmfnJYm1e5UgKnnsEAWZ7QJRpeGy64Y6vtyTu73w61Duhk9RgzYjaS1w==; 5:jRgiyY3ByCPAxBq89PYx2rZg2jhP7W/MD85hIQFFXnG/hWqjIAZ3LOTClQhR9fL9whhw7hwaTOHi0f5SuwmuNxpHKAI+fOe4tbh75B9pf1JTCrCIHv8OhCdkfP+Zz/Kj2yNnEm1JlYYYXBvK3y3hew==; 24:anuBbmTKfl4kQE7Vrfr1J5d/BlWZBrI4IvQafB+LmodicGbRarwAHkVhHHIC+n23Vn6E0N5ymlP+0qP5rDfFMMEF7zTnybGDYPQ+aXlHCig= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0801MB1743; 7:xUnCkaT0RSoCimB3Tjj79PqEE7g/OA9S+mB2u/e50ZeNzt3cbiwL9lWxN+YqCdKBcNumf2qiDtXMErXAMDM7DOf2Eqjq70lsJRhf/9YWr81R1Wh3J1M0NDBeVzAdjeZz/5qdcqYAmzS81o0G+0qdycDJCa8Qb4XIWUglDIz5XQ9DP7VPqbFcx2iO8cul5BSL9b5vqKFOqzyOwF4dPvriU8izLA41xXdBX/EN+XVrPhv4RsXnfE1XJyZZo/Qc0b2XC2DldgSXx/exhP4sIqes1ycry5ugJJbeSLzrb9xwMnFMMwD9kEA0u81FmJ/O7H5eC5ljQ099rUXCnS6u3OKoHQ==; 20:iP+Pku7RCgZEvKu6aUSKRRMkjYzuIxab56fHZBgOUlPRuY/MOKRQjTzPhlfprpbYcS3a6HZsTRyubmg6o2ut2qmLMmbdsSq+v0w6yEBpKF6Cu844WP846fqlcZNpG0KxhLDk2y/QgVi5t9P0Kypk9AQ4YF8D5dRSO83gS1S3WA4= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 19:19:04.9761 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1743 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: VI1PR0801MB1743.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR0801MB1743.eurprd08.prod.outlook.com Subject: [CRIU] [PATCH] net: suggest enabling NETFILTER_XT_MARK if iptables-restore failed X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/criu/net.c b/criu/net.c index b4230007cd9e..1a4356a55f04 100644 --- a/criu/net.c +++ b/criu/net.c @@ -2275,6 +2275,9 @@ int network_lock_internal() if (kdat.ipv6) ret |= iptables_restore(true, conf, sizeof(conf) - 1); + if (ret) + pr_err("Locking network failed: iptables-restore returned %d. This may be connected to disabled CONFIG_NETFILTER_XT_MARK kernel build config option.\n", ret); + if (restore_ns(nsret, &net_ns_desc)) ret = -1;
On x86_64 defconfig it's =m, so if you boot kernel without initramfs in qemu, you will see this. Fixes: #292 Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com> --- criu/net.c | 3 +++ 1 file changed, 3 insertions(+)