Commit 531e6131 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_set: remove indirection from update API call 



This stems from a time when sets and nft_dynset resided in different kernel
modules.  We can replace this with a direct call.

We could even remove both ->update and ->delete, given its only
supported by rhashtable, but on the off-chance we'll see runtime
add/delete for other types or a new set type keep that as-is for now.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 17a20e09

include/net/netfilter/nf_tables.h

+0 −4
Original line number Diff line number Diff line
@@ -464,10 +464,6 @@ struct nft_set_ops { 
						  const u32 *key);

	const struct nft_set_ext *	(*update)(struct nft_set *set,

						  const u32 *key,

						  struct nft_elem_priv *

							(*new)(struct nft_set *,

							       const struct nft_expr *,

							       struct nft_regs *),

						  const struct nft_expr *expr,

						  struct nft_regs *regs);

	bool				(*delete)(const struct nft_set *set,

include/net/netfilter/nf_tables_core.h

+3 −0
Original line number Diff line number Diff line
@@ -188,4 +188,7 @@ void nft_objref_eval(const struct nft_expr *expr, struct nft_regs *regs, 
		     const struct nft_pktinfo *pkt);

void nft_objref_map_eval(const struct nft_expr *expr, struct nft_regs *regs,

			 const struct nft_pktinfo *pkt);

struct nft_elem_priv *nft_dynset_new(struct nft_set *set,

				     const struct nft_expr *expr,

				     struct nft_regs *regs);

#endif /* _NET_NF_TABLES_CORE_H */

net/netfilter/nft_dynset.c

+4 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int nft_dynset_expr_setup(const struct nft_dynset *priv, 
	return 0;

}



static struct nft_elem_priv *nft_dynset_new(struct nft_set *set,

struct nft_elem_priv *nft_dynset_new(struct nft_set *set,

				     const struct nft_expr *expr,

				     struct nft_regs *regs)

{
@@ -91,8 +91,7 @@ void nft_dynset_eval(const struct nft_expr *expr, 
		return;

	}



	ext = set->ops->update(set, &regs->data[priv->sreg_key], nft_dynset_new,

			     expr, regs);

	ext = set->ops->update(set, &regs->data[priv->sreg_key], expr, regs);

	if (ext) {

		if (priv->op == NFT_DYNSET_OP_UPDATE &&

		    nft_set_ext_exists(ext, NFT_SET_EXT_TIMEOUT) &&

net/netfilter/nft_set_hash.c

+1 −3
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ nft_rhash_get(const struct net *net, const struct nft_set *set, 


static const struct nft_set_ext *

nft_rhash_update(struct nft_set *set, const u32 *key,

		 struct nft_elem_priv *(*new)(struct nft_set *, const struct nft_expr *,

		 struct nft_regs *regs),

		 const struct nft_expr *expr, struct nft_regs *regs)

{

	struct nft_rhash *priv = nft_set_priv(set);
@@ -141,7 +139,7 @@ nft_rhash_update(struct nft_set *set, const u32 *key, 
	if (he != NULL)

		goto out;



	elem_priv = new(set, expr, regs);

	elem_priv = nft_dynset_new(set, expr, regs);

	if (!elem_priv)

		goto err1;

net/netfilter/nft_set_pipapo_avx2.c

+0 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,6 @@ static inline void pipapo_resmap_init_avx2(const struct nft_pipapo_match *m, uns 
 * @net:	Network namespace

 * @set:	nftables API set representation

 * @key:	nftables API element representation containing key data

 * @ext:	nftables API extension pointer, filled with matching reference

 *

 * For more details, see DOC: Theory of Operation in nft_set_pipapo.c.

 *