From mboxrd@z Thu Jan 1 00:00:00 1970 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.gnu.org (lists.gnu.org [209.51.188.17]) (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 027B7C6FA8E for ; Thu, 2 Mar 2023 16:39:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXluj-0001ZX-Pc; Thu, 02 Mar 2023 11:36:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXltv-0000bx-4F for qemu-devel@nongnu.org; Thu, 02 Mar 2023 11:35:29 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXltr-000854-Kd for qemu-devel@nongnu.org; Thu, 02 Mar 2023 11:35:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677774922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5gmqO07UE2HYZtRxbtwedSz7QCPj0b1AsY/WPaBdgvQ=; b=P6a6zaBBctWTVd95EQLBR47yazWNRtauBfP3xUwA7mNbmtcI/TnYs5/r0J9DQbcQ7dB5Gb Jak3wIyP8UvbmtVycImbBvA7jNPHLSoWcqGCfKgWzqnCRoJ42Dxva0CQyz9YmlQ/fOIDu4 F1eE2tulcD96rSglkUdNt59qB+WI1gE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-79-ajKmaQH2MIqP_ibwiKHsyA-1; Thu, 02 Mar 2023 11:35:19 -0500 X-MC-Unique: ajKmaQH2MIqP_ibwiKHsyA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22E378027FD; Thu, 2 Mar 2023 16:35:19 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 317EB492C3E; Thu, 2 Mar 2023 16:35:17 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: David Hildenbrand , Vladimir Sementsov-Ogievskiy , John Snow , Stefan Hajnoczi , Juan Quintela , qemu-block@nongnu.org, Hailiang Zhang , Fam Zheng , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Eric Blake Subject: [PATCH 23/43] migration: Create migrate_max_cpu_throttle() Date: Thu, 2 Mar 2023 17:33:50 +0100 Message-Id: <20230302163410.11399-24-quintela@redhat.com> In-Reply-To: <20230302163410.11399-1-quintela@redhat.com> References: <20230302163410.11399-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Juan Quintela --- migration/migration.h | 2 -- migration/options.h | 1 + migration/options.c | 9 +++++++++ migration/ram.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/migration/migration.h b/migration/migration.h index bf24a0d471..8ee70cec76 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -412,8 +412,6 @@ bool migrate_postcopy(void); int migrate_use_tls(void); -int migrate_max_cpu_throttle(void); - uint64_t ram_get_total_transferred_pages(void); /* Sending on the return path - generic and then for each message type */ diff --git a/migration/options.h b/migration/options.h index ccdeebfee7..0e026bc150 100644 --- a/migration/options.h +++ b/migration/options.h @@ -53,6 +53,7 @@ int migrate_compress_level(void); int migrate_compress_threads(void); int migrate_compress_wait_thread(void); int migrate_decompress_threads(void); +uint8_t migrate_max_cpu_throttle(void); int64_t migrate_max_postcopy_bandwidth(void); int migrate_multifd_channels(void); MultiFDCompression migrate_multifd_compression(void); diff --git a/migration/options.c b/migration/options.c index 0dbc4bdea8..472982f91e 100644 --- a/migration/options.c +++ b/migration/options.c @@ -519,6 +519,15 @@ int migrate_decompress_threads(void) return s->parameters.decompress_threads; } +uint8_t migrate_max_cpu_throttle(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->parameters.max_cpu_throttle; +} + int64_t migrate_max_postcopy_bandwidth(void) { MigrationState *s; diff --git a/migration/ram.c b/migration/ram.c index fc456074ee..daa880fb80 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -721,7 +721,7 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period, uint64_t pct_initial = s->parameters.cpu_throttle_initial; uint64_t pct_increment = s->parameters.cpu_throttle_increment; bool pct_tailslow = s->parameters.cpu_throttle_tailslow; - int pct_max = s->parameters.max_cpu_throttle; + int pct_max = migrate_max_cpu_throttle(); uint64_t throttle_now = cpu_throttle_get_percentage(); uint64_t cpu_now, cpu_ideal, throttle_inc; -- 2.39.2