Message ID | 1566698301-8740-3-git-send-email-dubeyabhishek777@gmail.com |
---|---|
State | New |
Series | "GSoC 19: Optimizing the Pre-dump Algorithm" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.131.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Sun, 25 Aug 2019 03:59:22 +0200 (CEST) Received: by 2002:a6b:e005:0:0:0:0:0 with SMTP id z5csp2671477iog; Sat, 24 Aug 2019 18:59:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqwhDnHpG19ZdLO0/hl0cE5oAeZWYPvpx6am+JthRV7+F3JWb4RP/FWrIkmhtdKkWqhYxhrM X-Received: by 2002:ac2:42cc:: with SMTP id n12mr6859489lfl.47.1566698359668; Sat, 24 Aug 2019 18:59:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566698359; cv=none; d=google.com; s=arc-20160816; b=wTFJrZorZlwzs96En5iY7lixTfvAT7xyqWzalgUx6kmLZYtyesv+vqOxutlkufnZE1 kZzcdOpg4e/CRY1mrIDiJWnwakEzjjXIUNdelwvwD1ejB0vDZm5WtrcQEF61TpkMZISK DHg/KB3t6XnKGKB4lssPo5zKggM/oyQnfujsYNeHWaztXMWZzUZoUHUuu3/U2Fa+wDhV BPvgk5oWh31aA+DBLQn7+aAxa/xcQobVNqdreCXO4DZADGEVa3dNdTGnpS5Dedd9w3RY ryX/ONJ1aDS/xM+FHPpIq4fUPcp8ru5Qot7MSYKLxQ1kQmuqKk8W4QfVK6xssW4DtCSS yzPw== 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 :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=/v+vEmstxbb0vXRXfFsE+BMuokkWMIhLFEKizUeJqmk=; b=iReMeTmec//U72VSYD6W/wUCIOa0doEgahzTbA4c74IgaXW69RiTk2Xbeoe/lXd0Tq 2id6A2vi/+1Aoa4sMjRu8y0aCNUHXy50twghsaQGstrNTI/R9Sb1rcZqMt446yn9rm/X sX4uryj+Ysn1WwrtAVkXJmY2w1x6icWb9XlAEg8HjM1zAUDTckJ6nvX8EVowR3CIurCT TvgsEaX3juMCvC+R0Bh3GFFeykW+jEfQ2hUMYJkdpHkf/ddE5p0Yd22GA5Kx2Yf4YSQD TfhEAaqL437oI7MRLDYZdLPXFyy3a/pSHdVgEg2tM6ikfMbsTQ66zT87dVmfeNpNUz5s rvsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PLYzliN6; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id t129si715005lff.66.2019.08.24.18.59.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Aug 2019 18:59:19 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PLYzliN6; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x7P1waG7017627; Sun, 25 Aug 2019 04:58:36 +0300 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2056.outbound.protection.outlook.com [104.47.9.56]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x7P1vTNm017587 for <criu@openvz.org>; Sun, 25 Aug 2019 04:57:29 +0300 Received: from VI1PR0802CA0005.eurprd08.prod.outlook.com (2603:10a6:800:aa::15) by VI1PR08MB3679.eurprd08.prod.outlook.com (2603:10a6:803:85::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Sun, 25 Aug 2019 01:57:28 +0000 Received: from DB5EUR01FT045.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e02::201) by VI1PR0802CA0005.outlook.office365.com (2603:10a6:800:aa::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.2199.15 via Frontend Transport; Sun, 25 Aug 2019 01:57:28 +0000 Authentication-Results: spf=pass (sender IP is 209.85.214.194) smtp.mailfrom=gmail.com; openvz.org; dkim=pass (signature was verified) header.d=gmail.com;openvz.org; dmarc=pass action=none header.from=gmail.com;compauth=pass reason=100 Received-SPF: Pass (protection.outlook.com: domain of gmail.com designates 209.85.214.194 as permitted sender) receiver=protection.outlook.com; client-ip=209.85.214.194; helo=mail-pl1-f194.google.com; Received: from mail-pl1-f194.google.com (209.85.214.194) by DB5EUR01FT045.mail.protection.outlook.com (10.152.4.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.2199.13 via Frontend Transport; Sun, 25 Aug 2019 01:57:27 +0000 Received: by mail-pl1-f194.google.com with SMTP id w11so7495376plp.5 for <criu@openvz.org>; Sat, 24 Aug 2019 18:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gq4hEM8vJYRPiYFP2yE6Z5ZlABCxBlC1Z6FRk0Nr/+8=; b=PLYzliN6dQDKPuZVHeHM/HoejWgin0vxCbbwyxkdHR/Q3JYQz+nGu0OMUOMLuZemII YFIz+FeudAwYcLzCb05GEOGqMj/QGB1mpYgtwb8JD6jyAhNpBVFs5KC125ROe/7a0njB fzWPPooTMVaeFvY013ivadjjZNwpkZ6hWkYx6ya8hy4xCemOjVN2jOTXQjMysrGLHpFh 3V86a2r7OMQh5LSNfhpMic9//6LaAlTK6k1ppPVhNOx5mu2K5ioTn4ac1NEp1f1mGCYp H+O8RbonAGhIBA/FD8+I+syD1vzBY4mRXGmd1sd+yYUZeFLgtjz9uGkIUhZsfvCM6qS8 GnUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gq4hEM8vJYRPiYFP2yE6Z5ZlABCxBlC1Z6FRk0Nr/+8=; b=Nu7LDeaJRGL5/V1yCwhpiaEaK67dpJYxzGravN5A34eySZoWdaKQZ9czxo4c00Z/P6 CWxGWjohjidpJ/9tEmSih5sLoCSa0Rf0HpcZZqkD7NZxez/cWw3qAWdJbneJQz76Qekb cXmesbiRlP4EOmGxR7GqUMwFIYCdw6W/z+Zte9eAP5Y5HqfMI5NmUuvNYL1hxj/OSqbp f9gf+9n8bIBkZhmmhr1hiYFcKi/uamA/4oJdnLsGAsQ7qraFWOwnl7JaGKgO395g7UhD uJ8E+VNeuGhiHc8TUbzOsmLrNVKyB6bVkHHYAo9i4M2nGrDufOF3bHsptEadsFp9k5Ee VPyA== X-Gm-Message-State: APjAAAV7UiVczSGCM1S7D81u7ukdBH29Zc0mF/p0oRQCTB/z0/2CBOza 01BNqLT0h9z6nrnlXxz1wHicNJdIWVo1dQ== X-Received: by 2002:a17:902:3003:: with SMTP id u3mr184176plb.161.1566698246498; Sat, 24 Aug 2019 18:57:26 -0700 (PDT) Received: from localhost.localdomain ([14.139.128.40]) by smtp.googlemail.com with ESMTPSA id w26sm8397413pfq.100.2019.08.24.18.57.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Aug 2019 18:57:26 -0700 (PDT) From: Abhishek Dubey <dubeyabhishek777@gmail.com> To: xemul@virtuozzo.com, avagin@gmail.com Date: Sun, 25 Aug 2019 07:28:16 +0530 Message-Id: <1566698301-8740-3-git-send-email-dubeyabhishek777@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1566698301-8740-1-git-send-email-dubeyabhishek777@gmail.com> References: <1566698301-8740-1-git-send-email-dubeyabhishek777@gmail.com> X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-Forefront-Antispam-Report: CIP:209.85.214.194; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10001)(2980300002)(199004)(189003)(11346002)(246002)(6636002)(86362001)(36756003)(8676002)(336012)(356004)(6666004)(1006002)(446003)(2616005)(1096003)(956004)(126002)(476003)(76482006)(26005)(5660300002)(106002)(7596002)(59536001)(7636002)(49486002)(4326008)(486006)(61266001)(47776003)(50466002)(51416003)(305945005)(2160300002)(48376002)(76176011)(95326003)(82202003)(55446002)(16586007)(73392003)(50226002)(16003); DIR:INB; SFP:; SCL:1; SRVR:VI1PR08MB3679; H:mail-pl1-f194.google.com; FPR:; SPF:Pass; LANG:en; PTR:mail-pl1-f194.google.com; A:1; MX:1; MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cdf64e64-8f09-4b5b-6d73-08d728ff9510 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(5600166)(711020)(4605104)(4709080)(8001031)(1402095)(71702078); SRVR:VI1PR08MB3679; X-MS-TrafficTypeDiagnostic: VI1PR08MB3679: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NNsmnKZjp3i/T3+77BeFn0FzXRSt+NnYAGK2sRmao6AAT5IYYAbJM5HdfBpY?= =?us-ascii?Q?oVQlOM9FEv6S1phRoK4OZqG3A0j96PY7Rd7S47acUTxrIH/LKiIzjsrvjGal?= =?us-ascii?Q?UkJw9yUipQfXfKvW7h2HhbENeFM3VHIbDNIdwVUgWY3+c92hDbDN+iWS7rB3?= =?us-ascii?Q?fxMTh7uO7hAVYs/CFBr7H9pvKpUJfOWrEdpugsb2EhA/YGQUFeASi0WHp4Ke?= =?us-ascii?Q?cYpTU1YwsMYfpMIJBFSoN+SYYOJl6LcXb67kPZ5k9WYRvVzsk7W4mObMTgBW?= =?us-ascii?Q?MdNgF5I4i2e7wSQGj/IYJFBg4foPkg1K+hZqP4AReAhyudFvUyikte3Ekw/f?= =?us-ascii?Q?8GKPlBC7RooVI8qeRG+bHEnVTdfraPL/5zPwVQjLq2GsBackjo5q/F/LuZx9?= =?us-ascii?Q?7xzGQz9/YNR/TruSOHP7jvi1ldRgHOw3NP1+732KqplFT/ra09ETIBpLZjRF?= =?us-ascii?Q?eGC1vYq4vTd3/OqwAnch5CuH1dgIkGPJsJShAgy6QyrPH2rHZCMfYfqu4yJK?= =?us-ascii?Q?956cnl5wgLsp92Z/N9iH90/KwgVEG7FNTj8lg0quT1JHtBIFUyDiqgftcrDQ?= =?us-ascii?Q?RpedzLPGb2dr686oYTgy/Z5yD2D3uCL5fO+5XGue6mYUwZegKbp/bA+lcrxt?= =?us-ascii?Q?P3uoYSpDDAhwCQq51VkAx7t1qKWn8NHnKvCAa15viewEVRi3PYcAtac4VLFx?= =?us-ascii?Q?FFyHccS1fGm2PWK3pnHO6Ucc2DTpmGHeaBtKZRL9BvFLD3Yw3954/7+pBpMp?= =?us-ascii?Q?b8HzL6n7HKNPO8ysPLBMlJk2Qoataa10n0nWql98y5DWQTJuxx0wepVlarit?= =?us-ascii?Q?9KF/50ScoY9bArf7pv2PREKqtbIdMzHNAsM2YxfntGPvdzJq6PSHcEyo7Q4n?= =?us-ascii?Q?wlDuuas3em+uEI9a/+Hq7MYiSWOmECXuzl1TTn9FdgC9kW/F5PQlMlq6Rk78?= =?us-ascii?Q?yhk9QhAjpwVbQW/R/Xrmbg=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2019 01:57:27.8627 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdf64e64-8f09-4b5b-6d73-08d728ff9510 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3679 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 209.85.214.194 X-MS-Exchange-CrossPremises-AuthSource: DB5EUR01FT045.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: 1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Incoming; SFV:NSPM; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR08MB3679.eurprd08.prod.outlook.com Cc: criu@openvz.org Subject: [CRIU] [PATCH 2/7] Skip generating iov for non-PROT_READ memory 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/mem.c b/criu/mem.c index 911b9d2..640b00a 100644 --- a/criu/mem.c +++ b/criu/mem.c @@ -361,6 +361,20 @@ static int generate_vma_iovs(struct pstree_item *item, struct vma_area *vma, !vma_area_is(vma, VMA_ANON_SHARED)) return 0; + /* + * process_vm_readv syscall can't copy memory regions lacking + * PROT_READ flag. Therefore, avoid generating iovs for such + * regions in "read" mode pre-dump. Regions skipped by pre-dumps + * can't be referred as parent by following dump stage. So, mark + * "has_parent=false" for such regions. + */ + if (opts.pre_dump_mode == PRE_DUMP_READ && + !(vma->e->prot & PROT_READ)) { + if (pre_dump) + return 0; + has_parent = false; + } + if (vma_entry_is(vma->e, VMA_AREA_AIORING)) { if (pre_dump) return 0;
skip iov-generation corresponding to regions not having PROT_READ, since process_vm_readv syscall can't process them during pre-dumping in "read" mode. Signed-off-by: Abhishek Dubey <dubeyabhishek777@gmail.com> --- criu/mem.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)