1. Patchew
  2. Libvirt
  3. [libvirt] [PATCH 0/4] test_driver: implement IOThread related APIs
  4. View patch

[libvirt] [PATCH 4/4] test_driver: implement virDomainGetIOThreadInfo

Ilias Stamatis posted 4 patches 6 years, 6 months ago
There is a newer version of this series
[libvirt] [PATCH 4/4] test_driver: implement virDomainGetIOThreadInfo
Posted by Ilias Stamatis 6 years, 6 months ago 
Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
---
 src/test/test_driver.c | 74 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 47e28a01ec..4c6f3db8de 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2774,6 +2774,79 @@ testDomainPinIOThread(virDomainPtr dom,
 }


+static int
+testDomainGetIOThreadInfo(virDomainPtr dom,
+                          virDomainIOThreadInfoPtr **info,
+                          unsigned int flags)
+{
+    virDomainObjPtr vm = NULL;
+    virDomainDefPtr def = NULL;
+    virBitmapPtr cpumask = NULL;
+    virBitmapPtr bitmap = NULL;
+    virDomainIOThreadInfoPtr *info_ret = NULL;
+    size_t i;
+    int hostcpus;
+    int ret = -1;
+
+    virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+                  VIR_DOMAIN_AFFECT_CONFIG, -1);
+
+    if (!(vm = testDomObjFromDomain(dom)))
+        goto cleanup;
+
+    if (!(def = virDomainObjGetOneDef(vm, flags)))
+        goto cleanup;
+
+    if (def->niothreadids == 0)
+        return 0;
+
+    if ((hostcpus = virHostCPUGetCount()) < 0)
+        goto cleanup;
+
+    if (VIR_ALLOC_N(info_ret, def->niothreadids) < 0)
+        goto cleanup;
+
+    for (i = 0; i < def->niothreadids; i++) {
+        if (VIR_ALLOC(info_ret[i]) < 0)
+            goto cleanup;
+
+        info_ret[i]->iothread_id = def->iothreadids[i]->iothread_id;
+
+        cpumask = def->iothreadids[i]->cpumask;
+        if (!cpumask) {
+            if (def->cpumask) {
+                cpumask = def->cpumask;
+            } else {
+                if (!(bitmap = virBitmapNew(hostcpus)))
+                    goto cleanup;
+                virBitmapSetAll(bitmap);
+                cpumask = bitmap;
+            }
+        }
+
+        if (virBitmapToData(cpumask, &info_ret[i]->cpumap,
+                            &info_ret[i]->cpumaplen) < 0)
+            goto cleanup;
+
+        virBitmapFree(bitmap);
+        bitmap = NULL;
+    }
+
+    VIR_STEAL_PTR(*info, info_ret);
+    ret = def->niothreadids;
+
+ cleanup:
+    if (info_ret) {
+        for (i = 0; i < def->niothreadids; i++)
+            virDomainIOThreadInfoFree(info_ret[i]);
+        VIR_FREE(info_ret);
+    }
+    virBitmapFree(bitmap);
+    virDomainObjEndAPI(&vm);
+    return ret;
+}
+
+
 static int
 testDomainSetUserPassword(virDomainPtr dom,
                           const char *user ATTRIBUTE_UNUSED,
@@ -7916,6 +7989,7 @@ static virHypervisorDriver testHypervisorDriver = {
     .domainAddIOThread = testDomainAddIOThread, /* 5.6.0 */
     .domainDelIOThread = testDomainDelIOThread, /* 5.6.0 */
     .domainPinIOThread = testDomainPinIOThread, /* 5.6.0 */
+    .domainGetIOThreadInfo = testDomainGetIOThreadInfo, /* 5.6.0 */
     .domainSetUserPassword = testDomainSetUserPassword, /* 5.6.0 */
     .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */
     .domainSetVcpusFlags = testDomainSetVcpusFlags, /* 0.8.5 */
--
2.22.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 1/4] test_driver: implement virDomainAddIOThread
Posted by Erik Skultety 6 years, 6 months ago 
On Tue, Jul 23, 2019 at 12:17:54PM +0200, Ilias Stamatis wrote:
> Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
> ---

One more thing, this patch will break virsh-optparse again, more specifically
some of the cpu-stats tests (yeah, those are very bad tests). The offending
ones need to be removed in a standalone patch related to this one.
Ultimately, the whole optparse thing will need to be re-written in a different
manner.

Erik

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 1/4] test_driver: implement virDomainAddIOThread
Posted by Erik Skultety 6 years, 6 months ago 
On Thu, Jul 25, 2019 at 02:09:01PM +0200, Erik Skultety wrote:
> On Tue, Jul 23, 2019 at 12:17:54PM +0200, Ilias Stamatis wrote:
> > Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
> > ---
>
> One more thing, this patch will break virsh-optparse again, more specifically
> some of the cpu-stats tests (yeah, those are very bad tests). The offending
> ones need to be removed in a standalone patch related to this one.
> Ultimately, the whole optparse thing will need to be re-written in a different
> manner.
>
> Erik

Sigh...^this response was meant for the CPUStats patch...please ignore it in
context of the iothread series.

Erik

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 4/4] test_driver: implement virDomainGetIOThreadInfo
Posted by Erik Skultety 6 years, 6 months ago 
On Tue, Jul 23, 2019 at 12:17:57PM +0200, Ilias Stamatis wrote:
> Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
> ---
>  src/test/test_driver.c | 74 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 74 insertions(+)
>
> diff --git a/src/test/test_driver.c b/src/test/test_driver.c
> index 47e28a01ec..4c6f3db8de 100644
> --- a/src/test/test_driver.c
> +++ b/src/test/test_driver.c
> @@ -2774,6 +2774,79 @@ testDomainPinIOThread(virDomainPtr dom,
>  }
>
>
> +static int
> +testDomainGetIOThreadInfo(virDomainPtr dom,
> +                          virDomainIOThreadInfoPtr **info,
> +                          unsigned int flags)
> +{
> +    virDomainObjPtr vm = NULL;
> +    virDomainDefPtr def = NULL;
> +    virBitmapPtr cpumask = NULL;
> +    virBitmapPtr bitmap = NULL;
> +    virDomainIOThreadInfoPtr *info_ret = NULL;
> +    size_t i;
> +    int hostcpus;
> +    int ret = -1;
> +
> +    virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
> +                  VIR_DOMAIN_AFFECT_CONFIG, -1);
> +
> +    if (!(vm = testDomObjFromDomain(dom)))
> +        goto cleanup;
> +
> +    if (!(def = virDomainObjGetOneDef(vm, flags)))
> +        goto cleanup;
> +
> +    if (def->niothreadids == 0)
> +        return 0;

^This will leave the object locked, so once you do Info, anything else after
that will deadlock, so goto is needed.

Erik

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 4/4] test_driver: implement virDomainGetIOThreadInfo
Posted by Ilias Stamatis 6 years, 6 months ago 
On Thu, Jul 25, 2019 at 5:43 PM Erik Skultety <eskultet@redhat.com> wrote:
>
> On Tue, Jul 23, 2019 at 12:17:57PM +0200, Ilias Stamatis wrote:
> > Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
> > ---
> >  src/test/test_driver.c | 74 ++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 74 insertions(+)
> >
> > diff --git a/src/test/test_driver.c b/src/test/test_driver.c
> > index 47e28a01ec..4c6f3db8de 100644
> > --- a/src/test/test_driver.c
> > +++ b/src/test/test_driver.c
> > @@ -2774,6 +2774,79 @@ testDomainPinIOThread(virDomainPtr dom,
> >  }
> >
> >
> > +static int
> > +testDomainGetIOThreadInfo(virDomainPtr dom,
> > +                          virDomainIOThreadInfoPtr **info,
> > +                          unsigned int flags)
> > +{
> > +    virDomainObjPtr vm = NULL;
> > +    virDomainDefPtr def = NULL;
> > +    virBitmapPtr cpumask = NULL;
> > +    virBitmapPtr bitmap = NULL;
> > +    virDomainIOThreadInfoPtr *info_ret = NULL;
> > +    size_t i;
> > +    int hostcpus;
> > +    int ret = -1;
> > +
> > +    virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
> > +                  VIR_DOMAIN_AFFECT_CONFIG, -1);
> > +
> > +    if (!(vm = testDomObjFromDomain(dom)))
> > +        goto cleanup;
> > +
> > +    if (!(def = virDomainObjGetOneDef(vm, flags)))
> > +        goto cleanup;
> > +
> > +    if (def->niothreadids == 0)
> > +        return 0;
>
> ^This will leave the object locked, so once you do Info, anything else after
> that will deadlock, so goto is needed.
>
> Erik

Of course... I don't know how I missed that. I guess I don't need to
re-send it though only for this change?

Ilias

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 4/4] test_driver: implement virDomainGetIOThreadInfo
Posted by Erik Skultety 6 years, 6 months ago 
On Fri, Jul 26, 2019 at 12:55:20PM +0200, Ilias Stamatis wrote:
> On Thu, Jul 25, 2019 at 5:43 PM Erik Skultety <eskultet@redhat.com> wrote:
> >
> > On Tue, Jul 23, 2019 at 12:17:57PM +0200, Ilias Stamatis wrote:
> > > Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
> > > ---
> > >  src/test/test_driver.c | 74 ++++++++++++++++++++++++++++++++++++++++++
> > >  1 file changed, 74 insertions(+)
> > >
> > > diff --git a/src/test/test_driver.c b/src/test/test_driver.c
> > > index 47e28a01ec..4c6f3db8de 100644
> > > --- a/src/test/test_driver.c
> > > +++ b/src/test/test_driver.c
> > > @@ -2774,6 +2774,79 @@ testDomainPinIOThread(virDomainPtr dom,
> > >  }
> > >
> > >
> > > +static int
> > > +testDomainGetIOThreadInfo(virDomainPtr dom,
> > > +                          virDomainIOThreadInfoPtr **info,
> > > +                          unsigned int flags)
> > > +{
> > > +    virDomainObjPtr vm = NULL;
> > > +    virDomainDefPtr def = NULL;
> > > +    virBitmapPtr cpumask = NULL;
> > > +    virBitmapPtr bitmap = NULL;
> > > +    virDomainIOThreadInfoPtr *info_ret = NULL;
> > > +    size_t i;
> > > +    int hostcpus;
> > > +    int ret = -1;
> > > +
> > > +    virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
> > > +                  VIR_DOMAIN_AFFECT_CONFIG, -1);
> > > +
> > > +    if (!(vm = testDomObjFromDomain(dom)))
> > > +        goto cleanup;
> > > +
> > > +    if (!(def = virDomainObjGetOneDef(vm, flags)))
> > > +        goto cleanup;
> > > +
> > > +    if (def->niothreadids == 0)
> > > +        return 0;
> >
> > ^This will leave the object locked, so once you do Info, anything else after
> > that will deadlock, so goto is needed.
> >
> > Erik
>
> Of course... I don't know how I missed that. I guess I don't need to
> re-send it though only for this change?

No need, this can go straight in, I still need to look more closely on the
iothread deletion API though.

so for this one:
Reviewed-by: Erik Skultety <eskultet@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.