net: fixup build after bpf header changes
Subsystems (7)
Jakub Kicinski
maintainerPATCH 1/1 net: fixup build after bpf header changes
Recent bpf-next merge brought in header changes which uncovered includes missing in net-next which were not present in bpf-next. Build problems happen only on less-popular arches like hppa, sparc, alpha etc.
I could repro the build problem with ice but not the mlx5 problem Abdul was reporting. mlx5 does look like it should include filter.h, anyway.
---
CC: jesse.brandeburg at intel.com
CC: anthony.l.nguyen at intel.com
CC: saeedm at nvidia.com
CC: leon at kernel.org
CC: intel-wired-lan at lists.osuosl.org
CC: linux-rdma at vger.kernel.org
CC: bpf at vger.kernel.org
--- drivers/net/ethernet/intel/ice/ice_nvm.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + 2 files changed, 3 insertions(+)
drivers/net/ethernet/intel/ice/ice_nvm.c +2 -0
@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018, Intel Corporation. */ +#include <linux/vmalloc.h> +#include "ice_common.h" /**
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -0
@@ -37,6 +37,7 @@#include <net/geneve.h> #include <linux/bpf.h> #include <linux/if_bridge.h> +#include <linux/filter.h> #include <net/page_pool.h> #include <net/xdp_sock_drv.h> #include "eswitch.h"
Signature · 1 line
2.31.1
Quoted 9 lines · Jakub Kicinski
Recent bpf-next merge brought in header changes which uncovered includes missing in net-next which were not present in bpf-next. Build problems happen only on less-popular arches like hppa, sparc, alpha etc.
I could repro the build problem with ice but not the mlx5 problem Abdul was reporting. mlx5 does look like it should include
filter.h, anyway.
I got an internal report on the same thing also, but I couldn't repro myself neither, I will ask them to test your patch.
Hi
Thank You Jakub for the patch.
Kernel builds fine with given patch fix
Quoted 51 lines · Jakub Kicinski
Recent bpf-next merge brought in header changes which uncovered includes missing in net-next which were not present in bpf-next. Build problems happen only on less-popular arches like hppa, sparc, alpha etc.
I could repro the build problem with ice but not the mlx5 problem Abdul was reporting. mlx5 does look like it should include
filter.h, anyway.Reported-by Abdul Haleem <[email protected]>Fixes e63a02348958 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next")Link https://lore.kernel.org/all/7c03768d-d948-c935-a7ab-b1f963ac7eed at linux.vnet.ibm.com/Signed-off-by Jakub Kicinski <[email protected]>---
CC: jesse.brandeburg at intel.com
CC: anthony.l.nguyen at intel.com
CC: saeedm at nvidia.com
CC: leon at kernel.org
CC: intel-wired-lan at lists.osuosl.org
CC: linux-rdma at vger.kernel.org
CC: bpf at vger.kernel.org--- drivers/net/ethernet/intel/ice/ice_nvm.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + 2 files changed, 3 insertions(+)drivers/net/ethernet/intel/ice/ice_nvm.c +2
-0@@ -1,6 +1,8 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018, Intel Corporation. */ +#include <linux/vmalloc.h> +#include "ice_common.h" /** drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1
-0@@ -37,6 +37,7 @@#include <net/geneve.h> #include <linux/bpf.h> #include <linux/if_bridge.h> +#include <linux/filter.h> #include <net/page_pool.h> #include <net/xdp_sock_drv.h> #include "eswitch.h"
Signature · 4 lines
Regard's Abdul Haleem IBM Linux Technology Center
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 10 lines · On Mon, 3 Jan 2022 19:48:27 -0800 you wrote:
Recent bpf-next merge brought in header changes which uncovered includes missing in net-next which were not present in bpf-next. Build problems happen only on less-popular arches like hppa, sparc, alpha etc.
I could repro the build problem with ice but not the mlx5 problem Abdul was reporting. mlx5 does look like it should include
filter.h, anyway.[...]
Here is the summary with links:
- [net-next] net: fixup build after bpf header changes
https://git.kernel.org/netdev/net-next/c/7d714ff14d64
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 6 lines · Saeed Mahameed
Quoted 5 lines · Jakub Kicinski
Recent bpf-next merge brought in header changes which uncovered includes missing in net-next which were not present in bpf-next. Build problems happen only on less-popular arches like hppa, sparc, alpha etc.
Quoted 8 lines
Quoted 4 lines
I could repro the build problem with ice but not the mlx5 problem Abdul was reporting. mlx5 does look like it should include
filter.h, anyway.I got an internal report on the same thing also, but I couldn't repro myself neither, I will ask them to test your patch.
The patch seems to have fixed the issue.
Thanks.