netfilter: nf_tables: expression ops overloading
Split the expression ops into two parts and support overloading of
the runtime expression ops based on the requested function through
a ->select_ops() callback.
This can be used to provide optimized implementations, for instance
for loading small aligned amounts of data from the packet or inlining
frequently used operations into the main evaluation loop.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/net/netfilter/nft_cmp.c b/net/netfilter/nft_cmp.c
index e734d67..2c9d5fe 100644
--- a/net/netfilter/nft_cmp.c
+++ b/net/netfilter/nft_cmp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
+ * Copyright (c) 2008-2009 Patrick McHardy <kaber@trash.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -124,23 +124,29 @@
return -1;
}
-static struct nft_expr_ops nft_cmp_ops __read_mostly = {
- .name = "cmp",
+static struct nft_expr_type nft_cmp_type;
+static const struct nft_expr_ops nft_cmp_ops = {
+ .type = &nft_cmp_type,
.size = NFT_EXPR_SIZE(sizeof(struct nft_cmp_expr)),
- .owner = THIS_MODULE,
.eval = nft_cmp_eval,
.init = nft_cmp_init,
.dump = nft_cmp_dump,
+};
+
+static struct nft_expr_type nft_cmp_type __read_mostly = {
+ .name = "cmp",
+ .ops = &nft_cmp_ops,
.policy = nft_cmp_policy,
.maxattr = NFTA_CMP_MAX,
+ .owner = THIS_MODULE,
};
int __init nft_cmp_module_init(void)
{
- return nft_register_expr(&nft_cmp_ops);
+ return nft_register_expr(&nft_cmp_type);
}
void nft_cmp_module_exit(void)
{
- nft_unregister_expr(&nft_cmp_ops);
+ nft_unregister_expr(&nft_cmp_type);
}