Message ID | c3893f85-5595-c06d-f56d-7989638510fe@virtuozzo.com |
---|---|
State | Accepted |
Series | "Support descriptors sent over unix sockets" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [209.85.233.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 10 Jul 2017 22:02:01 +0200 (CEST) Received: by 10.100.186.208 with SMTP id b74csp3059976pjc; Mon, 10 Jul 2017 03:19:04 -0700 (PDT) X-Received: by 10.25.25.65 with SMTP id 62mr1023150lfz.91.1499681944147; Mon, 10 Jul 2017 03:19:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499681944; cv=none; d=google.com; s=arc-20160816; b=mLeW6qC1+o8oXTcjkeZLsrMoyqs4LyBpPw6HQmtkIxo+HYrHxc2JpphqPwsUrkI07V vF4IGYF5v2vu/ZVejJ/FUjIgjf3MVcSzPXvaKmN+Id3b0wtSfA/kx1GHZ4w4aXgsbvSd ODu+C9zqgJ+o5xpNZx65ARJsdusP75Q2yWXFKKnI53w/nS9NyJVQwhJ52ILI0VY0YcCf Z5cKGZIWvIrZpCxP0pIq1VcYLo9TjwfuGyZ1T0ZA5srAohfjb9NwghF0s+vVvob1rPIY 4gT3rYfVki7TCthcfXvVeS/V2uTKASR73Grff/nA0cMDylOW5wFL07IKzDFkYD1gJLfG zHjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :spamdiagnosticoutput:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:arc-authentication-results; bh=soZygmMIjjIAtLa+MBlHvtK2P2MLCeW25zO12h8nyzw=; b=BxYVVQzLmGfe8nqMrLzHw++TBV1QGO6Mg3fPuwtT9uUjM1E7uSxMnJaqlH9GCMD6pe sltkQ8OO5PBhf7Li0yIDkKi6a15lFQBbRxnXM56wdahsUR7+L1YOGDLd9o5YRKYq/Pq6 pQxrRwoAsZfAdqR9d3YpsJfBTItNVkjMlNrf5Jwm/L06MoET5v/PjRfsTs4BinRuj479 VXYdrUrXLt33IGHQq5574S11ag2VmCH8sY8XQ50jFXlKpDvu0vuQO4mv2b6RTiKq5W2C QAUzYoUo9v21iZJDnlQ5xLvFgQH7USy341MH4Eg35jMltq1/bBhVynoL0nX+Mw4m2ACv Jngw== ARC-Authentication-Results: i=1; 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 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 c82si4704828lfc.351.2017.07.10.03.19.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jul 2017 03:19:04 -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 v6AAGVM7025640; Mon, 10 Jul 2017 13:18:51 +0300 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp0050.outbound.protection.outlook.com [213.199.154.50]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v6A9ffSa025098 for <criu@openvz.org>; Mon, 10 Jul 2017 12:41:41 +0300 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from [172.16.24.160] (195.214.232.6) by AM4PR0802MB2129.eurprd08.prod.outlook.com (2603:10a6:200:5c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.13; Mon, 10 Jul 2017 09:41:36 +0000 To: CRIU <criu@openvz.org> References: <c6cad0e6-3497-bdea-4932-9c38cf49a651@virtuozzo.com> From: Pavel Emelyanov <xemul@virtuozzo.com> Message-ID: <c3893f85-5595-c06d-f56d-7989638510fe@virtuozzo.com> Date: Mon, 10 Jul 2017 12:41:33 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <c6cad0e6-3497-bdea-4932-9c38cf49a651@virtuozzo.com> X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: VI1PR06CA0030.eurprd06.prod.outlook.com (2a01:111:e400:587c::40) To AM4PR0802MB2129.eurprd08.prod.outlook.com (2603:10a6:200:5c::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 842b2d6a-8200-4131-cac9-08d4c777dbe7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:AM4PR0802MB2129; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 3:xuxNptDOJ0XhSDU49jGBJevlwnSVP5ezYi1NsGOfqaFa053kZ/D8WUsjVUXp+XdnYaYVPc9mXLRUqrl0smymb3K6E1aTYcZpvVLM3U4wmdnt+yykIFVWqvOy02DV5Mu1KOc/n95hFNoku8lswPbDnnufgsCoFgmyRvHzE14gHiE2MuTNiWl8pr05XlXP8RTBxj/dB81qkwZv5a9nt380xukQdg51aha1I62BtxvhjK2m/DQfZzA+e8OoTcUtjRHPiKT1+QoshK35U82kwF4AEEYDyYXjP+BvaZimNlsFvbOpAQhezRkTzC/eikRxIkGu2sqBajvEy0nbUxSKsg/hPEgIAZtopzyDNDcZiyLsbByDDt4hWgQN8V9kcdLwcqOKzF+o0WuqihVfuMicfGLASFyBCngGm/42JWvyRx/wezCUf2bBRHu5z4o8xhdv4p8peQLi/N4Wg8cguek0tezxx9BecBGK5dEKxfuA0cYJ41XJlZ6tInC/ANA4T5FNMv5F1iQR+I/jsjLK4QEM7Ka5yEzev24ZdhlrKlHunYSUw0lr0OSjIoAXRiERZeph017Kdce/1Gk7w4TKcBbHF3Ft8S4VlIxdjFQVaU9+fW6TgoFRi68rF0eOQB/G7aTCEfAMTOhrUz0kxRN+LtieXNftKzkGRBWXzjJF/Lp20CKz2vW2ITnRsrPGC1Qx+uexpJeCyykM9kwcWkfrMXzPs3B/07I2F8XYVMarnPIDENZHhgo= X-MS-TrafficTypeDiagnostic: AM4PR0802MB2129: X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 25:1o13h32vsFm9kNBLSWi/5qIo3Am2SbdWqdMDvDYf5b0sxzMH2FJOHYu8bqwNWZ+nxpwSGIkii4Q56UDlCcbrrKGTVaalZMn4TI0PmEUa+4Rv1F3tcPxJzJQ8HyFSHiQLPVFj8JUp5Zbxd6uY3r2D7huEKjaJwrQ8pxvsR28VurDjDoUB+GMcAjaZ40NO6m3VC6PhUBAjX5+haiSCYJDtiacBM7x4GHKhf88pIm4EZr1qR1UfDlX8BxDu4NAZxVGOrK7wpWL3f5klYWJCL0IAoxl3fJ1ukzzn14x/ilgeDhYJDhFgUr4yYAgq2AyBO17R0M5XX5SSuMhPGx1mHsn6Gp4tuaulX0asiHxpFn+wwV49zVFitqLJK+zI2NfDDAW9GSgTzyX02D/YODV8xCLhjt3heVbaumFvn5Tmei2RN61FijNoHuo4MHenyOC26Kt7ZXkQ9rPN9bJ0lU8luOk8ZoaaMcIO7RoIqS505lidczny23I3xk5U+TJa/ROMiDE5j6+bfSiaTAUNBv8ptNy1A3esAUM+SHpgcaznmxPK+KsuOp2Cl505wZoMO4JurkZ73FqacfRjLCny51MeDHk/KUZscoNWjcUjbn8v0TP0ELjfthWJdhBX0LsS8BS58KBAD0+vKC7R+dDGRLLKWtC3patmpxVMfF+PZzBkNpPyO20Mgrj6vc/YDenMVrJPul+I4pQ99ZvzQdKMeTO7FrBMONdOckyAvtwzcJ+zlid6lecQ7aHUGlw6yKqcnl5CWL4Gw2Wg9oLWvpkapeM0yQDsFMdwDuc0vkwiqlCrTtAJn65RowqPsB7mK5briWsxw+eLEYFv/4p+8BSyixDH74hNB7aV7jiQd47oE7JLPiSuuQlPqVJiPOP7BVs5Y1x/mG5GR3ah8rcltddwGD3i0V0ns/TSE/2CqKr26fTboJzTsYM= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 31:KX3phrg+JO1JFmblkKLXxsjnttWIbDFOaRQQrjJc3qOpxvR7a/vdzhg4HRIC2L/Tds1jIZKWvFJ1jGlNVPgoIKNVIFHz099YdSLxt4IiNPC99xOB182QBCSJSDN4az+ns3/ADvL2N26T3OI6hsrn5OxStvkzxkjxNERkDHKyQrLj8D0exdapyY5PrTYve5NcDY/ZugBSjynsnSQH5Co9EJhjTCqcwpHqtgSm0SOxPFVpPvmU6FgX6iIypGwo3sswhDPPR+rFK+dO88rNEB0/I4Wo5vnt7jLLSzps7o45PC1fgqL7z5VOg+g3aHdKE+yxEgjjKDHT4HizbdzpSYiG6cYc8vFx5iA6fuO0M9Nr5iyAgyOlxkJtD4nwkELBhUAKgojr6QAwMjD/I/dGnbeFlzJ1BK+a1wnjfvGENULVTaunvbvmXX0oSkgT8zEUaUSoLmfHBeV9TRUelsKkilxiYxGUSLfz2Gz9BqwuEoWB5757jN++rq4zOVbRDiQjWDC+q5EVbstdZa7z/th60GVVyEFXe4l19bv5/9AQ+f0MShwi4N/K9WpVNf5T+QYtYG7eAPw3Do3U5f6B9WfP9+6SmcFT4NuqDyzU/RY3iZoblxFFW8klSRzHlQMUXsi9G5ylATnJyFLfQTGeYSJoeKHqxsu8q96eXNqvQ0472dYwvwf+cvNNRGP+3S7JMmcXpJagX4klBbiiZchhXCETcEDyOA== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 20:w04vX849pHRJ2WbjMB4isKno39qyZDh37JC51RC7seCKpHSn8/LhFF5rpYU2anAkL4QZ7HwjP1f52+BHkYqmNnp4WQrUJ+evOxHqB/SeB+QvUEyf38Nfqagv6Kz118RxKKDxMzIRTLA10QtXj8LgkqDaLFK7/4j5bB3zp72i/GPA2REWnFJjRqGh9blkh+yzniPsgwinKrC2MF9+a/m9dTNLHsB4OxxtEuWOmNoPmksU5v83MkRXQpqhPzJWUfJ0A8vRfHqxL1PNHB8n+QnP7yk6hltrUREK4TSxQ+H+DPRVMUGaN1HV6F9EcZIMHlRUxOAnXNXg62kjGFddWHjGHsLXCI3KP5f81TqrYI1uOSv/nFXxaEDLOlHJQa6O5wbG5ICEs6mAwdnf2Ju3dXysCgDXpFLVPxGXe20dHe0N7Q8= X-Exchange-Antispam-Report-Test: UriScan:(236129657087228)(148574349560750); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(9101524173)(601004)(2401047)(2017060910075)(8121501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM4PR0802MB2129; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM4PR0802MB2129; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 4:yURb5k7bgs9uQfDgWNABbbiqSE+XFHn9uWm89VN3tgjnRSR7j+l0lvpkpRxTgRUOR1vSSa9zaaw8rlnS/1MCSWxcDsRwAwfxkdwdnGuA6xMDdCDtKgY2IWOg1q6gI1mTaaQnUYZllyAnm6lGykNCpKUe/antyAugrzCW5SFcKlcF0qEN4+GD3XvfbekH2v8JgevhscWNAGpjOU8BUzN9hGmrLEC+h9c+2FdmsQNoLSxXLEYbgNFjtbuROADAx4+eYwxy0lkap/gWRY/QzxAO/zYh8pHxVikEFR/0uvHw24alH5ZMkNQTJ7WXQygidi5YTDgb9S2g5zQeKKlshN1Hawrz3ekycO+4zCYLlr+80hUYh55c1fs/1BkrV81TtDPTfNLh79U2CTPXmNCDz05w3iYw/qiqYWB34jXaxnljju4YlSOGgM13TMNbKnpBSjfvv6DxPUbYgJQFk/Rg3P6x1bMWmxleAAj9frN8z+f2A43w9LqqZjDbn936Dn3aEcLSZQYeC9HmKXT5jaduEIXFDoadxSpv7Eyh49sLFljLoazKRSbaLiFsTRVNHGgZNxMJRqwbQpEMHlZFFAYNEaa56TnCjYdNjNIg+FHFwTwI2ZoYFO9kWjux7szW06sHicm3EOiEyGlRnz5CBjesPwemDKSv3wfmFvn/cYV3D4/fxPKPR9cbj73C+X/IRPLkeVc8NerofKWbZkhBOSKKLrhdUPFmj/NG/38BY/rjbe6XdU7bLN+f9fPrCr2EzN466IxEwh1Ux0LKoc2Co/HHrDeyVUvwbRg/bz2SwbuM36ciAIK4N5k6BTgQK1aUkuehT82+YPG33bOMasUhzYx7HqCIMezFASsUUL49cpqBBG+YStosRRqWu003udo50nx4DSW84NPubkKhQeuhrOwlr5/CuA== X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM4PR0802MB2129; H:[172.16.24.160]; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 23:r/RM1OvU5YjGD5XE8w1G9atsOSOAFncp4vLHs8rmWkUIIf0RZ6x+4iuKPydU8zsLZHVzhjJLV1NChGVFavr0POmgH8PZF454ITdgsgqk3/oLuLaED48BbyAtwHL/RK5f3lx8Xc+7CBWW0xgcA40lKQ== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 6:QTh0I2ktjBGnYwxL+jFPC3PAA3K+pMweF0T/24ipFCA4twmp0FC6nnpxipReo2onlvOTJviLwST9/XegC10XRHrrObyjKJPVnJPu/2EiywlIY3CZ4YJH1T6/hVuQXbraJYSxKMHY3REDUCJ6amThRhj2ycLLsujXwAAFLDegOp6xsvtLr6oAnOTcYSEfj2PoGUc0AoqmzfbapyzEZbSScLK+7Q+UtDJDtDdTjMcLjYpxWr0c3P0pxeMorImoiTcNKfD2c8vAsUbhHYYDmZp4ZoR+mD3K2rZRkh0KzEDD5jgT9OmEYVHsaKU0nw+PtqsrG3jEt2Y8760WMR2L4W+ugVjixucPwQRZcXGfLGGTNj9c3+wVklgE0UXnTVZOVxsyjiSCsfwGO1Q3UsWdJT8S7XrX9hB3zi9CKcCiq1ZtkoqXpLwBLw5M2gDGqPyOVg1xOFKhDOrT0jYadQoIi2IhhpeHT++sw/VIRawX1pwyhpxBD+ytHSZDuPvw02yqN2HbzxS+DAItDpwB8NzXcOsPaFH1rvJhKq5GfqcRerKuwrtDA9ys1MksrQ+CVaN6VkZi38evxbZ+qpaPmg/rccGPKQbsojul6eOYuQGvdD8UPJTlqUXkaI+muML6seDmW3j6L3axZncpp7j04dWQePXDDe6fCT+A0KXJcdQheZ//WZ20F7pbmd+iSfosiqpP6NLmpSRHPlyGrRBGGdn/T9r1WPlbq66zsu55qvpGCndiUSGgzVDetBZek5ytcfGCso2/BCTf9XTGHQRpKGjzcX1e33XactLpYfGF+cUrXfbo4YDDCXu3fIVPBKPsPWdT2307L3h46jq66XruF6QbNEjnHHRnEhAsNyEOHNW8PEtvnwk= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 5:4/uHEADmrqZD+lZVAZIscrnFkYveT58lM7wrW8s2gASRyORUav3YdlW8YjkItPJ7LAjQd1tssr5DmnHSpn5CWH8SVx1aKnRY/YmFaMDRHPmtGBnMK+WMaJLatlfMzzdEfWSZuUqgG40U7BgyK//NfEYz2qUayh98rvQBe/4DkNRgIIOrHu6hB3Wvq+CJrSnhsSyDQ5CvzfI4uu6ATg+kHOF/+fQcc5/x6YLZzyk434SZOpCf83qxNGHsoMgn5ej+bZLouwvxyCxIlZFH1EKlwbgqB2cG5fk5M0zDPQfi7DbsBFAciJcFRrrMJi6O3yPIpphaGz0RUykw1mlJPrPx1GYAk/Ngl/VVe/pxj7Dcv5yYAkllBfA/yY+dRnmPwwX1DxmyebAniJLAjmbgnBJ/4bCK25bbzL/f3nqfoQvpisweqNiBd/nLsAFxVDmB5jZ4V2NIF6/wfPp49BtfQm86wwnhOZZTxc0aJ0dPEJDcHfLqYIptP/pjX2ko+dVwnHyh; 24:Nbsu9xFzG7qywP/vidk8Oaqk+vtRtJmGE2CZHWZCadaLUoHcfo1TfQlUi+0r9D10nPVwm01tj8Ur668B91WcMN95DQhs0z5a7Mll26xqvgA= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 7:FI50Wh7wtxSqzm//jPypVR/4zTWkqKeHX02v2iODnApj1rOWmRzidKwsMNzVbYgW3o9HTSknB54UCeZhDKCY32QN9ssJ17bTElRh9PtZebUvMW3Fj+NNmUzDahmiMLUVDyT2ZoFSfwV4kQIDWjm2wx30HIFJMvaXfmfdP0Rf6TH3C9nAOG+tnooZKaDx4fk5qQouyj/eZF9Gw6xsJryqqMLZ1MJ/se9jiww0Sx5rcN21gYEWZmIDoVrLr22f3+7X6sEQAE2+jHiQgR26Cz9n1+mJPmeBMq8Z10I0NzZwOmjXJ4kguFYBDnFJb+R+DEGon09tXUgneclyWRbezj5AaEaB5a88kBcrMcYJ8FivBAWNvYRqw4TcSb5dGFiPem3GKHEAEUj+FzuunvEmATq7St7fYduN26AgJtHmyw7+JeqCbFMIOVNhBS8KcNILqNvrmm16nfh+dXFZQAYFX2Y1Ps5kNWCY8MW0FqF87GcFswfziwxSbztJxi8OiBd/CrrZ8IvHbIgCsyPtFsMJBJ5OHlULI4hExPqRW1c1t0MrHywe8Yd4RPU5ZtTbDP25gXhn+vaVJiKRN4qAemG0a8TFAGCiXngVyCXVhw/b1XHVAej30hdgUKvzJ+Jb3Pe4ntItOWjcLEAN1UPGw8qUU2ppguqr+ktTbPS3mnxPh4x5zKrdXSca41nOdDOOMz+/xGrHatwRErYxbj8B5lrDEjm1zuCDUxyu36AIPVKXmEbBCZSCT6E2gej4op1u0/UTekzI2rs5Yfj5jgdAjq76YIwj8Co6nwyZlrlx+Dx1J3/uLto= X-Microsoft-Exchange-Diagnostics: 1; AM4PR0802MB2129; 20:N+x4HbCS8QLJG2gq30HAIeSZPm0za+voPRvvMwczBtIC1Eh9jjm8FXytCSptj+Nh6umP8BuSEJatuoVMSjs5Ns7xEfX3tdWAigJ+btvrh86gORjPCU9hDJ3Yz0QB7uNxkILZkALmIVkMDuDWDeydisgJkYEii+9diu6bb2IgK50= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2017 09:41:36.8019 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0802MB2129 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: AM4PR0802MB2129.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-Journaled-To-Recipients: log@swsoft.com X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM4PR0802MB2129.eurprd08.prod.outlook.com Subject: [CRIU] [PATCH 16/18] skqueue: Split the packets sending code 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/sk-queue.c b/criu/sk-queue.c index 28578b4..057c0bf 100644 --- a/criu/sk-queue.c +++ b/criu/sk-queue.c @@ -197,6 +197,34 @@ err_brk: return ret; } +static int send_one_pkt(int fd, struct sk_packet *pkt) +{ + int ret; + SkPacketEntry *entry = pkt->entry; + + /* + * Don't try to use sendfile here, because it use sendpage() and + * all data are split on pages and a new skb is allocated for + * each page. It creates a big overhead on SNDBUF. + * sendfile() isn't suitable for DGRAM sockets, because message + * boundaries messages should be saved. + */ + + ret = write(fd, pkt->data, entry->length); + xfree(pkt->data); + if (ret < 0) { + pr_perror("Failed to send packet"); + return -1; + } + if (ret != entry->length) { + pr_err("Restored skb trimmed to %d/%d\n", + ret, (unsigned int)entry->length); + return -1; + } + + return 0; +} + int restore_sk_queue(int fd, unsigned int peer_id) { struct sk_packet *pkt, *tmp; @@ -216,26 +244,10 @@ int restore_sk_queue(int fd, unsigned int peer_id) pr_info("\tRestoring %d-bytes skb for %u\n", (unsigned int)entry->length, peer_id); - /* - * Don't try to use sendfile here, because it use sendpage() and - * all data are split on pages and a new skb is allocated for - * each page. It creates a big overhead on SNDBUF. - * sendfile() isn't suitable for DGRAM sockets, because message - * boundaries messages should be saved. - */ - - ret = write(fd, pkt->data, entry->length); - xfree(pkt->data); - if (ret < 0) { - pr_perror("Failed to send packet"); - goto out; - } - if (ret != entry->length) { - pr_err("Restored skb trimmed to %d/%d\n", - ret, (unsigned int)entry->length); - ret = -1; + ret = send_one_pkt(fd, pkt); + if (ret) goto out; - } + list_del(&pkt->list); sk_packet_entry__free_unpacked(entry, NULL); xfree(pkt);
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com> --- criu/sk-queue.c | 50 +++++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 19 deletions(-)