| Message ID | 20160628192423.14943-25-dsafonov@virtuozzo.com |
|---|---|
| State | Rejected |
| Series | "x86 Compatible C/R, part 2" |
| Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.25.109] by zdtm.openvz.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Tue, 28 Jun 2016 21:32:03 +0200 (CEST) Received: by 10.37.42.198 with SMTP id q189csp1746027ybq; Tue, 28 Jun 2016 12:31:59 -0700 (PDT) X-Received: by 10.98.149.10 with SMTP id p10mr4806890pfd.88.1467142005312; Tue, 28 Jun 2016 12:26:45 -0700 (PDT) Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id xx9si22881518pac.99.2016.06.28.12.26.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 12:26:45 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 199.115.104.192 as permitted sender) client-ip=199.115.104.192; Authentication-Results: mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=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 u5SJQZcJ020546; Tue, 28 Jun 2016 12:26:35 -0700 Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1lrp0019.outbound.protection.outlook.com [213.199.154.19]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id u5SJQF4M020282; Tue, 28 Jun 2016 12:26:16 -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.10) by HE1PR0801MB1740.eurprd08.prod.outlook.com (10.168.150.7) with Microsoft SMTP Server (TLS) id 15.1.523.12; Tue, 28 Jun 2016 19:26:14 +0000 From: Dmitry Safonov <dsafonov@virtuozzo.com> To: <criu@openvz.org> Date: Tue, 28 Jun 2016 22:24:17 +0300 Message-ID: <20160628192423.14943-25-dsafonov@virtuozzo.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160628192423.14943-1-dsafonov@virtuozzo.com> References: <20160628192423.14943-1-dsafonov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: HE1PR02CA0067.eurprd02.prod.outlook.com (10.163.170.35) To HE1PR0801MB1740.eurprd08.prod.outlook.com (10.168.150.7) X-MS-Office365-Filtering-Correlation-Id: d748b9fd-94be-432a-d6a5-08d39f8a1239 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1740; 2:IIxDWztglYyIRIyFU/11c1PW/rRrFNk1FL37jqCm3cNnDuuU/ru2bboGFRDJm86Q/SAF2fOtcerp5MvonwB5hHRDE7V+wZWJInhA6Wz/h1fPHtNX/grcvohzSaZzei5VFGKWFVGF9wDer5q6SZWSSwBnQPBANWqOaVZ81GbzqIzw3LVJirTBiuhkCiOR1nao; 3:xpja4MOXHVLigeRw/6sQKq2+P+PHTrQTeGlb3HBoig958z/5OT3JFriJ+SlW4Nr50Aw0QBO70H4aBDWXn3qzT1MfaedzES2EFCBSTgiCjDv8j4uCBmZV6q+Oxf/z7G6K X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1740; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1740; 25:eoZOpWxsfg768fNQdFilE+pmP39LH8Le5rGTPPd9lkpk9OzFt5WPqf4j86XO2E5ADJLG8DKWOU7pUwcqN7eCFU2ybI8lmT7lW4Ah/W9yRzJl8EVTLeiHnZfopInsdbl66Zs4H8Npq9PN6ShhkGv7tdVwg8aAKMrB52QslcSlveRFQvv6w/O/w0XNPP9/93GG3OjYWdpJUHl05WDWHWq1yumTMBRLQdwF+/7UtrLaNcJZfBZzzylXOMmuIOlp9qh7KlsItOSEoqvFc6FCQGHaXU65vL4s10w3swazrEJ4hQdIM/CSMm3YTOLn11xgDHg4zVerBbNklD1xS5Xh6RlzzngoFFUwWavxwz1dD6jIi3MVg8STGUeElzkVws3jBZKWK2cynI2YX6EJgto4oRIPALvy0FP5bN3YjHJYDrH0t/fIfcfkX1TmpM6aAIbh/nqDS9PYIGCahTRuxqAb4i3L2rmkBuzrfWp9l4CWKiieo5k/f2oSZX8hhSpVbrtRHZ2pVXXcuR5IKks2Oo33dnyvJ4ThmR8X7bMq0ERcYDH+LRpkhAfHDyhUIt1VZfl0TrmK7bTtQOoccjnM+WWIb05uGvPXWw3ODpgpzVOAIQZGzNx83LOMqAXXLQZudouc5gqbYUWcG3ICoLCnMhy7RnNfzjQMJFjW4f5XK3njRtdxtYPHX40+RsH+7s9vPN8+/Y+U X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524098)(601004)(2401047)(8121501046)(3002001)(10201501046); SRVR:HE1PR0801MB1740; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1740; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1740; 4:5OUkzT954DRLkevxADT+b1pcPiGwHSqChlQcH5pwhM0HXOabb9+v+nB0l+KKqX4OT7AEgQYQZbV96zCQ92aH4MpBIIp6k53R5QpT4AKb1F/6W66DSExCsItBMdJCOKRvOn1oAAC5Xj8itps5HgnZ3jfECQshkdNzt1jc2AWBjhOekcsvspWs5JX5l8ewCKGi3T518e05q5lu1WqaAsCo1LbVwNOGDnf3hIwZ/Ye4WHKDqo00t4/GctXk19oi8O+xe3mzSnL+PHXBzBnIn/6bpvJiAHCzvBITfoHrEGi54nqkUzfbGmMJw/Tw6qWDwGafNwk/FoA56XTeoGvHQ0tmm7lp7FFRI7Nkt+2am4/4fgMeE5pVkFmV+DwhJ3PPRoyd; 23:qO3/aYoHrWVTu1d2kRqtLqAb0AoiatpZ5DlHEh6+csto0u9P5z0zU99zBjj7CHCNUe5Ak0e/uKZPhDHAIPabyxUSFNDhP9maB/Z5ZrxsZbpi9+p1nhRvznIrTJsAbzmYDQaAAN7wRONXlB91r+KlU71zudBsyUgjGbznKwO67OcZoVsiawwkip/5O05hkbtV; 6:89oACnt2SS3/J6tbIeBeUNwAnuYgSNi+E24nyJ9x/I9m6cZs7eMNx1kW3jvZ0KKqDJkHhRA/echlPqZhvFOhxqypI0qPSpOrIbvP/tdgpxge4mp6Fq0TbxEBFiiG6vemrWZAZnlDCMyUG7IGBdnlE4ZdmyepbZXwemHx+8hR0smMFwsmgGv3YzBHEkXLBoosI6bev6qG+g0fho+0ZkKr2gZUmG+ACZaNivrnYL6RYAdQshgZC7YWVkQVPIuz87S/PhpiI0DhLWYK/StQvub/7yNMlhzwaFxY75GPQN8IRV4mealt0t0oSAiDOfDn1Z6T X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:HE1PR0801MB1740; H:dsafonov.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1740; 5:ilue/6jqRvGABPWO/Z4FwWnGpwGxu3IYUNCzN4aR51Nj4nJeHnRmtWmKkcePBjJc1PxsGlcG9O9zNFR0u+mJ2Zu/ujBYuK0IFTbDwcPXbVTngArAUq8T7CjaHXpjmJ1AkJ0IK9b9nUsu127DlsPHFw==; 24:oU5xaauXI9MofnXAtFQ46ocQb9Q0BhCJFH+jNwPcGOoJyGc/6xZiA34nSxuABlfHKowymCBJNxBdxny+UyRnJMGOst+3JZl5qbvNxgjcnRg=; 7:by8TpqzN8n54oJESE/YF9kb4du3UrJf427Taac5g7lea6Zjj0Xv8FCApPGSXY73NrEI4q0k3u8JNwgecEh6D/PzaLj0COKkF0/ubH5yxUa5kGo72tuaQjVOTg/h0aqaSu6OunrJR0IepOHsjqN5fVEzbq0QbbceHA3XyP8fJdZu/SoqQC1E7P27TFwLtyxGwSbCR834A5+T3YMR8hFwu+9IJJlNweWa17mApQyovFRRnpT1EbLCj0G0OE++4FaMDJFMoAJiy+zvMTdS7WR8GMQ==; 20:rziUuJAZQ8eHu84jc46jOzo4JC9jSFQCNZrsjpEWK4qjfllDmjlLHjVzFYOE/hi7ex+IWEXgikM1D9RNUlPciOm6YTptPM12kIRXH1TkiFg/pwicBxa10VEkoL8HsJEXZ+ZnxYmQ5cjiF3HtV6MRSp5f9hvN6L5wVt1iqjDh5R4= SpamDiagnosticOutput: 1:0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2016 19:26:14.3520 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1740 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.10 X-MS-Exchange-CrossPremises-AuthSource: HE1PR0801MB1740.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 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@odin.com X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR0801MB1740.eurprd08.prod.outlook.com Cc: gorcunov@openvz.org, Dmitry Safonov <dsafonov@virtuozzo.com>, xemul@virtuozzo.com Subject: [CRIU] [PATCHv3 24/30] x86/call32: reserve space for saving 64-bit sp on 32-bit stack 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/arch/x86/call32.S b/criu/arch/x86/call32.S index f2e118f266f1..bc724d6c5fae 100644 --- a/criu/arch/x86/call32.S +++ b/criu/arch/x86/call32.S @@ -34,6 +34,7 @@ call32_from_64: pushfq // Switch stacks + sub $8, %rdi mov %rsp,(%rdi) mov %rdi,%rsp @@ -53,6 +54,7 @@ call32_from_64: 1: // Restore the stack mov (%rsp),%rsp + add $8, %rdi // Restore registers popfq
I prefer this to be done in callee, than in caller for simplicity. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com> --- criu/arch/x86/call32.S | 2 ++ 1 file changed, 2 insertions(+)