From patchwork Wed Feb 28 01:36:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 207599 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp3080001dyb; Tue, 27 Feb 2024 17:49:41 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWsA75M8eE/IQpLS84u40EJNYTYWzVOWlAkAME6Tfk76HrcKYuFqUFjWYyVAIMhRBdCoOO7fq9gvWqdrwvVejX6Co6q8Q== X-Google-Smtp-Source: AGHT+IGKnZqClnEMsvhgDmjCH2Phlmn3GpqWdcgNHl9g55tZM8WRXLKFQYfMsIKt3L2dVQE8fj2y X-Received: by 2002:a05:6808:13c9:b0:3c1:7c22:c62c with SMTP id d9-20020a05680813c900b003c17c22c62cmr4902346oiw.40.1709084981701; Tue, 27 Feb 2024 17:49:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709084981; cv=pass; d=google.com; s=arc-20160816; b=qarON7Nd74VUUUfCEvOm7myKml7Srb/Qg17CqeAgl/SbsevoMyBUAjayWgXmd5I+u0 8CbamDxKKvgfn4x1mFt2l0CtO4splDLd9jIooz6kDNO6RcwzyeFVvbYde4ZnxuCMNw2l NUHIpYaaL3o9bfKXq7oULs4SDfK3dKYImO3cKJWJm9irWanCLfh2c/BTNNxfW8iNK7/w suoDNVtbOFex6/QkSyJ+WZ+UkqP5PtNOWmWlw/v6OoHj+TprHcvU00NvvnQj1GKLZ/UB ObldBFLXk2iBhHaVDKWfQxTxZusB7/m3Qb2Cpq7X2uB7BEA/DRh0wWkuA2pxSVDXvHBn SqBw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TpwOAfyqOPAgZ/VwWPB85gMdXpP36sPB+y45fk5KoPQ=; fh=VKrp0Y7I/+wT36BfKZ6oI/4N9BIwFCn9zerObkOrgGw=; b=kPlglpKoU4kd8PYzMLfODapShhf1aTnkWMLfLGqBa3vNOowoVU5jKYaM5Yu2lR5GGp C9s14kBHYDzSBAVYi3YSVCeE6653n3hsNVXrEbIrZreywpQ8tLzJ3jasA0qhMPExKW6Q ZStZkdjiMHhnpZDO2nCqsrrdV3wSECl2rkQ/U7IAxAOE8CKbMZrc5GAGbscuiWfB3ka1 0jswiTUXePoLvDQck3XaYgrIxL+waeI5NLmf8fztSkF/CUtLRceLTPNc6y4gMLk7y2hL BoSeGk4T888xTmFjRvC1Rzwcpv6scXESLURDfwqkQdq39xmu7bmB1NGEwsuQg+ZBK4wR KzFg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=bFLNsopU; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-84359-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84359-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id g22-20020aa78196000000b006e365f0ab17si6289864pfi.313.2024.02.27.17.49.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 17:49:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-84359-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=bFLNsopU; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-84359-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-84359-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 7AADC289110 for ; Wed, 28 Feb 2024 01:48:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D6A895786A; Wed, 28 Feb 2024 01:37:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="bFLNsopU" Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0F4E224DA; Wed, 28 Feb 2024 01:36:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709084218; cv=none; b=AFV7sdLGnPDmq4GQfiAbZ666IJdtRpSNgk15nEXra3OEFkG3gyXW3wfvNjucRvYwUOmVWrCYe7pMGaM1F8PDbW5e+eafsIdBBmoBWZnOJw6Q9eiJWQ+DexYlix3+vtFN696WgD6hdMHLHdZrAf8R+//Ca4EafeRuZ/fONWbDQu8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709084218; c=relaxed/simple; bh=c9cBIvB9gJ0iRjmdwjmxFBq3GIAlsGXKejPSwin0vYg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U9gUgEp90pErpgVXjcHDf0YiZzZen8OP6jnUyQ+gJZ3UJEjJsnIKXqZ1q7REO3gZ65sh3LM1fl1paJYveT6aU+8M0riEQseT7qnStgpaTfxGGNfUzQ/uCl3KNTRP6NRGogJM/6PyWCqpbmUk6/SAsRyukNIbdS3ik8kmZio8nGU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=bFLNsopU; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41S0lTI7015340; Wed, 28 Feb 2024 01:36:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type; s=qcppdkim1; bh=TpwOAfyqOPAgZ/VwWPB8 5gMdXpP36sPB+y45fk5KoPQ=; b=bFLNsopUOqgbbLvJrJf+o+2W5xyA1XA1G9MW fZvz4J9yD4SVilB98iocc0Jkt7pqoi+KaZbDnPYv7HoTW3Alcizdpp+zcqBDe6yE f3nRMu6zOi4XT401Jl5fFbtYH2qzDipKgILUk3sgAbJNik1t2tVb2dvWJcznoHvm +XHvUwiLJOgr97GS7S6Am9TgKAiQB5bVh+RudoMOuKjNwtnWe1zUZqe2YGJNik5B rRufTyyqepYd5IADgm1rn8ACzW3a/+CZERlS3BN769eZzaoPsYNpLxCyDlFyjzY/ El3nDIHDlk8TcvK1nkBlXCxlMwCQgM0C0cpUcmMal9UEFOT+Jg== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3whthv02ke-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Feb 2024 01:36:37 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41S1aaOX029861 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Feb 2024 01:36:36 GMT Received: from hu-wcheng-lv.qualcomm.com (10.49.16.6) by nalasex01b.na.qualcomm.com (10.47.209.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Tue, 27 Feb 2024 17:36:35 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v18 24/41] ALSA: usb-audio: Prevent starting of audio stream if in use Date: Tue, 27 Feb 2024 17:36:02 -0800 Message-ID: <20240228013619.29758-25-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240228013619.29758-1-quic_wcheng@quicinc.com> References: <20240228013619.29758-1-quic_wcheng@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nalasex01b.na.qualcomm.com (10.47.209.197) To nalasex01b.na.qualcomm.com (10.47.209.197) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: -tHmLBH7EMfybygXoHiDpDU9SariM0W6 X-Proofpoint-GUID: -tHmLBH7EMfybygXoHiDpDU9SariM0W6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-27_11,2024-02-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 adultscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2402120000 definitions=main-2402280011 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792105493473844176 X-GMAIL-MSGID: 1792105493473844176 With USB audio offloading, an audio session is started from the ASoC platform sound card and PCM devices. Likewise, the USB SND path is still readily available for use, in case the non-offload path is desired. In order to prevent the two entities from attempting to use the USB bus, introduce a flag that determines when either paths are in use. If a PCM device is already in use, the check will return an error to userspace notifying that the stream is currently busy. This ensures that only one path is using the USB substream. Signed-off-by: Wesley Cheng --- sound/usb/card.h | 1 + sound/usb/pcm.c | 29 ++++++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/sound/usb/card.h b/sound/usb/card.h index d66cc0b139af..3c900e5afbce 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -165,6 +165,7 @@ struct snd_usb_substream { unsigned int pkt_offset_adj; /* Bytes to drop from beginning of packets (for non-compliant devices) */ unsigned int stream_offset_adj; /* Bytes to drop from beginning of stream (for non-compliant devices) */ + unsigned int opened:1; /* pcm device opened */ unsigned int running: 1; /* running status */ unsigned int period_elapsed_pending; /* delay period handling */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 3adb09ce1702..3e6d33de6ce6 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1241,8 +1241,17 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream) struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_usb_substream *subs = &as->substream[direction]; + struct snd_usb_audio *chip = subs->stream->chip; int ret; + mutex_lock(&chip->mutex); + if (subs->opened) { + mutex_unlock(&chip->mutex); + return -EBUSY; + } + subs->opened = 1; + mutex_unlock(&chip->mutex); + runtime->hw = snd_usb_hardware; /* need an explicit sync to catch applptr update in low-latency mode */ if (direction == SNDRV_PCM_STREAM_PLAYBACK && @@ -1259,13 +1268,23 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream) ret = setup_hw_info(runtime, subs); if (ret < 0) - return ret; + goto err_open; ret = snd_usb_autoresume(subs->stream->chip); if (ret < 0) - return ret; + goto err_open; ret = snd_media_stream_init(subs, as->pcm, direction); if (ret < 0) - snd_usb_autosuspend(subs->stream->chip); + goto err_resume; + + return 0; + +err_resume: + snd_usb_autosuspend(subs->stream->chip); +err_open: + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); + return ret; } @@ -1274,6 +1293,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream) int direction = substream->stream; struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_usb_substream *subs = &as->substream[direction]; + struct snd_usb_audio *chip = subs->stream->chip; int ret; snd_media_stop_pipeline(subs); @@ -1287,6 +1307,9 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream) subs->pcm_substream = NULL; snd_usb_autosuspend(subs->stream->chip); + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); return 0; }