| Message ID | 20220104034827.1564167-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [net-next] net: fixup build after bpf header changes | expand |
On Mon, Jan 03, 2022 at 07:48:27PM -0800, Jakub Kicinski 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. > 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 Tested-by : Abdul haleem <abdhalee@linux.vnet.ibm.com> On 1/4/22 9:18 AM, Jakub Kicinski 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. > > Reported-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com> > 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@linux.vnet.ibm.com/ > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > CC: jesse.brandeburg@intel.com > CC: anthony.l.nguyen@intel.com > CC: saeedm@nvidia.com > CC: leon@kernel.org > CC: intel-wired-lan@lists.osuosl.org > CC: linux-rdma@vger.kernel.org > CC: bpf@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(+) > > diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c > index cd739a2c64e8..4eb0599714f4 100644 > --- a/drivers/net/ethernet/intel/ice/ice_nvm.c > +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c > @@ -1,6 +1,8 @@ > // SPDX-License-Identifier: GPL-2.0 > /* Copyright (c) 2018, Intel Corporation. */ > > +#include <linux/vmalloc.h> > + > #include "ice_common.h" > > /** > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > index efcf9d30b131..31c911182498 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c > @@ -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"
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: 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!
On Mon, Jan 03, 2022 at 11:24:11PM -0800, Saeed Mahameed wrote: >On Mon, Jan 03, 2022 at 07:48:27PM -0800, Jakub Kicinski 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. >> > >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.
diff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c index cd739a2c64e8..4eb0599714f4 100644 --- a/drivers/net/ethernet/intel/ice/ice_nvm.c +++ b/drivers/net/ethernet/intel/ice/ice_nvm.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018, Intel Corporation. */ +#include <linux/vmalloc.h> + #include "ice_common.h" /** diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index efcf9d30b131..31c911182498 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -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"
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 <abdhalee@linux.vnet.ibm.com> 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@linux.vnet.ibm.com/ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: jesse.brandeburg@intel.com CC: anthony.l.nguyen@intel.com CC: saeedm@nvidia.com CC: leon@kernel.org CC: intel-wired-lan@lists.osuosl.org CC: linux-rdma@vger.kernel.org CC: bpf@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(+)