netfilter: nf_dup_netdev: add nf_dev_xmit_recursion*() helpers and use them
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_dup_netdev: add nf_dev_xmit_recursion*() helpers and use them
Update nft_dup and nft_fwd to use the nf_dev_xmit_recursion() helpers. This patch also disables BH when transmitting the skb to address a possible migration to different CPU leading to imbalanced decrementation of the recursion counters.
This is modeled after Florian Westphal's dev_xmit_recursion*() API available since 97cdcf37b57e ("net: place xmit recursion in softnet data") according to its current state in the tree.
Fixes 1d47b55b36d2 ("netfilter: nft_fwd_netdev: use recursion counter in neigh egress path")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/net/netfilter/nf_dup_netdev.h | 34 +++++++++++++++++++++++---- net/netfilter/nf_dup_netdev.c | 10 ++++---- net/netfilter/nft_fwd_netdev.c | 10 ++++---- 3 files changed, 40 insertions(+), 14 deletions(-)
include/net/netfilter/nf_dup_netdev.h +29 -5
@@ -11,15 +11,39 @@ void nf_fwd_netdev_egress(const struct nft_pktinfo *pkt, int oif);#define NF_RECURSION_LIMIT 2 -static inline u8 *nf_get_nf_dup_skb_recursion (void ) -{#ifndef CONFIG_PREEMPT_RT -return this_cpu_ptr (&softnet_data.xmit.nf_dup_skb_recursion); +static inline bool nf_dev_xmit_recursion (void ) +{ +return unlikely (__this_cpu_read (softnet_data.xmit.nf_dup_skb_recursion) > +NF_RECURSION_LIMIT ); +} + +static inline void nf_dev_xmit_recursion_inc (void ) +{ +__this_cpu_inc (softnet_data.xmit.nf_dup_skb_recursion); +} + +static inline void nf_dev_xmit_recursion_dec (void ) +{ +__this_cpu_dec (softnet_data.xmit.nf_dup_skb_recursion); +}#else -return ¤t->net_xmit.nf_dup_skb_recursion; -#endif +static inline bool nf_dev_xmit_recursion (void ) +{ +return unlikely (current->net_xmit.nf_dup_recursion >NF_RECURSION_LIMIT ); +} + +static inline void nf_dev_xmit_recursion_inc (void ) +{ + current->net_xmit.nf_dup_skb_recursion++; } +static inline void nf_dev_xmit_recursion_dec (void ) +{ + current->net_xmit.nf_dup_skb_recursion--; +} +#endif +struct nft_offload_ctx ;struct nft_flow_rule ;
net/netfilter/nf_dup_netdev.c +5 -5
@@ -16,9 +16,7 @@static void nf_do_netdev_egress (struct sk_buff *skb,struct net_device *dev,enum nf_dev_hooks hook) { -u8 *nf_dup_skb_recursion =nf_get_nf_dup_skb_recursion (); - -if (*nf_dup_skb_recursion >NF_RECURSION_LIMIT ) +if (nf_dev_xmit_recursion ()) goto err;if (hook ==NF_NETDEV_INGRESS &&skb_mac_header_was_set (skb)) {
@@ -30,9 +28,11 @@ static void nf_do_netdev_egress(struct sk_buff *skb, struct net_device *dev, skb->dev = dev;skb_clear_tstamp (skb); - (*nf_dup_skb_recursion)++; +local_bh_disable (); +nf_dev_xmit_recursion_inc ();dev_queue_xmit (skb); - (*nf_dup_skb_recursion)--; +nf_dev_xmit_recursion_dec (); +local_bh_enable ();return ; err:kfree_skb (skb);
net/netfilter/nft_fwd_netdev.c +6 -4
@@ -95,7 +95,6 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr,struct nft_regs *regs, const struct nft_pktinfo *pkt) { - u8 *nf_dup_skb_recursion = nf_get_nf_dup_skb_recursion(); struct nft_fwd_neigh *priv = nft_expr_priv(expr);void *addr = ®s->data[priv->sreg_addr];int oif = regs->data[priv->sreg_dev];
@@ -154,7 +153,7 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr, goto out; } -if (*nf_dup_skb_recursion >NF_RECURSION_LIMIT ) { +if (nf_dev_xmit_recursion ()) { verdict =NF_DROP ; goto out; }
@@ -176,9 +175,12 @@ static void nft_fwd_neigh_eval(const struct nft_expr *expr, skb->dev = dev;skb_clear_tstamp (skb); - (*nf_dup_skb_recursion)++; + +local_bh_disable (); +nf_dev_xmit_recursion_inc ();neigh_xmit (neigh_table, dev, addr, skb); - (*nf_dup_skb_recursion)--; +nf_dev_xmit_recursion_dec (); +local_bh_enable (); out: regs->verdict.code = verdict; }
Signature · 1 line
2.47.3