From nobody Sat May 18 12:29:51 2024 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 1531489763341510.7920944626144; Fri, 13 Jul 2018 06:49:23 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id BD0877EBC7; Fri, 13 Jul 2018 13:49:20 +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 8697E5D75A; Fri, 13 Jul 2018 13:49:20 +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 3963418037F0; Fri, 13 Jul 2018 13:49:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6DDmWRk003200 for ; Fri, 13 Jul 2018 09:48:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 22AC910FFE56; Fri, 13 Jul 2018 13:48:32 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7D7910FFE55 for ; Fri, 13 Jul 2018 13:48:31 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Jul 2018 15:48:26 +0200 Message-Id: <77d32591350baba001eb711365444b80f3b30a37.1531489673.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] virDevMapperGetTargetsImpl: Be tolerant to kernels without DM support 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 13 Jul 2018 13:49:21 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1591732 If kernel is compiled without CONFIG_BLK_DEV_DM enabled, there is no /dev/mapper/control device and since dm_task_create() actually does some ioctl() over it creating a task may fail. To cope with this handle ENOENT and ENODEV gracefully. Signed-off-by: Michal Privoznik Reviewed-by: J=EF=BF=BDn Tomko --- src/util/virdevmapper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index b365f20145..7da0dba911 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -87,8 +87,14 @@ virDevMapperGetTargetsImpl(const char *path, return ret; } =20 - if (!(dmt =3D dm_task_create(DM_DEVICE_DEPS))) + if (!(dmt =3D dm_task_create(DM_DEVICE_DEPS))) { + if (errno =3D=3D ENOENT || errno =3D=3D ENODEV) { + /* It's okay. Kernel is probably built without + * devmapper support. */ + ret =3D 0; + } return ret; + } =20 if (!dm_task_set_name(dmt, path)) { if (errno =3D=3D ENOENT) { --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat May 18 12:29:51 2024 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 153148976691827.109875322150515; Fri, 13 Jul 2018 06:49:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 53AC1804F4; Fri, 13 Jul 2018 13:49:25 +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 19D6F2010CC7; Fri, 13 Jul 2018 13:49:25 +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 BFE8D18037F2; Fri, 13 Jul 2018 13:49:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w6DDmWSP003205 for ; Fri, 13 Jul 2018 09:48:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE7AE10FFE56; Fri, 13 Jul 2018 13:48:32 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F76B10FFE55 for ; Fri, 13 Jul 2018 13:48:32 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Jul 2018 15:48:27 +0200 Message-Id: <7d1a877dfdca5c27f112f43cbcd707f982a7abe7.1531489673.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] qemu_cgroup: Allow/disallow devmapper control iff available 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 13 Jul 2018 13:49:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1591732 On kernels without device mapper support there won't be /dev/mapper/control. Therefore it doesn't make much sense to put it into devices CGroup. Signed-off-by: Michal Privoznik Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_cgroup.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index c8fba7f9e6..43e17d786e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -129,6 +129,7 @@ qemuSetupImageCgroupInternal(virDomainObjPtr vm, } =20 if (virStoragePRDefIsManaged(src->pr) && + virFileExists(DEVICE_MAPPER_CONTROL_PATH) && qemuSetupImagePathCgroup(vm, DEVICE_MAPPER_CONTROL_PATH, false) < = 0) return -1; =20 @@ -163,28 +164,29 @@ qemuTeardownImageCgroup(virDomainObjPtr vm, return 0; } =20 - for (i =3D 0; i < vm->def->ndisks; i++) { - virStorageSourcePtr diskSrc =3D vm->def->disks[i]->src; + if (virFileExists(DEVICE_MAPPER_CONTROL_PATH)) { + for (i =3D 0; i < vm->def->ndisks; i++) { + virStorageSourcePtr diskSrc =3D vm->def->disks[i]->src; =20 - if (src =3D=3D diskSrc) - continue; + if (src =3D=3D diskSrc) + continue; =20 - if (virStoragePRDefIsManaged(diskSrc->pr)) - break; - } + if (virStoragePRDefIsManaged(diskSrc->pr)) + break; + } =20 - if (i =3D=3D vm->def->ndisks) { - VIR_DEBUG("Disabling device mapper control"); - ret =3D virCgroupDenyDevicePath(priv->cgroup, - DEVICE_MAPPER_CONTROL_PATH, perms, t= rue); - virDomainAuditCgroupPath(vm, priv->cgroup, "deny", - DEVICE_MAPPER_CONTROL_PATH, - virCgroupGetDevicePermsString(perms), ret= ); - if (ret < 0) - return ret; + if (i =3D=3D vm->def->ndisks) { + VIR_DEBUG("Disabling device mapper control"); + ret =3D virCgroupDenyDevicePath(priv->cgroup, + DEVICE_MAPPER_CONTROL_PATH, perm= s, true); + virDomainAuditCgroupPath(vm, priv->cgroup, "deny", + DEVICE_MAPPER_CONTROL_PATH, + virCgroupGetDevicePermsString(perms),= ret); + if (ret < 0) + return ret; + } } =20 - VIR_DEBUG("Deny path %s", src->path); =20 ret =3D virCgroupDenyDevicePath(priv->cgroup, src->path, perms, true); --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list