From nobody Thu Mar 6 14:28:45 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 4Z7sHJ32tNz5pgJt; Thu, 06 Mar 2025 14:29:00 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (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 4Z7sHJ1Hnqz48jc; Thu, 06 Mar 2025 14:29:00 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5e5deb6482cso185762a12.1; Thu, 06 Mar 2025 06:29:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741271338; x=1741876138; 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=qrUAW48hTK5gu0CDCeMWApeF+DtVkEhbH10xB0SRBiA=; b=XbM8HxIs+F4/25nwbWlz9/rMYYSgydrXar4J3nmlRwOszPkOmptaGo7E0RW9bZog02 Q9no3rVB3+TL3gIT/tI9l+f3isyYoIAYwSfHXZFLmvTfe89YJB7T4+MpHYClbrFAHC9+ 3oGM+wL+dhlYSqh879TXw9Bz6onlpXS+EgG7fL33Vy8llDMU70Gj9OuOrKVAVbme93lJ 6g56tjtCkYw/+cdR4ALznHApgaGk6Xlae5ZsT1O4hg21eW596Ed/5q4JZsPiI1uiu2Gf VNUgMyMZHWKVJ/KefCG+Xx8fuc1w6SPbm9vZKG8yYxvqr2O87IgjqWlHIB0optXo4ezM WLYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741271338; x=1741876138; 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=qrUAW48hTK5gu0CDCeMWApeF+DtVkEhbH10xB0SRBiA=; b=n2gBSvStNHmk3/50mJAv+Sk6J8y/QGMZJRhsPS5KaE32AoFsmRTpq20WsofrD7+5Rt 0t8Vi5jycEhZtv9RggpNuhGxNMK2M+jMJPM+7dwfcF1hC1lvDcCaRBhckX4z3ysC2/VE 8CrMCmhDdcjBcAEm/gja3zbgfpw+LXnXiV4a2TjxRP7qaK8eLX/Jq067ITokiQpAAWAv aB/N3NBOUVyTeTptczAkPsoBToK2kzN38c9dS8gmsRW2cvUa044YujdhOwx/PaLb6sIL 5Wm5YKL/auiKwhqEWUIB9Fu1W79QMcRsPUTsGsW4odnhNo3xHkWJbUj+I5Cs93IMRDdB /zJQ== X-Forwarded-Encrypted: i=1; AJvYcCUBOZn2QXj8nEVZLlJDRw27aCfT+r2oIW5mr2t/TgaAvaW3x25tGO+zHSp9GUvmXkMaJ0KP@freebsd.org, AJvYcCUG1nxBHKqXetR5+Pkm1iPBrbv9ZVIl9IACGvAmMl8KLlomdpV+dcGvUtmqyzprDibtwIkj3N2L4ZoLTORBQFfjavKu@freebsd.org, AJvYcCWPCYtOZ+Y5S3g5SIkvIfPC3xb/NxhJiayrWWMACOHu2zIb6wuHgu1f/MaZzqWU0r+ab1qPoxXbN2Jz/zudB8P7QydB9og=@freebsd.org, AJvYcCX95jbXDO7ljzyz1OYloTKmXukB1K3/amJMbvJqklamkr6rCTCGKcYVKtl3WnQufd15NLpkPWxBcWG1XHZs1jw=@freebsd.org, AJvYcCXzuxmiQZZqhYCQDJdWHMp0dRoi1CMLll2XUNlLET9q6HFRQLGwVhz8ouF4+eqcEf4H8U8y@freebsd.org X-Gm-Message-State: AOJu0YwNQPj7m+0B3QgAd5edxPeULZnyixuuror80JhcNdypHi02SMVq G3ma9IIYDihW5griKZNZMqBarlkyQgfAit7bdR3UHDN9L1ktNLNsKvp4aXtS0Pk9yweNFtS5s8/ G40cFs80OO+k9SzaF+4BtVRG2v2MLXqVC X-Gm-Gg: ASbGncu2xVFU6c9Nepl4ctAjzSO095QxJ7mI8S9kqBOa0mGr5SxfxTzXjkZfm+pykrL uEs0OvvOm498s4wU+MqkfvV+hvIJH8jn5CBRnd0QZ6xnn6ae0i7vZPp+dTNgR+nEb3vcnMkSuC/ HuE+ApysawDMtm6PMwh2OIPYYqOA== X-Google-Smtp-Source: AGHT+IHA01TyPUUaguBJI/PZI4AtZFVePTVcjA9+pdhEp34xV0YqemvEH2vxZqmcPedAWmOVARukXUWW+tX6oGTrkWY= X-Received: by 2002:a17:907:8687:b0:ac1:17fe:c74f with SMTP id a640c23a62f3a-ac22cc5501fmr357873766b.21.1741271337823; Thu, 06 Mar 2025 06:28:57 -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 15:28:45 +0100 X-Gm-Features: AQ5f1JppXgMPth-euR0aJuysNU8aNSQPkryhamZENKrb_YuqSXX3UIrZiUv9f-M Message-ID: Subject: Re: git: 234683726708 - main - devclass: make devclass_alloc_unit use M_NOWAIT To: John Baldwin Cc: Zhenlei Huang , 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: 4Z7sHJ1Hnqz48jc X-Spamd-Bar: ---- On Thu, Mar 6, 2025 at 2:33=E2=80=AFPM John Baldwin wrote= : > > On 3/6/25 06:35, Mateusz Guzik wrote: > > On Thu, Mar 6, 2025 at 12:32=E2=80=AFPM Zhenlei Huang wrote: > >> > >> > >> > >> 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=3D234683726708cf5212d672d= 676d30056d4133859 > >> > >> 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 illega= l. > >> > >> 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= , int *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, W= arner 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 us= e 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 loc= ks held: > > exclusive sleep mutex SD slot mtx (sdhci) r =3D 0 (0xd8dec028) locked @ > > /var/jenkins/workspace/pfSense-Plus-snapshots-25_03-main/sources/FreeBS= D-src-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 > > Just use a regular taskqueue like taskqueue_thread instead of taskqueue_s= wi? > PCI hotplug defines its own thread taskqueue for adding and removing devi= ces. > > The bug is here, IMO. Eventually new-bus will need some sort of topology > lock and that will have to be an sx lock, so this code needs to change > anyway. The sound code that tries to frob devices with a regular mutex > also needs to change. > > In terms of taskqueue_swi, it's probably something that needs to go away. > Generally speaking, code uses tasks for functions that need to sleep, > and taskqueue_swi breaks that. > > I will fix sdhci to use a proper taskqueue and then revert this commit. > That's fine with me, but if you do, also make sure to change the M_NOWAIT into M_WAITOK in devclass_add_device: dev->nameunit =3D malloc(buflen, M_BUS, M_NOWAIT|M_ZERO); --=20 Mateusz Guzik