From patchwork Sat Feb 17 00:09:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wesley Cheng X-Patchwork-Id: 202484 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp71800dyc; Fri, 16 Feb 2024 16:26:19 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU1abajIdPevPYKKoIFzC91STluaPbhGnZQ+r08BxaYJqPXSPQpQXFFC1vYFxhAZFgiEDpkBBMGZ+HCkCA5aRbddyUUAA== X-Google-Smtp-Source: AGHT+IGwX3kvOpKsWXgTJ3wRvz3wLz/KneVcHgOkH1V5U+HUyNtYszJvrnIyUczKxLIb+LHCdsOb X-Received: by 2002:a05:6a00:4fd1:b0:6e0:41fa:7a15 with SMTP id le17-20020a056a004fd100b006e041fa7a15mr8058719pfb.22.1708129579786; Fri, 16 Feb 2024 16:26:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708129579; cv=pass; d=google.com; s=arc-20160816; b=N3r65lTI9RHyN7Ac2SkzEM2PsqM70ZkMASpYW5i9Pg1STVbLlHOP5AhISRJIUChWk+ I2XYkOd64zQVOWIzd4YqzMHtRz6vLZar3S53+82MZ4XXRSZh7qaio7rvzY8sK7X8yyTD HGZzVMvjFkcWleqeYiTHrexMTPydrbIlhfr82U2eFcxnEdEpf693Yr/Kai4qaQ2x2WsH +j0dTA0yaFcJ+XXSMp7Dmf1E4GWWgcZ9JLp5HrMHvOyRiMj/uZSS/BWMqLouFHhdGnEy TOM711NyeEY5YFw5UBLeNblu2WJ5tH55gKui4cfgW0AuUx+4XkurUl9sjLEBkRyCs0P/ 4zpg== 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=3zxXfN7nPIPgKpIBwejjElQKiwfnr2TqnGVPhrKJrNM=; fh=VKrp0Y7I/+wT36BfKZ6oI/4N9BIwFCn9zerObkOrgGw=; b=h38O7e0FhzgSnDhBFQMjsbA9+d5EAuBETzU5K3mxGSBImt9wT2dURwATSI6E8xLKBU tgUqo/QQWyK/5sU4G1LjZWhEzImlNF4Cmtgg7PU+xq9xvyjKw0SYY7T2AkYDRwbNH2Wk +bZ5PdxQ+HF4+T581Z1wPO8g5yB791cmUJNn1EhdCW0VUiKnmeZe0T6+UJrKrmPP6YIp T7awfMQwyN+HtY9xdriRfp90CM/Qk//1pG6cgCOT9Ceus9XkU9GvITl9g/W2A2vNftQY KdYYG3d9M2IGk2TfcPgR8+TK+OJvavOUbGsXSlWiPQ3XL6RMg9TZ21O3//30iDy9M/mf AV+g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=azvei4tq; 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-69550-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69550-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 n129-20020a632787000000b005dc875b87ddsi645340pgn.223.2024.02.16.16.26.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 16:26:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-69550-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=azvei4tq; 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-69550-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69550-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 8D45A28A75A for ; Sat, 17 Feb 2024 00:23:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 149337FBD2; Sat, 17 Feb 2024 00:11:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="azvei4tq" 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 97C5B4F8AA; Sat, 17 Feb 2024 00:10:59 +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=1708128662; cv=none; b=f6wLrTZQBM1CU1bYT6sJzglEuZcScCAdUdBPtpsUIs1LW8Ixy7TmbvWfdAcs5RuQ2b2aUjROv05mgxLnT8hI6PQyoVj61mV9P4N+vDsL6TZlv9XZ3iEUaQj3HSkfbl3yBeuvmeti/iN0ynSnODV/cemNA4GNAL3VWVfo9dWTFlM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708128662; c=relaxed/simple; bh=v5Qd+yk5eFsMdQyfVCnpYRgSBmU1vEelmLam1nicbNU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WYI5MOwX832HbIw0zEL5aIDg4XNgTzQxJIfOGjrLO/DOlGCMBT7h46Wi900xI+OIKRXTY2cr3pF7fZgkZTBE3f1bgYjvXKGjCpV1NLyRMDdHTdX56PPwRD6cTaTXZ3TMAMqUvsyXM80yk8xofs6+kl0v+n8XnmNS7Y3UfbXYi48= 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=azvei4tq; 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 (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41GNQBZD012882; Sat, 17 Feb 2024 00:10:41 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=3zxXfN7nPIPgKpIBwejj ElQKiwfnr2TqnGVPhrKJrNM=; b=azvei4tqueaRT6q5Ua3fXSsVMkgWbOFOU7Ds 1NyLEygVPbCOwXPM4fJLHvTZwR54tZSY2JI8FokyUKa6gz7oU1gg6lztreOYfT6f LwJOxvzCPkh7oDkLr2FSUYX2Sf317FlfhgMLwiJffULiOT7DTrOVOHFJdbuA9Wm7 lE7lDmSZ5aRFgAOHtw9C+BGUlOASrIUR3g3T3aZCl7h+qpqH87rhBt8Luxrebt6y u3iMWynF2jZev57+QTPreYvDGt+txmYATruKBJLfeQjm6bpXXr5779WYH8pVK9WN hSThgqv24ApRZC+Osjw3fuEfyNfGWTIZ3rsOukfEyeLTb0uZOA== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3wabeers4k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 17 Feb 2024 00:10:40 +0000 (GMT) Received: from nalasex01b.na.qualcomm.com (nalasex01b.na.qualcomm.com [10.47.209.197]) by NALASPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41H0AdS4012935 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 17 Feb 2024 00:10:39 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; Fri, 16 Feb 2024 16:10:38 -0800 From: Wesley Cheng To: , , , , , , , , , , , , , , CC: , , , , , , , Wesley Cheng Subject: [PATCH v17 33/51] ALSA: usb-audio: Prevent starting of audio stream if in use Date: Fri, 16 Feb 2024 16:09:59 -0800 Message-ID: <20240217001017.29969-34-quic_wcheng@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240217001017.29969-1-quic_wcheng@quicinc.com> References: <20240217001017.29969-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: nalasex01a.na.qualcomm.com (10.47.209.196) 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: N9c4nPF31pEaDt9gYy-x3_54UPxl7txa X-Proofpoint-GUID: N9c4nPF31pEaDt9gYy-x3_54UPxl7txa 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-16_23,2024-02-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 phishscore=0 mlxscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 impostorscore=0 suspectscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402160189 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791103682477979252 X-GMAIL-MSGID: 1791103682477979252 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 a03d0b5e242b..0b14f7f4c743 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; }