From nobody Fri Oct 21 20:49:43 2022 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 4MvGmp6HWsz4gmbJ; Fri, 21 Oct 2022 20:49:46 +0000 (UTC) (envelope-from bz@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MvGmp5m0wz3X5Q; Fri, 21 Oct 2022 20:49:46 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666385386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UkKtGnBC2b/51g+YfWOhzfXE4yJg8hYVDUuwuhawZYc=; b=T84ueQ65KpS/3HXRCdiYG+LyNdJuYoEhWz2D9ws9c1IT5hEEIr2/6p7e1vlthTevlMTJEK 6Vuq+Ep/MvnGTeEZK1QkyWyQaSxD4fBjh0DXI32AILkznCPgf1EaP3aBHhNaXvebbNugsF ktpGGBpjzghmqnj/RvOJKAOyuGB9R6i369xShQbKwqC2iOggSntBuoFHu/5wPyiFXgISwM +Bcc6PJ5dMVFs4bs1BeM2yPk23ysxW8CogqtziZv+3UKxIzhscT4fhyaSx60rZpHsRpORi roQ8zCC/muv35/bBPy60ueaAez1g/l2jlW1EmsB+m/OCpIblioIfLnsL+nxSdQ== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MvGmp419bzbrr; Fri, 21 Oct 2022 20:49:46 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 563698D4A178; Fri, 21 Oct 2022 20:49:45 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id A26EA5C3A832; Fri, 21 Oct 2022 20:49:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 3HCfDoks-Y9m; Fri, 21 Oct 2022 20:49:43 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 572735C3A82F; Fri, 21 Oct 2022 20:49:43 +0000 (UTC) Date: Fri, 21 Oct 2022 20:49:43 +0000 (UTC) From: "Bjoern A. Zeeb" To: Gleb Smirnoff cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d6eabdac2ef4 - main - dpaa2: fix build without WITNESS In-Reply-To: <202210180540.29I5eO4f068116@gitrepo.freebsd.org> Message-ID: <5o8r9457-958-93p8-1o14-878p402620so@mnoonqbm.arg> References: <202210180540.29I5eO4f068116@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666385386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UkKtGnBC2b/51g+YfWOhzfXE4yJg8hYVDUuwuhawZYc=; b=RYdiBAk4RMO3WxN9ApFs1SzwXs97Fz2XqA7c8horHBQpJY+2nB+nDqy8O0G+40N7CelPW/ ARE04UoUqn8K00NSWLf9nHfZX+sKbQBV0qjCdfJ/v+PTYoZFbrOycRxcFRPwtSBTc9ZMas ZCtGsGaT7lAKiRnXkceM9VDYQBqYdElf+O0MWLwW/T/Q3YlHeVAuwWzuKipd5l9nk/1kZ9 93TTf0FWjmnvUmpVmYeOC6A/gc/JJmawTkswlosMKxRgqrUK7yy6AqCl7Rwx4rQEBzIofS STzVPxnujaYWLYXgi3gBruSqVwVdtfiQo6GPpmDEm0Hma0ak6bC4K3Jms7L/xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666385386; a=rsa-sha256; cv=none; b=QyESmeItGUtUUSOq1DyIkCsY1oVxHw2BpxZksWL6ZXd2/2xHHiwjZTdK2v5uMPbmGzGSsS LjIpUiYNoLSaXmA+x5TwR14vqONCWwXTzLf+1uYPCIW0B2+KnI9ZaR42h+dm4RJv/WXYKt OgCj7R5IBqzCNMy+c49XwmG+xTEbcah2cTRkpa76bLC4pOdWvzZNGU0+7bkGSpPOLaMCLt n2wPiEkKUdVOfBLU6AiWnuR1S+ciOH0sfd+kKSXXa5qtcsqEwjh2Fl9OariO7/iIhfOmAL y7ctf5jEV/55P1wT61XFMUKArjOao9E/IVLsRvs7k4dQDdkRpVJOLArxi7v8Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Tue, 18 Oct 2022, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d6eabdac2ef444b62aba186c793fbd5d4226b157 > > commit d6eabdac2ef444b62aba186c793fbd5d4226b157 > Author: Gleb Smirnoff > AuthorDate: 2022-10-18 05:38:40 +0000 > Commit: Gleb Smirnoff > CommitDate: 2022-10-18 05:38:40 +0000 > > dpaa2: fix build without WITNESS > > Using mutex(9) requires including per manual page. With > WITNESS the header was cryptically included via dpaa_ni.h -> mbuf.h. Secondary path (without WITNESS) while this still doesn't break without the fix but with the fixed mbuf.h: dpaa2_io.c includes sys/bus.h which includes sys/systm.h which includes sys/pcpu.h which includes sys/_lock.h which defines LOCK_DEBUG which then prevents the #error in any of the locking implementations to trigger. This is why arm64's GENERIC-NODEBUG doesn't barf. I would argue the #errors in the locking implementations are close to useless these days (also value assumed on LOCK_DEBUG sometimes before the first check whether it is defined at all). Thanks for catching the general problem; there's more fish to be fried! > --- > sys/dev/dpaa2/dpaa2_io.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/sys/dev/dpaa2/dpaa2_io.c b/sys/dev/dpaa2/dpaa2_io.c > index 14b5fa31cbc9..e2b7992bfdb6 100644 > --- a/sys/dev/dpaa2/dpaa2_io.c > +++ b/sys/dev/dpaa2/dpaa2_io.c > @@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > #include > #include > #include > -- Bjoern A. Zeeb r15:7