From: Li Zhong <zhong@linux.vnet.ibm.com>
To: Daniel Borkmann <dborkman@redhat.com>, NetDev <netdev@vger.kernel.org>
Cc: brouer@redhat.com, davem@davemloft.net
Subject: [PATCH v2 net-next] packet: fix using smp_processor_id() in preemptible code
Date: Fri, 13 Dec 2013 06:51:04 +0800 [thread overview]
Message-ID: <1386888664.2586.3.camel@ThinkPad-T5421> (raw)
In-Reply-To: <52A83699.9010504@redhat.com>
This patches tries to fix the following warning on next-1211 by
replacing smp_processor_id() with raw_smp_processor_id().
[ 11.120893] BUG: using smp_processor_id() in preemptible [00000000] code: arping/3510
[ 11.120913] caller is .packet_sendmsg+0xc14/0xe68
[ 11.120920] CPU: 13 PID: 3510 Comm: arping Not tainted 3.13.0-rc3-next-20131211-dirty #1
[ 11.120926] Call Trace:
[ 11.120932] [c0000001f803f6f0] [c0000000000138dc] .show_stack+0x110/0x25c (unreliable)
[ 11.120942] [c0000001f803f7e0] [c00000000083dd24] .dump_stack+0xa0/0x37c
[ 11.120951] [c0000001f803f870] [c000000000493fd4] .debug_smp_processor_id+0xfc/0x12c
[ 11.120959] [c0000001f803f900] [c0000000007eba78] .packet_sendmsg+0xc14/0xe68
[ 11.120968] [c0000001f803fa80] [c000000000700968] .sock_sendmsg+0xa0/0xe0
[ 11.120975] [c0000001f803fbf0] [c0000000007014d8] .SyS_sendto+0x100/0x148
[ 11.120983] [c0000001f803fd60] [c0000000006fff10] .SyS_socketcall+0x1c4/0x2e8
[ 11.120990] [c0000001f803fe30] [c00000000000a1e4] syscall_exit+0x0/0x9c
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
---
v2: as Daniel suggested, removed the part about setting queue_mapping
net/packet/af_packet.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 9d70f13..cc803c6 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -310,7 +310,7 @@ static bool packet_use_direct_xmit(const struct packet_sock *po)
static u16 packet_pick_tx_queue(struct net_device *dev)
{
- return (u16) smp_processor_id() % dev->real_num_tx_queues;
+ return (u16) raw_smp_processor_id() % dev->real_num_tx_queues;
}
/* register_prot_hook must be invoked with the po->bind_lock held,
next prev parent reply other threads:[~2013-12-12 1:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-12 6:10 [RFC PATCH net-next] packet: fix using smp_processor_id() in preemptible code Li Zhong
2013-12-11 9:55 ` Daniel Borkmann
2013-12-12 22:51 ` Li Zhong [this message]
2013-12-12 7:19 ` [PATCH v2 " Jesper Dangaard Brouer
2013-12-12 7:29 ` Daniel Borkmann
2013-12-12 21:15 ` David Miller
2013-12-13 1:49 ` Li Zhong
2013-12-12 23:55 ` [RFC PATCH " Li Zhong
2013-12-12 7:18 ` Jesper Dangaard Brouer
2013-12-13 6:41 ` Li Zhong
2013-12-13 7:40 ` Li Zhong
2013-12-11 21:49 ` David Miller
2013-12-12 22:54 ` Li Zhong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386888664.2586.3.camel@ThinkPad-T5421 \
--to=zhong@linux.vnet.ibm.com \
--cc=brouer@redhat.com \
--cc=davem@davemloft.net \
--cc=dborkman@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.