* Re: mmotm 2021-05-19-23-58 uploaded (net/netfilter/nft_set_pipapo_avx2.c) [not found] <20210520065918.KsmugQp47%akpm@linux-foundation.org> @ 2021-05-20 22:40 ` Randy Dunlap 2021-05-20 23:07 ` Stephen Rothwell 0 siblings, 1 reply; 3+ messages in thread From: Randy Dunlap @ 2021-05-20 22:40 UTC (permalink / raw) To: akpm, broonie, linux-fsdevel, linux-kernel, linux-mm, linux-next, mhocko, mm-commits, sfr, netdev@vger.kernel.org, Stefano Brivio, netfilter-devel, coreteam [-- Attachment #1: Type: text/plain, Size: 1540 bytes --] On 5/19/21 11:59 PM, akpm@linux-foundation.org wrote: > The mm-of-the-moment snapshot 2021-05-19-23-58 has been uploaded to > > https://www.ozlabs.org/~akpm/mmotm/ > > mmotm-readme.txt says > > README for mm-of-the-moment: > > https://www.ozlabs.org/~akpm/mmotm/ > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully > more than once a week. > > You will need quilt to apply these patches to the latest Linus release (5.x > or 5.x-rcY). The series file is in broken-out.tar.gz and is duplicated in > https://ozlabs.org/~akpm/mmotm/series > > The file broken-out.tar.gz contains two datestamp files: .DATE and > .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss, > followed by the base kernel version against which this patch series is to > be applied. > > This tree is partially included in linux-next. To see which patches are > included in linux-next, consult the `series' file. Only the patches > within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in > linux-next. on x86_64: (from linux-next, not mmotm) ../net/netfilter/nft_set_pipapo_avx2.c: In function ‘nft_pipapo_avx2_lookup’: ../net/netfilter/nft_set_pipapo_avx2.c:1135:10: error: implicit declaration of function ‘nft_pipapo_lookup’; did you mean ‘nft_pipapo_avx2_lookup’? [-Werror=implicit-function-declaration] return nft_pipapo_lookup(net, set, key, ext); ^~~~~~~~~~~~~~~~~ Full randconfig file is attached. -- ~Randy Reported-by: Randy Dunlap <rdunlap@infradead.org> [-- Attachment #2: config-r9445.gz --] [-- Type: application/gzip, Size: 37684 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: mmotm 2021-05-19-23-58 uploaded (net/netfilter/nft_set_pipapo_avx2.c) 2021-05-20 22:40 ` mmotm 2021-05-19-23-58 uploaded (net/netfilter/nft_set_pipapo_avx2.c) Randy Dunlap @ 2021-05-20 23:07 ` Stephen Rothwell 2021-05-21 1:04 ` Randy Dunlap 0 siblings, 1 reply; 3+ messages in thread From: Stephen Rothwell @ 2021-05-20 23:07 UTC (permalink / raw) To: Randy Dunlap Cc: akpm, broonie, linux-fsdevel, linux-kernel, linux-mm, linux-next, mhocko, mm-commits, sfr, netdev@vger.kernel.org, Stefano Brivio, netfilter-devel, coreteam [-- Attachment #1: Type: text/plain, Size: 2529 bytes --] Hi Randy, On Thu, 20 May 2021 15:40:54 -0700 Randy Dunlap <rdunlap@infradead.org> wrote: > > on x86_64: > (from linux-next, not mmotm) Yeah, this is caused by a bad merge resolution by me. > ../net/netfilter/nft_set_pipapo_avx2.c: In function ‘nft_pipapo_avx2_lookup’: > ../net/netfilter/nft_set_pipapo_avx2.c:1135:10: error: implicit declaration of function ‘nft_pipapo_lookup’; did you mean ‘nft_pipapo_avx2_lookup’? [-Werror=implicit-function-declaration] > return nft_pipapo_lookup(net, set, key, ext); > ^~~~~~~~~~~~~~~~~ I have added this to the merge resolution today: diff --git a/include/net/netfilter/nf_tables_core.h b/include/net/netfilter/nf_tables_core.h index 789e9eadd76d..8652b2514e57 100644 --- a/include/net/netfilter/nf_tables_core.h +++ b/include/net/netfilter/nf_tables_core.h @@ -89,6 +89,8 @@ extern const struct nft_set_type nft_set_bitmap_type; extern const struct nft_set_type nft_set_pipapo_type; extern const struct nft_set_type nft_set_pipapo_avx2_type; +bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, + const u32 *key, const struct nft_set_ext **ext); #ifdef CONFIG_RETPOLINE bool nft_rhash_lookup(const struct net *net, const struct nft_set *set, const u32 *key, const struct nft_set_ext **ext); @@ -101,8 +103,6 @@ bool nft_hash_lookup_fast(const struct net *net, const u32 *key, const struct nft_set_ext **ext); bool nft_hash_lookup(const struct net *net, const struct nft_set *set, const u32 *key, const struct nft_set_ext **ext); -bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, - const u32 *key, const struct nft_set_ext **ext); bool nft_set_do_lookup(const struct net *net, const struct nft_set *set, const u32 *key, const struct nft_set_ext **ext); #else diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c index 9addc0b447f7..dce866d93fee 100644 --- a/net/netfilter/nft_set_pipapo.c +++ b/net/netfilter/nft_set_pipapo.c @@ -408,7 +408,6 @@ int pipapo_refill(unsigned long *map, int len, int rules, unsigned long *dst, * * Return: true on match, false otherwise. */ -INDIRECT_CALLABLE_SCOPE bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, const u32 *key, const struct nft_set_ext **ext) { It should apply on top of next-20210520 if you want to test it (I haven't tested it yet, but will later today). -- Cheers, Stephen Rothwell [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: mmotm 2021-05-19-23-58 uploaded (net/netfilter/nft_set_pipapo_avx2.c) 2021-05-20 23:07 ` Stephen Rothwell @ 2021-05-21 1:04 ` Randy Dunlap 0 siblings, 0 replies; 3+ messages in thread From: Randy Dunlap @ 2021-05-21 1:04 UTC (permalink / raw) To: Stephen Rothwell Cc: akpm, broonie, linux-fsdevel, linux-kernel, linux-mm, linux-next, mhocko, mm-commits, sfr, netdev@vger.kernel.org, Stefano Brivio, netfilter-devel, coreteam On 5/20/21 4:07 PM, Stephen Rothwell wrote: > Hi Randy, > > On Thu, 20 May 2021 15:40:54 -0700 Randy Dunlap <rdunlap@infradead.org> wrote: >> >> on x86_64: >> (from linux-next, not mmotm) > > Yeah, this is caused by a bad merge resolution by me. > >> ../net/netfilter/nft_set_pipapo_avx2.c: In function ‘nft_pipapo_avx2_lookup’: >> ../net/netfilter/nft_set_pipapo_avx2.c:1135:10: error: implicit declaration of function ‘nft_pipapo_lookup’; did you mean ‘nft_pipapo_avx2_lookup’? [-Werror=implicit-function-declaration] >> return nft_pipapo_lookup(net, set, key, ext); >> ^~~~~~~~~~~~~~~~~ > > I have added this to the merge resolution today: > > diff --git a/include/net/netfilter/nf_tables_core.h b/include/net/netfilter/nf_tables_core.h > index 789e9eadd76d..8652b2514e57 100644 > --- a/include/net/netfilter/nf_tables_core.h > +++ b/include/net/netfilter/nf_tables_core.h > @@ -89,6 +89,8 @@ extern const struct nft_set_type nft_set_bitmap_type; > extern const struct nft_set_type nft_set_pipapo_type; > extern const struct nft_set_type nft_set_pipapo_avx2_type; > > +bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, > + const u32 *key, const struct nft_set_ext **ext); > #ifdef CONFIG_RETPOLINE > bool nft_rhash_lookup(const struct net *net, const struct nft_set *set, > const u32 *key, const struct nft_set_ext **ext); > @@ -101,8 +103,6 @@ bool nft_hash_lookup_fast(const struct net *net, > const u32 *key, const struct nft_set_ext **ext); > bool nft_hash_lookup(const struct net *net, const struct nft_set *set, > const u32 *key, const struct nft_set_ext **ext); > -bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, > - const u32 *key, const struct nft_set_ext **ext); > bool nft_set_do_lookup(const struct net *net, const struct nft_set *set, > const u32 *key, const struct nft_set_ext **ext); > #else > diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c > index 9addc0b447f7..dce866d93fee 100644 > --- a/net/netfilter/nft_set_pipapo.c > +++ b/net/netfilter/nft_set_pipapo.c > @@ -408,7 +408,6 @@ int pipapo_refill(unsigned long *map, int len, int rules, unsigned long *dst, > * > * Return: true on match, false otherwise. > */ > -INDIRECT_CALLABLE_SCOPE > bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, > const u32 *key, const struct nft_set_ext **ext) > { > > It should apply on top of next-20210520 if you want to test it (I > haven't tested it yet, but will later today). Yes, that builds. Thanks. -- ~Randy Reported-by: Randy Dunlap <rdunlap@infradead.org> https://people.kernel.org/tglx/notes-about-netiquette ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-21 1:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210520065918.KsmugQp47%akpm@linux-foundation.org>
2021-05-20 22:40 ` mmotm 2021-05-19-23-58 uploaded (net/netfilter/nft_set_pipapo_avx2.c) Randy Dunlap
2021-05-20 23:07 ` Stephen Rothwell
2021-05-21 1:04 ` Randy Dunlap
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).