The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at 
https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.22
------>
commit a893029e2574ac1e08f3dbcce04a7d9e5df25fe9
Author: Gao feng <gaof...@cn.fujitsu.com>
Date:   Mon Jun 29 17:59:28 2015 +0400

    ms/netfilter: ipt_CLUSTERIP: make clusterip_lock per net namespace
    
    this lock is used for protecting clusterip_configs of per
    net namespace, it should be per net namespace too.
    
    Signed-off-by: Gao feng <gaof...@cn.fujitsu.com>
    Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
    (cherry picked from commit f1e8077f490cff4253b197154bf2affaa0ca08e3)
    Signed-off-by: Vladimir Davydov <vdavy...@parallels.com>
---
 net/ipv4/netfilter/ipt_CLUSTERIP.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c 
b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index bed4137..b96ad7e 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -58,9 +58,6 @@ struct clusterip_config {
        struct rcu_head rcu;
 };
 
-/* clusterip_lock protects the clusterip_configs list */
-static DEFINE_SPINLOCK(clusterip_lock);
-
 #ifdef CONFIG_PROC_FS
 static const struct file_operations clusterip_proc_fops;
 #endif
@@ -69,6 +66,9 @@ static int clusterip_net_id __read_mostly;
 
 struct clusterip_net {
        struct list_head configs;
+       /* lock protects the configs list */
+       spinlock_t lock;
+
 #ifdef CONFIG_PROC_FS
        struct proc_dir_entry *procdir;
 #endif
@@ -99,10 +99,12 @@ clusterip_config_put(struct clusterip_config *c)
 static inline void
 clusterip_config_entry_put(struct clusterip_config *c)
 {
+       struct clusterip_net *cn = net_generic(&init_net, clusterip_net_id);
+
        local_bh_disable();
-       if (atomic_dec_and_lock(&c->entries, &clusterip_lock)) {
+       if (atomic_dec_and_lock(&c->entries, &cn->lock)) {
                list_del_rcu(&c->list);
-               spin_unlock(&clusterip_lock);
+               spin_unlock(&cn->lock);
                local_bh_enable();
 
                dev_mc_del(c->dev, c->clustermac);
@@ -198,9 +200,9 @@ clusterip_config_init(const struct ipt_clusterip_tgt_info 
*i, __be32 ip,
        }
 #endif
 
-       spin_lock_bh(&clusterip_lock);
+       spin_lock_bh(&cn->lock);
        list_add_rcu(&c->list, &cn->configs);
-       spin_unlock_bh(&clusterip_lock);
+       spin_unlock_bh(&cn->lock);
 
        return c;
 }
@@ -713,6 +715,8 @@ static int clusterip_net_init(struct net *net)
 
        INIT_LIST_HEAD(&cn->configs);
 
+       spin_lock_init(&cn->lock);
+
 #ifdef CONFIG_PROC_FS
        cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
        if (!cn->procdir) {
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to