From nobody Mon Feb 9 14:33:42 2026 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=1622833026; cv=none; d=zohomail.com; s=zohoarc; b=cCJa8eKeew2H71EJ3/eZ1J47AvE6GH235dpK8fLVkFVUehhjVdY9OE5tg2sdsiYKXVA9fHzvV0xwOk91/DmW8fvDU4K6qfhKocnMmNP6hyPb0xQLtTcA1O3tx7ZUwA7A5fBwi2l8tYsYq7YEBRSOKz0LphyuA1sJYlCbWiwCw/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622833026; 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=nOsObPn+8FSlx+P8OubsKc/ZuaPPA9fXkY/5lPHcUlU=; b=PIFyFz+v8s1iqs3ewIZ7fDf3I6uVwjhDKiuszssaOEgIULQW2PRUsMnxSLY4GnRajldrpK2eXWBfCyBMQWEaoRyL4wJ54N7ex36SG2Y0PBFk2HEbPqBfyYANnsbKmYEfNR/SzH0Bi/kD59bWaZcIJoQByqernJ19lK8Kg6cDo3I= 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) header.from= 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 1622833026952407.29283306662614; Fri, 4 Jun 2021 11:57:06 -0700 (PDT) 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-474-1bATwSL-MXmMKeDc1HTpXQ-1; Fri, 04 Jun 2021 14:57:03 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25543801B12; Fri, 4 Jun 2021 18:56:59 +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 D0C895D9CC; Fri, 4 Jun 2021 18:56:58 +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 DA63B1800BB8; Fri, 4 Jun 2021 18:56:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 154Irift028685 for ; Fri, 4 Jun 2021 14:53:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5937D36D5; Fri, 4 Jun 2021 18:53:44 +0000 (UTC) Received: from himantopus.redhat.com (ovpn-114-235.phx2.redhat.com [10.3.114.235]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2899D60937 for ; Fri, 4 Jun 2021 18:53:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622833025; 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=nOsObPn+8FSlx+P8OubsKc/ZuaPPA9fXkY/5lPHcUlU=; b=DcJOesA12r6G0RdMx3qOwC3J6pXCb1gV4mcesiUSJzbJESHHE9vuOvV3sxuibcsYZmscFP otr03BtZ0sAVNynz3rAwoABr7k7EtwMp9sWzpTXl7EhTy0UOj04vnOd1Z4pqE0hgrKS3/j 04UlLNocemB//QnYXE8co8YQu+D0Jt0= X-MC-Unique: 1bATwSL-MXmMKeDc1HTpXQ-1 From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/7] nodedev: implement virNodeDevice(Get|Set)Autostart() Date: Fri, 4 Jun 2021 13:53:37 -0500 Message-Id: <20210604185337.3745508-2-jjongsma@redhat.com> In-Reply-To: <20210604185337.3745508-1-jjongsma@redhat.com> References: <20210604185337.3745508-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.14 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" Implement autostart functionality for mediated devices. Signed-off-by: Jonathon Jongsma --- src/conf/node_device_conf.h | 1 + src/conf/virnodedeviceobj.c | 16 ++++ src/conf/virnodedeviceobj.h | 6 ++ src/libvirt_private.syms | 2 + src/node_device/node_device_driver.c | 133 ++++++++++++++++++++++++++- src/node_device/node_device_driver.h | 13 +++ src/node_device/node_device_udev.c | 19 +++- 7 files changed, 188 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index a60562e4fe..863b893973 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -153,6 +153,7 @@ struct _virNodeDevCapMdev { char *uuid; virMediatedDeviceAttr **attributes; size_t nattributes; + bool autostart; }; =20 typedef struct _virNodeDevCapPCIDev virNodeDevCapPCIDev; diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index b213592b56..deee796440 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -41,6 +41,7 @@ struct _virNodeDeviceObj { used by testdriver */ bool active; bool persistent; + bool autostart; }; =20 struct _virNodeDeviceObjList { @@ -1026,6 +1027,21 @@ virNodeDeviceObjSetPersistent(virNodeDeviceObj *obj, } =20 =20 +bool +virNodeDeviceObjIsAutostart(virNodeDeviceObj *obj) +{ + return obj->autostart; +} + + +void +virNodeDeviceObjSetAutostart(virNodeDeviceObj *obj, + bool autostart) +{ + obj->autostart =3D autostart; +} + + struct virNodeDeviceObjListRemoveHelperData { virNodeDeviceObjListRemoveIterator callback; diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index 7353e4619b..78188be2a2 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -135,6 +135,12 @@ virNodeDeviceObjIsPersistent(virNodeDeviceObj *obj); void virNodeDeviceObjSetPersistent(virNodeDeviceObj *obj, bool persistent); +bool +virNodeDeviceObjIsAutostart(virNodeDeviceObj *obj); + +void +virNodeDeviceObjSetAutostart(virNodeDeviceObj *obj, + bool autostart); =20 typedef bool (*virNodeDeviceObjListRemoveIterator)(virNodeDeviceObj *obj, const void *opaque); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0ced2a7990..dd46fe8750 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1278,6 +1278,7 @@ virNetworkPortDefSaveStatus; virNodeDeviceObjEndAPI; virNodeDeviceObjGetDef; virNodeDeviceObjIsActive; +virNodeDeviceObjIsAutostart; virNodeDeviceObjIsPersistent; virNodeDeviceObjListAssignDef; virNodeDeviceObjListExport; @@ -1294,6 +1295,7 @@ virNodeDeviceObjListNumOfDevices; virNodeDeviceObjListRemove; virNodeDeviceObjListRemoveLocked; virNodeDeviceObjSetActive; +virNodeDeviceObjSetAutostart; virNodeDeviceObjSetPersistent; =20 =20 diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 8a0a2c3847..5436b5487d 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -611,11 +611,12 @@ nodeDeviceDefToMdevctlConfig(virNodeDeviceDef *def, c= har **buf) size_t i; virNodeDevCapMdev *mdev =3D &def->caps->data.mdev; g_autoptr(virJSONValue) json =3D virJSONValueNewObject(); + const char *startval =3D mdev->autostart ? "auto" : "manual"; =20 if (virJSONValueObjectAppendString(json, "mdev_type", mdev->type) < 0) return -1; =20 - if (virJSONValueObjectAppendString(json, "start", "manual") < 0) + if (virJSONValueObjectAppendString(json, "start", startval) < 0) return -1; =20 if (mdev->attributes) { @@ -962,6 +963,46 @@ virMdevctlStart(virNodeDeviceDef *def, char **errmsg) } =20 =20 +/* gets a virCommand object that executes a mdevctl command to set the + * 'autostart' property of the device to the specified value + */ +virCommand* +nodeDeviceGetMdevctlSetAutostartCommand(virNodeDeviceDef *def, + bool autostart, + char **errmsg) +{ + virCommand *cmd =3D virCommandNewArgList(MDEVCTL, + "modify", + "--uuid", + def->caps->data.mdev.uuid, + NULL); + + if (autostart) + virCommandAddArg(cmd, "--auto"); + else + virCommandAddArg(cmd, "--manual"); + + virCommandSetErrorBuffer(cmd, errmsg); + + return cmd; +} + + +static int +virMdevctlSetAutostart(virNodeDeviceDef *def, bool autostart, char **errms= g) +{ + int status; + g_autoptr(virCommand) cmd =3D NULL; + + cmd =3D nodeDeviceGetMdevctlSetAutostartCommand(def, autostart, errmsg= ); + + if (virCommandRun(cmd, &status) < 0 || status !=3D 0) + return -1; + + return 0; +} + + virCommand* nodeDeviceGetMdevctlListCommand(bool defined, char **output, @@ -997,6 +1038,7 @@ nodeDeviceParseMdevctlChildDevice(const char *parent, virJSONValue *props; virJSONValue *attrs; g_autoptr(virNodeDeviceDef) child =3D g_new0(virNodeDeviceDef, 1); + const char *start =3D NULL; =20 /* the child object should have a single key equal to its uuid. * The value is an object describing the properties of the mdev */ @@ -1014,6 +1056,8 @@ nodeDeviceParseMdevctlChildDevice(const char *parent, mdev->uuid =3D g_strdup(uuid); mdev->type =3D g_strdup(virJSONValueObjectGetString(props, "mdev_type")); + start =3D virJSONValueObjectGetString(props, "start"); + mdev->autostart =3D STREQ_NULLABLE(start, "auto"); =20 attrs =3D virJSONValueObjectGet(props, "attrs"); =20 @@ -1257,6 +1301,7 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def) =20 /* all devices returned by virMdevctlListDefined() are persistent */ virNodeDeviceObjSetPersistent(obj, true); + virNodeDeviceObjSetAutostart(obj, def->caps->data.mdev.autostart); =20 if (!defined) event =3D virNodeDeviceEventLifecycleNew(name, @@ -1686,5 +1731,91 @@ nodeDeviceDefCopyFromMdevctl(virNodeDeviceDef *dst, if (virMediatedDeviceAttrsCopy(dstmdev, srcmdev)) ret =3D true; =20 + if (dstmdev->autostart !=3D srcmdev->autostart) { + ret =3D true; + dstmdev->autostart =3D srcmdev->autostart; + } + + return ret; +} + + +int +nodeDeviceSetAutostart(virNodeDevice *device, + int autostart) +{ + int ret =3D -1; + virNodeDeviceObj *obj =3D NULL; + virNodeDeviceDef *def =3D NULL; + + if (nodeDeviceInitWait() < 0) + return -1; + + if (!(obj =3D nodeDeviceObjFindByName(device->name))) + return -1; + def =3D virNodeDeviceObjGetDef(obj); + + if (virNodeDeviceSetAutostartEnsureACL(device->conn, def) < 0) + goto cleanup; + + if (nodeDeviceHasCapability(def, VIR_NODE_DEV_CAP_MDEV)) { + if (!virNodeDeviceObjIsPersistent(obj)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot set autostart for transient dev= ice")); + goto cleanup; + } + + if (autostart !=3D virNodeDeviceObjIsAutostart(obj)) { + g_autofree char *errmsg =3D NULL; + + if (virMdevctlSetAutostart(def, autostart, &errmsg) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to set autostart on '%s': %s"), + def->name, + errmsg && errmsg[0] !=3D '\0' ? errmsg : _(= "Unknown Error")); + goto cleanup; + } + /* Due to mdevctl performance issues, it may take several seco= nds + * to re-query mdevctl for the defined devices. Because the md= evctl + * command returned without an error status, assume it was + * successful and set the object status directly here rather t= han + * waiting for the next query */ + virNodeDeviceObjSetAutostart(obj, autostart); + } + ret =3D 0; + } else { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Unsupported device type")); + } + + cleanup: + virNodeDeviceObjEndAPI(&obj); + return ret; +} + + +int +nodeDeviceGetAutostart(virNodeDevice *device, + int *autostart) +{ + virNodeDeviceObj *obj =3D NULL; + virNodeDeviceDef *def =3D NULL; + int ret =3D -1; + + if (nodeDeviceInitWait() < 0) + return -1; + + if (!(obj =3D nodeDeviceObjFindByName(device->name))) + return -1; + def =3D virNodeDeviceObjGetDef(obj); + + if (virNodeDeviceGetAutostartEnsureACL(device->conn, def) < 0) + goto cleanup; + + *autostart =3D virNodeDeviceObjIsAutostart(obj); + ret =3D 0; + + cleanup: + virNodeDeviceObjEndAPI(&obj); return ret; } diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_de= vice_driver.h index edd763f0e4..d178a18180 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -171,3 +171,16 @@ bool nodeDeviceDefCopyFromMdevctl(virNodeDeviceDef *ds= t, int nodeDeviceCreate(virNodeDevice *dev, unsigned int flags); + +int +nodeDeviceSetAutostart(virNodeDevice *dev, + int autostart); + +int +nodeDeviceGetAutostart(virNodeDevice *dev, + int *autostart); + +virCommand* +nodeDeviceGetMdevctlSetAutostartCommand(virNodeDeviceDef *def, + bool autostart, + char **errmsg); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index f99578414d..7e3e03e8f2 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1488,6 +1488,8 @@ udevAddOneDevice(struct udev_device *device) bool new_device =3D true; int ret =3D -1; bool was_persistent =3D false; + bool autostart =3D true; + bool is_mdev; =20 def =3D g_new0(virNodeDeviceDef, 1); =20 @@ -1509,17 +1511,28 @@ udevAddOneDevice(struct udev_device *device) if (udevSetParent(device, def) !=3D 0) goto cleanup; =20 + is_mdev =3D def->caps->data.type =3D=3D VIR_NODE_DEV_CAP_MDEV; + if ((obj =3D virNodeDeviceObjListFindByName(driver->devs, def->name)))= { objdef =3D virNodeDeviceObjGetDef(obj); =20 - if (def->caps->data.type =3D=3D VIR_NODE_DEV_CAP_MDEV) + if (is_mdev) nodeDeviceDefCopyFromMdevctl(def, objdef); was_persistent =3D virNodeDeviceObjIsPersistent(obj); + autostart =3D virNodeDeviceObjIsAutostart(obj); + /* If the device was defined by mdevctl and was never instantiated= , it * won't have a sysfs path. We need to emit a CREATED event... */ new_device =3D (objdef->sysfs_path =3D=3D NULL); =20 virNodeDeviceObjEndAPI(&obj); + } else { + /* All non-mdev devices report themselves as autostart since they + * should still be present and active after a reboot unless the de= vice + * is removed from the host. Mediated devices can only be autostar= t if + * they are in already in the device list from parsing the mdevctl + * output. */ + autostart =3D !is_mdev; } =20 /* If this is a device change, the old definition will be freed @@ -1527,6 +1540,7 @@ udevAddOneDevice(struct udev_device *device) if (!(obj =3D virNodeDeviceObjListAssignDef(driver->devs, def))) goto cleanup; virNodeDeviceObjSetPersistent(obj, was_persistent); + virNodeDeviceObjSetAutostart(obj, autostart); objdef =3D virNodeDeviceObjGetDef(obj); =20 if (new_device) @@ -1930,6 +1944,7 @@ udevSetupSystemDev(void) goto cleanup; =20 virNodeDeviceObjSetActive(obj, true); + virNodeDeviceObjSetAutostart(obj, true); =20 virNodeDeviceObjEndAPI(&obj); =20 @@ -2331,6 +2346,8 @@ static virNodeDeviceDriver udevNodeDeviceDriver =3D { .nodeDeviceDefineXML =3D nodeDeviceDefineXML, /* 7.3.0 */ .nodeDeviceUndefine =3D nodeDeviceUndefine, /* 7.3.0 */ .nodeDeviceCreate =3D nodeDeviceCreate, /* 7.3.0 */ + .nodeDeviceSetAutostart =3D nodeDeviceSetAutostart, /* 7.5.0 */ + .nodeDeviceGetAutostart =3D nodeDeviceGetAutostart, /* 7.5.0 */ }; =20 =20 --=20 2.31.1