From nobody Fri Apr 24 16:24:45 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g2JFn4BlNz6bXwG for ; Fri, 24 Apr 2026 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2JFn0fjzz3bJg for ; Fri, 24 Apr 2026 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777047885; 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=yUZfiHBHGwsR/kG9a2NaCQOPpTMF3iNatNmZYilMRR0=; b=xaGVh1kty9fjGDJwmEpquSEQVMrlYiIHKMZhjr9VrHcefY2MzvNbUnJKTfu8Jcy9IPQUFF NVNBwuUWj5Ef7Z3uVJ3wrKDHw00o4cOTq3BVGyT7w1chigS85JLIszGOJmg0TqfrXZj/xe VxLYw0fRPHUTtewZrbsjZ7bzwr2tqx/aRcJ9X+D/jQRv6J7d71SdqoCu7Hf/IYrFRdfDb9 ouxaQT256HJgj/Y16I6KJ6d44UGiAPtFL+4Ws+xVlf+OC1Y4QvY8EnyY+n3HhNvUGzUvDU zUkJaPZHYkfyIUuuLbtvGZnV13/91h+3Ka6Dz6m1Nlu82HNG15J56bLDBN4Qlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777047885; a=rsa-sha256; cv=none; b=v368I8r7+R4+oMNDhcunHnJqw4c5x+509wZejgoVQv5CUCWZo0ZfZ1MCIoggUPeg9aGriC Ib49HSQJ2vxVOL4DBjvd6kYm3VOnFNcaSfn+BVDAWjUvab5dxpAgpo8HyVgI8OtBdQubgf O17PM/zos8rQaM/qAtgi8lMOMLw+rK5BJJPTmeiT0CnDF7BxAbIAcrbksGFJNZfyzkt8z/ KXRflVdn6ZyvAibEOBrVDqrFIhQaxmN9r4D5FEXdU1buFqkkit9CfhxnjpRNTM87K43mgi 4uxx32J7HAscrMuEglknFCxIbIJsw9T1592Sdt99u6HgIJuXgQlz7FJ0J2jStg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777047885; 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=yUZfiHBHGwsR/kG9a2NaCQOPpTMF3iNatNmZYilMRR0=; b=BLMYmKbdlh5AkAJsWpyDEUo1NzvDQAfvxig28y7cdirwyPZLTtAgBWO4d56OuJUHjC6vwo ZtRSHVPtzxbiNqwwhnfA19kXljY9APXENH4eT+ouofew00Zf/jmRdrTpITMcEnXyUA82FP YE2UElHKf5Cb3CrTRNQ/YD40vjkzxEqRw9ljp3E4S1/9qCvs+sGNlKEMLXnHRa/KFm1Lj8 FyGJSOa8NurHblgbv+Gi9LmR1jYqbcrauxNLnZ25OdDH9qgDdZ0bGNO8mB4Dfu6C2EelsC 7b21T0dKprCKEvYLB4SKp9cgmSpDpcDu3N2nH8SmPfl1i06riLsQdf0rZQLt1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2JFn05ghz19P9 for ; Fri, 24 Apr 2026 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a5d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 16:24:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Raphael 'kena' Poss From: Warner Losh Subject: git: a80ec2b51ac6 - main - speaker(4): make spkropen thread-safe List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a80ec2b51ac6b8f2588b927913e40c7a3d2862e6 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 16:24:45 +0000 Message-Id: <69eb994d.3a5d7.3e0b30d5@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a80ec2b51ac6b8f2588b927913e40c7a3d2862e6 commit a80ec2b51ac6b8f2588b927913e40c7a3d2862e6 Author: Raphael 'kena' Poss AuthorDate: 2026-01-01 16:34:44 +0000 Commit: Warner Losh CommitDate: 2026-04-24 16:23:06 +0000 speaker(4): make spkropen thread-safe Signed-off-by: Raphael Poss Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1922 --- sys/dev/speaker/spkr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 85789c107336..85a0c837f4b4 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -24,7 +25,6 @@ static d_ioctl_t spkrioctl; static struct cdevsw spkr_cdevsw = { .d_version = D_VERSION, - .d_flags = 0, .d_open = spkropen, .d_close = spkrclose, .d_write = spkrwrite, @@ -394,7 +394,7 @@ playstring(char *cp, size_t slen) * endtone(), and rest() functions defined above. */ -static bool spkr_active = false; /* exclusion flag */ +static int spkr_active = 0; /* exclusion flag */ static char *spkr_inbuf; /* incoming buf */ static int @@ -404,7 +404,7 @@ spkropen(struct cdev *dev, int flags, int fmt, struct thread *td) (void) printf("spkropen: entering with dev = %s\n", devtoname(dev)); #endif /* DEBUG */ - if (spkr_active) + if (!atomic_cmpset_int(&spkr_active, 0, 1)) return(EBUSY); else { #ifdef DEBUG @@ -412,7 +412,6 @@ spkropen(struct cdev *dev, int flags, int fmt, struct thread *td) #endif /* DEBUG */ playinit(); spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK); - spkr_active = true; return(0); } } @@ -453,7 +452,7 @@ spkrclose(struct cdev *dev, int flags, int fmt, struct thread *td) wakeup(&endtone); wakeup(&endrest); free(spkr_inbuf, M_SPKR); - spkr_active = false; + (void) atomic_swap_int(&spkr_active, 0); return(0); }