qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Volker Rümelin" <vr_qemu@t-online.de>, M_O_Bz <m_o_bz@163.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PULL 05/15] hw/audio/hda-codec: fix multiplication overflow
Date: Fri, 1 Dec 2023 12:15:21 -0500	[thread overview]
Message-ID: <680135687270765d987ce9d5271d072b28c39fa0.1701450838.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1701450838.git.mst@redhat.com>

From: Volker Rümelin <vr_qemu@t-online.de>

After a relatively short time, there is an multiplication overflow
when multiplying (now - buft_start) with hda_bytes_per_second().
While the uptime now - buft_start only overflows after 2**63 ns
= 292.27 years, this happens hda_bytes_per_second() times faster
with the multiplication. At 44100 samples/s * 2 channels
* 2 bytes/channel = 176400 bytes/s that is 14.52 hours. After the
multiplication overflow the affected audio stream stalls.

Replace the multiplication and following division with muldiv64()
to prevent a multiplication overflow.

Fixes: 280c1e1cdb ("audio/hda: create millisecond timers that handle IO")
Reported-by: M_O_Bz <m_o_bz@163.com>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20231105172552.8405-1-vr_qemu@t-online.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/audio/hda-codec.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c
index b9ad1f4c39..f756e419bb 100644
--- a/hw/audio/hda-codec.c
+++ b/hw/audio/hda-codec.c
@@ -22,6 +22,7 @@
 #include "hw/qdev-properties.h"
 #include "intel-hda.h"
 #include "migration/vmstate.h"
+#include "qemu/host-utils.h"
 #include "qemu/module.h"
 #include "intel-hda-defs.h"
 #include "audio/audio.h"
@@ -189,9 +190,9 @@ struct HDAAudioState {
     bool     use_timer;
 };
 
-static inline int64_t hda_bytes_per_second(HDAAudioStream *st)
+static inline uint32_t hda_bytes_per_second(HDAAudioStream *st)
 {
-    return 2LL * st->as.nchannels * st->as.freq;
+    return 2 * (uint32_t)st->as.nchannels * (uint32_t)st->as.freq;
 }
 
 static inline void hda_timer_sync_adjust(HDAAudioStream *st, int64_t target_pos)
@@ -222,12 +223,18 @@ static void hda_audio_input_timer(void *opaque)
 
     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
 
-    int64_t buft_start = st->buft_start;
+    int64_t uptime = now - st->buft_start;
     int64_t wpos = st->wpos;
     int64_t rpos = st->rpos;
+    int64_t wanted_rpos;
 
-    int64_t wanted_rpos = hda_bytes_per_second(st) * (now - buft_start)
-                          / NANOSECONDS_PER_SECOND;
+    if (uptime <= 0) {
+        /* wanted_rpos <= 0 */
+        goto out_timer;
+    }
+
+    wanted_rpos = muldiv64(uptime, hda_bytes_per_second(st),
+                           NANOSECONDS_PER_SECOND);
     wanted_rpos &= -4; /* IMPORTANT! clip to frames */
 
     if (wanted_rpos <= rpos) {
@@ -286,12 +293,18 @@ static void hda_audio_output_timer(void *opaque)
 
     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
 
-    int64_t buft_start = st->buft_start;
+    int64_t uptime = now - st->buft_start;
     int64_t wpos = st->wpos;
     int64_t rpos = st->rpos;
+    int64_t wanted_wpos;
 
-    int64_t wanted_wpos = hda_bytes_per_second(st) * (now - buft_start)
-                          / NANOSECONDS_PER_SECOND;
+    if (uptime <= 0) {
+        /* wanted_wpos <= 0 */
+        goto out_timer;
+    }
+
+    wanted_wpos = muldiv64(uptime, hda_bytes_per_second(st),
+                           NANOSECONDS_PER_SECOND);
     wanted_wpos &= -4; /* IMPORTANT! clip to frames */
 
     if (wanted_wpos <= wpos) {
-- 
MST



  parent reply	other threads:[~2023-12-01 17:17 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-01 17:15 [PULL 00/15] virtio,pc,pci: fixes Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 01/15] osdep: add getloadavg Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 02/15] netdev: set timeout depending on loadavg Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 03/15] tests/acpi/bios-tables-test: do not write new blobs unless there are changes Michael S. Tsirkin
2023-12-01 17:27   ` Ani Sinha
2023-12-02 20:59     ` Michael S. Tsirkin
2024-01-24  8:58   ` Igor Mammedov
2024-01-24  9:47     ` Ani Sinha
2023-12-01 17:15 ` [PULL 04/15] hw/audio/virtio-snd-pci: fix the PCI class code Michael S. Tsirkin
2023-12-01 17:15 ` Michael S. Tsirkin [this message]
2023-12-01 17:15 ` [PULL 06/15] hw/audio/hda-codec: reenable the audio mixer Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 07/15] virtio-snd: check AUD_register_card return value Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 08/15] virtio-sound: add realize() error cleanup path Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 09/15] pcie_sriov: Remove g_new assertion Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 10/15] hw/acpi/erst: Do not ignore Error* in realize handler Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 11/15] hw/i386: fix short-circuit logic with non-optimizing builds Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 12/15] virtio-iommu: Remove useless !sdev check in virtio_iommu_probe() Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 13/15] msix: unset PCIDevice::msix_vector_poll_notifier in rollback Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 14/15] vhost-user: fix the reconnect error Michael S. Tsirkin
2023-12-01 17:15 ` [PULL 15/15] vhost-user-scsi: free the inflight area when reset Michael S. Tsirkin
2023-12-02 20:58 ` [PULL 00/15] virtio,pc,pci: fixes Michael S. Tsirkin
2023-12-04 14:45 ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=680135687270765d987ce9d5271d072b28c39fa0.1701450838.git.mst@redhat.com \
    --to=mst@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=m_o_bz@163.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=vr_qemu@t-online.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).