netfilter: ecache: don't use nf_conn spinlock

For updating eache missed value we can use cmpxchg.
This also avoids need to disable BH.

kernel robot reported build failure on v1 because not all arches support
cmpxchg for u16, so extend this to u32.

This doesn't increase struct size, existing padding is used.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 16bcff809b18120ccfca5dfd3d427ff45dc9af6c..6c4c490a3e342ae75156b8ad4f9942d7ca8155b9 100644 (file)
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -21,10 +21,10 @@ enum nf_ct_ecache_state {
 
 struct nf_conntrack_ecache {
        unsigned long cache;            /* bitops want long */
-       u16 missed;                     /* missed events */
        u16 ctmask;                     /* bitmask of ct events to be delivered */
        u16 expmask;                    /* bitmask of expect events to be delivered */
        enum nf_ct_ecache_state state:8;/* ecache state */
+       u32 missed;                     /* missed events */
        u32 portid;                     /* netlink portid of destroyer */
 };
 

diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
index 873908054f7fac6400403f6999e807cae3ae1862..07e65b4e92f86b944bb5c1a2b6ab676658120da5 100644 (file)
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -131,13 +131,13 @@ static void ecache_work(struct work_struct *work)
 }
 
 static int __nf_conntrack_eventmask_report(struct nf_conntrack_ecache *e,
-                                          const unsigned int events,
-                                          const unsigned long missed,
+                                          const u32 events,
+                                          const u32 missed,
                                           const struct nf_ct_event *item)
 {
-       struct nf_conn *ct = item->ct;
        struct net *net = nf_ct_net(item->ct);
        struct nf_ct_event_notifier *notify;
+       u32 old, want;
        int ret;
 
        if (!((events | missed) & e->ctmask))
@@ -157,12 +157,13 @@ static int __nf_conntrack_eventmask_report(struct nf_conntrack_ecache *e,
        if (likely(ret >= 0 && missed == 0))
                return 0;
 
-       spin_lock_bh(&ct->lock);
-       if (ret < 0)
-               e->missed |= events;
-       else
-               e->missed &= ~missed;
-       spin_unlock_bh(&ct->lock);
+       do {
+               old = READ_ONCE(e->missed);
+               if (ret < 0)
+                       want = old | events;
+               else
+                       want = old & ~missed;
+       } while (cmpxchg(&e->missed, old, want) != old);
 
        return ret;
 }
@@ -172,7 +173,7 @@ int nf_conntrack_eventmask_report(unsigned int events, struct nf_conn *ct,
 {
        struct nf_conntrack_ecache *e;
        struct nf_ct_event item;
-       unsigned long missed;
+       unsigned int missed;
        int ret;
 
        if (!nf_ct_is_confirmed(ct))
@@ -211,7 +212,7 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct)
 {
        struct nf_conntrack_ecache *e;
        struct nf_ct_event item;
-       unsigned long events;
+       unsigned int events;
 
        if (!nf_ct_is_confirmed(ct) || nf_ct_is_dying(ct))
                return;
@@ -312,7 +313,7 @@ void nf_conntrack_ecache_pernet_init(struct net *net)
        cnet->ct_net = &net->ct;
        INIT_DELAYED_WORK(&cnet->ecache_dwork, ecache_work);
 
-       BUILD_BUG_ON(__IPCT_MAX >= 16); /* ctmask, missed use u16 */
+       BUILD_BUG_ON(__IPCT_MAX >= 16); /* e->ctmask is u16 */
 }
 
 void nf_conntrack_ecache_pernet_fini(struct net *net)