3 files changed, 31 insertions, 3 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 962e3de25a35..c7ef6c5d3782 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1441,15 +1441,38 @@ int call_netdevice_notifiers(unsigned long val, struct net_device *dev)
 EXPORT_SYMBOL(call_netdevice_notifiers);
 
 static struct jump_label_key netstamp_needed __read_mostly;
+#ifdef HAVE_JUMP_LABEL
+/* We are not allowed to call jump_label_dec() from irq context
+ * If net_disable_timestamp() is called from irq context, defer the
+ * jump_label_dec() calls.
+ */
+static atomic_t netstamp_needed_deferred;
+#endif
 
 void net_enable_timestamp(void)
 {
+#ifdef HAVE_JUMP_LABEL
+        int deferred = atomic_xchg(&netstamp_needed_deferred, 0);
+
+        if (deferred) {
+                while (--deferred)
+                        jump_label_dec(&netstamp_needed);
+                return;
+        }
+#endif
+        WARN_ON(in_interrupt());
         jump_label_inc(&netstamp_needed);
 }
 EXPORT_SYMBOL(net_enable_timestamp);
 
 void net_disable_timestamp(void)
 {
+#ifdef HAVE_JUMP_LABEL
+        if (in_interrupt()) {
+                atomic_inc(&netstamp_needed_deferred);
+                return;
+        }
+#endif
         jump_label_dec(&netstamp_needed);
 }
 EXPORT_SYMBOL(net_disable_timestamp);
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index e59aabd0eae4..a057fe64debd 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -404,6 +404,7 @@ __ipq_rcv_skb(struct sk_buff *skb)
         int status, type, pid, flags;
         unsigned int nlmsglen, skblen;
         struct nlmsghdr *nlh;
+        bool enable_timestamp = false;
 
         skblen = skb->len;
         if (skblen < sizeof(*nlh))
@@ -441,12 +442,13 @@ __ipq_rcv_skb(struct sk_buff *skb)
                         RCV_SKB_FAIL(-EBUSY);
                 }
         } else {
-                net_enable_timestamp();
+                enable_timestamp = true;
                 peer_pid = pid;
         }
 
         spin_unlock_bh(&queue_lock);
-
+        if (enable_timestamp)
+                net_enable_timestamp();
         status = ipq_receive_peer(NLMSG_DATA(nlh), type,
                                   nlmsglen - NLMSG_LENGTH(0));
         if (status < 0)
diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
index e63c3972a739..fb80a23c6640 100644
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
@@ -405,6 +405,7 @@ __ipq_rcv_skb(struct sk_buff *skb)
         int status, type, pid, flags;
         unsigned int nlmsglen, skblen;
         struct nlmsghdr *nlh;
+        bool enable_timestamp = false;
 
         skblen = skb->len;
         if (skblen < sizeof(*nlh))
@@ -442,11 +443,13 @@ __ipq_rcv_skb(struct sk_buff *skb)
                         RCV_SKB_FAIL(-EBUSY);
                 }
         } else {
-                net_enable_timestamp();
+                enable_timestamp = true;
                 peer_pid = pid;
         }
 
         spin_unlock_bh(&queue_lock);
+        if (enable_timestamp)
+                net_enable_timestamp();
 
         status = ipq_receive_peer(NLMSG_DATA(nlh), type,
                                   nlmsglen - NLMSG_LENGTH(0));