From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753366AbcAOQUV (ORCPT ); Fri, 15 Jan 2016 11:20:21 -0500 Received: from www.linutronix.de ([62.245.132.108]:38893 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753220AbcAOQUQ (ORCPT ); Fri, 15 Jan 2016 11:20:16 -0500 Date: Fri, 15 Jan 2016 17:20:15 +0100 From: Sebastian Andrzej Siewior To: linux-rt-users@vger.kernel.org Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, Steven Rostedt , netdev@vger.kernel.org Subject: [PATCH RT 2/2] net/core: skbuf use local lock in __netdev_alloc_skb() Message-ID: <20160115162015.GB3781@linutronix.de> References: <20160115161841.GA3781@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20160115161841.GA3781@linutronix.de> X-Key-Id: 2A8CF5D1 X-Key-Fingerprint: 6425 4695 FFF0 AA44 66CC 19E6 7B96 E816 2A8C F5D1 User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org local_irq_save() was introduced in v4.2-rc1 via 9451980a6646 ("net: Use cached copy of pfmemalloc to avoid accessing page"). This is only v4.1-RT..v4.4-RT fallout. Signed-off-by: Sebastian Andrzej Siewior --- net/core/skbuff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 7c422e441f1c..53f10c2d7718 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -434,13 +434,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len, if (sk_memalloc_socks()) gfp_mask |= __GFP_MEMALLOC; - local_irq_save(flags); + local_lock_irqsave(netdev_alloc_lock, flags); nc = this_cpu_ptr(&netdev_alloc_cache); data = __alloc_page_frag(nc, len, gfp_mask); pfmemalloc = nc->pfmemalloc; - local_irq_restore(flags); + local_unlock_irqrestore(netdev_alloc_lock, flags); if (unlikely(!data)) return NULL; -- 2.7.0.rc3