Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: xt_quota: use per-rule spin lock

Use per-rule spin lock to improve the scalability.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

authored by

Changli Gao and committed by
Patrick McHardy
b0c81aa5 f667009e

+5 -5
+5 -5
net/netfilter/xt_quota.c
··· 11 11 #include <linux/netfilter/xt_quota.h> 12 12 13 13 struct xt_quota_priv { 14 - uint64_t quota; 14 + spinlock_t lock; 15 + uint64_t quota; 15 16 }; 16 17 17 18 MODULE_LICENSE("GPL"); ··· 21 20 MODULE_ALIAS("ipt_quota"); 22 21 MODULE_ALIAS("ip6t_quota"); 23 22 24 - static DEFINE_SPINLOCK(quota_lock); 25 - 26 23 static bool 27 24 quota_mt(const struct sk_buff *skb, struct xt_action_param *par) 28 25 { ··· 28 29 struct xt_quota_priv *priv = q->master; 29 30 bool ret = q->flags & XT_QUOTA_INVERT; 30 31 31 - spin_lock_bh(&quota_lock); 32 + spin_lock_bh(&priv->lock); 32 33 if (priv->quota >= skb->len) { 33 34 priv->quota -= skb->len; 34 35 ret = !ret; ··· 38 39 } 39 40 /* Copy quota back to matchinfo so that iptables can display it */ 40 41 q->quota = priv->quota; 41 - spin_unlock_bh(&quota_lock); 42 + spin_unlock_bh(&priv->lock); 42 43 43 44 return ret; 44 45 } ··· 54 55 if (q->master == NULL) 55 56 return -ENOMEM; 56 57 58 + spin_lock_init(&q->master->lock); 57 59 q->master->quota = q->quota; 58 60 return 0; 59 61 }