From nobody Tue Jun 25 19:29:36 2024 X-Original-To: dev-commits-src-main@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 4W7vzP0dtTz5PsJT; Tue, 25 Jun 2024 19:29:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W7vzP08nJz4MWg; Tue, 25 Jun 2024 19:29:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719343777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6glgx722v1Ow4SPBVm8KBBNHCqbW1WNJapF2tkEFck8=; b=hH3N65rtAwCG419+mtqVO7Yfk4gzVPaeszLYKje4Bt4YwxXL3QhIggP35QyICiC+SnU+LB FoNpv8yz7hf/5/7L+4VxEqDhgeH18SC4wwx5QVbQM6n9QnX8GoQYYcbKqxfDPAVNwIxp+t FWTerERh2HyMO3PjthcrYznbbYyeQSlCvb8TTpmF1YM39/Yuqn4O3HoGJSpup+1W0xCr27 96HaXB91lz6b1OdZpQeRszvMxVEKIZ3AUqIu5xsigxQDHHwmU329T8NN1nK169khWo9myk q2mlxDrh0eSTP5RQjxW0H9TNOld7kyqlcJfEQqnqrmpc3pY1k0UmJ1guWs+OWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719343777; a=rsa-sha256; cv=none; b=KoqRs72Zt7fsYfVEDMA4mSCCwp98nbxrsbOcgEdL4Dq0qDQOJ3iqQ3T1kxWW7NRyEqlq6+ Tk3s0da1kmWAKwTr8XdXbW63xm+Qo1P4NzZpNvh4q/dQy8j/p2wtOhb8eWk+uszcuQiQVE Cs8rExkQ6qPrUHcdrG/lsayZnZ3P6S0nWSrFl5Ccmwm+pnFSoAYCWurKl206AIQ4XlBdHp ej8zbFw116kTHDe9D6bSMalYY/EzEtiePDI9ykjJCZCbRaWpoWmgZPpjhA0qWbEJq5aUka 2rCAFyY3xXmN7gQxonPF9OXZ4cjCln5RdQG1JKFRXR8l0zJIcd5BBiKVgqlziw== 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=1719343777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6glgx722v1Ow4SPBVm8KBBNHCqbW1WNJapF2tkEFck8=; b=aSMpeguAbXaTiOLTMFnWGCBUfS5Xwd9uUfIu1EpH9CAxz8QQU+r8vUIqlhlHGNXcV2J/XU KxiGNnPbYmZ7xu1taDplHh6XXa3kGlwpYNjxMOTGnRzQgO0bv+5VcxCEqHKH4OkXIPCeRr tdAgB33I5NF6zfK69yN892vLg56UDBq7HWw9LGoTJ5v5AlzXVr1fqZSmt+MhHBs33tRna/ RO1Q9sDhNoQXAY3hwnmJxkJuITCbVcjsLeRA8ige+DlfflFBmGdf5eMRRxbn3vTlhLcDBq xSAXai1+vRzOKk3cTSgzAaNe0mz4NySkdXaGyOmlBcPtKLYmPBPrDm22r5vW0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W7vzN6sXzzF3H; Tue, 25 Jun 2024 19:29:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45PJTaoZ009595; Tue, 25 Jun 2024 19:29:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45PJTaeg009592; Tue, 25 Jun 2024 19:29:36 GMT (envelope-from git) Date: Tue, 25 Jun 2024 19:29:36 GMT Message-Id: <202406251929.45PJTaeg009592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7d6932d20aed - main - ctladm: Fix a race when loading ctl.ko List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d6932d20aedbbb220cd78e90ab4e82d1abaad31 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7d6932d20aedbbb220cd78e90ab4e82d1abaad31 commit 7d6932d20aedbbb220cd78e90ab4e82d1abaad31 Author: Mark Johnston AuthorDate: 2024-06-24 15:09:18 +0000 Commit: Mark Johnston CommitDate: 2024-06-25 19:29:03 +0000 ctladm: Fix a race when loading ctl.ko If multiple ctladm processes try to load ctl.ko at the same time, only one will succeed. Handle this possibility by retrying the operation (open /dev/cam/ctl) if kldload returns EEXIST, rather than bailing. This at least helps ensure that ctladm tests can be run in parallel when ctl.ko is not preloaded. Reviewed by: asomers MFC after: 1 week --- usr.sbin/ctladm/ctladm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 95557406741c..5abc95cddc34 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -4469,7 +4469,7 @@ main(int argc, char **argv) if (fd == -1 && errno == ENOENT) { saved_errno = errno; retval = kldload("ctl"); - if (retval != -1) + if (retval != -1 || errno == EEXIST) fd = open(device, O_RDWR); else errno = saved_errno;