Message ID | 20160628192423.14943-18-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:17 +0200 (CEST) Received: by 10.37.42.198 with SMTP id q189csp1746115ybq; Tue, 28 Jun 2016 12:32:14 -0700 (PDT) X-Received: by 10.98.14.72 with SMTP id w69mr4716893pfi.140.1467142002239; Tue, 28 Jun 2016 12:26:42 -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 s80si34982050pfj.204.2016.06.28.12.26.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 12:26:42 -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 u5SJQVtH020482; Tue, 28 Jun 2016 12:26:31 -0700 Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1lrp0020.outbound.protection.outlook.com [213.199.154.20]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id u5SJQ6EJ020261; Tue, 28 Jun 2016 12:26:09 -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:07 +0000 From: Dmitry Safonov <dsafonov@virtuozzo.com> To: <criu@openvz.org> Date: Tue, 28 Jun 2016 22:24:10 +0300 Message-ID: <20160628192423.14943-18-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: bd9d77c4-143f-48d7-435b-08d39f8a0e06 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1740; 2:VMXxDDFbFpp/VZnKmuTbwnCp0eqbVcWXz2djBvYDn+XCeYg7SO5P5EA3aXezi88sz9Q9kwWW2XqWimZU5pyNrqVumrq6wmcsJ6d0EkpJFvjnZ5Ezqi9wHtXSxqM2AKiRz8p1cr8tGEl8zZoms9IqONoO1F16Sd0RDWHnBeDTN8W6GVkeOnFpVX2jWI9WcWTa; 3:uPNnT6jFd15RYhrIx/Xp5hz8Ga8GAk/YiNQucGAlzvnDWNmRWc7npfOqxn3+18+04XaCOCK5Dzi8GAdnuhrHRDJGtDAw5aGNn0zI6+iWhLlrCg8eQ+iMQOXxg1uMC0a+; 25:hkQy/mlCzCAY2zEs63g0sM8KRXzq4gbx6r44lsN3O33e2DXPE5xu4wU+5H/2+fUTxqeZz21vBuPqacj+zsxinhRPN1FoBfvNJ8PewHwvBfvIqk9VdNAlV5SJ++Knh3ULFV9SjI6bo2iwqP+xyibmTU8CsCA5JnJ6UdzXP7DIerJCB2d5j9mpumm2BNXKl23SR5/lQRWZz6fiWJJdB82oc4Y/HGAy660xD1Bf/vbwBq686nYNO8/mkkn4y5dOKUgdD5dseyOEDUThmcTwvac3NGO1JFtQTQ0F7RTiF19ZWNpxW/5nc2PQV0Je/1vAA7ZdDRq+qRxftcp+n5iDrGC/mwnZrA3/uwKgosplPHILQIR5T2e5+jKHHLJfKeN5nLOBZZaGrqcwOgMHbMtuocahO0ODkeLT2Vx4CqiUhsks1hY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0801MB1740; 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:QvhUWX6UnK0NhC7gKSkHOKPBsJhqCMlU5VYHs5xkNcZ2MzkV3Jsv63U5bcN7ut5kbsyAiwAq8P4MkgbWnt22NJbm25KAFd3ERsoiWPzbfcf4VJtav7OD9YCzEPcYTpnTxx8gcgJpszOTW5dt4lvAwJlHe4WGF6Ek4U8HdW+nCbNuzG9/2kBmuAdUf4E0biCcMxfg2r1+7hISizi2cxVrIVu3FL1PJmoSHcuSnpzMcgyrwvZI0Lur4OM4D1xkhLgLZhxSXeHEvnkkMy8akRNhRCoH4mTX2DDOWhO96CyuQdUhumUwgeyrwOcgrbaBTBp+4osXQw8L15FqLxC+HLFsEDSXEVOvXkE8/FbAzKJHpzPHQDQa0PvJL/wLUKkaQ42z; 23:4sKivQEguCVuaRYJRZAygXSPmznL5Vgwtx2mk935xJISPStOBJrUCFuF2CSQNuHPi62eHuFXg/OQ0lmgJrGaZjYyt+XvjkjSOWgmVhJ3IFwaHuR6qhruKOA6fHmCYyIxGpOTvMjwS4iIVqW5MptriT7vfnV0b7VXL3INSJV7Wd6vyyvfFcKoyXKqBRa2Y/51; 6:eJNbeXqoi9ozlpJ1kN7n/Wc1PNqLk0VAkU9zMO66KEAmuNps9BD50FzJd0Wa4qgtfOW8BFCEZuMc4Bk0X6C4tu1IVOu6+9ZjBLAByCW6LmT+Gyhi4mt6hg6dMiZ3Fu0SVut55H6TJYdW5xyzSOZJYIWe34dnoCE9wHRPgYeM8tYW4MkR3KPI8q9VTdYSY30DummuLEc2zvEkPoVbZfDXrDI+OvHd2g4SHP12J+38QGe7bmILZAY48Ai30HRjfvRducmrw4ItdZ4sMAv57kNFMGLwDcClE/xhLMYuN6OMBtedhErCc3eP5UlhRQ4vQNPY 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:sBYhUI4CRryTYQznsaZ1Aq7aS3qzQoekbO4uIvVMldfLunIDONl3l/qX8y9RTE+YLL9npWJm9rDiFyWxMM+wVK1gtq+jrl0Lyzpn3iWf3vZBAt6up+P3Spi6B0hQqjyAhNPrdfAJfCNhPwbQYPUxww==; 24:rXw2zYQSHACC5nn9KoADSYE4jU09xKSeJ+q81OT3RjqQG0dgjQ6kK6nbTrw3nEerlPgabRmWguFA4Hp2hiAnrFBlQTIFElkkZRiCvO7pPXA=; 7:9H/be9H1TBl/ooZMazwHBTaLmGZxZl4AfLoP+5fnokKDepieUV8bmE1/Br1g/A4aHb6Sr+P9URs3lluzMvdv532F98AvltAfNmoZ0Qw+doGsQtpCdDKTpVAQp+FDcbSUlOs9a+2Wzc3f236ZDqXjXlH9JtqFBQg/GWvjkykxBnbPLQYyeuSLxLBRQ0AuLVZljt+DvDPCVinv4NpF2jUaSpOnL51oz/SJ63JkE1l95KHm1QVsd8L8M+EYYkY9HtNEAHuX2imADFDUpkdhprAnAw==; 20:I8hLdOXJk2jhWM2pVmvjwkqnoNpG/CBBSEnCJ+EbvY4fVySAdsKpvpaVks6Sf62HoGWGZvnpoOGleCPvIQWIWafDDeVwJYMzIFWaiVit4+V5vTwaOxBDImGmORGq/Xh14J5HTIFKwUBS9SR47xyFYEzrnQKU/4NrqUPFV2+N+fM= SpamDiagnosticOutput: 1:0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2016 19:26:07.2771 (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 17/30] vdso: try_fill_symtable always for compat tasks 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/vdso.c b/criu/vdso.c index 517755513555..057b2adb4d74 100644 --- a/criu/vdso.c +++ b/criu/vdso.c @@ -102,7 +102,14 @@ int parasite_fixup_vdso(struct parasite_ctl *ctl, pid_t pid, */ args->start = vma->e->start; args->len = vma_area_len(vma); - args->try_fill_symtable = (fd < 0) ? true : false; + /* + * XXX: For compatible tasks, vDSO pfn is different from + * our native vdso_pfn. Check vma explicitly. + */ + if (!seized_native(ctl)) + args->try_fill_symtable = true; + else + args->try_fill_symtable = (fd < 0) ? true : false; args->is_vdso = false; if (parasite_execute_daemon(PARASITE_CMD_CHECK_VDSO_MARK, ctl)) {
Their vDSO's pfn differ from native tasks. TODO: compute on dump compatible vDSO's pfn. Cc: Cyrill Gorcunov <gorcunov@openvz.org> Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com> --- criu/vdso.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)