From nobody Thu May 16 13:55:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606317928; cv=none; d=zohomail.com; s=zohoarc; b=NFa1AmVaabklqTnikmtdZt6edx2AMHdz4goHHBy/5dPi7ZokvRCMKIgKSOO7BD4sN8oqR+vm4udFz8Le5FMQpBJmYnCjfDHqjDqHvWKDwChryqLImWeLs9Okd3tL641QuZ0rxbYqc6EMAn5jLCJOA0mpRt/hagGzrSukFOrtc/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606317928; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3qq5wYi+g1OPeKCDrcPjUsrFS92h8sYhy/GKp6/d2cY=; b=Q4nKgDorNA6hGTKiAL8/i5QTpqZ6EvsC3Zp4Xc8TqwzLvjRTyDzgRBETremT7no5R4VXUYPHTz8RlPlT4sFiyY2dFXPNlJaNxiKxc2gaeNEV8O5HaLGarYLXQ3odBjuEGkkInU7GOikjzkUOltT4gbm3nlNocuf9olVY/Jtb9tw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606317928529928.731616279824; Wed, 25 Nov 2020 07:25:28 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-hd1EPZmHMBmpZWSdBIgugQ-1; Wed, 25 Nov 2020 10:25:23 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0ECE61934103; Wed, 25 Nov 2020 15:25:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D32275C1B4; Wed, 25 Nov 2020 15:25:15 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A13C01809CA7; Wed, 25 Nov 2020 15:25:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0APEbo7V020385 for ; Wed, 25 Nov 2020 09:37:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8CA805D71B; Wed, 25 Nov 2020 14:37:50 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 092205D6AC for ; Wed, 25 Nov 2020 14:37:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606317926; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3qq5wYi+g1OPeKCDrcPjUsrFS92h8sYhy/GKp6/d2cY=; b=ZyDdKjCCNKMdhvxLmScVjJZjtU+AfHneEsmijuEVcrvTisBvP6DhMh9ZR7il0Lq/X6c9/z JQDbWNRk0K/jUVxbg/mC/PELinZjr/kFrSZSnOCQMZTD93Fs8oag4C0fCd+tRQ7oc2hQ05 YRo3bU8179x1fQ2WaFtXXYfXoUYp4Nw= X-MC-Unique: hd1EPZmHMBmpZWSdBIgugQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] qemu: move cgroup cpu period and quota defines to vircgroup.h Date: Wed, 25 Nov 2020 15:37:41 +0100 Message-Id: <850c2c46674b6958e86d8390db89ce23c2341216.1606314162.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: Daniel Henrique Barboza --- src/qemu/qemu_driver.c | 21 ++++++++------------- src/util/vircgroup.h | 5 +++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 391596ba11..0e0a165e76 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -126,11 +126,6 @@ VIR_LOG_INIT("qemu.qemu_driver"); =20 #define QEMU_NB_NUMA_PARAM 2 =20 -#define QEMU_SCHED_MIN_PERIOD 1000LL -#define QEMU_SCHED_MAX_PERIOD 1000000LL -#define QEMU_SCHED_MIN_QUOTA 1000LL -#define QEMU_SCHED_MAX_QUOTA 18446744073709551LL - #define QEMU_GUEST_VCPU_MAX_ID 4096 =20 #define QEMU_NB_BLKIO_PARAM 6 @@ -9364,7 +9359,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_VCPU_PERIOD)) { SCHED_RANGE_CHECK(value_ul, VIR_DOMAIN_SCHEDULER_VCPU_PERIOD, - QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD= ); + VIR_CGROUP_CPU_PERIOD_MIN, VIR_CGROUP_CPU_PE= RIOD_MAX); =20 if (def && value_ul) { if ((rc =3D qemuSetVcpusBWLive(vm, priv->cgroup, value_ul,= 0))) @@ -9384,7 +9379,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_VCPU_QUOTA)) { SCHED_RANGE_CHECK(value_l, VIR_DOMAIN_SCHEDULER_VCPU_QUOTA, - QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); + VIR_CGROUP_CPU_QUOTA_MIN, VIR_CGROUP_CPU_QUO= TA_MAX); =20 if (def && value_l) { if ((rc =3D qemuSetVcpusBWLive(vm, priv->cgroup, 0, value_= l))) @@ -9404,7 +9399,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD)= ) { SCHED_RANGE_CHECK(value_ul, VIR_DOMAIN_SCHEDULER_GLOBAL_PERIOD, - QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD= ); + VIR_CGROUP_CPU_PERIOD_MIN, VIR_CGROUP_CPU_PE= RIOD_MAX); =20 if (def && value_ul) { if ((rc =3D qemuSetGlobalBWLive(priv->cgroup, value_ul, 0)= )) @@ -9424,7 +9419,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA))= { SCHED_RANGE_CHECK(value_l, VIR_DOMAIN_SCHEDULER_GLOBAL_QUOTA, - QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); + VIR_CGROUP_CPU_QUOTA_MIN, VIR_CGROUP_CPU_QUO= TA_MAX); =20 if (def && value_l) { if ((rc =3D qemuSetGlobalBWLive(priv->cgroup, 0, value_l))) @@ -9444,7 +9439,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_EMULATOR_PERIO= D)) { SCHED_RANGE_CHECK(value_ul, VIR_DOMAIN_SCHEDULER_EMULATOR_PERI= OD, - QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD= ); + VIR_CGROUP_CPU_PERIOD_MIN, VIR_CGROUP_CPU_PE= RIOD_MAX); =20 if (def && value_ul) { if ((rc =3D qemuSetEmulatorBandwidthLive(priv->cgroup, @@ -9465,7 +9460,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA= )) { SCHED_RANGE_CHECK(value_l, VIR_DOMAIN_SCHEDULER_EMULATOR_QUOTA, - QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); + VIR_CGROUP_CPU_QUOTA_MIN, VIR_CGROUP_CPU_QUO= TA_MAX); =20 if (def && value_l) { if ((rc =3D qemuSetEmulatorBandwidthLive(priv->cgroup, @@ -9486,7 +9481,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_IOTHREAD_PERIO= D)) { SCHED_RANGE_CHECK(value_ul, VIR_DOMAIN_SCHEDULER_IOTHREAD_PERI= OD, - QEMU_SCHED_MIN_PERIOD, QEMU_SCHED_MAX_PERIOD= ); + VIR_CGROUP_CPU_PERIOD_MIN, VIR_CGROUP_CPU_PE= RIOD_MAX); =20 if (def && value_ul) { if ((rc =3D qemuSetIOThreadsBWLive(vm, priv->cgroup, value= _ul, 0))) @@ -9506,7 +9501,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, =20 } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_IOTHREAD_QUOTA= )) { SCHED_RANGE_CHECK(value_l, VIR_DOMAIN_SCHEDULER_IOTHREAD_QUOTA, - QEMU_SCHED_MIN_QUOTA, QEMU_SCHED_MAX_QUOTA); + VIR_CGROUP_CPU_QUOTA_MIN, VIR_CGROUP_CPU_QUO= TA_MAX); =20 if (def && value_l) { if ((rc =3D qemuSetIOThreadsBWLive(vm, priv->cgroup, 0, va= lue_l))) diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index f7eed983cc..2a9b341985 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -230,6 +230,11 @@ int virCgroupGetCpuShares(virCgroupPtr group, unsigned= long long *shares); int virCgroupSetupCpuShares(virCgroupPtr cgroup, unsigned long long shares, unsigned long long *realValue); =20 +#define VIR_CGROUP_CPU_PERIOD_MIN 1000LL +#define VIR_CGROUP_CPU_PERIOD_MAX 1000000LL +#define VIR_CGROUP_CPU_QUOTA_MIN 1000LL +#define VIR_CGROUP_CPU_QUOTA_MAX 18446744073709551LL + int virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_pe= riod); int virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_p= eriod); int virCgroupGetCpuPeriodQuota(virCgroupPtr cgroup, unsigned long long *pe= riod, --=20 2.26.2 From nobody Thu May 16 13:55:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606317927; cv=none; d=zohomail.com; s=zohoarc; b=PwNlOV6OIQyp7SCgeI4V6ixUa/apo2/RjbWdHsvZ2ad5YaMtUnQ7afAOLxBskN1MSGhBYiuKpLCD3u+ulHZdTyzTyzkGvdqknxmMyq69ggnV9CHpt2ErVkr8QaRIRDykBop+a9kICsZkVD1eOj+cWCTNSQlZZBpVmNxDYFvf7lY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606317927; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6E16Dlu0Xu1u0vFfL7F1j9XtK3BcxTLrxOSYYqSU8kw=; b=VzmsL1tKR6M9XcZ6XSHRxV5IuUTBZBRox+t4jkKw7ovI9VfIREkz+kbr3fFOA7iWMSpddmqCUVbaqnvalsDTcyw4ZUbfIDdJkgr8VGxpPCvqAFvqO6YoS082YFtKyRttbinvox7qOyFFL9sYeABrHUlav8mmc6pdhD6n3d5qV7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606317926816843.7781477339354; Wed, 25 Nov 2020 07:25:26 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-587-g6WZpufmODa-ZGtnUNkN_A-1; Wed, 25 Nov 2020 10:25:23 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9C5F7101AFD0; Wed, 25 Nov 2020 15:25:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 78A741002393; Wed, 25 Nov 2020 15:25:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 44AEF57684; Wed, 25 Nov 2020 15:25:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0APEbp9X020391 for ; Wed, 25 Nov 2020 09:37:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 725AF5D71B; Wed, 25 Nov 2020 14:37:51 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id E20A15D6AC for ; Wed, 25 Nov 2020 14:37:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606317925; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6E16Dlu0Xu1u0vFfL7F1j9XtK3BcxTLrxOSYYqSU8kw=; b=Aputxz4cKxObq8tFLf10mP5EqOUwOdJ36sF8PyTL0qJSfbEZno1bpW5XxhrhNvQgJUk8rD qE7cJkXDzLoSrpMLS8qXexhLxjuXmKqHOA/LjoqxJp1MJZ0Bo2G9ZKbo3vEUY2TG5YaEo9 1DNGEM2BXsAd1IqYWkw0KGgYTIFGHOI= X-MC-Unique: g6WZpufmODa-ZGtnUNkN_A-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] vircgroupv1: use defines for cpu period and quota limits Date: Wed, 25 Nov 2020 15:37:42 +0100 Message-Id: <0e443259ede3d24652c588921076ade13aee4d45.1606314162.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: Daniel Henrique Barboza --- src/util/vircgroupv1.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 984cd50409..06849efd38 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -1881,13 +1881,13 @@ static int virCgroupV1SetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_period) { - /* The cfs_period should be greater or equal than 1ms, and less or equ= al - * than 1s. - */ - if (cfs_period < 1000 || cfs_period > 1000000) { + if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN || + cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_period '%llu' must be in range (1000, 100000= 0)"), - cfs_period); + _("cfs_period '%llu' must be in range (%llu, %llu)"= ), + cfs_period, + VIR_CGROUP_CPU_PERIOD_MIN, + VIR_CGROUP_CPU_PERIOD_MAX); return -1; } =20 @@ -1911,13 +1911,14 @@ static int virCgroupV1SetCpuCfsQuota(virCgroupPtr group, long long cfs_quota) { - /* The cfs_quota should be greater or equal than 1ms */ if (cfs_quota >=3D 0 && - (cfs_quota < 1000 || - cfs_quota > ULLONG_MAX / 1000)) { + (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN || + cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_quota '%lld' must be in range (1000, %llu)"), - cfs_quota, ULLONG_MAX / 1000); + _("cfs_quota '%lld' must be in range (%llu, %llu)"), + cfs_quota, + VIR_CGROUP_CPU_QUOTA_MIN, + VIR_CGROUP_CPU_QUOTA_MAX); return -1; } =20 --=20 2.26.2 From nobody Thu May 16 13:55:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606317931; cv=none; d=zohomail.com; s=zohoarc; b=eYn8JU0Noak/TyJ+6K76kIuLwqyasXaH5R5+QTA0FNIqiqfZyXoWvduWz3enQbob8z3i+DmCdjmgiOTx3qMlI/fKSKbhpGIykZunBHPxCzn2e+koFzRzuoxjWsuAFBDR8G7W/NYXJqzwJQaUhTqEJPACHMs/vRfAt9Eg8yrDbaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606317931; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3/Eln6RlxTuVVg1exiLlvFxjWsm2Xcvs+fP9kAdKyRs=; b=R0a9lbze4OFSEQKYF7EYBa2vNV0xBBKDJHbM6j4qXwx3CkGMKUCwDYyVGw+HMZY5va3+7D+ZVMP45VtLqViUqgHaWASNrEUnPcVbLM92ey/kXdxsHUKchg59UFCIddd77kbZAoKjqzJfaGUCJ5LnR1AqlapoQNv6ZMEHIO3D/T8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606317931102433.8690646540582; Wed, 25 Nov 2020 07:25:31 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-ylQhz5X9P3yH0HCxZwYDpQ-1; Wed, 25 Nov 2020 10:25:25 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7885C742C; Wed, 25 Nov 2020 15:25:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D8C45D720; Wed, 25 Nov 2020 15:25:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 19E5E1809CA0; Wed, 25 Nov 2020 15:25:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0APEbqlJ020396 for ; Wed, 25 Nov 2020 09:37:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 554695D71B; Wed, 25 Nov 2020 14:37:52 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5C475D6AC for ; Wed, 25 Nov 2020 14:37:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606317929; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3/Eln6RlxTuVVg1exiLlvFxjWsm2Xcvs+fP9kAdKyRs=; b=h4tEHn9T2YDBBCOrTV5JlYUCPoK8p8lxLxfIqeS8LGPpeTvwqzo1UOXSbqHjUkeLOYgHIa QLNoHkgTcJkI9AtzVTgKXN6laX8BIaAkOMl50R98caH6XDdFwtF65t2kLbtoUUJd1t5Z5C 93PEyNhmiL+V6wZ9CQI3tUcgPfCLl4g= X-MC-Unique: ylQhz5X9P3yH0HCxZwYDpQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] vircgroupv2: use defines for cpu period and quota limits Date: Wed, 25 Nov 2020 15:37:43 +0100 Message-Id: <99fc56da123d601228d123465fd0c412d69a6054.1606314162.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: Daniel Henrique Barboza --- src/util/vircgroupv2.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 2b32f614e4..22da3a5c6a 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -1482,12 +1482,12 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, g_autofree char *str =3D NULL; char *tmp; =20 - /* The cfs_period should be greater or equal than 1ms, and less or equ= al - * than 1s. - */ - if (cfs_period < 1000 || cfs_period > 1000000) { + if (cfs_period < VIR_CGROUP_CPU_PERIOD_MIN || + cfs_period > VIR_CGROUP_CPU_PERIOD_MAX) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_period '%llu' must be in range (1000, 100000= 0)"), + _("cfs_period '%llu' must be in range (%llu, %llu)"= ), + VIR_CGROUP_CPU_PERIOD_MIN, + VIR_CGROUP_CPU_PERIOD_MAX, cfs_period); return -1; } @@ -1543,17 +1543,18 @@ static int virCgroupV2SetCpuCfsQuota(virCgroupPtr group, long long cfs_quota) { - /* The cfs_quota should be greater or equal than 1ms */ if (cfs_quota >=3D 0 && - (cfs_quota < 1000 || - cfs_quota > ULLONG_MAX / 1000)) { + (cfs_quota < VIR_CGROUP_CPU_QUOTA_MIN || + cfs_quota > VIR_CGROUP_CPU_QUOTA_MAX)) { virReportError(VIR_ERR_INVALID_ARG, - _("cfs_quota '%lld' must be in range (1000, %llu)"), - cfs_quota, ULLONG_MAX / 1000); + _("cfs_quota '%lld' must be in range (%llu, %llu)"), + cfs_quota, + VIR_CGROUP_CPU_QUOTA_MIN, + VIR_CGROUP_CPU_QUOTA_MAX); return -1; } =20 - if (cfs_quota =3D=3D ULLONG_MAX / 1000) { + if (cfs_quota =3D=3D VIR_CGROUP_CPU_QUOTA_MAX) { return virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "cpu.max", "max"); @@ -1578,7 +1579,7 @@ virCgroupV2GetCpuCfsQuota(virCgroupPtr group, } =20 if (STREQLEN(str, "max", 3)) { - *cfs_quota =3D ULLONG_MAX / 1000; + *cfs_quota =3D VIR_CGROUP_CPU_QUOTA_MAX; return 0; } =20 --=20 2.26.2 From nobody Thu May 16 13:55:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606317933; cv=none; d=zohomail.com; s=zohoarc; b=Ok3SEWjWJmoz3aC9kuB/5FmnqoVnuB3zfGExU47iuD3YI96CQsWIphNDrQmEO/l9KR5bG9ATuofhpS7nSU2xz7+mcookLaVQSRbqzypbYK8w7zN9SltuxIVjBbWKbiLhrfCwqfZu//cSnUjY6/9Wj6PVVBBhYeGsfEVhzSF6rAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606317933; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BRHQuevmjKbwFX3+YKRgrf33Y13x5RNBILhpjWcy4vg=; b=Ndrwz0hvupIZASt2466Y68pRQSWwtzJy3V9Zl8d41cK9DgHHAf4mDYdJ3m4PtYfyQPTCPVly5Pz1zheKnHSC0CyWZdjoY+VK1M8jP4lyhg/1VO3iQyBR52tT7z2Veb99oYrXnivUsEaNj51iNAcED7zXQIWkkCUfxuTS5KlMEnI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606317933927770.5748753498327; Wed, 25 Nov 2020 07:25:33 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-319-YTlpkidMMzqm4Da4e0QNgw-1; Wed, 25 Nov 2020 10:25:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72F02C7419; Wed, 25 Nov 2020 15:25:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4622B19D9C; Wed, 25 Nov 2020 15:25:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 103FB1809CA7; Wed, 25 Nov 2020 15:25:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0APEbrjI020401 for ; Wed, 25 Nov 2020 09:37:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 383085D71B; Wed, 25 Nov 2020 14:37:53 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id A97685D6AC for ; Wed, 25 Nov 2020 14:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606317932; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BRHQuevmjKbwFX3+YKRgrf33Y13x5RNBILhpjWcy4vg=; b=Um52VvWpy7tai8JE67ZiQeWyp/cw9ijGVpWTS33mSiJf0LNwg8Qk3E3MlF7g5emGMl+Jkq DcxgP2Rg8axYgURwESywLnfkAwlKJYKjMH8j0+BnO5H+iiG6gnEzNp0jjr3ps3IxYyjTkG 4PnIcn/FGpxznJIvVYpIU4Q7rSebzSI= X-MC-Unique: YTlpkidMMzqm4Da4e0QNgw-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] vircgroup: fix cpu quota maximum limit Date: Wed, 25 Nov 2020 15:37:44 +0100 Message-Id: <0d95050aaf851def9e0a3440dd4eeb078ca738de.1606314162.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Kernel commit added proper check for cpu quota maximum limit to prevent internal overflow. Even though this change is not present in all kernels it makes sense to enforce the same limit in libvirt. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1750315 Signed-off-by: Pavel Hrdina Reviewed-by: Daniel Henrique Barboza --- src/util/vircgroup.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 2a9b341985..ec0902e301 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -233,7 +233,9 @@ int virCgroupSetupCpuShares(virCgroupPtr cgroup, unsign= ed long long shares, #define VIR_CGROUP_CPU_PERIOD_MIN 1000LL #define VIR_CGROUP_CPU_PERIOD_MAX 1000000LL #define VIR_CGROUP_CPU_QUOTA_MIN 1000LL -#define VIR_CGROUP_CPU_QUOTA_MAX 18446744073709551LL +/* Based on kernel code ((1ULL << MAX_BW_BITS) - 1) where MAX_BW_BITS is + * (64 - BW_SHIFT) and BW_SHIFT is 20 */ +#define VIR_CGROUP_CPU_QUOTA_MAX 17592186044415LL =20 int virCgroupSetCpuCfsPeriod(virCgroupPtr group, unsigned long long cfs_pe= riod); int virCgroupGetCpuCfsPeriod(virCgroupPtr group, unsigned long long *cfs_p= eriod); --=20 2.26.2