Re: git: 9820afb99e6f - main - LinuxKPI: introduce LINUXKPI_DEBUG to enable LinuxKPI debugging

On Sun, 11 Oct 2026, Bjoern A. Zeeb wrote:

> On Sun, 11 Oct 2026, Nuno Teixeira wrote:
>
>> Hello Bjoern,
>> 
>> I've just update my laptop world and poudriere jail to
>> main-n290042-9f0432041b8f: Sun Oct 11
>> and graphics/drm-612-kmod failed to build:
>> 
>> <snip>
>> --- dma-fence-array.o ---
>> In file included from
>> /wrkdirs/usr/ports/graphics/drm-612-kmod/work/drm-kmod-drm_v6.12.110_1/drivers/dma-buf/dma-fence-array.c:29:
>> In file included from
>> /wrkdirs/usr/ports/graphics/drm-612-kmod/work/drm-kmod-drm_v6.12.110_1/linuxkpi/bsd/include/linux/dma-fence-array.h:30:
>> In file included from
>> /wrkdirs/usr/ports/graphics/drm-612-kmod/work/drm-kmod-drm_v6.12.110_1/linuxkpi/bsd/include/linux/dma-fence.h:31:
>> In file included from
>> /usr/src/sys/compat/linuxkpi/common/include/linux/wait.h:36:
>> /usr/src/sys/compat/linuxkpi/common/include/linux/spinlock.h:32:10: fatal
>> error: 'opt_linuxkpi.h' file not found
>>   32 | #include "opt_linuxkpi.h"
>>      |          ^~~~~~~~~~~~~~~~
>> --- dma-buf.o ---
>> In file included from
>> /wrkdirs/usr/ports/graphics/drm-612-kmod/work/drm-kmod-drm_v6.12.110_1/drivers/dma-buf/dma-buf.c:53:
>> In file included from
>> /wrkdirs/usr/ports/graphics/drm-612-kmod/work/drm-kmod-drm_v6.12.110_1/linuxkpi/gplv2/include/linux/dma-buf.h:29:
>> In file included from
>> /usr/src/sys/compat/linuxkpi/common/include/linux/file.h:39:
>> In file included from
>> /usr/src/sys/compat/linuxkpi/common/include/linux/fs.h:39:
>> In file included from
>> /usr/src/sys/compat/linuxkpi/common/include/linux/wait.h:36:
>> /usr/src/sys/compat/linuxkpi/common/include/linux/spinlock.h:32:10: fatal
>> error: 'opt_linuxkpi.h' file not found
>>   32 | #include "opt_linuxkpi.h"
>>      |          ^~~~~~~~~~~~~~~~
>> <snip>
>> 
>> Thanks,
>
> This got added to LINUXKPI_GENSRC (see below).
>
> I did a clean universe for amd64, arm64, and riscv including drm-kmod master 
> branch (and
> I am sure all the other branches as well as all my desktops/laptops over the 
> last year
> since this was stuck in review--multiple times).
>
> Hmm, this is just another DOH moment... and I admit ... oh well.  Yeah, I 
> never
> build drm-kmod outside my src builds.
>
> I am not sure why drm-kmod does not use the supplied general lists for 
> includes and
> generic sources to add but yeah, that ain't work.
>
> If no one beats me to it, I'll open yet another pull request later, first 
> just to add
> opt_linuxkpi.h which will need to be applied to all supported drm-kmod 
> branches.
>
> Thanks for letting me know.

Can you try
https://github.com/freebsd/drm-kmod/pull/524



> Mind you https://reviews.freebsd.org/D60207 would make that all easier right 
> away but
> it's not there yet but it'll likely cleanup quite some bits then.
>
>
>> Bjoern A. Zeeb <bz@freebsd.org> escreveu (sábado, 10/10/2026 à(s) 19:29):
>> 
>>> The branch main has been updated by bz:
>>> 
>>> URL:
>>> https://cgit.FreeBSD.org/src/commit/?id=9820afb99e6fdc471cb820f321530c52ed2c31ac
>>> 
>>> commit 9820afb99e6fdc471cb820f321530c52ed2c31ac
>>> Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
>>> AuthorDate: 2025-11-25 17:17:55 +0000
>>> Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
>>> CommitDate: 2026-10-10 18:28:33 +0000
>>>
>>>     LinuxKPI: introduce LINUXKPI_DEBUG to enable LinuxKPI debugging
>>>
>>>     This allows us to build kernels which will (if the sysctl is enabled
>>>     too) show pr_debug() and pr_devel() output.
>>>
>>>     Enable it by default for debug kernels.
>>>
>>>     This option can later also be used for other LinuxKPI parts, like
>>>     skbuffs, netdevice, rcu, ... to conditionally compile in debugging
>>>     support to further justify its existence beyond an in-code #define.
>>>
>>>     Sponsored by:   The FreeBSD Foundation
>>>     MFC after:      3 days
>>>     Reviewed by:    dumbbell, emaste
>>>     Differential Revision: https://reviews.freebsd.org/D54060
>>> ---
>>>  sys/compat/linuxkpi/common/include/linux/kernel.h | 6 ++++--
>>>  sys/conf/kmod.mk                                  | 1 +
>>>  sys/conf/options                                  | 3 +++
>>>  sys/conf/std.debug                                | 1 +
>>>  sys/conf/std.nodebug                              | 1 +
>>>  5 files changed, 10 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
>>> index c35116dfcaa8..c2081be0da5a 100644
>>> --- a/sys/conf/kmod.mk
>>> +++ b/sys/conf/kmod.mk
>>> @@ -103,6 +103,7 @@ LINUXKPI_GENSRCS+= \
>>>         pci_iov_if.h \
>>>         pcib_if.h \
>>>         vnode_if.h \
>>> +       opt_linuxkpi.h \
>>>         opt_stack.h
>>>
>>>  .if ${MK_USB} != "no"

-- 
For there shall arise false Christs, and false prophets, and shall shew
great signs and wonders; insomuch that, if it were possible, they shall
deceive the very elect. Behold, I have told you before. [Mat. 24:24-25]