From patchwork Tue Apr 26 10:22:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 12826829 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1AD95C433FE for ; Tue, 26 Apr 2022 10:22:38 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.313685.531358 (Exim 4.92) (envelope-from ) id 1njIKw-0006SQ-0z; Tue, 26 Apr 2022 10:22:26 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 313685.531358; Tue, 26 Apr 2022 10:22:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njIKv-0006SJ-UN; Tue, 26 Apr 2022 10:22:25 +0000 Received: by outflank-mailman (input) for mailman id 313685; Tue, 26 Apr 2022 10:22:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njIKu-0006S6-3V for xen-devel@lists.xenproject.org; Tue, 26 Apr 2022 10:22:24 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c2aeb2b0-c54a-11ec-a405-831a346695d4; Tue, 26 Apr 2022 12:22:22 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2051.outbound.protection.outlook.com [104.47.6.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-8-emKarZHHM46xiNh5QyzeEg-1; Tue, 26 Apr 2022 12:22:21 +0200 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by DB6PR0401MB2325.eurprd04.prod.outlook.com (2603:10a6:4:49::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.21; Tue, 26 Apr 2022 10:22:19 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::5cb0:5195:4203:7c2f]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::5cb0:5195:4203:7c2f%9]) with mapi id 15.20.5186.021; Tue, 26 Apr 2022 10:22:19 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c2aeb2b0-c54a-11ec-a405-831a346695d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1650968542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2D6z8DLOg+aZWIepU3LxQZQ51kG6eQiRLZZZoiI9SdQ=; b=TWK4NmAs0K0bkuB1jJafkyFRHV5+Q0zMShg4EobDJiTD8Y+/zX8yjSvt96GE15hkQtkIB+ OJ67MZXKcsg+m9wCt6q2wlnerZpDCgfd4ss+Gx20/LkSdAahS2s+2KfhXfMMpes4wFsc3B IrMuToTS1PzIDBoRMfUXQM0wdmm7awI= X-MC-Unique: emKarZHHM46xiNh5QyzeEg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KcfiAISGD904hY1BVLrMSBXTF1Fn2Dq5hmClD0/zX0R29JLFW77xLVZY8a9HTBL1DKH5CahiyzYtpQUKGxHcYf6sDUCv4xFc3ztVvyqBglVICd/X4UrJSrE51ZeF9JeRo4G2egcSI3fMlnFzC+QzzQ1Hp2h2VL23TP2GZccP6v9LUVqDOT7UP8D/TsONZA8idbo0RQrj3q3VlyApMFYroHZALftTCelF+p3gplnCGu77vHluvmOPrBeGyqvjEj+vtLdbMe3blPvI0F1jeCO1z+XmOXDohpxmA0awkxdUyp8dC1qddynvnBTrSV9oOvgk1WpmPKBAhfIio96lk493HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2D6z8DLOg+aZWIepU3LxQZQ51kG6eQiRLZZZoiI9SdQ=; b=QxUJNP+ZfgXq0xuROprm48P3Vmwrqr7Tloz+6fwvLFu9vYJIPc/D7nF1wGo1VCLYaRX5TWyeT91kZjVAi8B4HlBr4bqz+qfGMvAGMcUboB9+JXrBV/IwcAnc+kU7zoQ/dtWylWWtIoiW/PlIHXMpHYqRahAlv1HzFZg/QpCcsyEa1vyDTePdVL+9WfJDtXyloMPKDU+DGP1MYYXNBC0K6INcXPBV04ByLQbtqtTVTW85JLeapDGiqOME+PppQ1xYviK56L2gfPTaKMh7wDEATTeTTqyJNXbjwiNK+XbHrVk3r/I3SEw/WnM37o7eV4V/Z2ZJR464UpvTzcDrgJcHlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Tue, 26 Apr 2022 12:22:18 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Subject: [PATCH v3 1/8] libxenguest: short-circuit "all-dirty" handling Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Juergen Gross , George Dunlap , Anthony Perard References: In-Reply-To: X-ClientProxiedBy: AM6P195CA0101.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::42) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 64e5fe35-b3a7-400b-e428-08da276ea51d X-MS-TrafficTypeDiagnostic: DB6PR0401MB2325:EE_ X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FrA29hiqSta82wVniLc7JJvfOcp5uZKSocQ77MtamLuiZp1Le9LllPpiw8RupOEZgjYB6sH1PtM8/SVSwW/QzeepYLgO3cg8UEApVp2Yn6y1Hx+asS2ZQfqcbNWgjuFNnTnzM+TJq2NjXygQGAxYtmzQoK0cof142Co+StYfUh3f9WaAFqt5Eg2rNjml1+eA7vbhJxfzvxbRiHbKO3ZQsJ08lfdGaqnE3jhwzNT7ic4JEeciEnSQA35l1YaflFqr125+830sP+IoTszSiG6E03wU6nEx9GLIYmMvcBHT3IxT+hruyRmrpw2aTOQi93J6SYh7vXhPoiK5oX202KmcZzb+ir0uHCGIfMD09s7H3RR/Ul3Oea4E8obeO4GK7LHmvOyKyKNnTO2/4Q53dJ8QNi+fy8fCW9cNsC+SPHy14ij3veo2NpvJfTW0qca+OW/K9hlPVDjPQF0mAsgmUJKDRIS1hFP/3pIDAoM2Ol+6M9lCkW62KMVTceq8YZzAZA8c3L1kGNfXN36OFb4hdVAPDUTUqVaRt4GG8Y7pWxCUBQqGcxBFfpOriI6eKgniucbX1ei1uZmlyTXJwJ6E3SQq3WkON7A0zeJM7+lO9iLoHI9adn4zJZTYlMw1FzBuOzH8bI7pP29UO2pJV5rvxsb9JqHv65c2XkPhW5zPjBT2Bo8WjABj2r/rcmCjULoyHSjqshrhhHnrkaG+Dg5GBRdUFKpOd/CLiLpTOIlvs9GCfQAASlWfJnTCZD++cW85z5qWYWPSjXNlOOnfLtIDxNoK1Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU2PR04MB8616.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(66946007)(6512007)(5660300002)(8936002)(2616005)(26005)(66556008)(54906003)(6916009)(316002)(2906002)(86362001)(31696002)(38100700002)(6486002)(508600001)(66476007)(4326008)(8676002)(83380400001)(186003)(6506007)(31686004)(36756003)(14143004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?B3f887b1wnMnZnrtUTJJCvQReoqu?= =?utf-8?q?J0tZ1UdRm8a/ftpG7I8yb/2vCvuZS2mQx9Qc0uLq7VtZ2+H5mWY5gud2hGFzgKuAq?= =?utf-8?q?84fHZxcYXM5QNVk19xo3w+ctxnbQzFj0ePkBSxjsB6jTysBi/4qyG1G1BWwgvKGQm?= =?utf-8?q?dmIQv9d45dnX1Gd+yBW9zGKdU1HQtn6wUIUqFquy0ZSqHyH20NrawF975poT5F2Gv?= =?utf-8?q?ho5Gbt5DlumMqRtq/JBe6DkGqkFKexzLEk5LiC26UADnE8AP6B8MsudLDi8C/B/5C?= =?utf-8?q?WdgqgCGIWWLBRW6r8V+t/CevA3q2ouIM3MUO2WTtkYNqIckCUW1ng7S8TnXemxjp5?= =?utf-8?q?dkEqxUoEnBBwddQs1xOnkyX8vtqWn5nTba6S6vJsvnEaNk8Sg8/cEhcbPCOO1nJjF?= =?utf-8?q?moQsTuKvXAMnW2aRqmww2vK3KMnW5nr3CSEzFAI/LHheCa5ymoy7INE8TtfPWm/YG?= =?utf-8?q?5ojV0Ve9WeR1YTFbN3pQZ2Or5eoHMHYzoMIT+SMeZx46IyOGtYQuuaW7Bca10e5DR?= =?utf-8?q?yxSxnvheuLY8Tk99xhRNznr+uKBpIn+XyqCiNXX4IuHbBdR7UxZCFsQnI5f0yFstB?= =?utf-8?q?V3N36/2MuvFT9WVgiN10qQKirp76qBceh+jF2BNKwBlIK/JsYMBzbUSp3zy8aSt0M?= =?utf-8?q?4ahBsBy8TTV44ZvqZc+maegLuZFCLLqiMupv8nFtSY2dtBUcpuub1cQ1dW1qNQ1J7?= =?utf-8?q?QyjZ+vMfuBcrbdwbeIil5Kp/4oOgobykg5LYADfDjZWyksSx8X2NLUCeBq/LS6Qbq?= =?utf-8?q?iaG1nWO2Gc3C4jpJ2blMJyfmBqyBlPvH/UUjzeRur/bXid8/HKs9VUrq6JFGj3kv9?= =?utf-8?q?5Z3HLDSU2ieIkccl7h06gfK9KpiXmLJgnAE/CnldbawKIF95OKv50OFlzH+6ewD6K?= =?utf-8?q?LUlZaAxbHh0lA2WUgl4CfCK28CJ4nZSA2nabQ4F4UpYrD3+2wE0BUhdNvY3bjVYhQ?= =?utf-8?q?fHieUr7PIxqB52TyN/Z1uaBQEovYB+xDuLxwguyyhyQ/1KISxKw7NKm6iLwe951Gu?= =?utf-8?q?iHg5JbaRYxQCRhouU8A+JUca4tcYGMlSzJmGuf6hFeKg1WXoTZBQfwW3PehAqCRh8?= =?utf-8?q?YehDLupimr+/wT60tk4iiC18M7ASjKbzSMXRKlRwdGx2ViIaPPUEsCk4/BuY2SHld?= =?utf-8?q?w3TCQ8DIyJwf/Fh0YV14mKB2Cl2SW6G8zRPQQDZGsDgywUmUywDbU/TSntWQQj3j2?= =?utf-8?q?2i+l1+C4AAlt0E4/aG8Jn3v2SG8grWucSlLvBEVJDVeSn/jhTFLP4hm4nXCASi1ZH?= =?utf-8?q?d1RWy617vlQTsQIbdi+DVBLkx809l4xpRkY6zuM9gJfpx/n/0jpaMIJ3jacqE/KYG?= =?utf-8?q?f1ysoeE7lHJ797I58yyPwzo7hupXkbTUfjLCjo173ub3pJ+K+kwbo/Gh2UABLJ8Ce?= =?utf-8?q?XXLjmvy2swjvhZ1vi3zflA7svtrHctvlGVeq2O2RxER+mXvzTvHFLAJqNe9I1g08h?= =?utf-8?q?CYpk2GDOLG6cW4kSMwi0NsWu81QsK11bHb8xC2wRx7AEF4KtpznHHQ967DYTxNlyM?= =?utf-8?q?P0ndwAWtsm5icssZQRttfjuA/z/yH4bnaUpZWxtRjxlXXr178qw0rJvcvLNfTydBC?= =?utf-8?q?HQc3kSR7vi73nYT33973ry6gcl6ifDLxl757imzoEtb7sVXomZnaU164mnslrMWEb?= =?utf-8?q?nsfjQzxrGc28ICw8VjgUlJ2c47gJADiw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64e5fe35-b3a7-400b-e428-08da276ea51d X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2022 10:22:19.7369 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ouC7P2uP3uskeKkA0NP9JBtxfd+PnQVCQCCIx8v6sC469xCKHqjsBcXyvuk2I00cmeq5seqRG0mJBNWFXpWbPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0401MB2325 For one it is unnecessary to fill a perhaps large chunk of memory with all ones. Add a new parameter to send_dirty_pages() for callers to indicate so. Then it is further unnecessary to allocate the dirty bitmap altogether when all that's ever going to happen is a single all-dirty run. Signed-off-by: Jan Beulich Reviewed-by: Juergen Gross Acked-by: Ian Jackson --- NOTE: Ian demands that this not be committed without also committing "libxenguest: avoid allocating unused deferred-pages bitmap" (because of the ugly -1L). --- a/tools/libs/guest/xg_sr_save.c +++ b/tools/libs/guest/xg_sr_save.c @@ -364,7 +364,7 @@ static int suspend_domain(struct xc_sr_c * Bitmap is bounded by p2m_size. */ static int send_dirty_pages(struct xc_sr_context *ctx, - unsigned long entries) + unsigned long entries, bool all_dirty) { xc_interface *xch = ctx->xch; xen_pfn_t p; @@ -375,7 +375,7 @@ static int send_dirty_pages(struct xc_sr for ( p = 0, written = 0; p < ctx->save.p2m_size; ++p ) { - if ( !test_bit(p, dirty_bitmap) ) + if ( !all_dirty && !test_bit(p, dirty_bitmap) ) continue; rc = add_to_batch(ctx, p); @@ -407,12 +407,7 @@ static int send_dirty_pages(struct xc_sr */ static int send_all_pages(struct xc_sr_context *ctx) { - DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, - &ctx->save.dirty_bitmap_hbuf); - - bitmap_set(dirty_bitmap, ctx->save.p2m_size); - - return send_dirty_pages(ctx, ctx->save.p2m_size); + return send_dirty_pages(ctx, ctx->save.p2m_size, true /* all_dirty */); } static int enable_logdirty(struct xc_sr_context *ctx) @@ -502,9 +497,6 @@ static int send_memory_live(struct xc_sr int rc; int policy_decision; - DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, - &ctx->save.dirty_bitmap_hbuf); - precopy_policy_t precopy_policy = ctx->save.callbacks->precopy_policy; void *data = ctx->save.callbacks->data; @@ -522,8 +514,6 @@ static int send_memory_live(struct xc_sr if ( precopy_policy == NULL ) precopy_policy = simple_precopy_policy; - bitmap_set(dirty_bitmap, ctx->save.p2m_size); - for ( ; ; ) { policy_decision = precopy_policy(*policy_stats, data); @@ -535,7 +525,7 @@ static int send_memory_live(struct xc_sr if ( rc ) goto out; - rc = send_dirty_pages(ctx, stats.dirty_count); + rc = send_dirty_pages(ctx, stats.dirty_count, x == 1); if ( rc ) goto out; } @@ -681,7 +671,8 @@ static int suspend_and_send_dirty(struct } } - rc = send_dirty_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages); + rc = send_dirty_pages(ctx, stats.dirty_count + ctx->save.nr_deferred_pages, + false /* all_dirty */); if ( rc ) goto out; @@ -801,8 +792,11 @@ static int setup(struct xc_sr_context *c if ( rc ) goto err; - dirty_bitmap = xc_hypercall_buffer_alloc_pages( - xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); + dirty_bitmap = ctx->save.live || ctx->stream_type != XC_STREAM_PLAIN + ? xc_hypercall_buffer_alloc_pages( + xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))) + : (void *)-1L; + ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * sizeof(*ctx->save.batch_pfns)); ctx->save.deferred_pages = bitmap_alloc(ctx->save.p2m_size);