Re: ipset 7.7 modules fail to build on kernel 4.19.152

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Den mån 2 nov. 2020 kl 09:55 skrev Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxx>:
>
> Hi,
>
> On Sun, 1 Nov 2020, Oskar Berggren wrote:
>
> > I can build ipset 7.6 modules on 4.19.152 kernel (Debian buster
> > current stable), but 7.7 fails:
> >
> > $ configure; make
> > $ make modules
> > jhash.h:90:32 `fallthrough` undeclared
> > jhash.h:136:21 `fallthrough` undeclared
> >
> > ip_set_core.c:90:40 macro list_for_each_entry_rcu passed 4 arguments
> > but takes just 3
> > ip_set_core.c:89:2 list_for_each_entry_rcu undeclared
> >
> > Plus a few more but I think they are just because the compiler is
> > confused after the above problems.
> >
> > There are commits in 7.7 touching the above pieces of code.
>
> Does the patch fixes all the issues above?
>
> diff --git a/kernel/include/linux/jhash.h b/kernel/include/linux/jhash.h
> index 5e578b1..8df77ec 100644
> --- a/kernel/include/linux/jhash.h
> +++ b/kernel/include/linux/jhash.h
> @@ -1,5 +1,6 @@
>  #ifndef _LINUX_JHASH_H
>  #define _LINUX_JHASH_H
> +#include <linux/netfilter/ipset/ip_set_compat.h>
>
>  /* jhash.h: Jenkins hash support.
>   *


It fixes the problems listed for jhash.h, but unfortunately not for
ip_set_core.c.

There don't seem to be any compat layer for list_for_each_entry_rcu in
ipset sources.

The fourth parameter to list_for_each_entry_rcu seems to appear in
5.4-rc1 by this commit:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=28875945ba98d1b47a8a706812b6494d165bb0a0


/Oskar




[Index of Archives]     [Netfitler Users]     [Berkeley Packet Filter]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux