From patchwork Tue Nov 5 08:32:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 13862645 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 108F0D1266A for ; Tue, 5 Nov 2024 08:33:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8EzM-00042u-32; Tue, 05 Nov 2024 03:32:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8Ez6-0003yw-Af for qemu-devel@nongnu.org; Tue, 05 Nov 2024 03:32:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8Ez4-0006lb-DW for qemu-devel@nongnu.org; Tue, 05 Nov 2024 03:32:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730795535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XlpeZu8PQNVmBeZ7e1W+G4VWHpOwVNux592PqTOuuho=; b=H+BveNQsMfwI+uN+mnVJ51a3Y5MRXpk8TpeFL1Napartv8MnSY7WhKzaDJwrI+jHOcvPWn wWHalexCZ8LXLRWCkrRuS08rHSP7dPFtwNiYk8vx7vm4r/N6WoWgbpAVG2cwIHxFV8kXtW Gt3vl+dVMTNgsGHolfKLWjDO75K+ZZs= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-515-olKn2pRLNr-z-LlALsP9EQ-1; Tue, 05 Nov 2024 03:32:11 -0500 X-MC-Unique: olKn2pRLNr-z-LlALsP9EQ-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 010CE1955F37; Tue, 5 Nov 2024 08:32:09 +0000 (UTC) Received: from localhost (unknown [10.39.208.8]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E122D19560AA; Tue, 5 Nov 2024 08:32:06 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: mjt@tls.msk.ru, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann Subject: [PATCH] hw/audio/hda: avoid unnecessary re-open stream on reconfiguration Date: Tue, 5 Nov 2024 12:32:03 +0400 Message-ID: <20241105083203.2230983-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.34, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Marc-André Lureau Closing and opening a stream too quickly during reconfiguration create issues with Spice. Note: the issue with Spice has been there before and still is. When the audio stream is recreated, for example when using `out.mixing-engine=false`. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2639 Fixes: 6d6e23361f ("hw/audio/hda: fix memory leak on audio setup") Signed-off-by: Marc-André Lureau --- hw/audio/hda-codec.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/audio/hda-codec.c b/hw/audio/hda-codec.c index bc661504cf..b734a5c718 100644 --- a/hw/audio/hda-codec.c +++ b/hw/audio/hda-codec.c @@ -502,7 +502,15 @@ static void hda_audio_setup(HDAAudioStream *st) trace_hda_audio_format(st->node->name, st->as.nchannels, fmt2name[st->as.fmt], st->as.freq); - hda_close_stream(st->state, st); + /* + * Do not hda_close_stream(st->state, st), AUD_open_() handles the logic for + * fixed_settings, and same format. This helps prevent race issues in Spice + * server & client code too. (see #2639) + */ + if (use_timer) { + timer_free(st->buft); + st->buft = NULL; + } if (st->output) { if (use_timer) { cb = hda_audio_output_cb;