xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: nft_set_pipapo: add helper to release pcpu scratch area

Browse Source 
[ Upstream commit 47b1c03c3c1a119435480a1e73f27197dc59131d ]

After next patch simple kfree() is not enough anymore, so add
a helper for it.

Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Stable-dep-of: 5a8cdf6fd860 ("netfilter: nft_set_pipapo: remove scratch_aligned pointer")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Florian Westphal
2024-02-07 21:52:47 +01:00
committed by Greg Kroah-Hartman
parent 1771e8347f
commit d6fcad0da2
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
net/netfilter/nft_set_pipapo.c
View File

@@ -1101,6 +1101,24 @@ static void pipapo_map(struct nft_pipapo_match *m,
f->mt[map[i].to + j].e = e; f->mt[map[i].to + j].e = e;
} }
/**
* pipapo_free_scratch() - Free per-CPU map at original (not aligned) address
* @m: Matching data
* @cpu: CPU number
*/
static void pipapo_free_scratch(const struct nft_pipapo_match *m, unsigned int cpu)
{
struct nft_pipapo_scratch *s;
void *mem;
s = *per_cpu_ptr(m->scratch, cpu);
if (!s)
return;
mem = s;
kfree(mem);
}
/** /**
* pipapo_realloc_scratch() - Reallocate scratch maps for partial match results * pipapo_realloc_scratch() - Reallocate scratch maps for partial match results
* @clone: Copy of matching data with pending insertions and deletions * @clone: Copy of matching data with pending insertions and deletions
@@ -1133,7 +1151,7 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,
return -ENOMEM; return -ENOMEM;
} }
kfree(*per_cpu_ptr(clone->scratch, i)); pipapo_free_scratch(clone, i);
*per_cpu_ptr(clone->scratch, i) = scratch; *per_cpu_ptr(clone->scratch, i) = scratch;
@@ -1359,7 +1377,7 @@ out_lt:
} }
out_scratch_realloc: out_scratch_realloc:
for_each_possible_cpu(i) for_each_possible_cpu(i)
kfree(*per_cpu_ptr(new->scratch, i)); pipapo_free_scratch(new, i);
#ifdef NFT_PIPAPO_ALIGN #ifdef NFT_PIPAPO_ALIGN
free_percpu(new->scratch_aligned); free_percpu(new->scratch_aligned);
#endif #endif
@@ -1644,7 +1662,7 @@ static void pipapo_free_match(struct nft_pipapo_match *m)
int i; int i;
for_each_possible_cpu(i) for_each_possible_cpu(i)
kfree(*per_cpu_ptr(m->scratch, i)); pipapo_free_scratch(m, i);
#ifdef NFT_PIPAPO_ALIGN #ifdef NFT_PIPAPO_ALIGN
free_percpu(m->scratch_aligned); free_percpu(m->scratch_aligned);
@@ -2235,7 +2253,7 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx,
free_percpu(m->scratch_aligned); free_percpu(m->scratch_aligned);
#endif #endif
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)
kfree(*per_cpu_ptr(m->scratch, cpu)); pipapo_free_scratch(m, cpu);
free_percpu(m->scratch); free_percpu(m->scratch);
pipapo_free_fields(m); pipapo_free_fields(m);
kfree(m); kfree(m);
@@ -2252,7 +2270,7 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx,
free_percpu(priv->clone->scratch_aligned); free_percpu(priv->clone->scratch_aligned);
#endif #endif
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)
kfree(*per_cpu_ptr(priv->clone->scratch, cpu)); pipapo_free_scratch(priv->clone, cpu);
free_percpu(priv->clone->scratch); free_percpu(priv->clone->scratch);
pipapo_free_fields(priv->clone); pipapo_free_fields(priv->clone);