From nobody Mon May 6 23:51:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1666698248; cv=none; d=zohomail.com; s=zohoarc; b=A9TXuBW9ZTsaBXr4djKzuymELHw1d7cY0N0up0Z6DJzVz+n56g6fIXTprfR0AFHdpbWBen9QEej8V1J3x1QL3O48V3dEfeDsqN1xus4db8eKqnU3D7YRpiun8vg6hhSAxDHjMlygiLn9/VYj3t91PDCEniMKMg6aIr5bRVGZveQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666698248; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=rtDccSkLBReDev+8cmy08DjOgYEqn5iI3ngxecfvsOM=; b=iJ59QcjLAjg/v5nsXFPJDybB92akX3M2Pw7ztncYg566pt2JURTBwzkSeX/oraYAdK4kmyAeaxb+u3C21m2lpCBLdpWIff0zKErs+jJLQtanKQ0cRcFDbBPm9X3TMUgdTnb+gpoDkLO7f5sCBJpTCcmePF+VJiRCa0yYuwVGpa8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1666698248405615.3770834267618; Tue, 25 Oct 2022 04:44:08 -0700 (PDT) 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-436-Cv2nzFYtNo64tFfksgPIfQ-1; Tue, 25 Oct 2022 07:44:05 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06CAD8065E3; Tue, 25 Oct 2022 11:43:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24F2B40C2064; Tue, 25 Oct 2022 11:43:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8E7BC19465A4; Tue, 25 Oct 2022 11:43:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 797571946597 for ; Tue, 25 Oct 2022 11:43:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C3DE2207B37A; Tue, 25 Oct 2022 11:43:27 +0000 (UTC) Received: from antique-laptop.redhat.com (unknown [10.40.20.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E624207B367 for ; Tue, 25 Oct 2022 11:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666698247; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rtDccSkLBReDev+8cmy08DjOgYEqn5iI3ngxecfvsOM=; b=EtHeykEnErdM7J0UeEBwrRNr772t2PjQRAFQ1iZcVQKVS20wPoCPf1x5JExX676tunw1CU qKW2g93sK+LMg0Af5JXDGeiOscNmcG2ouRu+s2CA4Lbh4igS7O3IMJEzcDFhnbz5jjnKdu dyD114nOf8n2s9pyDWyvHiWTgAPrPck= X-MC-Unique: Cv2nzFYtNo64tFfksgPIfQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH v2] Revert "cgroup/LXC: Do not condition availability of v2 by controllers" Date: Tue, 25 Oct 2022 13:43:25 +0200 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666698248749100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This reverts commit e49313b54ed2a149c71f9073659222742ff3ffb0. This reverts commit a0f37232b9c4296ca16955cc625f75eb848ace39. Revert them together to not break build. This fix of the issue is incorrect and breaks usage of other controllers in hybrid mode that systemd creates, specifically usage of devices and cpuacct controllers as they are now assumed to be part of the cgroup v2 topology which is not true. We need to find different solution to the issue. Signed-off-by: Pavel Hrdina Reviewed-by: Michal Privoznik --- src/util/vircgroup.c | 6 ++---- src/util/vircgroupv2.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 49ebd37ded..a6a409af3d 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2921,12 +2921,10 @@ int virCgroupBindMount(virCgroup *group, const char *oldroot, const char *mountopts) { - ssize_t i; + size_t i; virCgroup *parent =3D virCgroupGetNested(group); =20 - /* In hybrid environments, V2 may be mounted over V1. - * Mount the backends in reverse order. */ - for (i =3D VIR_CGROUP_BACKEND_TYPE_LAST - 1; i >=3D 0; i--) { + for (i =3D 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { if (parent->backends[i] && parent->backends[i]->bindMount(parent, oldroot, mountopts) < 0= ) { return -1; diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index bf6bd11fef..4c110940cf 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -69,13 +69,28 @@ virCgroupV2Available(void) return false; =20 while (getmntent_r(mounts, &entry, buf, sizeof(buf)) !=3D NULL) { + g_autofree char *contFile =3D NULL; + g_autofree char *contStr =3D NULL; + if (STRNEQ(entry.mnt_type, "cgroup2")) continue; =20 + /* Systemd uses cgroup v2 for process tracking but no controller is + * available. We should consider this configuration as cgroup v2 is + * not available. */ + contFile =3D g_strdup_printf("%s/cgroup.controllers", entry.mnt_di= r); + + if (virFileReadAll(contFile, 1024 * 1024, &contStr) < 0) + goto cleanup; + + if (STREQ(contStr, "")) + continue; + ret =3D true; break; } =20 + cleanup: VIR_FORCE_FCLOSE(mounts); return ret; } --=20 2.37.3