From nobody Thu Mar 6 11:35:34 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 4Z7nRT3z5Vz5pSBk; Thu, 06 Mar 2025 11:35:49 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7nRT1yL3z3t5j; Thu, 06 Mar 2025 11:35:49 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-abf4802b242so109597166b.1; Thu, 06 Mar 2025 03:35:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741260947; x=1741865747; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=oLYj2kguV3i2IGhabNqwlPc2ueKVwmbZFCB9rNTnOUo=; b=nXrW9efbFSR5xrS1QUd466DA8Z0AFPzw72ilsoHrEb7rvJ+rrMjjwfMljJvjS60NFy Nyxwkiwgq5/QwhucVCQGhM6CUxAAjkSJ1MJh2E2O05Ja3U6oy1RLt8y+c1+kYlxC9OCQ +R8lQLpvIaGRzgCdYhj3jj1f++PW+nAAe2hFRiOmUvco1eFm4K+Wcz78IanLmdtkM2kk tNXZr37fRVMzXG9JcsxlRRN5PYSjnHk7xlKYiDzahdbdpMJRYGz9KEdOd37keRLew9uL G7fCzeEtK5EGZpw67A6Lm+fa4soXSgBMnt05PYZpBkRG7xPVrH/Fwsk/HiScmq8Ku1RZ jvwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741260947; x=1741865747; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oLYj2kguV3i2IGhabNqwlPc2ueKVwmbZFCB9rNTnOUo=; b=oxulMHFk3ntiFnaVgkpJVgCqLAjl0Tfrnd591jSy4gVgRJ7yxlr0PkuRXOkDXGK2V6 +F4sWRd1hEIRcMuCLqBLUXQVgyGA4oqtKVKKbJKuJzSMv9t9KqIi3zPeV0Sd+oZL9LmR d0OCm+R0LiRwzagyjkxJyqS0d+2OJwD341mjRFMJAczvhqwLJ/O+9uphhCl78XN3pK6o lpqKWhoWcs2QQm1PDcB62Ngg/V3pr6dB+IWdM+Ywbrp0vqESaTfI7D1LkQOmC7IF5H/C /n5+M6qoTO4zV71UH3uyDvhoUr9brah/OS1z5VvoGBs+0LBWnlgV7Kpn9/1GObhUPice mP9A== X-Forwarded-Encrypted: i=1; AJvYcCU3uPmxBOtGlLAAAQPzGgiaIGuIYgipcOvmnT9fDTd6TnjIOXDoDK1xAoYzLLGEhxaIQr7I8M37bOETMr0csX0=@freebsd.org, AJvYcCWTQYXUtoWKdOdjwUpGq7os1DqralrtPhNPWfRoY486z4a0PvJGMyJRl01L3So56TijmOhkHNPKCzLCBoxfDMW/Fw0S1Yo=@freebsd.org, AJvYcCWZa7fgQNwqis2UCXj/ORbbN5tamX0gmQrpPx1HLuPuaiqCAWLMHG4bAuebfjX62w4xj+1eMGhHnpumXfzhQQ7mV+DR@freebsd.org, AJvYcCWltBmZG0FKHhQwIUVJi1XZew/Ye0yZXu4ZHIIRNaSzPfDo6HGs6cNzR80poCbdYVaOeIvk@freebsd.org X-Gm-Message-State: AOJu0Yw2BsPO54gXIIPtB6qFiSBoks3ZZRlrLe7SAgi/DVltgxRxxTek YjduJIkGoQh4RFJNKWicZwK1hHVm9eviGUD17cnmH55sSqjG2IK5ACMe1vMQAsqHI/qYxoe0Dy8 oPsocsdqW3PAMuo+4G+d3bPjjEiGQS870 X-Gm-Gg: ASbGncvLlT1/gVcpBP9B3BEhS9xXVb7XIzXZAQPLkZiEu3U6WRCjEk9za4pFDihj6ir hOehodKVltxIvN7cjFmMocwI9sN8k0M6VVtK7by0KBc8EJUhq4MoxBc6wrIoo5QJvVkfFHujPY4 fV0fRngcnMAv5as5NpPtjq3hEeqg== X-Google-Smtp-Source: AGHT+IEkgD6gYmCUgGUg8vxC5OeVWShnUveRfACWxv2Z+Vmf2Dia0Ff0kGjK38Hl5hnx41KGHpw3fZNrCmoGWMNS2AQ= X-Received: by 2002:a17:906:478b:b0:ac1:df32:ac27 with SMTP id a640c23a62f3a-ac20dafc617mr780731766b.53.1741260946447; Thu, 06 Mar 2025 03:35:46 -0800 (PST) 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 References: <202503061103.526B32Id022652@gitrepo.freebsd.org> In-Reply-To: From: Mateusz Guzik Date: Thu, 6 Mar 2025 12:35:34 +0100 X-Gm-Features: AQ5f1JqyKYdyrQ4v97MuR35gDq4nG7TiHdtnyQ_el7iG2-9BySYUuw6JQC4_Uzo Message-ID: Subject: Re: git: 234683726708 - main - devclass: make devclass_alloc_unit use M_NOWAIT To: Zhenlei Huang Cc: Mateusz Guzik , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , Warner Losh , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Z7nRT1yL3z3t5j X-Spamd-Bar: ---- On Thu, Mar 6, 2025 at 12:32=E2=80=AFPM Zhenlei Huang wr= ote: > > > > On Mar 6, 2025, at 7:03 PM, Mateusz Guzik wrote: > > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D234683726708cf5212d672d676= d30056d4133859 > > 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 =3D *unitp; > > @@ -1264,8 +1265,11 @@ devclass_alloc_unit(devclass_t dc, device_t dev, i= nt *unitp) > int newsize; > > newsize =3D unit + 1; > - dc->devices =3D reallocf(dc->devices, > - newsize * sizeof(*dc->devices), M_BUS, M_WAITOK); > + devices =3D reallocf(dc->devices, > + newsize * sizeof(*dc->devices), M_BUS, M_NOWAIT); > > > I'd recommend against this. From the commit message of f3d3c63442ff, Warn= er said, > > In addition, transition to M_WAITOK since this is a sleepable context > So, the M_WAITOK is intentional. > > Rather than reverting this, the caller devclass_add_device() should use M= _WAITOK. > Per my commit message this is callable from a *NOT* sleepable context. Here is a splat we got at Netgate: uma_zalloc_debug: zone "malloc-16" with the following non-sleepable locks h= eld: exclusive sleep mutex SD slot mtx (sdhci) r =3D 0 (0xd8dec028) locked @ /var/jenkins/workspace/pfSense-Plus-snapshots-25_03-main/sources/FreeBSD-sr= c-plus-RELENG_25_03/sys/dev/sdhci/sdhci.c:688 stack backtrace: #0 0xc0330ebc at witness_debugger+0x78 #1 0xc033217c at witness_warn+0x428 #2 0xc05b0a58 at uma_zalloc_debug+0x34 #3 0xc05b067c at uma_zalloc_arg+0x30 #4 0xc0291760 at malloc+0x8c #5 0xc02920ec at reallocf+0x14 #6 0xc02f8894 at devclass_add_device+0x1e8 #7 0xc02f6c78 at make_device+0xe0 #8 0xc02f6abc at device_add_child_ordered+0x30 #9 0xc0156e0c at sdhci_card_task+0x238 #10 0xc0324090 at taskqueue_run_locked+0x1b4 #11 0xc0323ea0 at taskqueue_run+0x50 #12 0xc0275f88 at ithread_loop+0x264 #13 0xc0271f28 at fork_exit+0xa0 #14 0xc05f82d4 at swi_exit+0 It may be some callers are sleepable. Perhaps a different variant accepting flags would be prudent, but I have no interest in looking into that. > ``` > - dev->nameunit =3D malloc(buflen, M_BUS, M_NOWAIT|M_ZERO); > - if (!dev->nameunit) > - return (ENOMEM); > + dev->nameunit =3D malloc(buflen, M_BUS, M_WAITOK | M_ZERO); > ``` > > Best regards, > Zhenlei > > + if (devices =3D=3D NULL) > + return (ENOMEM); > + dc->devices =3D devices; > memset(dc->devices + dc->maxunit, 0, > sizeof(device_t) * (newsize - dc->maxunit)); > dc->maxunit =3D newsize; > > > > --=20 Mateusz Guzik