Re: [PATCH 0/5] cleanups, fixes, and progress towards avoiding "make headers"

David Hildenbrand
2024-06-12T08:24:37Z

On 11.06.24 22:54, John Hubbard wrote:
> On 6/11/24 2:36 AM, David Hildenbrand wrote:
>> On 08.06.24 04:10, John Hubbard wrote:
>>> Eventually, once the build succeeds on a sufficiently old distro, the
>>> idea is to delete $(KHDR_INCLUDES) from the selftests/mm build, and then
>>> after that, from selftests/lib.mk and all of the other selftest builds.
>>>
>>> For now, this series merely achieves a clean build of selftests/mm on a
>>> not-so-old distro: Ubuntu 23.04:
>>
>> Wasn't the plan to rely on the tools/include headers, and pull in there whatever we need?
>
> Yes, it is. You are correct.
>
>>
>>>
>>> 1. Add __NR_mseal.
>>>
>>
>> For example, making sure that tools/include/uapi/asm-generic/unistd.h is updated to contain __NR_mseal?
>
> Well, here it gets less clear cut, because the selftests pull in *lots* of
> system headers. In this case /usr/include/unistd.h gets pulled in. If we
> force tools/include/uapi/asm-generic/unistd.h to be included, then we'll
> get many many warnings of redefinitions of __NR_* items.

I think, there is a difference between unistd.h and linux/unistd.h. We
want to continue including unistd.h from the distro, but might want to
stop including the linux one from the distro.

My thinking was that we start maintaining our own linux headers copy
in-tree, and start converting our tests from including <linux/> supplied
by the distro to include the in-tree ones.

For mseal_test.c, that might mean stopping including "linux/mman.h", and
instead including the in-tree one.

>
> So what's really going on here is that we have this uneasy mix of system
> headers from the test machine, and newer versions of some of those headers
> in the kernel tree. And some of those are easier to combine with system
> headers, than others. unistd.h is clearly not going quietly, which is
> why, I believe, the "#ifndef __NR_* " approach has flowered in the
> selftests.

Right, these mixtures are not what we want I think. But I have no idea
how easy it would be to convert individual tests.

Maybe all it takes is updating the in-tree headers and then including
"TBD/linux/whatever.h" instead of <linux/whatever.h>

In QEMU, we maintain some (not all) kernel headers ourselves, and
include them via

"standard-headers/linux/whatever.h"

>
>>
>> ... to avoid hand-crafted defines we have to maintain for selftests.
>>
>> But maybe I am remembering something outdated.
>>
>
> You remembered correctly, but the situation is slighly muddier than
> one would prefer. :)

Absolutely, and I appreciate that you are trying to improve the situation.

--
Cheers,

David / dhildenb