From nobody Mon Mar 10 17:41:46 2025 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 4ZBPN01Mrqz5pPY9; Mon, 10 Mar 2025 17:41:52 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBPMz6rjPz3Z9J; Mon, 10 Mar 2025 17:41:51 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741628512; 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: in-reply-to:in-reply-to:references:references; bh=kTFJM1v73EHxeoF2qkcAJoWyHoyHVM7gGjpqK/xmrsk=; b=i22eecTMaCHwusrZOujqqx+RK/gThmjX37zTpRMi7fuwBdYqZnRPnoltH5NqCAQzOqzj63 37c5Sqz7oVUqDP9isbynfCBi8SapE31M0YvySp9Cho7HG5O0zS47umtScS36aedtCprEtD LhVNTEmGMEodZq9GRyoolHX8CcyCAGx0qNfvq3nqPbzwx5oJAYa9i6VLDk2ka6KG8nX5Al vbjTmd108QycHHe6wks2K0ZMCxOGxWC0pIRpPsZBJn0JFy0gjfHcjg6aAZWVwMujfETEDg A/0C4XE2rWWATvJWg3p5xEDp4BXSSvD8tHwevuQK6JSgc+0/CnYaB1MXB7ATlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741628512; a=rsa-sha256; cv=none; b=JdrKxlZTrCKWond+2V7NbAtECMpdFd8QfKOBiFGKA5GaX/CpZXBLGO71fd3DSY+DobL/8Y 6BULoJ7DG8etunhFxECgjW1iVEGv3cyb/ltzQsHbdi9PRU64pltuzWaI7svLZV845pSyEu OTHSyXOUOnKLWHZ5CV/P9RwKDsC8S77wwtnQx5wkkUet5jUGhC66hGDPalvlSeRYOpNhLs nc6Ol/fXE602SWI6QSOf2Zht77nlkbVhLlVED3P9tkceExLolIcaj64Xux11rjjQZ8Grry xSQfNq/00BX7VxgXemtB4VvkK+WD+d872neLYQn+VEDpHG42gkg1xo2Fc33bWA== 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=1741628512; 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: in-reply-to:in-reply-to:references:references; bh=kTFJM1v73EHxeoF2qkcAJoWyHoyHVM7gGjpqK/xmrsk=; b=fyx4lP9KJ6zsR8a4jj+G+bm9NWpeGWnvKKhL0Nsb5CEhW7nj4tiyIUmhslx5dzJ62jS8IU FpiIafXZb99jC6+/nIFVtcAUQ+IBP6zFQoZKko8oHBkL8zDBRrQmZBqfYrEGKgj8lCZlnA lINGcCgvmhdoNf7OeZ5uGDOdYmRS0u1aGxSevTJ4bcWH78/XBFC53rx30483HIlz5hFgTJ HE1HKBmggTCr8lJd8E/jNl8De2KE8AGEScfgcLKy0alOhxrxtjMxg0f7RFGaRo6j/EPz+9 BNTEUpuRfV1eMjmO/jwuYp5x6cB6jM7ngSLeJoz1OJt6NQj/BvnjSScZLI7TpA== Received: from [192.168.1.52] (c-73-231-46-254.hsd1.ca.comcast.net [73.231.46.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZBPMz2Gbjz1Bcb; Mon, 10 Mar 2025 17:41:51 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.94.25022327 Date: Mon, 10 Mar 2025 10:41:46 -0700 Subject: Re: 78cd83e4017b - main - devclass_alloc_unit: Go back to using M_WAITOK From: Ravi Pokala To: John Baldwin , , , Message-ID: <14C8991D-C686-48DC-9E5D-5F40CE1C75BB@panasas.com> Thread-Topic: 78cd83e4017b - main - devclass_alloc_unit: Go back to using M_WAITOK References: <202503101735.52AHZiu6027210@gitrepo.freebsd.org> In-Reply-To: <202503101735.52AHZiu6027210@gitrepo.freebsd.org> 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: quoted-printable Hi John, > This reverts commit 234683726708cf5212d672d676d30056d4133859. The commit message for that change says that this allocation might be done = while holding a lock, and so M_WAITOK is not valid. So then why is this chan= ge okay? Thanks, Ravi (rpokala@0 =EF=BB=BF-----Original Message----- From: > on behalf of John Baldwin > Date: Monday, March 10, 2025 at 10:35 To: >, >, > Subject: git: 78cd83e4017b - main - devclass_alloc_unit: Go back to using M= _WAITOK The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3D78cd83e4017bccf62a291e57f0ccec= cf80e50423 commit 78cd83e4017bccf62a291e57f0cceccf80e50423 Author: John Baldwin > AuthorDate: 2025-03-10 17:34:44 +0000 Commit: John Baldwin > CommitDate: 2025-03-10 17:34:44 +0000 devclass_alloc_unit: Go back to using M_WAITOK This restores a change made earlier in f3d3c63442fff. This reverts commit 234683726708cf5212d672d676d30056d4133859. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D49273 --- sys/kern/subr_bus.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 38a8cab639e4..63de61262554 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -1211,7 +1211,6 @@ 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 =3D *unitp; @@ -1268,11 +1267,8 @@ devclass_alloc_unit(devclass_t dc, device_t dev, int= *unitp) int newsize; newsize =3D unit + 1; - devices =3D reallocf(dc->devices, - newsize * sizeof(*dc->devices), M_BUS, M_NOWAIT); - if (devices =3D=3D NULL) - return (ENOMEM); - dc->devices =3D devices; + dc->devices =3D reallocf(dc->devices, + newsize * sizeof(*dc->devices), M_BUS, M_WAITOK); memset(dc->devices + dc->maxunit, 0, sizeof(device_t) * (newsize - dc->maxunit)); dc->maxunit =3D newsize;