From nobody Thu Mar 6 11:03:02 2025 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 4Z7mjf55d2z5pQ1V; Thu, 06 Mar 2025 11:03:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7mjf4W9Wz3gmx; Thu, 06 Mar 2025 11:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741258982; 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=vt45hcr3ppc+mhmQejxl2JNQf1pGtT1mudqMh8k5ryY=; b=MmHHW+yWZIL36BUKULa5VseRu0ijgEwC5vZjtu1WabUg4QUBUAzWhgUvJoQEtudYyjAG0F xCIHWA6aXqtoXoJpGyCknesskbawJEqqH61aJOrRcQB/X+BFwQD7r1zoJ+vXLOsrJUTJ8G 0pvAHeD0SaS+L5wYTW2rjmTihKRt/yICT4fsTFaYHewPT1HNzeSkk3fpCVWy4dCFRHs8gH A3eLwx8M5quW5GmP0gqCp6kJRxnmhuDcGBNizun/prwjJPIuxR5MngJE+kRGskRlv4AKH1 7UtR7e+qmsgEsSmkeaL0HCpx+3ykJGzR+0i/IaZqB3TtwYNLPTPNMOTtYagN1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741258982; a=rsa-sha256; cv=none; b=NaOYgcZeApnb8KXJRY2rAA+mz8vDaOpzQ7D/dLdAksmPZ16MSJdEXhDhgbOoJeDBm6lHdm ZXCT0/SMZoEc681E0YfDex93oZVddcRlU+Xw2Eg+44dVgMLYZL+dMZuxffxSL8Hq1goI1H I1vPJiz3daoYmvX+SWX7c9nPzRUYUa7ReuKjNEdDZMq1hGHXoTtvtxopaUHwbxv2uglFAw aSWqAJnNZkaAG+37817IppFePe5sHkflk2FNA77HlKPeslsJA2nBhqB3TKGfKB8wvTvgC1 EOlgQt1XGshIRy/KS+k8iZgLEoz8WX6qVd1lFFR6wjwbifnonvQAmMAQr7WbXw== 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=1741258982; 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=vt45hcr3ppc+mhmQejxl2JNQf1pGtT1mudqMh8k5ryY=; b=jCzx7zz1Z/gmkGFU2wBA36tn2xFJT+NS6EBJ3yusLAUKOceQofnWr659Q7UC0bN9RJuq0a akGc+qAL6TIhVFnl8tJIbKDgrayrv4ds802vyv8vS7RdWSoHFOBIEsm9qQdjMSzFbK+H+R CJyKijUWr99uJW80kDGAphFTWxYAl7PpotuFKk11mQdx5KMA5O0INaEliToDi+TQ0/ysWJ Au7XIPLZNGVFmo+mN+pj2Rp347VLJCgkBqJ+aPCt8cCQ3+DL5xlTlPHPpjDgs3XfLPsuGm jR9tVN84VDecNNcblNBrMGpFhPB5aWVJZRIVctPKusGw9HevzRZatyIIgbG8Dw== 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 4Z7mjf41QrzntD; Thu, 06 Mar 2025 11:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 526B32X8022655; Thu, 6 Mar 2025 11:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 526B32Id022652; Thu, 6 Mar 2025 11:03:02 GMT (envelope-from git) Date: Thu, 6 Mar 2025 11:03:02 GMT Message-Id: <202503061103.526B32Id022652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 234683726708 - main - devclass: make devclass_alloc_unit use M_NOWAIT 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 234683726708cf5212d672d676d30056d4133859 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=234683726708cf5212d672d676d30056d4133859 commit 234683726708cf5212d672d676d30056d4133859 Author: Mateusz Guzik AuthorDate: 2025-03-06 11:01:49 +0000 Commit: Mateusz Guzik CommitDate: 2025-03-06 11:01:49 +0000 devclass: make devclass_alloc_unit use M_NOWAIT The only caller already does this. The routine can be called with a mutex held making M_WAITOK illegal. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/subr_bus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 9506e471705c..0422352bba51 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1208,6 +1208,7 @@ devclass_get_sysctl_tree(devclass_t dc) static int devclass_alloc_unit(devclass_t dc, device_t dev, int *unitp) { + device_t *devices; const char *s; int unit = *unitp; @@ -1264,8 +1265,11 @@ devclass_alloc_unit(devclass_t dc, device_t dev, int *unitp) int newsize; newsize = unit + 1; - dc->devices = reallocf(dc->devices, - newsize * sizeof(*dc->devices), M_BUS, M_WAITOK); + devices = reallocf(dc->devices, + newsize * sizeof(*dc->devices), M_BUS, M_NOWAIT); + if (devices == NULL) + return (ENOMEM); + dc->devices = devices; memset(dc->devices + dc->maxunit, 0, sizeof(device_t) * (newsize - dc->maxunit)); dc->maxunit = newsize;