On Wed, Feb 03, 2021 at 11:38:55AM -0600, Jonathon Jongsma wrote:
> mdevctl does not currently provide any events when the list of defined
> devices changes, so we will need to poll mdevctl for the list of defined
> devices periodically. When a mediated device no longer exists from one
> iteration to the next, we need to treat it as an "undefine" event.
>
> When we get such an event, we remove the device from the list if it's
> not active. Otherwise, we simply mark it as non-persistent.
>
> Signed-off-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
> ---
> src/node_device/node_device_driver.c | 55 +++++++++++++++++++++++++---
> 1 file changed, 50 insertions(+), 5 deletions(-)
>
> diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
> index fd57dcacc1..598cd865c5 100644
> --- a/src/node_device/node_device_driver.c
> +++ b/src/node_device/node_device_driver.c
> @@ -1182,24 +1182,63 @@ struct _virMdevctlForEachData {
> };
>
>
> +/* This function keeps the list of persistent mediated devices consistent
> + * between the nodedev driver and mdevctl.
> + * @obj is a device that is currently known by the nodedev driver, and @opaque
> + * contains the most recent list of devices defined by mdevctl. If @obj is no
> + * longer defined in mdevctl, remove it from the driver as well. */
> +static void
> +removeMissingPersistentMdevs(virNodeDeviceObjPtr obj,
> + const void *opaque)
> +{
> + const virMdevctlForEachData *data = opaque;
> + size_t i;
> + virNodeDeviceDefPtr def = virNodeDeviceObjGetDef(obj);
> + virObjectEventPtr event;
> +
> + /* transient mdevs are populated via udev, so don't remove them from the
> + * nodedev driver just because they are not reported by by mdevctl */
> + if (!virNodeDeviceObjIsPersistent(obj))
> + return;
> +
> + for (i = 0; i < data->ndefs; i++) {
> + /* OK, this mdev is still defined by mdevctl */
> + if (STREQ(data->defs[i]->name, def->name))
> + return;
> + }
> +
> + event = virNodeDeviceEventLifecycleNew(def->name,
> + VIR_NODE_DEVICE_EVENT_UNDEFINED,
> + 0);
> +
> + /* The device is active, but no longer defined by mdevctl. Keep the device
> + * in the list, but mark it as non-persistent */
> + if (virNodeDeviceObjIsActive(obj))
> + virNodeDeviceObjSetPersistent(obj, false);
> + else
> + virNodeDeviceObjListRemoveLocked(driver->devs, obj);
> +
> + virObjectEventStateQueue(driver->nodeDeviceEventState, event);
> +}
> +
> +
> int
> nodeDeviceUpdateMediatedDevices(void)
> {
> - g_autofree virNodeDeviceDefPtr *defs = NULL;
> - int ndefs;
> + virMdevctlForEachData data = { 0, };
> GList * tofree = NULL;
> size_t i;
>
> - if ((ndefs = virMdevctlListDefined(&defs)) < 0) {
> + if ((data.ndefs = virMdevctlListDefined(&data.defs)) < 0) {
> virReportSystemError(errno, "%s",
> _("failed to query mdevs from mdevctl"));
> return -1;
> }
>
> - for (i = 0; i < ndefs; i++) {
> + for (i = 0; i < data.ndefs; i++) {
> virNodeDeviceObjPtr obj;
> virObjectEventPtr event;
> - virNodeDeviceDefPtr def = defs[i];
> + virNodeDeviceDefPtr def = data.defs[i];
> bool was_defined = false;
>
> def->driver = g_strdup("vfio_mdev");
> @@ -1245,8 +1284,14 @@ nodeDeviceUpdateMediatedDevices(void)
> virObjectEventStateQueue(driver->nodeDeviceEventState, event);
> }
>
> + /* Any mdevs that were previously defined but were not returned the latest
> + * mdevctl query should be removed from the device list */
> + virNodeDeviceObjListForEachSafe(driver->devs, removeMissingPersistentMdevs,
> + &data);
So, apparently it is now suggested to limit the usage of virHashX to only
virHashNew and resort to the GLib primitives otherwise, which means the code
will have to be adjusted for that. Apart from that I don't see an issue with
this patch.
Reviewed-by: Erik Skultety <eskultet@xxxxxxxxxx>
(I will still give it a test for aspects that are not immediately clear from
the code)
