From patchwork Thu Mar 6 12:55:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 327422 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DEF972C00C8 for ; Thu, 6 Mar 2014 23:59:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751136AbaCFM7W (ORCPT ); Thu, 6 Mar 2014 07:59:22 -0500 Received: from mail-ee0-f52.google.com ([74.125.83.52]:40477 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750805AbaCFM7U (ORCPT ); Thu, 6 Mar 2014 07:59:20 -0500 Received: by mail-ee0-f52.google.com with SMTP id e49so1095538eek.11 for ; Thu, 06 Mar 2014 04:59:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Em7/OJzkTGpKTjueSJBleb+febi/yuiIZeLTlNMZIrk=; b=sJdWWMXjPGckiQ0Zu+gOEbpseHlS8D+3UgHkOHmo2/CsYu61Mu0pMU0LMtthiL+cQH +6AnenkGDYe4D318SMmThoZazyYHLQpAh6cZONxGTEjv5GkDKOMsKb1BYhZ1rcOVAucb YsuQh7zaLKlGtTubuymqt581RI08TvwIms5DDmDgPYeiGROnaE1Q2bfMjyLTqiLjX/Ap cxZEWmxM9yuPIY3pBR9VddDHh/1LbjBHGi/zuVY/+Jxb7B6bhpazllIMrVK1C9WQNsoy KC9Gjf1uUoAIT8Iway3ICoAY6j5cYkcA4/Films+2H73WQaAs1giTm1dnUm2b2omHlJq e+dg== X-Received: by 10.14.105.9 with SMTP id j9mr12101754eeg.71.1394110759093; Thu, 06 Mar 2014 04:59:19 -0800 (PST) Received: from swordfish.minsk.epam.com ([86.57.255.92]) by mx.google.com with ESMTPSA id 46sm21544842ees.4.2014.03.06.04.59.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Mar 2014 04:59:18 -0800 (PST) From: Sergey Senozhatsky To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH] net: use raw_cpu ops in snmp stats bh Date: Thu, 6 Mar 2014 15:55:36 +0300 Message-Id: <1394110536-4532-1-git-send-email-sergey.senozhatsky@gmail.com> X-Mailer: git-send-email 1.9.0.382.g7f3562c Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit a25982c15ae52 ("percpu: add preemption checks to __this_cpu ops") added preemption checks to __this_cpu ops, which are used in SNMP_INC_STATS_BH() and SNMP_ADD_STATS_BH(), resulting in following warnings: BUG: using __this_cpu_add() in preemptible [00000000] code: ssh/4661 caller is __this_cpu_preempt_check+0x2b/0x2d CPU: 3 PID: 4661 Comm: ssh Not tainted 3.14.0-rc5-next-20140306-dbg-dirty #162 Hardware name: Acer Aspire 5741G /Aspire 5741G , BIOS V1.20 02/08/2011 0000000000000000 ffff880094939be0 ffffffff813b8305 0000000000000003 ffff880094939c00 ffffffff8121221f ffff88015130a8c0 0000000000000000 ffff880094939c38 ffffffff8121226b 635f736968745f5f 29286464615f7570 Call Trace: [] dump_stack+0x4e/0x7a [] check_preemption_disabled+0xce/0xdd [] __this_cpu_preempt_check+0x2b/0x2d [] ? tcp_rearm_rto+0x9f/0xa1 [] tcp_event_new_data_sent+0x6d/0x91 [] tcp_write_xmit+0x3f1/0x935 [] __tcp_push_pending_frames+0x28/0x82 [] tcp_push+0xcc/0x102 [] tcp_sendmsg+0x8c5/0xb7a [] ? string.isra.6+0x3b/0x9f [] inet_sendmsg+0x75/0xa0 [] sock_aio_write+0xe7/0xfe [] ? string.isra.6+0x3b/0x9f [] do_sync_write+0x54/0x73 [] vfs_write+0xc6/0x17c [] SyS_write+0x44/0x78 [] tracesys+0xd4/0xd9 use raw_cpu_inc() and raw_cpu_add() instead of __this_cpu_inc() and __this_cpu_add(). Signed-off-by: Sergey Senozhatsky --- include/net/snmp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/snmp.h b/include/net/snmp.h index 36ab852..b549ad6 100644 --- a/include/net/snmp.h +++ b/include/net/snmp.h @@ -126,7 +126,7 @@ struct linux_xfrm_mib { extern __typeof__(type) __percpu *name[SNMP_ARRAY_SZ] #define SNMP_INC_STATS_BH(mib, field) \ - __this_cpu_inc(mib[0]->mibs[field]) + raw_cpu_inc(mib[0]->mibs[field]) #define SNMP_INC_STATS_USER(mib, field) \ this_cpu_inc(mib[0]->mibs[field]) @@ -141,7 +141,7 @@ struct linux_xfrm_mib { this_cpu_dec(mib[0]->mibs[field]) #define SNMP_ADD_STATS_BH(mib, field, addend) \ - __this_cpu_add(mib[0]->mibs[field], addend) + raw_cpu_add(mib[0]->mibs[field], addend) #define SNMP_ADD_STATS_USER(mib, field, addend) \ this_cpu_add(mib[0]->mibs[field], addend)