Commit f7232247 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'nf-next-24-09-06' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next 

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patchset contains Netfilter updates for net-next:

Patch #1 adds ctnetlink support for kernel side filtering for
	 deletions, from Changliang Wu.

Patch #2 updates nft_counter support to Use u64_stats_t,
	 from Sebastian Andrzej Siewior.

Patch #3 uses kmemdup_array() in all xtables frontends,
	 from Yan Zhen.

Patch #4 is a oneliner to use ERR_CAST() in nf_conntrack instead
	 opencoded casting, from Shen Lichuan.

Patch #5 removes unused argument in nftables .validate interface,
	 from Florian Westphal.

Patch #6 is a oneliner to correct a typo in nftables kdoc,
	 from Simon Horman.

Patch #7 fixes missing kdoc in nftables, also from Simon.

Patch #8 updates nftables to handle timeout less than CONFIG_HZ.

Patch #9 rejects element expiration if timeout is zero,
	 otherwise it is silently ignored.

Patch #10 disallows element expiration larger than timeout.

Patch #11 removes unnecessary READ_ONCE annotation while mutex is held.

Patch #12 adds missing READ_ONCE/WRITE_ONCE annotation in dynset.

Patch #13 annotates data-races around element expiration.

Patch #14 allocates timeout and expiration in one single set element
	  extension, they are tighly couple, no reason to keep them
	  separated anymore.

Patch #15 updates nftables to interpret zero timeout element as never
	  times out. Note that it is already possible to declare sets
	  with elements that never time out but this generalizes to all
	  kind of set with timeouts.

Patch #16 supports for element timeout and expiration updates.

* tag 'nf-next-24-09-06' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next:
  netfilter: nf_tables: set element timeout update support
  netfilter: nf_tables: zero timeout means element never times out
  netfilter: nf_tables: consolidate timeout extension for elements
  netfilter: nf_tables: annotate data-races around element expiration
  netfilter: nft_dynset: annotate data-races around set timeout
  netfilter: nf_tables: remove annotation to access set timeout while holding lock
  netfilter: nf_tables: reject expiration higher than timeout
  netfilter: nf_tables: reject element expiration with no timeout
  netfilter: nf_tables: elements with timeout below CONFIG_HZ never expire
  netfilter: nf_tables: Add missing Kernel doc
  netfilter: nf_tables: Correct spelling in nf_tables.h
  netfilter: nf_tables: drop unused 3rd argument from validate callback ops
  netfilter: conntrack: Convert to use ERR_CAST()
  netfilter: Use kmemdup_array instead of kmemdup for multiple allocation
  netfilter: nft_counter: Use u64_stats_t for statistic.
  netfilter: ctnetlink: support CTA_FILTER for flush
====================

Link: https://patch.msgid.link/20240905232920.5481-1-pablo@netfilter.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents aa05fe67 4201f393

include/net/netfilter/nf_tables.h

+29 −13
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ static inline void nft_data_copy(u32 *dst, const struct nft_data *src, 
 *	@family: protocol family

 *	@level: depth of the chains

 *	@report: notify via unicast netlink message

 *	@reg_inited: bitmap of initialised registers

 */

struct nft_ctx {

	struct net			*net;
@@ -313,6 +314,7 @@ static inline void *nft_elem_priv_cast(const struct nft_elem_priv *priv) 
/**

 * enum nft_iter_type - nftables set iterator type

 *

 * @NFT_ITER_UNSPEC: unspecified, to catch errors

 * @NFT_ITER_READ: read-only iteration over set elements

 * @NFT_ITER_UPDATE: iteration under mutex to update set element state

 */
@@ -685,9 +687,8 @@ void nf_tables_destroy_set(const struct nft_ctx *ctx, struct nft_set *set); 
 *	@NFT_SET_EXT_DATA: mapping data

 *	@NFT_SET_EXT_FLAGS: element flags

 *	@NFT_SET_EXT_TIMEOUT: element timeout

 *	@NFT_SET_EXT_EXPIRATION: element expiration time

 *	@NFT_SET_EXT_USERDATA: user data associated with the element

 *	@NFT_SET_EXT_EXPRESSIONS: expressions assiciated with the element

 *	@NFT_SET_EXT_EXPRESSIONS: expressions associated with the element

 *	@NFT_SET_EXT_OBJREF: stateful object reference associated with element

 *	@NFT_SET_EXT_NUM: number of extension types

 */
@@ -697,7 +698,6 @@ enum nft_set_extensions { 
	NFT_SET_EXT_DATA,

	NFT_SET_EXT_FLAGS,

	NFT_SET_EXT_TIMEOUT,

	NFT_SET_EXT_EXPIRATION,

	NFT_SET_EXT_USERDATA,

	NFT_SET_EXT_EXPRESSIONS,

	NFT_SET_EXT_OBJREF,
@@ -809,14 +809,14 @@ static inline u8 *nft_set_ext_flags(const struct nft_set_ext *ext) 
	return nft_set_ext(ext, NFT_SET_EXT_FLAGS);

}



static inline u64 *nft_set_ext_timeout(const struct nft_set_ext *ext)

{

	return nft_set_ext(ext, NFT_SET_EXT_TIMEOUT);

}

struct nft_timeout {

	u64	timeout;

	u64	expiration;

};



static inline u64 *nft_set_ext_expiration(const struct nft_set_ext *ext)

static inline struct nft_timeout *nft_set_ext_timeout(const struct nft_set_ext *ext)

{

	return nft_set_ext(ext, NFT_SET_EXT_EXPIRATION);

	return nft_set_ext(ext, NFT_SET_EXT_TIMEOUT);

}



static inline struct nft_userdata *nft_set_ext_userdata(const struct nft_set_ext *ext)
@@ -832,8 +832,11 @@ static inline struct nft_set_elem_expr *nft_set_ext_expr(const struct nft_set_ex 
static inline bool __nft_set_elem_expired(const struct nft_set_ext *ext,

					  u64 tstamp)

{

	return nft_set_ext_exists(ext, NFT_SET_EXT_EXPIRATION) &&

	       time_after_eq64(tstamp, *nft_set_ext_expiration(ext));

	if (!nft_set_ext_exists(ext, NFT_SET_EXT_TIMEOUT) ||

	    READ_ONCE(nft_set_ext_timeout(ext)->timeout) == 0)

		return false;



	return time_after_eq64(tstamp, READ_ONCE(nft_set_ext_timeout(ext)->expiration));

}



static inline bool nft_set_elem_expired(const struct nft_set_ext *ext)
@@ -961,8 +964,7 @@ struct nft_expr_ops { 
						const struct nft_expr *expr,

						bool reset);

	int				(*validate)(const struct nft_ctx *ctx,

						    const struct nft_expr *expr,

						    const struct nft_data **data);

						    const struct nft_expr *expr);

	bool				(*reduce)(struct nft_regs_track *track,

						  const struct nft_expr *expr);

	bool				(*gc)(struct net *net,
@@ -1747,10 +1749,18 @@ struct nft_trans_table { 
#define nft_trans_table_update(trans)			\

	nft_trans_container_table(trans)->update



enum nft_trans_elem_flags {

	NFT_TRANS_UPD_TIMEOUT		= (1 << 0),

	NFT_TRANS_UPD_EXPIRATION	= (1 << 1),

};



struct nft_trans_elem {

	struct nft_trans		nft_trans;

	struct nft_set			*set;

	struct nft_elem_priv		*elem_priv;

	u64				timeout;

	u64				expiration;

	u8				update_flags;

	bool				bound;

};
@@ -1760,6 +1770,12 @@ struct nft_trans_elem { 
	nft_trans_container_elem(trans)->set

#define nft_trans_elem_priv(trans)			\

	nft_trans_container_elem(trans)->elem_priv

#define nft_trans_elem_update_flags(trans)		\

	nft_trans_container_elem(trans)->update_flags

#define nft_trans_elem_timeout(trans)			\

	nft_trans_container_elem(trans)->timeout

#define nft_trans_elem_expiration(trans)		\

	nft_trans_container_elem(trans)->expiration

#define nft_trans_elem_set_bound(trans)			\

	nft_trans_container_elem(trans)->bound

include/net/netfilter/nf_tproxy.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ __be32 nf_tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr); 


/**

 * nf_tproxy_handle_time_wait4 - handle IPv4 TCP TIME_WAIT reopen redirections

 * @net:	The network namespace.

 * @skb:	The skb being processed.

 * @laddr:	IPv4 address to redirect to or zero.

 * @lport:	TCP port to redirect to or zero.

include/net/netfilter/nft_fib.h

+1 −3
Original line number Diff line number Diff line
@@ -21,9 +21,7 @@ nft_fib_is_loopback(const struct sk_buff *skb, const struct net_device *in) 
int nft_fib_dump(struct sk_buff *skb, const struct nft_expr *expr, bool reset);

int nft_fib_init(const struct nft_ctx *ctx, const struct nft_expr *expr,

		 const struct nlattr * const tb[]);

int nft_fib_validate(const struct nft_ctx *ctx, const struct nft_expr *expr,

		     const struct nft_data **data);



int nft_fib_validate(const struct nft_ctx *ctx, const struct nft_expr *expr);



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

			const struct nft_pktinfo *pkt);

include/net/netfilter/nft_meta.h

+1 −2
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ void nft_meta_set_destroy(const struct nft_ctx *ctx, 
			  const struct nft_expr *expr);



int nft_meta_set_validate(const struct nft_ctx *ctx,

			  const struct nft_expr *expr,

			  const struct nft_data **data);

			  const struct nft_expr *expr);



bool nft_meta_get_reduce(struct nft_regs_track *track,

			 const struct nft_expr *expr);

include/net/netfilter/nft_reject.h

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ struct nft_reject { 
extern const struct nla_policy nft_reject_policy[];



int nft_reject_validate(const struct nft_ctx *ctx,

			const struct nft_expr *expr,

			const struct nft_data **data);

			const struct nft_expr *expr);



int nft_reject_init(const struct nft_ctx *ctx,

		    const struct nft_expr *expr,