[PATCH 1/1] 9pfs: suppress performance warnings on qtest runs

[PATCH 1/1] 9pfs: suppress performance warnings on qtest runs

[Christian Schoenebeck]

Don't trigger any performance warning if we're just running test cases,
because tests intentionally run for edge cases.

So far performance warnings were suppressed for the 'synth' fs driver
backend only. This patch suppresses them for all 9p fs driver backends.

Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
 hw/9pfs/9p-synth.c         | 2 --
 hw/9pfs/virtio-9p-device.c | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c
index cec8c0eefc..7eb210ffa8 100644
--- a/hw/9pfs/9p-synth.c
+++ b/hw/9pfs/9p-synth.c
@@ -541,8 +541,6 @@ static int synth_init(FsContext *ctx, Error **errp)
     QLIST_INIT(&synth_root.child);
     qemu_mutex_init(&synth_mutex);
 
-    ctx->export_flags |= V9FS_NO_PERF_WARN;
-
     /* Add "." and ".." entries for root */
     v9fs_add_dir_node(&synth_root, synth_root.attr->mode,
                       "..", synth_root.attr, synth_root.attr->inode);
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 36f3aa9352..14371a78ef 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -21,6 +21,7 @@
 #include "hw/virtio/virtio-access.h"
 #include "qemu/iov.h"
 #include "qemu/module.h"
+#include "sysemu/qtest.h"
 
 static void virtio_9p_push_and_notify(V9fsPDU *pdu)
 {
@@ -199,6 +200,11 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp)
     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
     V9fsVirtioState *v = VIRTIO_9P(dev);
     V9fsState *s = &v->state;
+    FsDriverEntry *fse = get_fsdev_fsentry(s->fsconf.fsdev_id);
+
+    if (qtest_enabled() && fse) {
+        fse->export_flags |= V9FS_NO_PERF_WARN;
+    }
 
     if (v9fs_device_realize_common(s, &virtio_9p_transport, errp)) {
         return;
-- 
2.20.1

Re: [PATCH 1/1] 9pfs: suppress performance warnings on qtest runs

[Greg Kurz]

On Mon, 19 Oct 2020 13:10:18 +0200
Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:

> Don't trigger any performance warning if we're just running test cases,
> because tests intentionally run for edge cases.
> 
> So far performance warnings were suppressed for the 'synth' fs driver
> backend only. This patch suppresses them for all 9p fs driver backends.
> 
> Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> ---

LGTM

Reviewed-by: Greg Kurz <groug@kaod.org>

>  hw/9pfs/9p-synth.c         | 2 --
>  hw/9pfs/virtio-9p-device.c | 6 ++++++
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c
> index cec8c0eefc..7eb210ffa8 100644
> --- a/hw/9pfs/9p-synth.c
> +++ b/hw/9pfs/9p-synth.c
> @@ -541,8 +541,6 @@ static int synth_init(FsContext *ctx, Error **errp)
>      QLIST_INIT(&synth_root.child);
>      qemu_mutex_init(&synth_mutex);
>  
> -    ctx->export_flags |= V9FS_NO_PERF_WARN;
> -
>      /* Add "." and ".." entries for root */
>      v9fs_add_dir_node(&synth_root, synth_root.attr->mode,
>                        "..", synth_root.attr, synth_root.attr->inode);
> diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> index 36f3aa9352..14371a78ef 100644
> --- a/hw/9pfs/virtio-9p-device.c
> +++ b/hw/9pfs/virtio-9p-device.c
> @@ -21,6 +21,7 @@
>  #include "hw/virtio/virtio-access.h"
>  #include "qemu/iov.h"
>  #include "qemu/module.h"
> +#include "sysemu/qtest.h"
>  
>  static void virtio_9p_push_and_notify(V9fsPDU *pdu)
>  {
> @@ -199,6 +200,11 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp)
>      VirtIODevice *vdev = VIRTIO_DEVICE(dev);
>      V9fsVirtioState *v = VIRTIO_9P(dev);
>      V9fsState *s = &v->state;
> +    FsDriverEntry *fse = get_fsdev_fsentry(s->fsconf.fsdev_id);
> +
> +    if (qtest_enabled() && fse) {
> +        fse->export_flags |= V9FS_NO_PERF_WARN;
> +    }
>  
>      if (v9fs_device_realize_common(s, &virtio_9p_transport, errp)) {
>          return;

Re: [PATCH 1/1] 9pfs: suppress performance warnings on qtest runs

[Christian Schoenebeck]

On Montag, 19. Oktober 2020 13:48:22 CEST Greg Kurz wrote:
> On Mon, 19 Oct 2020 13:10:18 +0200
> 
> Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> > Don't trigger any performance warning if we're just running test cases,
> > because tests intentionally run for edge cases.
> > 
> > So far performance warnings were suppressed for the 'synth' fs driver
> > backend only. This patch suppresses them for all 9p fs driver backends.
> > 
> > Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > ---
> 
> LGTM
> 
> Reviewed-by: Greg Kurz <groug@kaod.org>

Thanks Greg!

BTW, if you still have something to be merged, keep in mind freeze for 5.2 
starts next monday.

Best regards,
Christian Schoenebeck

Re: [PATCH 1/1] 9pfs: suppress performance warnings on qtest runs

[Greg Kurz]

On Mon, 19 Oct 2020 14:12:46 +0200
Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:

> On Montag, 19. Oktober 2020 13:48:22 CEST Greg Kurz wrote:
> > On Mon, 19 Oct 2020 13:10:18 +0200
> > 
> > Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> > > Don't trigger any performance warning if we're just running test cases,
> > > because tests intentionally run for edge cases.
> > > 
> > > So far performance warnings were suppressed for the 'synth' fs driver
> > > backend only. This patch suppresses them for all 9p fs driver backends.
> > > 
> > > Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > > ---
> > 
> > LGTM
> > 
> > Reviewed-by: Greg Kurz <groug@kaod.org>
> 
> Thanks Greg!
> 
> BTW, if you still have something to be merged, keep in mind freeze for 5.2 
> starts next monday.
> 

Nothing on my side. Thanks for the reminder anyway :)

Cheers,

--
Greg

> Best regards,
> Christian Schoenebeck
> 
>