[v1] selftests/bpf: Fix bpf selftest build warning

[RESEND PATCH] selftests/bpf: Fix bpf selftest build warning

Posted by Saket Kumar Bhaskar 9 months ago

On linux-next, build for bpf selftest displays a warning:

Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h'
differs from latest version at 'include/uapi/linux/if_xdp.h'.

Commit 8066e388be48 ("net: add UAPI to the header guard in various network headers")
changed the header guard from _LINUX_IF_XDP_H to _UAPI_LINUX_IF_XDP_H
in include/uapi/linux/if_xdp.h.

To resolve the warning, update tools/include/uapi/linux/if_xdp.h
to align with the changes in include/uapi/linux/if_xdp.h

Fixes: 8066e388be48 ("net: add UAPI to the header guard in various network headers")
Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Closes: https://lore.kernel.org/all/c2bc466d-dff2-4d0d-a797-9af7f676c065@linux.ibm.com/
Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Signed-off-by: Saket Kumar Bhaskar <skb99@linux.ibm.com>
---

[RESEND]:
 - Added Fixes and Tested-by tag.
 - Added Greg as receipent for driver-core tree.

Original patch: https://lore.kernel.org/all/20250509123802.695574-1-skb99@linux.ibm.com/

 tools/include/uapi/linux/if_xdp.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/include/uapi/linux/if_xdp.h b/tools/include/uapi/linux/if_xdp.h
index 42869770776e..44f2bb93e7e6 100644
--- a/tools/include/uapi/linux/if_xdp.h
+++ b/tools/include/uapi/linux/if_xdp.h
@@ -7,8 +7,8 @@
  *	      Magnus Karlsson <magnus.karlsson@intel.com>
  */
 
-#ifndef _LINUX_IF_XDP_H
-#define _LINUX_IF_XDP_H
+#ifndef _UAPI_LINUX_IF_XDP_H
+#define _UAPI_LINUX_IF_XDP_H
 
 #include <linux/types.h>
 
@@ -180,4 +180,4 @@ struct xdp_desc {
 /* TX packet carries valid metadata. */
 #define XDP_TX_METADATA (1 << 1)
 
-#endif /* _LINUX_IF_XDP_H */
+#endif /* _UAPI_LINUX_IF_XDP_H */
-- 
2.43.5

Re: [RESEND PATCH] selftests/bpf: Fix bpf selftest build warning

Posted by Greg KH 9 months ago

On Mon, May 12, 2025 at 02:45:11PM +0530, Saket Kumar Bhaskar wrote:
> On linux-next, build for bpf selftest displays a warning:
> 
> Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h'
> differs from latest version at 'include/uapi/linux/if_xdp.h'.
> 
> Commit 8066e388be48 ("net: add UAPI to the header guard in various network headers")
> changed the header guard from _LINUX_IF_XDP_H to _UAPI_LINUX_IF_XDP_H
> in include/uapi/linux/if_xdp.h.
> 
> To resolve the warning, update tools/include/uapi/linux/if_xdp.h
> to align with the changes in include/uapi/linux/if_xdp.h
> 
> Fixes: 8066e388be48 ("net: add UAPI to the header guard in various network headers")
> Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
> Closes: https://lore.kernel.org/all/c2bc466d-dff2-4d0d-a797-9af7f676c065@linux.ibm.com/
> Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
> Signed-off-by: Saket Kumar Bhaskar <skb99@linux.ibm.com>
> ---
> 
> [RESEND]:
>  - Added Fixes and Tested-by tag.
>  - Added Greg as receipent for driver-core tree.

Why?  Commit 8066e388be48 ("net: add UAPI to the header guard in various
network headers") is not in that tree/branch, so why do I need it?

confused,

greg k-h

Re: [RESEND PATCH] selftests/bpf: Fix bpf selftest build warning

Posted by Alexei Starovoitov 9 months ago

On Mon, May 12, 2025 at 2:23 AM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Mon, May 12, 2025 at 02:45:11PM +0530, Saket Kumar Bhaskar wrote:
> > On linux-next, build for bpf selftest displays a warning:
> >
> > Warning: Kernel ABI header at 'tools/include/uapi/linux/if_xdp.h'
> > differs from latest version at 'include/uapi/linux/if_xdp.h'.
> >
> > Commit 8066e388be48 ("net: add UAPI to the header guard in various network headers")
> > changed the header guard from _LINUX_IF_XDP_H to _UAPI_LINUX_IF_XDP_H
> > in include/uapi/linux/if_xdp.h.
> >
> > To resolve the warning, update tools/include/uapi/linux/if_xdp.h
> > to align with the changes in include/uapi/linux/if_xdp.h
> >
> > Fixes: 8066e388be48 ("net: add UAPI to the header guard in various network headers")
> > Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
> > Closes: https://lore.kernel.org/all/c2bc466d-dff2-4d0d-a797-9af7f676c065@linux.ibm.com/
> > Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
> > Signed-off-by: Saket Kumar Bhaskar <skb99@linux.ibm.com>
> > ---
> >
> > [RESEND]:
> >  - Added Fixes and Tested-by tag.
> >  - Added Greg as receipent for driver-core tree.
>
> Why?  Commit 8066e388be48 ("net: add UAPI to the header guard in various
> network headers") is not in that tree/branch, so why do I need it?

Certainly not driver-core.

Please resend with [PATCH net-next] and cc netdev.