Commit b0c81aa5 authored by Changli Gao's avatar Changli Gao Committed by Patrick McHardy

netfilter: xt_quota: use per-rule spin lock

Use per-rule spin lock to improve the scalability.
Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent f667009e
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
#include <linux/netfilter/xt_quota.h> #include <linux/netfilter/xt_quota.h>
struct xt_quota_priv { struct xt_quota_priv {
uint64_t quota; spinlock_t lock;
uint64_t quota;
}; };
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -20,8 +21,6 @@ MODULE_DESCRIPTION("Xtables: countdown quota match"); ...@@ -20,8 +21,6 @@ MODULE_DESCRIPTION("Xtables: countdown quota match");
MODULE_ALIAS("ipt_quota"); MODULE_ALIAS("ipt_quota");
MODULE_ALIAS("ip6t_quota"); MODULE_ALIAS("ip6t_quota");
static DEFINE_SPINLOCK(quota_lock);
static bool static bool
quota_mt(const struct sk_buff *skb, struct xt_action_param *par) quota_mt(const struct sk_buff *skb, struct xt_action_param *par)
{ {
...@@ -29,7 +28,7 @@ quota_mt(const struct sk_buff *skb, struct xt_action_param *par) ...@@ -29,7 +28,7 @@ quota_mt(const struct sk_buff *skb, struct xt_action_param *par)
struct xt_quota_priv *priv = q->master; struct xt_quota_priv *priv = q->master;
bool ret = q->flags & XT_QUOTA_INVERT; bool ret = q->flags & XT_QUOTA_INVERT;
spin_lock_bh(&quota_lock); spin_lock_bh(&priv->lock);
if (priv->quota >= skb->len) { if (priv->quota >= skb->len) {
priv->quota -= skb->len; priv->quota -= skb->len;
ret = !ret; ret = !ret;
...@@ -39,7 +38,7 @@ quota_mt(const struct sk_buff *skb, struct xt_action_param *par) ...@@ -39,7 +38,7 @@ quota_mt(const struct sk_buff *skb, struct xt_action_param *par)
} }
/* Copy quota back to matchinfo so that iptables can display it */ /* Copy quota back to matchinfo so that iptables can display it */
q->quota = priv->quota; q->quota = priv->quota;
spin_unlock_bh(&quota_lock); spin_unlock_bh(&priv->lock);
return ret; return ret;
} }
...@@ -55,6 +54,7 @@ static int quota_mt_check(const struct xt_mtchk_param *par) ...@@ -55,6 +54,7 @@ static int quota_mt_check(const struct xt_mtchk_param *par)
if (q->master == NULL) if (q->master == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&q->master->lock);
q->master->quota = q->quota; q->master->quota = q->quota;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment