From nobody Sun Apr 28 23:48:05 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500303763140306.53595541380446; Mon, 17 Jul 2017 08:02:43 -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 81D5E7CBA6; Mon, 17 Jul 2017 15:02:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 59EF07B5F1; Mon, 17 Jul 2017 15:02:37 +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 0E3CF3FAE2; Mon, 17 Jul 2017 15:02:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6HF2VkB024573 for ; Mon, 17 Jul 2017 11:02:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8BA47E902; Mon, 17 Jul 2017 15:02:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-46.phx2.redhat.com [10.3.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 669C27EBF6 for ; Mon, 17 Jul 2017 15:02:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 81D5E7CBA6 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 81D5E7CBA6 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 17 Jul 2017 11:02:22 -0400 Message-Id: <20170717150224.2988-2-jferlan@redhat.com> In-Reply-To: <20170717150224.2988-1-jferlan@redhat.com> References: <20170717150224.2988-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v5 1/3] nodedev: Fix usage of virNodeDeviceObjListGetParentHost 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.26]); Mon, 17 Jul 2017 15:02:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In order to avoid an eventual possible race, modify the call to not use the @def, but rather take the various fields needed. The race could occur because the Destroy path needs to Unlock (and Unref) the object. This could lead to an eventual change event from udevAddOneDevice which would free obj->def and it's fields that this code would be attempting to reference. So better safe than sorry. Signed-off-by: John Ferlan --- src/conf/virnodedeviceobj.c | 45 +++++++++++++++++++++++++++-----= ---- src/conf/virnodedeviceobj.h | 8 +++++-- src/node_device/node_device_driver.c | 40 +++++++++++++++++++++++++++----- src/test/test_driver.c | 41 ++++++++++++++++++++++++-------- 4 files changed, 105 insertions(+), 29 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 4c5ee8c..8416dda 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -543,24 +543,47 @@ virNodeDeviceObjListFindVportParentHost(virNodeDevice= ObjListPtr devs) } =20 =20 +/** + * @devs: Pointer to the device list + * @name: The name of the device + * @parent: The parent name + * @parent_wwnn: Parent's WWNN value + * @parent_wwpn: Parent's WWPN value + * @parent_fabric_wwn: Parent's fabric WWN value + * @create: Whether this is a create or existing device + * + * Using the input name and parent values, let's look for a parent host. + * This API cannot take the @def because it's called in a Destroy path whi= ch + * needs to unlock the object prior to calling since the searching involves + * locking the object (avoids deadlock). Once the lock is removed, it's + * possible, but improbable that udevAddOneDevice could have a "change" + * event on an existing vHBA causing the @def to be replaced in the object. + * If we use that @def, then we run the risk of some bad things happening + * + * Returns parent_host value on success or -1 on failure + */ int virNodeDeviceObjListGetParentHost(virNodeDeviceObjListPtr devs, - virNodeDeviceDefPtr def, + const char *name, + const char *parent, + const char *parent_wwnn, + const char *parent_wwpn, + const char *parent_fabric_wwn, int create) { int parent_host =3D -1; =20 - if (def->parent) { - parent_host =3D virNodeDeviceObjListGetParentHostByParent(devs, de= f->name, - def->paren= t); - } else if (def->parent_wwnn && def->parent_wwpn) { - parent_host =3D virNodeDeviceObjListGetParentHostByWWNs(devs, def-= >name, - def->parent_= wwnn, - def->parent_= wwpn); - } else if (def->parent_fabric_wwn) { + if (parent) { + parent_host =3D virNodeDeviceObjListGetParentHostByParent(devs, na= me, + parent); + } else if (parent_wwnn && parent_wwpn) { + parent_host =3D virNodeDeviceObjListGetParentHostByWWNs(devs, name, + parent_wwnn, + parent_wwpn); + } else if (parent_fabric_wwn) { parent_host =3D - virNodeDeviceObjListGetParentHostByFabricWWN(devs, def->name, - def->parent_fabri= c_wwn); + virNodeDeviceObjListGetParentHostByFabricWWN(devs, name, + parent_fabric_wwn= ); } else if (create =3D=3D CREATE_DEVICE) { /* Try to find a vport capable scsi_host when no parent supplied */ parent_host =3D virNodeDeviceObjListFindVportParentHost(devs); diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index 788fb66..f5ea8fe 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -75,8 +75,12 @@ virNodeDeviceObjListRemove(virNodeDeviceObjListPtr devs, =20 int virNodeDeviceObjListGetParentHost(virNodeDeviceObjListPtr devs, - virNodeDeviceDefPtr def, - int create); + const char *name, + const char *parent, + const char *parent_wwnn, + const char *parent_wwpn, + const char *parent_fabric_wwn, + int create); =20 virNodeDeviceObjListPtr virNodeDeviceObjListNew(void); diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 0a19908..1f888fb 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -563,7 +563,13 @@ nodeDeviceCreateXML(virConnectPtr conn, if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) =3D=3D -1) goto cleanup; =20 - if ((parent_host =3D virNodeDeviceObjListGetParentHost(driver->devs, d= ef, + /* NB: Since there's no @obj for which @def is assigned to, we can use + * the def-> values directly - unlike the Destroy code */ + if ((parent_host =3D virNodeDeviceObjListGetParentHost(driver->devs, + def->name, def->p= arent, + def->parent_wwnn, + def->parent_wwpn, + def->parent_fabri= c_wwn, CREATE_DEVICE)) <= 0) goto cleanup; =20 @@ -594,6 +600,11 @@ nodeDeviceDestroy(virNodeDevicePtr device) int ret =3D -1; virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr def; + char *name =3D NULL; + char *parent =3D NULL; + char *parent_wwnn =3D NULL; + char *parent_wwpn =3D NULL; + char *parent_fabric_wwn =3D NULL; char *wwnn =3D NULL, *wwpn =3D NULL; int parent_host =3D -1; =20 @@ -609,12 +620,24 @@ nodeDeviceDestroy(virNodeDevicePtr device) if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) < 0) goto cleanup; =20 - /* virNodeDeviceGetParentHost will cause the device object's lock - * to be taken, so grab the object def which will have the various - * fields used to search (name, parent, parent_wwnn, parent_wwpn, - * or parent_fabric_wwn) and drop the object lock. */ + /* Because we're about to release the lock and thus run into a race + * possibility (however improbably) with a udevAddOneDevice change + * event which would essentially free the existing @def (obj->def) and + * replace it with something new, we need to save off and use the + * various fields that virNodeDeviceObjListGetParentHost will use */ + if (VIR_STRDUP(name, def->name) < 0 || + VIR_STRDUP(parent, def->parent) < 0 || + VIR_STRDUP(parent_wwnn, def->parent_wwnn) < 0 || + VIR_STRDUP(parent_wwpn, def->parent_wwpn) < 0 || + VIR_STRDUP(parent_fabric_wwn, def->parent_fabric_wwn) < 0) + goto cleanup; + virNodeDeviceObjEndAPI(&obj); - if ((parent_host =3D virNodeDeviceObjListGetParentHost(driver->devs, d= ef, + if ((parent_host =3D virNodeDeviceObjListGetParentHost(driver->devs, + name, parent, + parent_wwnn, + parent_wwpn, + parent_fabric_wwn, EXISTING_DEVICE))= < 0) goto cleanup; =20 @@ -626,6 +649,11 @@ nodeDeviceDestroy(virNodeDevicePtr device) cleanup: nodeDeviceUnlock(); virNodeDeviceObjEndAPI(&obj); + VIR_FREE(name); + VIR_FREE(parent); + VIR_FREE(parent_wwnn); + VIR_FREE(parent_wwpn); + VIR_FREE(parent_fabric_wwn); VIR_FREE(wwnn); VIR_FREE(wwpn); return ret; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 83ab9cc..0e22ec2 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5579,8 +5579,13 @@ testNodeDeviceCreateXML(virConnectPtr conn, =20 /* Unlike the "real" code we don't need the parent_host in order to * call virVHBAManageVport, but still let's make sure the code finds - * something valid and no one messed up the mock environment. */ - if (virNodeDeviceObjListGetParentHost(driver->devs, def, CREATE_DEVICE= ) < 0) + * something valid and no one messed up the mock environment. We also + * don't need to make local copies since there's no @obj for which + * @def is assigned to, so we can use the def-> values directly. */ + if (virNodeDeviceObjListGetParentHost(driver->devs, def->name, def->pa= rent, + def->parent_wwnn, def->parent_ww= pn, + def->parent_fabric_wwn, + CREATE_DEVICE) < 0) goto cleanup; =20 /* In the real code, we'd call virVHBAManageVport followed by @@ -5619,7 +5624,12 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) testDriverPtr driver =3D dev->conn->privateData; virNodeDeviceObjPtr obj =3D NULL; virNodeDeviceDefPtr def; - char *parent_name =3D NULL, *wwnn =3D NULL, *wwpn =3D NULL; + char *name =3D NULL; + char *parent =3D NULL; + char *parent_wwnn =3D NULL; + char *parent_wwpn =3D NULL; + char *parent_fabric_wwn =3D NULL; + char *wwnn =3D NULL, *wwpn =3D NULL; virObjectEventPtr event =3D NULL; =20 if (!(obj =3D testNodeDeviceObjFindByName(driver, dev->name))) @@ -5629,18 +5639,25 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) =3D=3D -1) goto cleanup; =20 - if (VIR_STRDUP(parent_name, def->parent) < 0) + /* Because we're about to release the lock and thus run into a race + * possibility (however improbably) with a udevAddOneDevice change + * event which would essentially free the existing @def (obj->def) and + * replace it with something new, we need to save off and use the + * various fields that virNodeDeviceObjListGetParentHost will use */ + if (VIR_STRDUP(name, def->name) < 0 || + VIR_STRDUP(parent, def->parent) < 0 || + VIR_STRDUP(parent_wwnn, def->parent_wwnn) < 0 || + VIR_STRDUP(parent_wwpn, def->parent_wwpn) < 0 || + VIR_STRDUP(parent_fabric_wwn, def->parent_fabric_wwn) < 0) goto cleanup; =20 - /* virNodeDeviceGetParentHost will cause the device object's lock to be - * taken, so we have to dup the parent's name and drop the lock - * before calling it. We don't need the reference to the object - * any more once we have the parent's name. */ virObjectUnlock(obj); =20 /* We do this just for basic validation, but also avoid finding a * vport capable HBA if for some reason our vHBA doesn't exist */ - if (virNodeDeviceObjListGetParentHost(driver->devs, def, + if (virNodeDeviceObjListGetParentHost(driver->devs, name, parent, + parent_wwnn, parent_wwpn, + parent_fabric_wwn, EXISTING_DEVICE) < 0) { virObjectLock(obj); goto cleanup; @@ -5658,7 +5675,11 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) cleanup: virNodeDeviceObjEndAPI(&obj); testObjectEventQueue(driver, event); - VIR_FREE(parent_name); + VIR_FREE(name); + VIR_FREE(parent); + VIR_FREE(parent_wwnn); + VIR_FREE(parent_wwpn); + VIR_FREE(parent_fabric_wwn); VIR_FREE(wwnn); VIR_FREE(wwpn); return ret; --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 23:48:05 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500303758672879.8859902678973; Mon, 17 Jul 2017 08:02:38 -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 A73BE7A168; Mon, 17 Jul 2017 15:02:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 765397B60B; Mon, 17 Jul 2017 15:02:35 +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 181053FAE0; Mon, 17 Jul 2017 15:02:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6HF2YAO024583 for ; Mon, 17 Jul 2017 11:02:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 141A77E902; Mon, 17 Jul 2017 15:02:34 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-46.phx2.redhat.com [10.3.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9C2D7EFC0 for ; Mon, 17 Jul 2017 15:02:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A73BE7A168 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A73BE7A168 From: John Ferlan To: libvir-list@redhat.com Date: Mon, 17 Jul 2017 11:02:23 -0400 Message-Id: <20170717150224.2988-3-jferlan@redhat.com> In-Reply-To: <20170717150224.2988-1-jferlan@redhat.com> References: <20170717150224.2988-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v5 2/3] nodedev: Convert virNodeDeviceObjListPtr to use hash tables 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.28]); Mon, 17 Jul 2017 15:02:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than use a forward linked list of elements, it'll be much more efficient to use a hash table to reference the elements by unique name and to perform hash searches. This patch does all the heavy lifting of converting the list object to use a self locking list that contains the hash table. Each of the FindBy functions that do not involve finding the object by it's key (name) is converted to use virHashSearch in order to find the specific object. When searching for the key (name), it's possible to use virHashLookup. For any of the list perusal functions that are required to evaluate each object, the virHashForEach function is used. Signed-off-by: John Ferlan --- src/conf/virnodedeviceobj.c | 575 ++++++++++++++++++++++++++++++----------= ---- 1 file changed, 400 insertions(+), 175 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 8416dda..acf88db 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -25,6 +25,7 @@ #include "viralloc.h" #include "virnodedeviceobj.h" #include "virerror.h" +#include "virhash.h" #include "virlog.h" #include "virstring.h" =20 @@ -39,13 +40,19 @@ struct _virNodeDeviceObj { }; =20 struct _virNodeDeviceObjList { - size_t count; - virNodeDeviceObjPtr *objs; + virObjectLockable parent; + + /* name string -> virNodeDeviceObj mapping + * for O(1), lockless lookup-by-uuid */ + virHashTable *objs; + }; =20 =20 static virClassPtr virNodeDeviceObjClass; +static virClassPtr virNodeDeviceObjListClass; static void virNodeDeviceObjDispose(void *opaque); +static void virNodeDeviceObjListDispose(void *opaque); =20 static int virNodeDeviceObjOnceInit(void) @@ -56,6 +63,12 @@ virNodeDeviceObjOnceInit(void) virNodeDeviceObjDispose))) return -1; =20 + if (!(virNodeDeviceObjListClass =3D virClassNew(virClassForObjectLocka= ble(), + "virNodeDeviceObjList", + sizeof(virNodeDeviceObjL= ist), + virNodeDeviceObjListDisp= ose))) + return -1; + return 0; } =20 @@ -211,26 +224,49 @@ virNodeDeviceFindVPORTCapDef(const virNodeDeviceObj *= obj) } =20 =20 +static int +virNodeDeviceObjListFindBySysfsPathCallback(const void *payload, + const void *name ATTRIBUTE_UNU= SED, + const void *opaque) +{ + virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; + virNodeDeviceDefPtr def; + const char *sysfs_path =3D opaque; + int want =3D 0; + + virObjectLock(obj); + def =3D obj->def; + if (STREQ_NULLABLE(def->sysfs_path, sysfs_path)) + want =3D 1; + virObjectUnlock(obj); + return want; +} + + virNodeDeviceObjPtr virNodeDeviceObjListFindBySysfsPath(virNodeDeviceObjListPtr devs, const char *sysfs_path) { - size_t i; + virNodeDeviceObjPtr obj; =20 - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virNodeDeviceDefPtr def; + virObjectLock(devs); + obj =3D virHashSearch(devs->objs, virNodeDeviceObjListFindBySysfsPathC= allback, + (void *)sysfs_path); + virObjectRef(obj); + virObjectUnlock(devs); =20 + if (obj) virObjectLock(obj); - def =3D obj->def; - if ((def->sysfs_path !=3D NULL) && - (STREQ(def->sysfs_path, sysfs_path))) { - return virObjectRef(obj); - } - virObjectUnlock(obj); - } =20 - return NULL; + return obj; +} + + +static virNodeDeviceObjPtr +virNodeDeviceObjListFindByNameLocked(virNodeDeviceObjListPtr devs, + const char *name) +{ + return virObjectRef(virHashLookup(devs->objs, name)); } =20 =20 @@ -238,20 +274,42 @@ virNodeDeviceObjPtr virNodeDeviceObjListFindByName(virNodeDeviceObjListPtr devs, const char *name) { - size_t i; - - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virNodeDeviceDefPtr def; + virNodeDeviceObjPtr obj; =20 + virObjectLock(devs); + obj =3D virNodeDeviceObjListFindByNameLocked(devs, name); + virObjectUnlock(devs); + if (obj) virObjectLock(obj); - def =3D obj->def; - if (STREQ(def->name, name)) - return virObjectRef(obj); - virObjectUnlock(obj); - } =20 - return NULL; + return obj; +} + + +struct virNodeDeviceObjListFindByWWNsData { + const char *parent_wwnn; + const char *parent_wwpn; +}; + +static int +virNodeDeviceObjListFindByWWNsCallback(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *opaque) +{ + virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; + struct virNodeDeviceObjListFindByWWNsData *data =3D + (struct virNodeDeviceObjListFindByWWNsData *) opaque; + virNodeDevCapsDefPtr cap; + int want =3D 0; + + virObjectLock(obj); + if ((cap =3D virNodeDeviceFindFCCapDef(obj)) && + STREQ_NULLABLE(cap->data.scsi_host.wwnn, data->parent_wwnn) && + STREQ_NULLABLE(cap->data.scsi_host.wwpn, data->parent_wwpn) && + virNodeDeviceFindVPORTCapDef(obj)) + want =3D 1; + virObjectUnlock(obj); + return want; } =20 =20 @@ -260,22 +318,40 @@ virNodeDeviceObjListFindByWWNs(virNodeDeviceObjListPt= r devs, const char *parent_wwnn, const char *parent_wwpn) { - size_t i; + virNodeDeviceObjPtr obj; + struct virNodeDeviceObjListFindByWWNsData data =3D { + .parent_wwnn =3D parent_wwnn, .parent_wwpn =3D parent_wwpn }; =20 - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virNodeDevCapsDefPtr cap; + virObjectLock(devs); + obj =3D virHashSearch(devs->objs, virNodeDeviceObjListFindByWWNsCallba= ck, + &data); + virObjectRef(obj); + virObjectUnlock(devs); =20 + if (obj) virObjectLock(obj); - if ((cap =3D virNodeDeviceFindFCCapDef(obj)) && - STREQ_NULLABLE(cap->data.scsi_host.wwnn, parent_wwnn) && - STREQ_NULLABLE(cap->data.scsi_host.wwpn, parent_wwpn) && - virNodeDeviceFindVPORTCapDef(obj)) - return virObjectRef(obj); - virObjectUnlock(obj); - } =20 - return NULL; + return obj; +} + + +static int +virNodeDeviceObjListFindByFabricWWNCallback(const void *payload, + const void *name ATTRIBUTE_UNU= SED, + const void *opaque) +{ + virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; + const char *matchstr =3D opaque; + virNodeDevCapsDefPtr cap; + int want =3D 0; + + virObjectLock(obj); + if ((cap =3D virNodeDeviceFindFCCapDef(obj)) && + STREQ_NULLABLE(cap->data.scsi_host.fabric_wwn, matchstr) && + virNodeDeviceFindVPORTCapDef(obj)) + want =3D 1; + virObjectUnlock(obj); + return want; } =20 =20 @@ -283,21 +359,35 @@ static virNodeDeviceObjPtr virNodeDeviceObjListFindByFabricWWN(virNodeDeviceObjListPtr devs, const char *parent_fabric_wwn) { - size_t i; + virNodeDeviceObjPtr obj; =20 - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virNodeDevCapsDefPtr cap; + virObjectLock(devs); + obj =3D virHashSearch(devs->objs, virNodeDeviceObjListFindByFabricWWNC= allback, + (void *)parent_fabric_wwn); + virObjectRef(obj); + virObjectUnlock(devs); =20 + if (obj) virObjectLock(obj); - if ((cap =3D virNodeDeviceFindFCCapDef(obj)) && - STREQ_NULLABLE(cap->data.scsi_host.fabric_wwn, parent_fabric_w= wn) && - virNodeDeviceFindVPORTCapDef(obj)) - return virObjectRef(obj); - virObjectUnlock(obj); - } =20 - return NULL; + return obj; +} + + +static int +virNodeDeviceObjListFindByCapCallback(const void *payload, + const void *name ATTRIBUTE_UNUSED, + const void *opaque) +{ + virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; + const char *matchstr =3D opaque; + int want =3D 0; + + virObjectLock(obj); + if (virNodeDeviceObjHasCap(obj, matchstr)) + want =3D 1; + virObjectUnlock(obj); + return want; } =20 =20 @@ -305,18 +395,59 @@ static virNodeDeviceObjPtr virNodeDeviceObjListFindByCap(virNodeDeviceObjListPtr devs, const char *cap) { - size_t i; + virNodeDeviceObjPtr obj; =20 - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; + virObjectLock(devs); + obj =3D virHashSearch(devs->objs, virNodeDeviceObjListFindByCapCallbac= k, + (void *)cap); + virObjectRef(obj); + virObjectUnlock(devs); =20 + if (obj) virObjectLock(obj); - if (virNodeDeviceObjHasCap(obj, cap)) - return virObjectRef(obj); - virObjectUnlock(obj); - } =20 - return NULL; + return obj; +} + + +struct virNodeDeviceObjListFindSCSIHostByWWNsData { + const char *wwnn; + const char *wwpn; +}; + +static int +virNodeDeviceObjListFindSCSIHostByWWNsCallback(const void *payload, + const void *name ATTRIBUTE_= UNUSED, + const void *opaque) +{ + virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; + virNodeDeviceDefPtr def; + struct virNodeDeviceObjListFindSCSIHostByWWNsData *data =3D + (struct virNodeDeviceObjListFindSCSIHostByWWNsData *) opaque; + virNodeDevCapsDefPtr cap; + int want =3D 0; + + virObjectLock(obj); + def =3D obj->def; + cap =3D def->caps; + + while (cap) { + if (cap->data.type =3D=3D VIR_NODE_DEV_CAP_SCSI_HOST) { + virNodeDeviceGetSCSIHostCaps(&cap->data.scsi_host); + if (cap->data.scsi_host.flags & + VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST) { + if (STREQ(cap->data.scsi_host.wwnn, data->wwnn) && + STREQ(cap->data.scsi_host.wwpn, data->wwpn)) { + want =3D 1; + break; + } + } + } + cap =3D cap->next; + } + + virObjectUnlock(obj); + return want; } =20 =20 @@ -325,31 +456,30 @@ virNodeDeviceObjListFindSCSIHostByWWNs(virNodeDeviceO= bjListPtr devs, const char *wwnn, const char *wwpn) { - size_t i; + virNodeDeviceObjPtr obj; + struct virNodeDeviceObjListFindSCSIHostByWWNsData data =3D { + .wwnn =3D wwnn, .wwpn =3D wwpn }; =20 - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virNodeDevCapsDefPtr cap; + virObjectLock(devs); + obj =3D virHashSearch(devs->objs, + virNodeDeviceObjListFindSCSIHostByWWNsCallback, + &data); + virObjectRef(obj); + virObjectUnlock(devs); =20 + if (obj) virObjectLock(obj); - cap =3D obj->def->caps; - - while (cap) { - if (cap->data.type =3D=3D VIR_NODE_DEV_CAP_SCSI_HOST) { - virNodeDeviceGetSCSIHostCaps(&cap->data.scsi_host); - if (cap->data.scsi_host.flags & - VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST) { - if (STREQ(cap->data.scsi_host.wwnn, wwnn) && - STREQ(cap->data.scsi_host.wwpn, wwpn)) - return virObjectRef(obj); - } - } - cap =3D cap->next; - } - virObjectUnlock(obj); - } =20 - return NULL; + return obj; +} + + +static void +virNodeDeviceObjListDispose(void *obj) +{ + virNodeDeviceObjListPtr devs =3D obj; + + virHashFree(devs->objs); } =20 =20 @@ -358,8 +488,17 @@ virNodeDeviceObjListNew(void) { virNodeDeviceObjListPtr devs; =20 - if (VIR_ALLOC(devs) < 0) + if (virNodeDeviceObjInitialize() < 0) + return NULL; + + if (!(devs =3D virObjectLockableNew(virNodeDeviceObjListClass))) return NULL; + + if (!(devs->objs =3D virHashCreate(50, virObjectFreeHashData))) { + virObjectUnref(devs); + return NULL; + } + return devs; } =20 @@ -367,11 +506,7 @@ virNodeDeviceObjListNew(void) void virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs) { - size_t i; - for (i =3D 0; i < devs->count; i++) - virObjectUnref(devs->objs[i]); - VIR_FREE(devs->objs); - VIR_FREE(devs); + virObjectUnref(devs); } =20 =20 @@ -381,22 +516,28 @@ virNodeDeviceObjListAssignDef(virNodeDeviceObjListPtr= devs, { virNodeDeviceObjPtr obj; =20 - if ((obj =3D virNodeDeviceObjListFindByName(devs, def->name))) { + virObjectLock(devs); + + if ((obj =3D virNodeDeviceObjListFindByNameLocked(devs, def->name))) { + virObjectLock(obj); virNodeDeviceDefFree(obj->def); obj->def =3D def; - return obj; - } + } else { + if (!(obj =3D virNodeDeviceObjNew())) + goto cleanup; =20 - if (!(obj =3D virNodeDeviceObjNew())) - return NULL; + if (virHashAddEntry(devs->objs, def->name, obj) < 0) { + virNodeDeviceObjEndAPI(&obj); + goto cleanup; + } =20 - if (VIR_APPEND_ELEMENT_COPY(devs->objs, devs->count, obj) < 0) { - virNodeDeviceObjEndAPI(&obj); - return NULL; + obj->def =3D def; + virObjectRef(obj); } - obj->def =3D def; =20 - return virObjectRef(obj); + cleanup: + virObjectUnlock(devs); + return obj; } =20 =20 @@ -404,21 +545,20 @@ void virNodeDeviceObjListRemove(virNodeDeviceObjListPtr devs, virNodeDeviceObjPtr obj) { - size_t i; - - virObjectUnlock(obj); + virNodeDeviceDefPtr def; =20 - for (i =3D 0; i < devs->count; i++) { - virObjectLock(devs->objs[i]); - if (devs->objs[i] =3D=3D obj) { - virObjectUnlock(devs->objs[i]); - virObjectUnref(devs->objs[i]); + if (!obj) + return; + def =3D obj->def; =20 - VIR_DELETE_ELEMENT(devs->objs, i, devs->count); - break; - } - virObjectUnlock(devs->objs[i]); - } + virObjectRef(obj); + virObjectUnlock(obj); + virObjectLock(devs); + virObjectLock(obj); + virHashRemoveEntry(devs->objs, def->name); + virObjectUnlock(obj); + virObjectUnref(obj); + virObjectUnlock(devs); } =20 =20 @@ -643,25 +783,89 @@ virNodeDeviceCapMatch(virNodeDeviceObjPtr obj, } =20 =20 +struct virNodeDeviceCountData { + virConnectPtr conn; + virNodeDeviceObjListFilter aclfilter; + const char *matchstr; + int count; +}; + +static int +virNodeDeviceObjListNumOfDevicesCallback(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virNodeDeviceObjPtr obj =3D payload; + virNodeDeviceDefPtr def; + struct virNodeDeviceCountData *data =3D opaque; + virNodeDeviceObjListFilter aclfilter =3D data->aclfilter; + + virObjectLock(obj); + def =3D obj->def; + if ((!aclfilter || aclfilter(data->conn, def)) && + (!data->matchstr || virNodeDeviceObjHasCap(obj, data->matchstr))) + data->count++; + + virObjectUnlock(obj); + return 0; +} + + int virNodeDeviceObjListNumOfDevices(virNodeDeviceObjListPtr devs, virConnectPtr conn, const char *cap, virNodeDeviceObjListFilter aclfilter) { - size_t i; - int ndevs =3D 0; + struct virNodeDeviceCountData data =3D { + .conn =3D conn, .aclfilter =3D aclfilter, .matchstr =3D cap, .coun= t =3D 0 }; =20 - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virObjectLock(obj); - if ((!aclfilter || aclfilter(conn, obj->def)) && - (!cap || virNodeDeviceObjHasCap(obj, cap))) - ++ndevs; - virObjectUnlock(obj); - } + virObjectLock(devs); + virHashForEach(devs->objs, virNodeDeviceObjListNumOfDevicesCallback, &= data); + virObjectUnlock(devs); + + return data.count; +} + + +struct virNodeDeviceGetNamesData { + virConnectPtr conn; + virNodeDeviceObjListFilter aclfilter; + const char *matchstr; + int nnames; + char **names; + int maxnames; + bool error; +}; + +static int +virNodeDeviceObjListGetNamesCallback(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virNodeDeviceObjPtr obj =3D payload; + virNodeDeviceDefPtr def; + struct virNodeDeviceGetNamesData *data =3D opaque; + virNodeDeviceObjListFilter aclfilter =3D data->aclfilter; + + if (data->error) + return 0; =20 - return ndevs; + virObjectLock(obj); + def =3D obj->def; + + if ((!aclfilter || aclfilter(data->conn, def)) && + (!data->matchstr || virNodeDeviceObjHasCap(obj, data->matchstr))) { + if (VIR_STRDUP(data->names[data->nnames], def->name) < 0) { + data->error =3D true; + goto cleanup; + } + data->nnames++; + } + + cleanup: + virObjectUnlock(obj); + return 0; } =20 =20 @@ -673,28 +877,22 @@ virNodeDeviceObjListGetNames(virNodeDeviceObjListPtr = devs, char **const names, int maxnames) { - int nnames =3D 0; - size_t i; + struct virNodeDeviceGetNamesData data =3D { + .conn =3D conn, .aclfilter =3D aclfilter, .matchstr =3D cap, .name= s =3D names, + .nnames =3D 0, .maxnames =3D maxnames, .error =3D false }; =20 - for (i =3D 0; i < devs->count && nnames < maxnames; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virObjectLock(obj); - if ((!aclfilter || aclfilter(conn, obj->def)) && - (!cap || virNodeDeviceObjHasCap(obj, cap))) { - if (VIR_STRDUP(names[nnames], obj->def->name) < 0) { - virObjectUnlock(obj); - goto failure; - } - nnames++; - } - virObjectUnlock(obj); - } + virObjectLock(devs); + virHashForEach(devs->objs, virNodeDeviceObjListGetNamesCallback, &data= ); + virObjectUnlock(devs); + + if (data.error) + goto error; =20 - return nnames; + return data.nnames; =20 - failure: - while (--nnames >=3D 0) - VIR_FREE(names[nnames]); + error: + while (--data.nnames) + VIR_FREE(data.names[data.nnames]); return -1; } =20 @@ -731,6 +929,51 @@ virNodeDeviceMatch(virNodeDeviceObjPtr obj, #undef MATCH =20 =20 +struct virNodeDeviceObjListExportData { + virConnectPtr conn; + virNodeDeviceObjListFilter aclfilter; + unsigned int flags; + virNodeDevicePtr *devices; + int ndevices; + bool error; +}; + +static int +virNodeDeviceObjListExportCallback(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virNodeDeviceObjPtr obj =3D payload; + virNodeDeviceDefPtr def; + struct virNodeDeviceObjListExportData *data =3D opaque; + virNodeDevicePtr device =3D NULL; + + if (data->error) + return 0; + + virObjectLock(obj); + def =3D obj->def; + + if ((!data->aclfilter || data->aclfilter(data->conn, def)) && + virNodeDeviceMatch(obj, data->flags)) { + if (data->devices) { + if (!(device =3D virGetNodeDevice(data->conn, def->name)) || + VIR_STRDUP(device->parent, def->parent) < 0) { + virObjectUnref(device); + data->error =3D true; + goto cleanup; + } + data->devices[data->ndevices] =3D device; + } + data->ndevices++; + } + + cleanup: + virObjectUnlock(obj); + return 0; +} + + int virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjListPtr devs, @@ -738,49 +981,31 @@ virNodeDeviceObjListExport(virConnectPtr conn, virNodeDeviceObjListFilter aclfilter, unsigned int flags) { - virNodeDevicePtr *tmp_devices =3D NULL; - virNodeDevicePtr device =3D NULL; - int ndevices =3D 0; - int ret =3D -1; - size_t i; + struct virNodeDeviceObjListExportData data =3D { + .conn =3D conn, .aclfilter =3D aclfilter, .flags =3D flags, + .devices =3D NULL, .ndevices =3D 0, .error =3D false }; + + virObjectLock(devs); + if (devices && + VIR_ALLOC_N(data.devices, virHashSize(devs->objs) + 1) < 0) { + virObjectUnlock(devs); + return -1; + } =20 - if (devices && VIR_ALLOC_N(tmp_devices, devs->count + 1) < 0) - goto cleanup; + virHashForEach(devs->objs, virNodeDeviceObjListExportCallback, &data); + virObjectUnlock(devs); =20 - for (i =3D 0; i < devs->count; i++) { - virNodeDeviceObjPtr obj =3D devs->objs[i]; - virObjectLock(obj); - if ((!aclfilter || aclfilter(conn, obj->def)) && - virNodeDeviceMatch(obj, flags)) { - if (devices) { - if (!(device =3D virGetNodeDevice(conn, obj->def->name)) || - VIR_STRDUP(device->parent, obj->def->parent) < 0) { - virObjectUnref(device); - virObjectUnlock(obj); - goto cleanup; - } - tmp_devices[ndevices] =3D device; - } - ndevices++; - } - virObjectUnlock(obj); - } + if (data.error) + goto cleanup; =20 - if (tmp_devices) { - /* trim the array to the final size */ - ignore_value(VIR_REALLOC_N(tmp_devices, ndevices + 1)); - *devices =3D tmp_devices; - tmp_devices =3D NULL; - } + if (data.devices) { + ignore_value(VIR_REALLOC_N(data.devices, data.ndevices + 1)); + *devices =3D data.devices; + } =20 - ret =3D ndevices; + return data.ndevices; =20 cleanup: - if (tmp_devices) { - for (i =3D 0; i < ndevices; i++) - virObjectUnref(tmp_devices[i]); - } - - VIR_FREE(tmp_devices); - return ret; + virObjectListFree(data.devices); + return -1; } --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 23:48:05 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150030376548952.48971975260713; Mon, 17 Jul 2017 08:02:45 -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 BF7573DE3F; Mon, 17 Jul 2017 15:02:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36D8F7D938; Mon, 17 Jul 2017 15:02:41 +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 D8DBF3FAE7; Mon, 17 Jul 2017 15:02:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6HF2ZLn024591 for ; Mon, 17 Jul 2017 11:02:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 600177E902; Mon, 17 Jul 2017 15:02:35 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-46.phx2.redhat.com [10.3.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2694E7EBF6 for ; Mon, 17 Jul 2017 15:02:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BF7573DE3F Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BF7573DE3F From: John Ferlan To: libvir-list@redhat.com Date: Mon, 17 Jul 2017 11:02:24 -0400 Message-Id: <20170717150224.2988-4-jferlan@redhat.com> In-Reply-To: <20170717150224.2988-1-jferlan@redhat.com> References: <20170717150224.2988-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v5 3/3] nodedev: Remove driver locks around object list mgmt code 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.29]); Mon, 17 Jul 2017 15:02:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Since virnodedeviceobj now has a self-lockable hash table, there's no need to lock the table from the driver for processing. Thus remove the locks from the driver for NodeDeviceObjList mgmt. Signed-off-by: John Ferlan --- src/node_device/node_device_driver.c | 61 +++++++-------------------------= ---- src/node_device/node_device_hal.c | 16 ++-------- src/node_device/node_device_udev.c | 13 +++----- 3 files changed, 18 insertions(+), 72 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 1f888fb..1e6709d 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -174,19 +174,13 @@ nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) { - int ndevs =3D 0; - if (virNodeNumOfDevicesEnsureACL(conn) < 0) return -1; =20 virCheckFlags(0, -1); =20 - nodeDeviceLock(); - ndevs =3D virNodeDeviceObjListNumOfDevices(driver->devs, conn, cap, - virNodeNumOfDevicesCheckACL); - nodeDeviceUnlock(); - - return ndevs; + return virNodeDeviceObjListNumOfDevices(driver->devs, conn, cap, + virNodeNumOfDevicesCheckACL); } =20 =20 @@ -197,20 +191,14 @@ nodeListDevices(virConnectPtr conn, int maxnames, unsigned int flags) { - int nnames; - if (virNodeListDevicesEnsureACL(conn) < 0) return -1; =20 virCheckFlags(0, -1); =20 - nodeDeviceLock(); - nnames =3D virNodeDeviceObjListGetNames(driver->devs, conn, - virNodeListDevicesCheckACL, - cap, names, maxnames); - nodeDeviceUnlock(); - - return nnames; + return virNodeDeviceObjListGetNames(driver->devs, conn, + virNodeListDevicesCheckACL, + cap, names, maxnames); } =20 =20 @@ -219,19 +207,14 @@ nodeConnectListAllNodeDevices(virConnectPtr conn, virNodeDevicePtr **devices, unsigned int flags) { - int ret =3D -1; - virCheckFlags(VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP, -1); =20 if (virConnectListAllNodeDevicesEnsureACL(conn) < 0) return -1; =20 - nodeDeviceLock(); - ret =3D virNodeDeviceObjListExport(conn, driver->devs, devices, - virConnectListAllNodeDevicesCheckACL, - flags); - nodeDeviceUnlock(); - return ret; + return virNodeDeviceObjListExport(conn, driver->devs, devices, + virConnectListAllNodeDevicesCheckACL, + flags); } =20 =20 @@ -240,11 +223,7 @@ nodeDeviceObjFindByName(const char *name) { virNodeDeviceObjPtr obj; =20 - nodeDeviceLock(); - obj =3D virNodeDeviceObjListFindByName(driver->devs, name); - nodeDeviceUnlock(); - - if (!obj) { + if (!(obj =3D virNodeDeviceObjListFindByName(driver->devs, name))) { virReportError(VIR_ERR_NO_NODE_DEVICE, _("no node device with matching name '%s'"), name); @@ -294,11 +273,8 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, =20 virCheckFlags(0, NULL); =20 - nodeDeviceLock(); - obj =3D virNodeDeviceObjListFindSCSIHostByWWNs(driver->devs, wwnn, wwp= n); - nodeDeviceUnlock(); - - if (!obj) + if (!(obj =3D virNodeDeviceObjListFindSCSIHostByWWNs(driver->devs, + wwnn, wwpn))) return NULL; =20 def =3D virNodeDeviceObjGetDef(obj); @@ -509,13 +485,6 @@ nodeDeviceFindNewDevice(virConnectPtr conn, virNodeDevicePtr device =3D NULL; time_t start =3D 0, now =3D 0; =20 - /* The thread that creates the device takes the driver lock, so we - * must release it in order to allow the device to be created. - * We're not doing anything with the driver pointer at this point, - * so it's safe to release it, assuming that the pointer itself - * doesn't become invalid. */ - nodeDeviceUnlock(); - nodeDeviceGetTime(&start); =20 while ((now - start) < LINUX_NEW_DEVICE_WAIT_TIME) { @@ -532,8 +501,6 @@ nodeDeviceFindNewDevice(virConnectPtr conn, break; } =20 - nodeDeviceLock(); - return device; } =20 @@ -552,8 +519,6 @@ nodeDeviceCreateXML(virConnectPtr conn, virCheckFlags(0, NULL); virt_type =3D virConnectGetType(conn); =20 - nodeDeviceLock(); - if (!(def =3D virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, virt= _type))) goto cleanup; =20 @@ -586,7 +551,6 @@ nodeDeviceCreateXML(virConnectPtr conn, "wwnn '%s' and wwpn '%s'"), def->name, wwnn, wwpn); cleanup: - nodeDeviceUnlock(); virNodeDeviceDefFree(def); VIR_FREE(wwnn); VIR_FREE(wwpn); @@ -612,8 +576,6 @@ nodeDeviceDestroy(virNodeDevicePtr device) return -1; def =3D virNodeDeviceObjGetDef(obj); =20 - nodeDeviceLock(); - if (virNodeDeviceDestroyEnsureACL(device->conn, def) < 0) goto cleanup; =20 @@ -647,7 +609,6 @@ nodeDeviceDestroy(virNodeDevicePtr device) ret =3D 0; =20 cleanup: - nodeDeviceUnlock(); virNodeDeviceObjEndAPI(&obj); VIR_FREE(name); VIR_FREE(parent); diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic= e_hal.c index b220798..8731e3b 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -508,20 +508,15 @@ dev_refresh(const char *udi) const char *name =3D hal_name(udi); virNodeDeviceObjPtr obj; =20 - nodeDeviceLock(); if ((obj =3D virNodeDeviceObjListFindByName(driver->devs, name))) { /* Simply "rediscover" device -- incrementally handling changes * to sub-capabilities (like net.80203) is nasty ... so avoid it. */ virNodeDeviceObjListRemove(driver->devs, obj); - } else { - VIR_DEBUG("no device named %s", name); - } - nodeDeviceUnlock(); - - if (obj) { virObjectUnref(obj); dev_create(udi); + } else { + VIR_DEBUG("no device named %s", name); } } =20 @@ -541,14 +536,12 @@ device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, const char *name =3D hal_name(udi); virNodeDeviceObjPtr obj; =20 - nodeDeviceLock(); obj =3D virNodeDeviceObjListFindByName(driver->devs, name); VIR_DEBUG("%s", name); if (obj) virNodeDeviceObjListRemove(driver->devs, obj); else VIR_DEBUG("no device named %s", name); - nodeDeviceUnlock(); virObjectUnref(obj); } =20 @@ -561,11 +554,8 @@ device_cap_added(LibHalContext *ctx, virNodeDeviceObjPtr obj; virNodeDeviceDefPtr def; =20 - nodeDeviceLock(); - obj =3D virNodeDeviceObjListFindByName(driver->devs, name); - nodeDeviceUnlock(); VIR_DEBUG("%s %s", cap, name); - if (obj) { + if ((obj =3D virNodeDeviceObjListFindByName(driver->devs, name))) { def =3D virNodeDeviceObjGetDef(obj); (void)gather_capability(ctx, udi, cap, &def->caps); virNodeDeviceObjEndAPI(&obj); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 1b10c16..434efd7 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1607,7 +1607,6 @@ udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, const char *action =3D NULL; int udev_fd =3D -1; =20 - nodeDeviceLock(); udev_fd =3D udev_monitor_get_fd(udev_monitor); if (fd !=3D udev_fd) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1639,7 +1638,6 @@ udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, =20 cleanup: udev_device_unref(device); - nodeDeviceUnlock(); return; } =20 @@ -1767,7 +1765,6 @@ nodeStateInitialize(bool privileged, { udevPrivate *priv =3D NULL; struct udev *udev =3D NULL; - int ret =3D -1; =20 if (VIR_ALLOC(priv) < 0) return -1; @@ -1847,18 +1844,16 @@ nodeStateInitialize(bool privileged, goto cleanup; =20 /* Populate with known devices */ - + nodeDeviceUnlock(); if (udevEnumerateDevices(udev) !=3D 0) goto cleanup; =20 - ret =3D 0; + return 0; =20 cleanup: nodeDeviceUnlock(); - - if (ret =3D=3D -1) - nodeStateCleanup(); - return ret; + nodeStateCleanup(); + return -1; } =20 =20 --=20 2.9.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list