| Message ID | d8d1a8c6ade7f13a100a5c11fd1e53f7f2fddba3.1729198898.git.lorenzo.stoakes@oracle.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | introduce PIDFD_SELF* sentinels | expand |
On 10/17/24 2:05 PM, Lorenzo Stoakes wrote: > Conflicts can arise between system fcntl.h and linux/fcntl.h, imported by > the linux/pidfd.h UAPI header. > > Work around this by adding a wrapper for linux/pidfd.h to > tools/include/ which sets the linux/fcntl.h header guard ahead of > importing the pidfd.h header file. > > Adjust the pidfd selftests Makefile to reference this include directory and > put it at a higher precidence than any make header installed headers to > ensure the wrapper is preferred. ...but we are not actually using the installed headers, now. And we intend to continue avoiding them. So the ordering shouldn't matter. More below: > > This way we can directly import the UAPI header file without issue, use the > latest system header file without having to duplicate anything. > > Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> > Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> > --- > tools/include/linux/pidfd.h | 14 ++++++++++++++ > tools/testing/selftests/pidfd/Makefile | 3 +-- > 2 files changed, 15 insertions(+), 2 deletions(-) > create mode 100644 tools/include/linux/pidfd.h > > diff --git a/tools/include/linux/pidfd.h b/tools/include/linux/pidfd.h > new file mode 100644 > index 000000000000..113c8023072d > --- /dev/null > +++ b/tools/include/linux/pidfd.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#ifndef _TOOLS_LINUX_PIDFD_H > +#define _TOOLS_LINUX_PIDFD_H > + > +/* > + * Some systems have issues with the linux/fcntl.h import in linux/pidfd.h, so > + * work around this by setting the header guard. > + */ > +#define _LINUX_FCNTL_H > +#include "../../../include/uapi/linux/pidfd.h" > +#undef _LINUX_FCNTL_H Oh shoot, I think you, Shuah and I were referring to different uapi locations, the whole time. And so the basic approach is different after all. Your include path above actually refers to: $(top_srcdir)/include/uapi/linux/fcntl.h ...but what I was intending was to copy a snapshot of that file (or a snapshot from the one generated by "make headers"), to here: $(top_srcdir)/tools/include/uapi/linux/fcntl.h ...and then use $(TOOLS_INCLUDES), which is already in selftests/lib.mk, for that reason: to be available to all of the kselftests: TOOLS_INCLUDES := -isystem $(top_srcdir)/tools/include/uapi The reasoning for this directory is further explained here: tools/include/uapi/README (And I see that selftests/proc has started using $(TOOLS_INCLUDES), that's progress.) And now, it's possible to change fcntl.h in place, instead of using a wrapper. Although either way seems OK to me. (I'm sort of ignoring the details of the actual header file conflict itself, for now.) > + > +#endif /* _TOOLS_LINUX_PIDFD_H */ > diff --git a/tools/testing/selftests/pidfd/Makefile b/tools/testing/selftests/pidfd/Makefile > index d731e3e76d5b..f5038c9dae14 100644 > --- a/tools/testing/selftests/pidfd/Makefile > +++ b/tools/testing/selftests/pidfd/Makefile > @@ -1,8 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > -CFLAGS += -g $(KHDR_INCLUDES) -pthread -Wall > +CFLAGS += -g -isystem $(top_srcdir)/tools/include $(KHDR_INCLUDES) -pthread -Wall Instead, it would look like this, which now mostly matches selftests/mm/Makefile, which is also helpful, because eventually this can be factored into a common piece for all selftests: CFLAGS += -g -isystem $(KHDR_INCLUDES) $(TOOLS_INCLUDES) -pthread -Wall I apologize for just now noticing this! And these kselftests shouldn't require so much fussing around, I know. But once we get this just right, it will work well and last a long time. :) thanks,
On 10/17/24 15:45, John Hubbard wrote: > On 10/17/24 2:05 PM, Lorenzo Stoakes wrote: >> Conflicts can arise between system fcntl.h and linux/fcntl.h, imported by >> the linux/pidfd.h UAPI header. >> >> Work around this by adding a wrapper for linux/pidfd.h to >> tools/include/ which sets the linux/fcntl.h header guard ahead of >> importing the pidfd.h header file. >> >> Adjust the pidfd selftests Makefile to reference this include directory and >> put it at a higher precidence than any make header installed headers to >> ensure the wrapper is preferred. > > ...but we are not actually using the installed headers, now. And we intend > to continue avoiding them. So the ordering shouldn't matter. More below: > >> >> This way we can directly import the UAPI header file without issue, use the >> latest system header file without having to duplicate anything. >> >> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> >> Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> >> --- >> tools/include/linux/pidfd.h | 14 ++++++++++++++ >> tools/testing/selftests/pidfd/Makefile | 3 +-- >> 2 files changed, 15 insertions(+), 2 deletions(-) >> create mode 100644 tools/include/linux/pidfd.h >> >> diff --git a/tools/include/linux/pidfd.h b/tools/include/linux/pidfd.h >> new file mode 100644 >> index 000000000000..113c8023072d >> --- /dev/null >> +++ b/tools/include/linux/pidfd.h >> @@ -0,0 +1,14 @@ >> +/* SPDX-License-Identifier: GPL-2.0-only */ >> + >> +#ifndef _TOOLS_LINUX_PIDFD_H >> +#define _TOOLS_LINUX_PIDFD_H >> + >> +/* >> + * Some systems have issues with the linux/fcntl.h import in linux/pidfd.h, so >> + * work around this by setting the header guard. >> + */ >> +#define _LINUX_FCNTL_H >> +#include "../../../include/uapi/linux/pidfd.h" >> +#undef _LINUX_FCNTL_H > > Oh shoot, I think you, Shuah and I were referring to different uapi locations, > the whole time. And so the basic approach is different after all. > > Your include path above actually refers to: > > $(top_srcdir)/include/uapi/linux/fcntl.h Correct. I am glad we are on the same page now. > > ...but what I was intending was to copy a snapshot of that file (or a > snapshot from the one generated by "make headers"), to here: > > $(top_srcdir)/tools/include/uapi/linux/fcntl.h So why do the copy and snapshot. Anytime you build userspace in the reoo - you will need to run "make headers: whether you install them under tools/include or include. > > ...and then use $(TOOLS_INCLUDES), which is already in selftests/lib.mk, > for that reason: to be available to all of the kselftests: > > TOOLS_INCLUDES := -isystem $(top_srcdir)/tools/include/uapi Yes some tests do include that. > > The reasoning for this directory is further explained here: > > tools/include/uapi/README > > (And I see that selftests/proc has started using $(TOOLS_INCLUDES), that's > progress.) Yes the same problems apply here - what complicates this more is selftests are supposed to test kernel changes, hence the need to include latest kernel headers. The simple solution is adding a dependency so we don't have to duplicate the headers. I don't believe the perf solution works here. We will have to figure out a solution. > > And now, it's possible to change fcntl.h in place, instead of using a wrapper. > Although either way seems OK to me. (I'm sort of ignoring the details of > the actual header file conflict itself, for now.) > > >> + >> +#endif /* _TOOLS_LINUX_PIDFD_H */ >> diff --git a/tools/testing/selftests/pidfd/Makefile b/tools/testing/selftests/pidfd/Makefile >> index d731e3e76d5b..f5038c9dae14 100644 >> --- a/tools/testing/selftests/pidfd/Makefile >> +++ b/tools/testing/selftests/pidfd/Makefile >> @@ -1,8 +1,7 @@ >> # SPDX-License-Identifier: GPL-2.0-only >> -CFLAGS += -g $(KHDR_INCLUDES) -pthread -Wall >> +CFLAGS += -g -isystem $(top_srcdir)/tools/include $(KHDR_INCLUDES) -pthread -Wall > > Instead, it would look like this, which now mostly matches selftests/mm/Makefile, > which is also helpful, because eventually this can be factored into a common > piece for all selftests: > > CFLAGS += -g -isystem $(KHDR_INCLUDES) $(TOOLS_INCLUDES) -pthread -Wall KHDR_INCLUDES is "make headers" location under the root directory. So what happens when you add TOOLS_INCLUDES to it. Does "make kselftest-all" work as it is supposed to? If it and all tests can build then I am all for it. > > I apologize for just now noticing this! And these kselftests shouldn't require > so much fussing around, I know. But once we get this just right, it will work > well and last a long time. :) > On the contrary if we don't discuss/fuss and get this right, we have to deal with changes like adding local defines and adhoc approaches in individual tests - that is one reason we made the "make headers" as a dependency. I would like to solve the problem of proliferation of local defines and even system calls in some cases. For now I am going let this patch go through as it is important to add tests. My goals are simple: - no local defines unless it is abslulutely necessary - be able to build tests that add coverage for new kernel api and features before we release the kernel. - make it easier for CIs to build and run tests - continue to have tests works for kernel developres e.g: mm developers build tests in mm directory. They don't see the issues that crop up in CIs or running the entire kselftest default run like CIs do. Adhoc changes break some use-cases. thanks, -- Shuah
On 10/17/24 3:11 PM, Shuah Khan wrote: > On 10/17/24 15:45, John Hubbard wrote: >> On 10/17/24 2:05 PM, Lorenzo Stoakes wrote: >>> Conflicts can arise between system fcntl.h and linux/fcntl.h, imported by >>> the linux/pidfd.h UAPI header. >>> >>> Work around this by adding a wrapper for linux/pidfd.h to >>> tools/include/ which sets the linux/fcntl.h header guard ahead of >>> importing the pidfd.h header file. >>> >>> Adjust the pidfd selftests Makefile to reference this include directory and >>> put it at a higher precidence than any make header installed headers to >>> ensure the wrapper is preferred. >> >> ...but we are not actually using the installed headers, now. And we intend >> to continue avoiding them. So the ordering shouldn't matter. More below: >> >>> >>> This way we can directly import the UAPI header file without issue, use the >>> latest system header file without having to duplicate anything. >>> >>> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> >>> Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> >>> --- >>> tools/include/linux/pidfd.h | 14 ++++++++++++++ >>> tools/testing/selftests/pidfd/Makefile | 3 +-- >>> 2 files changed, 15 insertions(+), 2 deletions(-) >>> create mode 100644 tools/include/linux/pidfd.h >>> >>> diff --git a/tools/include/linux/pidfd.h b/tools/include/linux/pidfd.h >>> new file mode 100644 >>> index 000000000000..113c8023072d >>> --- /dev/null >>> +++ b/tools/include/linux/pidfd.h >>> @@ -0,0 +1,14 @@ >>> +/* SPDX-License-Identifier: GPL-2.0-only */ >>> + >>> +#ifndef _TOOLS_LINUX_PIDFD_H >>> +#define _TOOLS_LINUX_PIDFD_H >>> + >>> +/* >>> + * Some systems have issues with the linux/fcntl.h import in linux/pidfd.h, so >>> + * work around this by setting the header guard. >>> + */ >>> +#define _LINUX_FCNTL_H >>> +#include "../../../include/uapi/linux/pidfd.h" >>> +#undef _LINUX_FCNTL_H >> >> Oh shoot, I think you, Shuah and I were referring to different uapi locations, >> the whole time. And so the basic approach is different after all. >> >> Your include path above actually refers to: >> >> $(top_srcdir)/include/uapi/linux/fcntl.h > > Correct. I am glad we are on the same page now. > >> >> ...but what I was intending was to copy a snapshot of that file (or a >> snapshot from the one generated by "make headers"), to here: >> >> $(top_srcdir)/tools/include/uapi/linux/fcntl.h > > So why do the copy and snapshot. Anytime you build userspace in the > reoo - you will need to run "make headers: whether you install > them under tools/include or include. No, you only do "make headers" once, and that's a temporary thing too. After the author of the new selftest runs "make headers", the author will typically remove those headers, in order to verify that the selftests still build without the kernel generated header files. That's it! No one else has to deal with it. And that's what is being asked for here. > > >> >> ...and then use $(TOOLS_INCLUDES), which is already in selftests/lib.mk, >> for that reason: to be available to all of the kselftests: >> >> TOOLS_INCLUDES := -isystem $(top_srcdir)/tools/include/uapi > > Yes some tests do include that. > >> >> The reasoning for this directory is further explained here: >> >> tools/include/uapi/README >> >> (And I see that selftests/proc has started using $(TOOLS_INCLUDES), that's >> progress.) > > Yes the same problems apply here - what complicates this more is > selftests are supposed to test kernel changes, hence the need to > include latest kernel headers. The simple solution is adding a > dependency so we don't have to duplicate the headers. I don't > believe the perf solution works here. We will have to figure out > a solution. That's the key point: the fact that the selftests are intended to test kernel changes does *not* mean that we have to include the dynamically generated header files. That's going further than necessary. And it leads to problems and complaints for kernel developers, who are really one of the main user groups here. > >> >> And now, it's possible to change fcntl.h in place, instead of using a wrapper. >> Although either way seems OK to me. (I'm sort of ignoring the details of >> the actual header file conflict itself, for now.) >> >> >>> + >>> +#endif /* _TOOLS_LINUX_PIDFD_H */ >>> diff --git a/tools/testing/selftests/pidfd/Makefile b/tools/testing/selftests/pidfd/Makefile >>> index d731e3e76d5b..f5038c9dae14 100644 >>> --- a/tools/testing/selftests/pidfd/Makefile >>> +++ b/tools/testing/selftests/pidfd/Makefile >>> @@ -1,8 +1,7 @@ >>> # SPDX-License-Identifier: GPL-2.0-only >>> -CFLAGS += -g $(KHDR_INCLUDES) -pthread -Wall >>> +CFLAGS += -g -isystem $(top_srcdir)/tools/include $(KHDR_INCLUDES) -pthread -Wall >> >> Instead, it would look like this, which now mostly matches selftests/mm/Makefile, >> which is also helpful, because eventually this can be factored into a common >> piece for all selftests: >> >> CFLAGS += -g -isystem $(KHDR_INCLUDES) $(TOOLS_INCLUDES) -pthread -Wall > > KHDR_INCLUDES is "make headers" location under the root directory. So what > happens when you add TOOLS_INCLUDES to it. > > Does "make kselftest-all" work as it is supposed to? If it and all tests > can build then I am all for it. > >> >> I apologize for just now noticing this! And these kselftests shouldn't require >> so much fussing around, I know. But once we get this just right, it will work >> well and last a long time. :) >> > > > On the contrary if we don't discuss/fuss and get this right, we have to > deal with changes like adding local defines and adhoc approaches in > individual tests - that is one reason we made the "make headers" > as a dependency. I would like to solve the problem of proliferation > of local defines and even system calls in some cases. Yes, let's work through this. > > For now I am going let this patch go through as it is important to > add tests. Sure, we can iterate on it as necessary. > > My goals are simple: > > - no local defines unless it is abslulutely necessary Agreed. > - be able to build tests that add coverage for new kernel > api and features before we release the kernel. > - make it easier for CIs to build and run tests Up to a point! And that point should be somewhere *before* it inflicts extra pain and annoyance on the kernel developers. Let's not let CI drive this all by itself. CI is not writing these tests, and furthermore it can adapt a little bit if necessary. But even more to the point, avoiding "make headers" simplifies CI, rather than complicating it. > - continue to have tests works for kernel developres > e.g: mm developers build tests in mm directory. They > don't see the issues that crop up in CIs or running > the entire kselftest default run like CIs do. > > Adhoc changes break some use-cases. > > thanks, > -- Shuah > > thanks,
On Thu, Oct 17, 2024 at 02:45:43PM -0700, John Hubbard wrote: > On 10/17/24 2:05 PM, Lorenzo Stoakes wrote: > > Conflicts can arise between system fcntl.h and linux/fcntl.h, imported by > > the linux/pidfd.h UAPI header. > > > > Work around this by adding a wrapper for linux/pidfd.h to > > tools/include/ which sets the linux/fcntl.h header guard ahead of > > importing the pidfd.h header file. > > > > Adjust the pidfd selftests Makefile to reference this include directory and > > put it at a higher precidence than any make header installed headers to > > ensure the wrapper is preferred. > > ...but we are not actually using the installed headers, now. And we intend > to continue avoiding them. So the ordering shouldn't matter. More below: > > > > > This way we can directly import the UAPI header file without issue, use the > > latest system header file without having to duplicate anything. > > > > Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> > > Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> > > --- > > tools/include/linux/pidfd.h | 14 ++++++++++++++ > > tools/testing/selftests/pidfd/Makefile | 3 +-- > > 2 files changed, 15 insertions(+), 2 deletions(-) > > create mode 100644 tools/include/linux/pidfd.h > > > > diff --git a/tools/include/linux/pidfd.h b/tools/include/linux/pidfd.h > > new file mode 100644 > > index 000000000000..113c8023072d > > --- /dev/null > > +++ b/tools/include/linux/pidfd.h > > @@ -0,0 +1,14 @@ > > +/* SPDX-License-Identifier: GPL-2.0-only */ > > + > > +#ifndef _TOOLS_LINUX_PIDFD_H > > +#define _TOOLS_LINUX_PIDFD_H > > + > > +/* > > + * Some systems have issues with the linux/fcntl.h import in linux/pidfd.h, so > > + * work around this by setting the header guard. > > + */ > > +#define _LINUX_FCNTL_H > > +#include "../../../include/uapi/linux/pidfd.h" > > +#undef _LINUX_FCNTL_H > > Oh shoot, I think you, Shuah and I were referring to different uapi locations, > the whole time. And so the basic approach is different after all. > > Your include path above actually refers to: > > $(top_srcdir)/include/uapi/linux/fcntl.h > > ...but what I was intending was to copy a snapshot of that file (or a > snapshot from the one generated by "make headers"), to here: > > $(top_srcdir)/tools/include/uapi/linux/fcntl.h Yeah my first version of this used the uapi one but I thought doing that might conflict with snapshotting? Also it'd mean you'd absolutely have to have the $(TOOLS_INCLUDES) earlier in the include priority list and better maybe to special case in this instance. > > ...and then use $(TOOLS_INCLUDES), which is already in selftests/lib.mk, > for that reason: to be available to all of the kselftests: > > TOOLS_INCLUDES := -isystem $(top_srcdir)/tools/include/uapi > > The reasoning for this directory is further explained here: > > tools/include/uapi/README > > (And I see that selftests/proc has started using $(TOOLS_INCLUDES), that's > progress.) > > And now, it's possible to change fcntl.h in place, instead of using a wrapper. > Although either way seems OK to me. (I'm sort of ignoring the details of > the actual header file conflict itself, for now.) The fcntl.h and linux/fcntl.h conflict is apparently a rather well-known horror show. It's a difficult one to resolve as the UAPI pidfd.h header needs O_xxx defines but we also need to include this header in kernel code. An #ifdef __KERNEL__ block might be a solution here but fixing that is out of scope for these changes. > > > > + > > +#endif /* _TOOLS_LINUX_PIDFD_H */ > > diff --git a/tools/testing/selftests/pidfd/Makefile b/tools/testing/selftests/pidfd/Makefile > > index d731e3e76d5b..f5038c9dae14 100644 > > --- a/tools/testing/selftests/pidfd/Makefile > > +++ b/tools/testing/selftests/pidfd/Makefile > > @@ -1,8 +1,7 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > -CFLAGS += -g $(KHDR_INCLUDES) -pthread -Wall > > +CFLAGS += -g -isystem $(top_srcdir)/tools/include $(KHDR_INCLUDES) -pthread -Wall > > Instead, it would look like this, which now mostly matches selftests/mm/Makefile, > which is also helpful, because eventually this can be factored into a common > piece for all selftests: > > CFLAGS += -g -isystem $(KHDR_INCLUDES) $(TOOLS_INCLUDES) -pthread -Wall > > I apologize for just now noticing this! And these kselftests shouldn't require > so much fussing around, I know. But once we get this just right, it will work > well and last a long time. :) Yeah I know, but this won't work due to the header conflict, I was doing this previously. Also doing it this way means that uapi snapshot doesn't override the usr/ one if you have that, which I guess you want? > > thanks, > -- > John Hubbard
On 10/17/24 11:49 PM, Lorenzo Stoakes wrote: > On Thu, Oct 17, 2024 at 02:45:43PM -0700, John Hubbard wrote: >> On 10/17/24 2:05 PM, Lorenzo Stoakes wrote: ... >> Your include path above actually refers to: >> >> $(top_srcdir)/include/uapi/linux/fcntl.h >> >> ...but what I was intending was to copy a snapshot of that file (or a >> snapshot from the one generated by "make headers"), to here: >> >> $(top_srcdir)/tools/include/uapi/linux/fcntl.h > > Yeah my first version of this used the uapi one but I thought doing that > might conflict with snapshotting? Also it'd mean you'd absolutely have to > have the $(TOOLS_INCLUDES) earlier in the include priority list and better > maybe to special case in this instance. Actually, I think the goal is to just stop using KHDR_INCLUDES (./usr/include) entirely! More below... > >> >> ...and then use $(TOOLS_INCLUDES), which is already in selftests/lib.mk, >> for that reason: to be available to all of the kselftests: >> >> TOOLS_INCLUDES := -isystem $(top_srcdir)/tools/include/uapi >> >> The reasoning for this directory is further explained here: >> >> tools/include/uapi/README >> >> (And I see that selftests/proc has started using $(TOOLS_INCLUDES), that's >> progress.) >> >> And now, it's possible to change fcntl.h in place, instead of using a wrapper. >> Although either way seems OK to me. (I'm sort of ignoring the details of >> the actual header file conflict itself, for now.) > > The fcntl.h and linux/fcntl.h conflict is apparently a rather well-known > horror show. It's a difficult one to resolve as the UAPI pidfd.h header > needs O_xxx defines but we also need to include this header in kernel code. > > An #ifdef __KERNEL__ block might be a solution here but fixing that is out > of scope for these changes. Certainly out of scope! Your patch already avoids the biggest issue: it no longer requires "make headers", in order to build it. That's fine for now. Sorry to put you into the middle of a pre-existing kselftests debate. And the #ifdef __KERNEL__ sounds like a potential solution, or at least a building block for one. I need to take a closer look at this particular header file mess, the fcntl.h situation is new to me. >>> +#endif /* _TOOLS_LINUX_PIDFD_H */ >>> diff --git a/tools/testing/selftests/pidfd/Makefile b/tools/testing/selftests/pidfd/Makefile >>> index d731e3e76d5b..f5038c9dae14 100644 >>> --- a/tools/testing/selftests/pidfd/Makefile >>> +++ b/tools/testing/selftests/pidfd/Makefile >>> @@ -1,8 +1,7 @@ >>> # SPDX-License-Identifier: GPL-2.0-only >>> -CFLAGS += -g $(KHDR_INCLUDES) -pthread -Wall >>> +CFLAGS += -g -isystem $(top_srcdir)/tools/include $(KHDR_INCLUDES) -pthread -Wall >> >> Instead, it would look like this, which now mostly matches selftests/mm/Makefile, >> which is also helpful, because eventually this can be factored into a common >> piece for all selftests: >> >> CFLAGS += -g -isystem $(KHDR_INCLUDES) $(TOOLS_INCLUDES) -pthread -Wall >> >> I apologize for just now noticing this! And these kselftests shouldn't require >> so much fussing around, I know. But once we get this just right, it will work >> well and last a long time. :) > > Yeah I know, but this won't work due to the header conflict, I was doing > this previously. > > Also doing it this way means that uapi snapshot doesn't override the usr/ > one if you have that, which I guess you want? Actually, given that we want (or should want, so I claim) to build without first running "make headers", and given that "make headers" populates ./usr/include/, which in turn is what $(KHDR_INCLUDES) points to, this means that eventually we should end up with approximately: CFLAGS += -g -isystem $(TOOLS_INCLUDES) -pthread -Wall And I just checked, today's selftests/mm builds just fine, with a similar diff applied, so I'm not totally crazy: diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile index 02e1204971b0..b004a8edcba5 100644 --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -33,7 +33,7 @@ endif # LDLIBS. MAKEFLAGS += --no-builtin-rules -CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) $(TOOLS_INCLUDES) +CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(TOOLS_INCLUDES) LDLIBS = -lrt -lpthread -lm TEST_GEN_FILES = cow thanks,
diff --git a/tools/include/linux/pidfd.h b/tools/include/linux/pidfd.h new file mode 100644 index 000000000000..113c8023072d --- /dev/null +++ b/tools/include/linux/pidfd.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _TOOLS_LINUX_PIDFD_H +#define _TOOLS_LINUX_PIDFD_H + +/* + * Some systems have issues with the linux/fcntl.h import in linux/pidfd.h, so + * work around this by setting the header guard. + */ +#define _LINUX_FCNTL_H +#include "../../../include/uapi/linux/pidfd.h" +#undef _LINUX_FCNTL_H + +#endif /* _TOOLS_LINUX_PIDFD_H */ diff --git a/tools/testing/selftests/pidfd/Makefile b/tools/testing/selftests/pidfd/Makefile index d731e3e76d5b..f5038c9dae14 100644 --- a/tools/testing/selftests/pidfd/Makefile +++ b/tools/testing/selftests/pidfd/Makefile @@ -1,8 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -CFLAGS += -g $(KHDR_INCLUDES) -pthread -Wall +CFLAGS += -g -isystem $(top_srcdir)/tools/include $(KHDR_INCLUDES) -pthread -Wall TEST_GEN_PROGS := pidfd_test pidfd_fdinfo_test pidfd_open_test \ pidfd_poll_test pidfd_wait pidfd_getfd_test pidfd_setns_test include ../lib.mk -