From nobody Sun Feb 8 18:35:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15372856166016.0635226803644855; Tue, 18 Sep 2018 08:46:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6681462E83; Tue, 18 Sep 2018 15:46:54 +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 2E1825D9C7; Tue, 18 Sep 2018 15:46:54 +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 C97E2181A531; Tue, 18 Sep 2018 15:46:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w8IFkMim011988 for ; Tue, 18 Sep 2018 11:46:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id D50F24DC48; Tue, 18 Sep 2018 15:46:22 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id 594B85D9C7 for ; Tue, 18 Sep 2018 15:46:22 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 18 Sep 2018 17:45:32 +0200 Message-Id: <0220967781a24ca17b665a9222b7e7c2445f83e5.1537285203.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/47] vircgroup: extract virCgroupV1DetectControllers 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 18 Sep 2018 15:46:55 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: Fabiano Fid=C3=AAncio Reviewed-by: J=EF=BF=BDn Tomko --- src/util/vircgroup.c | 66 +------------------------------------ src/util/vircgroupbackend.h | 5 +++ src/util/vircgroupv1.c | 65 ++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 65 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index ff102e2cb0..7822eec683 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -351,70 +351,6 @@ virCgroupDetectPlacement(virCgroupPtr group, } =20 =20 -static int -virCgroupDetectControllers(virCgroupPtr group, - int controllers) -{ - size_t i; - size_t j; - - if (controllers >=3D 0) { - VIR_DEBUG("Filtering controllers %d", controllers); - /* First mark requested but non-existing controllers to be ignored= */ - for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - if (((1 << i) & controllers)) { - /* Remove non-existent controllers */ - if (!group->controllers[i].mountPoint) { - VIR_DEBUG("Requested controller '%s' not mounted, igno= ring", - virCgroupControllerTypeToString(i)); - controllers &=3D ~(1 << i); - } - } - } - for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - VIR_DEBUG("Controller '%s' wanted=3D%s, mount=3D'%s'", - virCgroupControllerTypeToString(i), - (1 << i) & controllers ? "yes" : "no", - NULLSTR(group->controllers[i].mountPoint)); - if (!((1 << i) & controllers) && - group->controllers[i].mountPoint) { - /* Check whether a request to disable a controller - * clashes with co-mounting of controllers */ - for (j =3D 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) { - if (j =3D=3D i) - continue; - if (!((1 << j) & controllers)) - continue; - - if (STREQ_NULLABLE(group->controllers[i].mountPoint, - group->controllers[j].mountPoint)) { - virReportSystemError(EINVAL, - _("Controller '%s' is not wan= ted, but '%s' is co-mounted"), - virCgroupControllerTypeToStri= ng(i), - virCgroupControllerTypeToStri= ng(j)); - return -1; - } - } - VIR_FREE(group->controllers[i].mountPoint); - } - } - } else { - VIR_DEBUG("Auto-detecting controllers"); - controllers =3D 0; - for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { - VIR_DEBUG("Controller '%s' present=3D%s", - virCgroupControllerTypeToString(i), - group->controllers[i].mountPoint ? "yes" : "no"); - if (group->controllers[i].mountPoint =3D=3D NULL) - continue; - controllers |=3D (1 << i); - } - } - - return controllers; -} - - static int virCgroupDetect(virCgroupPtr group, pid_t pid, @@ -453,7 +389,7 @@ virCgroupDetect(virCgroupPtr group, return -1; } =20 - rc =3D virCgroupDetectControllers(group, controllers); + rc =3D group->backend->detectControllers(group, controllers); if (rc < 0) return -1; =20 diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index 1856164c6b..31be70688c 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -69,6 +69,10 @@ typedef int typedef char * (*virCgroupGetPlacementCB)(virCgroupPtr group); =20 +typedef int +(*virCgroupDetectControllersCB)(virCgroupPtr group, + int controllers); + struct _virCgroupBackend { virCgroupBackendType type; =20 @@ -81,6 +85,7 @@ struct _virCgroupBackend { virCgroupDetectPlacementCB detectPlacement; virCgroupValidatePlacementCB validatePlacement; virCgroupGetPlacementCB getPlacement; + virCgroupDetectControllersCB detectControllers; }; typedef struct _virCgroupBackend virCgroupBackend; typedef virCgroupBackend *virCgroupBackendPtr; diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index ab8988cd59..4dbb3020f5 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -413,6 +413,70 @@ virCgroupV1GetPlacement(virCgroupPtr group) } =20 =20 +static int +virCgroupV1DetectControllers(virCgroupPtr group, + int controllers) +{ + size_t i; + size_t j; + + if (controllers >=3D 0) { + VIR_DEBUG("Filtering controllers %d", controllers); + /* First mark requested but non-existing controllers to be ignored= */ + for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + if (((1 << i) & controllers)) { + /* Remove non-existent controllers */ + if (!group->controllers[i].mountPoint) { + VIR_DEBUG("Requested controller '%s' not mounted, igno= ring", + virCgroupV1ControllerTypeToString(i)); + controllers &=3D ~(1 << i); + } + } + } + for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + VIR_DEBUG("Controller '%s' wanted=3D%s, mount=3D'%s'", + virCgroupV1ControllerTypeToString(i), + (1 << i) & controllers ? "yes" : "no", + NULLSTR(group->controllers[i].mountPoint)); + if (!((1 << i) & controllers) && + group->controllers[i].mountPoint) { + /* Check whether a request to disable a controller + * clashes with co-mounting of controllers */ + for (j =3D 0; j < VIR_CGROUP_CONTROLLER_LAST; j++) { + if (j =3D=3D i) + continue; + if (!((1 << j) & controllers)) + continue; + + if (STREQ_NULLABLE(group->controllers[i].mountPoint, + group->controllers[j].mountPoint)) { + virReportSystemError(EINVAL, + _("V1 controller '%s' is not = wanted, but '%s' is co-mounted"), + virCgroupV1ControllerTypeToSt= ring(i), + virCgroupV1ControllerTypeToSt= ring(j)); + return -1; + } + } + VIR_FREE(group->controllers[i].mountPoint); + } + } + } else { + VIR_DEBUG("Auto-detecting controllers"); + controllers =3D 0; + for (i =3D 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + VIR_DEBUG("Controller '%s' present=3D%s", + virCgroupV1ControllerTypeToString(i), + group->controllers[i].mountPoint ? "yes" : "no"); + if (group->controllers[i].mountPoint =3D=3D NULL) + continue; + controllers |=3D (1 << i); + } + } + + return controllers; +} + + virCgroupBackend virCgroupV1Backend =3D { .type =3D VIR_CGROUP_BACKEND_TYPE_V1, =20 @@ -424,6 +488,7 @@ virCgroupBackend virCgroupV1Backend =3D { .detectPlacement =3D virCgroupV1DetectPlacement, .validatePlacement =3D virCgroupV1ValidatePlacement, .getPlacement =3D virCgroupV1GetPlacement, + .detectControllers =3D virCgroupV1DetectControllers, }; =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list