UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: xt_NFQUEUE: coalesce IPv4 and IPv6 hashing 

Because rev1 and rev3 of the target share the same hashing
generalize it by introduing nfqueue_hash().

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
holger@eitzenberger.org 2013-03-23 10:04:04 +00:00 committed by Pablo Neira Ayuso
parent 8746ddcf12
commit 5c33448c40
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
net/netfilter/xt_NFQUEUE.c
View File

@ -76,22 +76,31 @@ static u32 hash_v6(const struct sk_buff *skb)
} }
#endif #endif
static u32
nfqueue_hash(const struct sk_buff *skb, const struct xt_action_param *par)
{
const struct xt_NFQ_info_v1 *info = par->targinfo;
u32 queue = info->queuenum;
if (par->family == NFPROTO_IPV4)
queue += ((u64) hash_v4(skb) * info->queues_total) >> 32;
#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
else if (par->family == NFPROTO_IPV6)
queue += ((u64) hash_v6(skb) * info->queues_total) >> 32;
#endif
return queue;
}
static unsigned int static unsigned int
nfqueue_tg_v1(struct sk_buff *skb, const struct xt_action_param *par) nfqueue_tg_v1(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_NFQ_info_v1 *info = par->targinfo; const struct xt_NFQ_info_v1 *info = par->targinfo;
u32 queue = info->queuenum; u32 queue = info->queuenum;
if (info->queues_total > 1) { if (info->queues_total > 1)
if (par->family == NFPROTO_IPV4) queue = nfqueue_hash(skb, par);
queue = (((u64) hash_v4(skb) * info->queues_total) >>
32) + queue;
#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
else if (par->family == NFPROTO_IPV6)
queue = (((u64) hash_v6(skb) * info->queues_total) >>
32) + queue;
#endif
}
return NF_QUEUE_NR(queue); return NF_QUEUE_NR(queue);
} }
@ -144,17 +153,10 @@ nfqueue_tg_v3(struct sk_buff *skb, const struct xt_action_param *par)
int cpu = smp_processor_id(); int cpu = smp_processor_id();
queue = info->queuenum + cpu % info->queues_total; queue = info->queuenum + cpu % info->queues_total;
} else { } else
if (par->family == NFPROTO_IPV4) queue = nfqueue_hash(skb, par);
queue = (((u64) hash_v4(skb) * info->queues_total) >>
32) + queue;
#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
else if (par->family == NFPROTO_IPV6)
queue = (((u64) hash_v6(skb) * info->queues_total) >>
32) + queue;
#endif
}
} }
return NF_QUEUE_NR(queue); return NF_QUEUE_NR(queue);
} }