From patchwork Sun Oct 13 19:58:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 11187509 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9828E1668 for ; Sun, 13 Oct 2019 20:07:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6CFA220673 for ; Sun, 13 Oct 2019 20:07:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j3AAwwsM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CFA220673 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:42066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJk9Z-0006JR-LK for patchwork-qemu-devel@patchwork.kernel.org; Sun, 13 Oct 2019 16:07:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37277) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJk0O-0005TU-3g for qemu-devel@nongnu.org; Sun, 13 Oct 2019 15:58:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJk0N-0003IZ-1W for qemu-devel@nongnu.org; Sun, 13 Oct 2019 15:58:16 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJk0M-0003HU-S2 for qemu-devel@nongnu.org; Sun, 13 Oct 2019 15:58:14 -0400 Received: by mail-wr1-x444.google.com with SMTP id j11so17263360wrp.1 for ; Sun, 13 Oct 2019 12:58:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8TTUthXqXhh1DdLxMpTCEbLpELmMAAhIVdhapb9+b1E=; b=j3AAwwsMmK1wBGCWAY08+feGmI9W/OiiQxbXFLKlgUIqJBfMggl4hQ20inpDRNnH0z oziaZ2dlzqEvRXy6fbCVXTDWBNnPy0HzCSe8M6d646AJ0ihFvWTlxuxYKFn8H3SZMQSG ZzSGTnClL1R+g2IFX8PUBHUzf//NTGboiKKie9iZS5bFyXL5qwMHqWNycqZUR+cf+eVa PwL9m8XwtAoHUotI8Qiz1E4WAcyJDCEp21E6IWlweOu85WDWIEbiyoVpNcYsf9VvyUhM JMr/ZonTEgL2TR4z2+lq5ZY+OI0unmg41TqKahXXrzCAukmjtsZxLAyTRImkCVIcHpNK e7hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8TTUthXqXhh1DdLxMpTCEbLpELmMAAhIVdhapb9+b1E=; b=lj595W5ttyZen2dkzFVcBiPZwcMAeBKRIGg5YHPn/5MRb6uHdUJ1eZY6rmr6nG4Oww mqpuQ0KwQdsaCAbPjW/1khksx0Jg3J24Yt0/vuQvDrDokJE5ppbJkzEVSU2Qd2mBdyBj aDdHiZUtVMsmH57qPE0p7PaSJG6XjTv9ouV1ZJlntyTapFgLvwhSPkZuA26MOEJoyJwC +9FbT/vsjk9+mtUikcoqLv4LVqPcZFJe71s/aq7yZVS9USQ0J/O6xJ6H1rm/HVXXFyfc J7DDlVKsBl8tKxrlZY0CdLoBE0P+z+3CnaJHocGJ9gB/bpVzweDibOZ6sOKjWcZxQTtd gwbw== X-Gm-Message-State: APjAAAV/cwEB/wkLzR3OPogVdo17o1GCjd3OZ4ZsyvoGKALPh9M3YeDC V1KOmyfMMIJ9yNuo9nCJZUwykiw6 X-Google-Smtp-Source: APXvYqxONJH4A4co2xrTivkqxeS61xKWlPRBwR/iJL71RP6wV3pPYu4qd2itDZy82VelvOuuUzyqKQ== X-Received: by 2002:a5d:51d2:: with SMTP id n18mr22694214wrv.225.1570996693775; Sun, 13 Oct 2019 12:58:13 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-0052-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:52::5]) by smtp.gmail.com with ESMTPSA id x129sm29941857wmg.8.2019.10.13.12.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2019 12:58:13 -0700 (PDT) From: " =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= " X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Subject: [PATCH v6 07/10] usb-audio: do not count on avail bytes actually available Date: Sun, 13 Oct 2019 21:58:04 +0200 Message-Id: X-Mailer: git-send-email 2.23.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This assumption is no longer true when mixeng is turned off. Signed-off-by: Kővágó, Zoltán --- hw/usb/dev-audio.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index ae42e5a2f1..74c99b1f12 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -319,30 +319,31 @@ static int streambuf_put(struct streambuf *buf, USBPacket *p) { uint32_t free = buf->size - (buf->prod - buf->cons); - if (!free) { + if (free < USBAUDIO_PACKET_SIZE) { return 0; } if (p->iov.size != USBAUDIO_PACKET_SIZE) { return 0; } - assert(free >= USBAUDIO_PACKET_SIZE); + usb_packet_copy(p, buf->data + (buf->prod % buf->size), USBAUDIO_PACKET_SIZE); buf->prod += USBAUDIO_PACKET_SIZE; return USBAUDIO_PACKET_SIZE; } -static uint8_t *streambuf_get(struct streambuf *buf) +static uint8_t *streambuf_get(struct streambuf *buf, size_t *len) { uint32_t used = buf->prod - buf->cons; uint8_t *data; if (!used) { + *len = 0; return NULL; } - assert(used >= USBAUDIO_PACKET_SIZE); data = buf->data + (buf->cons % buf->size); - buf->cons += USBAUDIO_PACKET_SIZE; + *len = MIN(buf->prod - buf->cons, + buf->size - (buf->cons % buf->size)); return data; } @@ -374,16 +375,21 @@ static void output_callback(void *opaque, int avail) USBAudioState *s = opaque; uint8_t *data; - for (;;) { - if (avail < USBAUDIO_PACKET_SIZE) { + while (avail) { + size_t written, len; + + data = streambuf_get(&s->out.buf, &len); + if (!data) { return; } - data = streambuf_get(&s->out.buf); - if (!data) { + + written = AUD_write(s->out.voice, data, len); + avail -= written; + s->out.buf.cons += written; + + if (written < len) { return; } - AUD_write(s->out.voice, data, USBAUDIO_PACKET_SIZE); - avail -= USBAUDIO_PACKET_SIZE; } }