Skip to content

Commit

Permalink
netfilter: nft_queue: use raw_smp_processor_id()
Browse files Browse the repository at this point in the history
Using smp_processor_id() causes splats with PREEMPT_RCU:

[19379.552780] BUG: using smp_processor_id() in preemptible [00000000] code: ping/32389
[19379.552793] caller is debug_smp_processor_id+0x17/0x19
[...]
[19379.552823] Call Trace:
[19379.552832]  [<ffffffff81274e9e>] dump_stack+0x67/0x90
[19379.552837]  [<ffffffff8129a4d4>] check_preemption_disabled+0xe5/0xf5
[19379.552842]  [<ffffffff8129a4fb>] debug_smp_processor_id+0x17/0x19
[19379.552849]  [<ffffffffa07c42dd>] nft_queue_eval+0x35/0x20c [nft_queue]

No need to disable preemption since we only fetch the numeric value, so
let's use raw_smp_processor_id() instead.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Pablo Neira Ayuso committed Dec 14, 2016
1 parent 8010d7f commit c2e756f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/netfilter/nft_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ static void nft_queue_eval(const struct nft_expr *expr,

if (priv->queues_total > 1) {
if (priv->flags & NFT_QUEUE_FLAG_CPU_FANOUT) {
int cpu = smp_processor_id();
int cpu = raw_smp_processor_id();

queue = priv->queuenum + cpu % priv->queues_total;
} else {
Expand Down

0 comments on commit c2e756f

Please sign in to comment.