* [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables
@ 2015-03-25 8:09 Patrick McHardy
2015-03-25 8:09 ` [PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id() Patrick McHardy
2015-03-25 11:20 ` [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables Pablo Neira Ayuso
0 siblings, 2 replies; 4+ messages in thread
From: Patrick McHardy @ 2015-03-25 8:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 971cd75..f70e34a 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -522,7 +522,6 @@ config NFT_NAT
typical Network Address Translation (NAT) packet transformations.
config NFT_QUEUE
- depends on NETFILTER_XTABLES
depends on NETFILTER_NETLINK_QUEUE
tristate "Netfilter nf_tables queue module"
help
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id()
2015-03-25 8:09 [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables Patrick McHardy
@ 2015-03-25 8:09 ` Patrick McHardy
2015-03-25 11:20 ` Pablo Neira Ayuso
2015-03-25 11:20 ` [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables Pablo Neira Ayuso
1 sibling, 1 reply; 4+ messages in thread
From: Patrick McHardy @ 2015-03-25 8:09 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
Using smp_processor_id() triggers warnings with PREEMPT_RCU. There is no
point in disabling preemption since we only collect the numeric value,
so use raw_smp_processor_id() instead.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/nft_meta.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index abe6811..5197874 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -153,7 +153,7 @@ void nft_meta_get_eval(const struct nft_expr *expr,
}
break;
case NFT_META_CPU:
- dest->data[0] = smp_processor_id();
+ dest->data[0] = raw_smp_processor_id();
break;
case NFT_META_IIFGROUP:
if (in == NULL)
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables
2015-03-25 8:09 [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables Patrick McHardy
2015-03-25 8:09 ` [PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id() Patrick McHardy
@ 2015-03-25 11:20 ` Pablo Neira Ayuso
1 sibling, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2015-03-25 11:20 UTC (permalink / raw)
To: Patrick McHardy; +Cc: netfilter-devel
Applied, thanks Patrick.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id()
2015-03-25 8:09 ` [PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id() Patrick McHardy
@ 2015-03-25 11:20 ` Pablo Neira Ayuso
0 siblings, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2015-03-25 11:20 UTC (permalink / raw)
To: Patrick McHardy; +Cc: netfilter-devel
On Wed, Mar 25, 2015 at 08:09:56AM +0000, Patrick McHardy wrote:
> Using smp_processor_id() triggers warnings with PREEMPT_RCU. There is no
> point in disabling preemption since we only collect the numeric value,
> so use raw_smp_processor_id() instead.
Also applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-25 11:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-25 8:09 [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables Patrick McHardy
2015-03-25 8:09 ` [PATCH 2/2] netfilter: nft_meta: use raw_smp_processor_id() Patrick McHardy
2015-03-25 11:20 ` Pablo Neira Ayuso
2015-03-25 11:20 ` [PATCH 1/2] netfilter: nf_tables: nft_queue does not depend on x_tables Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).