netfilter: nft_set_pipapo: prefer kvmalloc for scratch maps

[ Upstream commit 897eefee2eb73ec6c119a0ca357d7b4a3e92c5ef ]

The scratchmap size depends on the number of elements in the set.
For huge sets, each scratch map can easily require very large
allocations, e.g. for 100k entries each scratch map will require
close to 64kbyte of memory.

Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index c5855069bdaba08a0d39cfed59b79c45961bc114..9e4e25f2458f99823337e89f3f488755da82abe0 100644 (file)
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -1219,7 +1219,7 @@ static void pipapo_free_scratch(const struct nft_pipapo_match *m, unsigned int c
 
        mem = s;
        mem -= s->align_off;
-       kfree(mem);
+       kvfree(mem);
 }
 
 /**
@@ -1240,10 +1240,9 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,
                void *scratch_aligned;
                u32 align_off;
 #endif
-               scratch = kzalloc_node(struct_size(scratch, map,
-                                                  bsize_max * 2) +
-                                      NFT_PIPAPO_ALIGN_HEADROOM,
-                                      GFP_KERNEL_ACCOUNT, cpu_to_node(i));
+               scratch = kvzalloc_node(struct_size(scratch, map, bsize_max * 2) +
+                                       NFT_PIPAPO_ALIGN_HEADROOM,
+                                       GFP_KERNEL_ACCOUNT, cpu_to_node(i));
                if (!scratch) {
                        /* On failure, there's no need to undo previous
                         * allocations: this means that some scratch maps have