From nobody Fri Oct 10 17:34:19 2025 Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7BEE620DD40; Fri, 13 Jun 2025 15:50:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=93.17.236.30 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749829852; cv=none; b=Tgs9oHBCwEGanwB66KZ1I/pg08f1L46f6/jSmNK7DK1HHcDun1YrboMAhzNpyD1P/qRKPNbNRVRQ9AMdTWk1RorA9PMrMRmxonA3O/UXneg1+mVb+jW0kQS2M9ei5FXobT930jBNvC1rclELDyc113QNjBq19fnwQeH/hF0I++k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749829852; c=relaxed/simple; bh=VBm68IbYDQlcJwzAKKX7XTkORSsL7QzafbqZ2PWnfeo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GTueP5Z9kZrB+aeMhqcaL9p9SS9Rgg5ja9RfWF/2TES4ppVGsol9DX4muvpsrFuUhiB6JandkjC2WkUzux6mI5tLcjw/qWWLJte2QeOYLvyZAUDzZk1O7NomnyX+SlvtJO+VY+sdXJ1GRMPC1plkJ2fyoG0vibh292j+J+qeOTU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu; spf=pass smtp.mailfrom=csgroup.eu; arc=none smtp.client-ip=93.17.236.30 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=csgroup.eu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=csgroup.eu Received: from localhost (mailhub3.si.c-s.fr [192.168.12.233]) by localhost (Postfix) with ESMTP id 4bJk6V0jCdz9swJ; Fri, 13 Jun 2025 17:37:22 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jWHcplSs7NHT; Fri, 13 Jun 2025 17:37:22 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4bJk6Q4gjTz9st0; Fri, 13 Jun 2025 17:37:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 9BDA48B769; Fri, 13 Jun 2025 17:37:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Rb6hNhlGZvAw; Fri, 13 Jun 2025 17:37:18 +0200 (CEST) Received: from PO20335.idsi0.si.c-s.fr (unknown [192.168.235.99]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 31AC48B77C; Fri, 13 Jun 2025 17:37:18 +0200 (CEST) From: Christophe Leroy To: Jaroslav Kysela , Takashi Iwai Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sound@vger.kernel.org, Herve Codina Subject: [PATCH v2 4/4] ALSA: pcm: Convert snd_pcm_sync_ptr() to user_access_begin/user_access_end() Date: Fri, 13 Jun 2025 17:37:11 +0200 Message-ID: <0aff11ade645339ed659f9b97da4e0a535041db3.1749828169.git.christophe.leroy@csgroup.eu> X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1749829028; l=3615; i=christophe.leroy@csgroup.eu; s=20211009; h=from:subject:message-id; bh=VBm68IbYDQlcJwzAKKX7XTkORSsL7QzafbqZ2PWnfeo=; b=ATJzTdt+6UCojlfTymIkOnWF5cTZ9voZv/8igg5qs1ggdznb+SngDRntbXrFW+XzvYR3si2fa JHv/2MQqFYoB2hfSkibeG3oGzi18h3H/QI+dcVKMnZqxORX56ney2Eh X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now that snd_pcm_sync_ptr_get_user() and snd_pcm_sync_ptr_put_user() are converted to user_access_begin/user_access_end(), snd_pcm_sync_ptr_get_user() is more efficient than a raw get_user() followed by a copy_from_user(). And because copy_{to/from}_user() are generic functions focussed on transfer of big data blocks to/from user, snd_pcm_sync_ptr_put_user() is also more efficient for small amont of data. So use snd_pcm_sync_ptr_get_user() and snd_pcm_sync_ptr_put_user() in snd_pcm_sync_ptr() too. snd_pcm_ioctl_sync_ptr_buggy() is left as it is because the conversion wouldn't be straigh-forward due to the workaround it provides. Signed-off-by: Christophe Leroy --- sound/core/pcm_native.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 5ba2fbc0f0f7..b7880ca01cd9 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3094,45 +3094,43 @@ static int snd_pcm_sync_ptr(struct snd_pcm_substrea= m *substream, struct snd_pcm_sync_ptr __user *_sync_ptr) { struct snd_pcm_runtime *runtime =3D substream->runtime; - struct snd_pcm_sync_ptr sync_ptr; volatile struct snd_pcm_mmap_status *status; volatile struct snd_pcm_mmap_control *control; + u32 sflags; + struct snd_pcm_mmap_control scontrol; + struct snd_pcm_mmap_status sstatus; int err; =20 - memset(&sync_ptr, 0, sizeof(sync_ptr)); - if (get_user(sync_ptr.flags, (unsigned __user *)&(_sync_ptr->flags))) + if (snd_pcm_sync_ptr_get_user(sflags, scontrol, _sync_ptr)) return -EFAULT; - if (copy_from_user(&sync_ptr.c.control, &(_sync_ptr->c.control), sizeof(s= truct snd_pcm_mmap_control))) - return -EFAULT;=09 status =3D runtime->status; control =3D runtime->control; - if (sync_ptr.flags & SNDRV_PCM_SYNC_PTR_HWSYNC) { + if (sflags & SNDRV_PCM_SYNC_PTR_HWSYNC) { err =3D snd_pcm_hwsync(substream); if (err < 0) return err; } scoped_guard(pcm_stream_lock_irq, substream) { - if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL)) { - err =3D pcm_lib_apply_appl_ptr(substream, - sync_ptr.c.control.appl_ptr); + if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL)) { + err =3D pcm_lib_apply_appl_ptr(substream, scontrol.appl_ptr); if (err < 0) return err; } else { - sync_ptr.c.control.appl_ptr =3D control->appl_ptr; + scontrol.appl_ptr =3D control->appl_ptr; } - if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN)) - control->avail_min =3D sync_ptr.c.control.avail_min; + if (!(sflags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN)) + control->avail_min =3D scontrol.avail_min; else - sync_ptr.c.control.avail_min =3D control->avail_min; - sync_ptr.s.status.state =3D status->state; - sync_ptr.s.status.hw_ptr =3D status->hw_ptr; - sync_ptr.s.status.tstamp =3D status->tstamp; - sync_ptr.s.status.suspended_state =3D status->suspended_state; - sync_ptr.s.status.audio_tstamp =3D status->audio_tstamp; + scontrol.avail_min =3D control->avail_min; + sstatus.state =3D status->state; + sstatus.hw_ptr =3D status->hw_ptr; + sstatus.tstamp =3D status->tstamp; + sstatus.suspended_state =3D status->suspended_state; + sstatus.audio_tstamp =3D status->audio_tstamp; } - if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL)) + if (!(sflags & SNDRV_PCM_SYNC_PTR_APPL)) snd_pcm_dma_buffer_sync(substream, SNDRV_DMA_SYNC_DEVICE); - if (copy_to_user(_sync_ptr, &sync_ptr, sizeof(sync_ptr))) + if (snd_pcm_sync_ptr_put_user(sstatus, scontrol, _sync_ptr)) return -EFAULT; return 0; } --=20 2.47.0