Series comparison

-[Qemu-devel] [PULL for-2.11 0/1] Block patches
+[PULL 0/1] Block patches
-The following changes since commit 8048082f7a11040a366942a2de8abb4c3d0020c9:
+The following changes since commit 6338c30111d596d955e6bc933a82184a0b910c43:
-  Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-11-15-1' into staging (2017-11-16 11:34:24 +0000)
+  Merge tag 'm68k-for-7.2-pull-request' of https://github.com/vivier/qemu-m68k into staging (2022-09-21 13:12:36 -0400)
-are available in the git repository at:
+are available in the Git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 341e0b5658681f46680024cdbfc998717d85cc35:
+for you to fetch changes up to f16d15c9276bd8f501f861c39cbd4adc812d0c1d:
-  throttle-groups: forget timer and schedule next TGM on detach (2017-11-16 14:12:57 +0000)
+  virtiofsd: use g_date_time_get_microsecond to get subsecond (2022-09-22 13:13:47 -0400)
 ----------------------------------------------------------------
 Pull request
 ----------------------------------------------------------------
-----------------------------------------------------------------
+Yusuke Okada (1):
   virtiofsd: use g_date_time_get_microsecond to get subsecond
-Stefan Hajnoczi (1):
+ tools/virtiofsd/passthrough_ll.c | 7 +++++--
-  throttle-groups: forget timer and schedule next TGM on detach
+file changed, 5 insertions(+), 2 deletions(-)
  block/throttle-groups.c | 12 ++++++++++++
 file changed, 12 insertions(+)
 --
-.13.6
+.37.3

-[Qemu-devel] [PULL for-2.11 1/1] throttle-groups: forget timer and schedule next TGM on detach
+[PULL 1/1] virtiofsd: use g_date_time_get_microsecond to get subsecond
-tg->any_timer_armed[] must be cleared when detaching pending timers from
+From: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
 the AioContext.  Failure to do so leads to hung I/O because it looks
 like there are still timers pending when in fact they have been removed.
-Other ThrottleGroupMembers might have requests pending too so it's
+The "%f" specifier in g_date_time_format() is only available in glib
-necessary to schedule the next TGM so it can set a timer.
+.65.2 or later. If combined with older glib, the function returns null
 and the timestamp displayed as "(null)".
-This patch fixes hung I/O when QEMU is launched with drives that are in
+For backward compatibility, g_date_time_get_microsecond should be used
-the same throttling group:
+to retrieve subsecond.
-  (guest)$ dd if=/dev/zero of=/dev/vdb oflag=direct bs=512 &
+In this patch the g_date_time_format() leaves subsecond field as "%06d"
-  (guest)$ dd if=/dev/zero of=/dev/vdc oflag=direct bs=512 &
+and let next snprintf to format with g_date_time_get_microsecond.
   (qemu) stop
   (qemu) cont
   ...I/O is stuck...
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
-Message-id: 20171116112150.27607-1-stefanha@redhat.com
+Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 Message-id: 20220818184618.2205172-1-yokada.996@gmail.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/throttle-groups.c | 12 ++++++++++++
+ tools/virtiofsd/passthrough_ll.c | 7 +++++--
-file changed, 12 insertions(+)
+file changed, 5 insertions(+), 2 deletions(-)
-diff --git a/block/throttle-groups.c b/block/throttle-groups.c
+diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/throttle-groups.c
+--- a/tools/virtiofsd/passthrough_ll.c
-+++ b/block/throttle-groups.c
++++ b/tools/virtiofsd/passthrough_ll.c
-@@ -XXX,XX +XXX,XX @@ void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
+@@ -XXX,XX +XXX,XX @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile)
+ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
  void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
  {
-+    ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
+     g_autofree char *localfmt = NULL;
-     ThrottleTimers *tt = &tgm->throttle_timers;
++    char buf[64];
-+    int i;
+     if (current_log_level < level) {
-     /* Requests must have been drained */
+         return;
-     assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
+@@ -XXX,XX +XXX,XX @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
-     assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
+                                        fmt);
-     assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
+         } else {
+             g_autoptr(GDateTime) now = g_date_time_new_now_utc();
-+    /* Kick off next ThrottleGroupMember, if necessary */
+-            g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z");
-+    qemu_mutex_lock(&tg->lock);
++            g_autofree char *nowstr = g_date_time_format(now,
-+    for (i = 0; i < 2; i++) {
++                                       "%Y-%m-%d %H:%M:%S.%%06d%z");
-+        if (timer_pending(tt->timers[i])) {
++            snprintf(buf, 64, nowstr, g_date_time_get_microsecond(now));
-+            tg->any_timer_armed[i] = false;
+             localfmt = g_strdup_printf("[%s] [ID: %08ld] %s",
-+            schedule_next_request(tgm, i);
+-                                       nowstr, syscall(__NR_gettid), fmt);
-+        }
++                                       buf, syscall(__NR_gettid), fmt);
-+    }
+         }
-+    qemu_mutex_unlock(&tg->lock);
+         fmt = localfmt;
-+
+     }
      throttle_timers_detach_aio_context(tt);
      tgm->aio_context = NULL;
  }
 --
-.13.6
+.37.3

tg->any_timer_armed[] must be cleared when detaching pending timers from
the AioContext.  Failure to do so leads to hung I/O because it looks
like there are still timers pending when in fact they have been removed.

Other ThrottleGroupMembers might have requests pending too so it's
necessary to schedule the next TGM so it can set a timer.

This patch fixes hung I/O when QEMU is launched with drives that are in
the same throttling group:

(guest)$ dd if=/dev/zero of=/dev/vdb oflag=direct bs=512 &
  (guest)$ dd if=/dev/zero of=/dev/vdc oflag=direct bs=512 &
  (qemu) stop
  (qemu) cont
  ...I/O is stuck...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20171116112150.27607-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/throttle-groups.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/block/throttle-groups.c b/block/throttle-groups.c
index XXXXXXX..XXXXXXX 100644
--- a/block/throttle-groups.c
+++ b/block/throttle-groups.c
@@ -XXX,XX +XXX,XX @@ void throttle_group_attach_aio_context(ThrottleGroupMember *tgm,
 
 void throttle_group_detach_aio_context(ThrottleGroupMember *tgm)
 {
+    ThrottleGroup *tg = container_of(tgm->throttle_state, ThrottleGroup, ts);
     ThrottleTimers *tt = &tgm->throttle_timers;
+    int i;
 
     /* Requests must have been drained */
     assert(tgm->pending_reqs[0] == 0 && tgm->pending_reqs[1] == 0);
     assert(qemu_co_queue_empty(&tgm->throttled_reqs[0]));
     assert(qemu_co_queue_empty(&tgm->throttled_reqs[1]));
 
+    /* Kick off next ThrottleGroupMember, if necessary */
+    qemu_mutex_lock(&tg->lock);
+    for (i = 0; i < 2; i++) {
+        if (timer_pending(tt->timers[i])) {
+            tg->any_timer_armed[i] = false;
+            schedule_next_request(tgm, i);
+        }
+    }
+    qemu_mutex_unlock(&tg->lock);
+
     throttle_timers_detach_aio_context(tt);
     tgm->aio_context = NULL;
 }
-- 
2.13.6

From: Yusuke Okada <okada.yusuke@jp.fujitsu.com>

The "%f" specifier in g_date_time_format() is only available in glib
2.65.2 or later. If combined with older glib, the function returns null
and the timestamp displayed as "(null)".

For backward compatibility, g_date_time_get_microsecond should be used
to retrieve subsecond.

In this patch the g_date_time_format() leaves subsecond field as "%06d"
and let next snprintf to format with g_date_time_get_microsecond.

Signed-off-by: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 20220818184618.2205172-1-yokada.996@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tools/virtiofsd/passthrough_ll.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index XXXXXXX..XXXXXXX 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -XXX,XX +XXX,XX @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile)
 static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
 {
     g_autofree char *localfmt = NULL;
+    char buf[64];
 
     if (current_log_level < level) {
         return;
@@ -XXX,XX +XXX,XX @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
                                        fmt);
         } else {
             g_autoptr(GDateTime) now = g_date_time_new_now_utc();
-            g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z");
+            g_autofree char *nowstr = g_date_time_format(now,
+                                       "%Y-%m-%d %H:%M:%S.%%06d%z");
+            snprintf(buf, 64, nowstr, g_date_time_get_microsecond(now));
             localfmt = g_strdup_printf("[%s] [ID: %08ld] %s",
-                                       nowstr, syscall(__NR_gettid), fmt);
+                                       buf, syscall(__NR_gettid), fmt);
         }
         fmt = localfmt;
     }
-- 
2.37.3