From patchwork Thu Aug 11 07:23:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nevola X-Patchwork-Id: 658085 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3s8zyJ6J1Wz9sBr for ; Thu, 11 Aug 2016 17:23:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=GzeZZvVz; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932312AbcHKHXT (ORCPT ); Thu, 11 Aug 2016 03:23:19 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34974 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932295AbcHKHXT (ORCPT ); Thu, 11 Aug 2016 03:23:19 -0400 Received: by mail-wm0-f68.google.com with SMTP id i5so1319728wmg.2 for ; Thu, 11 Aug 2016 00:23:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=ieEsSA6x4XSv7Z5SlO+/HhC57oDhfKVXmC7HQgvmEwI=; b=GzeZZvVzY5ymGQ0l2JLbRP2wYRJDVvRR390s/sn+08NM1NJM9To5+UIrPm1Tynbg+i y7Ie/Lgu8WwNuBNInY6Lgr35w9/oKkucdssQZnQzX3qtm+KbrwiI204jfUIs50HVmbjO XjGQor4zG4Yi6vBCEFTfwgF7Ramy63Sl4lKY+ZfF2/OHhuG1+Dd3GhJmttZzm3sm9ieH L/l1qCrXUrSAHg8KkRFyuNEMKa5OtygN7z2JNM+JSDzdi/erqLNPHIt4qZl2lv6UB8ys KOjrqNV8A53lV1E8N6+PVKqo/KkmH4fQY60kM1ZL4l7sDOdOqBxjA/LF2l90puES/Kp9 Frsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=ieEsSA6x4XSv7Z5SlO+/HhC57oDhfKVXmC7HQgvmEwI=; b=Une8GmqQe+CBCF0w5GKY+Rsf034rERI77Jm36S10BOY73+X0mcIH4sf+LXHC+S8vHv Zv8vunnLcdZgl9jWMuMep0ku9MMGVrL8fIIClu6/kWrDV9jFYQbqtrx7ioAWogMF3h50 aLyf3ABD+Xn2RBpFfJ6cXwYT5uMkMWIJrnCK5itM5dfiD1r08u8+/dRVBPConEIoJmx9 K/00bIf1P5ANYASAtYoVFQKQNP4GyXGT+mFE50yKSyAbGdb/YJeahQA6ri2by3/eYZ4a WOzPdsDXKsl5r1xFbjlPNxMiF35UUA3nr9ZRT2uJXipi6701rkaK0zi5Yo53YCTP7vJq GNeQ== X-Gm-Message-State: AEkoouvrziHQqImKJZiEukDcOwUo2vgzluz4UttJd7P7mO7vNDOjqmozGyYjfgyrbVN+cQ== X-Received: by 10.194.148.19 with SMTP id to19mr9409269wjb.81.1470900197138; Thu, 11 Aug 2016 00:23:17 -0700 (PDT) Received: from sonyv (cli-5b7e49a2.wholesale.adamo.es. [91.126.73.162]) by smtp.gmail.com with ESMTPSA id a203sm13570296wma.0.2016.08.11.00.23.16 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 11 Aug 2016 00:23:16 -0700 (PDT) Date: Thu, 11 Aug 2016 09:23:14 +0200 From: Laura Garcia Liebana To: netfilter-devel@vger.kernel.org Subject: [PATCH v4] netfilter: nf_tables: add hash expression Message-ID: <20160811072311.GA12493@sonyv> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch adds a new hash expression, this provides jhash support but this can be extended to support for other hash functions. The modulus and seed already comes embedded into this new expression. Use case example: meta mark set hash ip saddr mod 10 Signed-off-by: Laura Garcia Liebana --- Changes in V4: - Use ERANGE in some cases according to the lib/nlattr.c policy - Typo fixed - Use nft_validate_register_load instead of nft_validate_register_store include/uapi/linux/netfilter/nf_tables.h | 20 +++++ net/netfilter/Kconfig | 6 ++ net/netfilter/Makefile | 1 + net/netfilter/nft_hash.c | 136 +++++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+) create mode 100644 net/netfilter/nft_hash.c diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 0e7928e..1399946 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -724,6 +724,26 @@ enum nft_meta_keys { }; /** + * enum nft_hash_attributes - nf_tables hash expression netlink attributes + * + * @NFTA_HASH_SREG: source register (NLA_U32) + * @NFTA_HASH_DREG: destination register (NLA_U32) + * @NFTA_HASH_LEN: source data length (NLA_U32) + * @NFTA_HASH_MODULUS: modulus value (NLA_U32) + * @NFTA_HASH_SEED: seed value (NLA_U32) + */ +enum nft_hash_attributes { + NFTA_HASH_UNSPEC, + NFTA_HASH_SREG, + NFTA_HASH_DREG, + NFTA_HASH_LEN, + NFTA_HASH_MODULUS, + NFTA_HASH_SEED, + __NFTA_HASH_MAX, +}; +#define NFTA_HASH_MAX (__NFTA_HASH_MAX - 1) + +/** * enum nft_meta_attributes - nf_tables meta expression netlink attributes * * @NFTA_META_DREG: destination register (NLA_U32) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index a2e4cf6..1074700 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -569,6 +569,12 @@ config NFT_COMPAT x_tables match/target extensions over the nf_tables framework. +config NFT_HASH + tristate "Netfilter nf_tables hash module" + help + This option adds the "hash" expression that you can use to perform + a hash operation on registers. + if NF_TABLES_NETDEV config NF_DUP_NETDEV diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile index 441a3c0..faa277e 100644 --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile @@ -93,6 +93,7 @@ obj-$(CONFIG_NFT_COUNTER) += nft_counter.o obj-$(CONFIG_NFT_LOG) += nft_log.o obj-$(CONFIG_NFT_MASQ) += nft_masq.o obj-$(CONFIG_NFT_REDIR) += nft_redir.o +obj-$(CONFIG_NFT_HASH) += nft_hash.o # nf_tables netdev obj-$(CONFIG_NFT_DUP_NETDEV) += nft_dup_netdev.o diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c new file mode 100644 index 0000000..eb05527 --- /dev/null +++ b/net/netfilter/nft_hash.c @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2016 Laura Garcia + * + * 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 + * published by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct nft_hash { + enum nft_registers sreg:8; + enum nft_registers dreg:8; + u8 len; + u32 modulus; + u32 seed; +}; + +static void nft_hash_eval(const struct nft_expr *expr, + struct nft_regs *regs, + const struct nft_pktinfo *pkt) +{ + struct nft_hash *priv = nft_expr_priv(expr); + const void *data = ®s->data[priv->sreg]; + u32 h; + + h = reciprocal_scale(jhash(data, priv->len, priv->seed), priv->modulus); + + regs->data[priv->dreg] = h; +} + +const struct nla_policy nft_hash_policy[NFTA_HASH_MAX + 1] = { + [NFTA_HASH_SREG] = { .type = NLA_U32 }, + [NFTA_HASH_DREG] = { .type = NLA_U32 }, + [NFTA_HASH_LEN] = { .type = NLA_U32 }, + [NFTA_HASH_MODULUS] = { .type = NLA_U32 }, + [NFTA_HASH_SEED] = { .type = NLA_U32 }, +}; + +static int nft_hash_init(const struct nft_ctx *ctx, + const struct nft_expr *expr, + const struct nlattr * const tb[]) +{ + struct nft_hash *priv = nft_expr_priv(expr); + u32 len; + + if (!tb[NFTA_HASH_SREG] || + !tb[NFTA_HASH_DREG] || + !tb[NFTA_HASH_LEN] || + !tb[NFTA_HASH_SEED] || + !tb[NFTA_HASH_MODULUS]) + return -EINVAL; + + priv->sreg = nft_parse_register(tb[NFTA_HASH_SREG]); + priv->dreg = nft_parse_register(tb[NFTA_HASH_DREG]); + + len = ntohl(nla_get_be32(tb[NFTA_HASH_LEN])); + if (len == 0 || len > U8_MAX) + return -ERANGE; + + priv->len = len; + + priv->modulus = ntohl(nla_get_be32(tb[NFTA_HASH_MODULUS])); + if (priv->modulus <= 1) + return -ERANGE; + + priv->seed = ntohl(nla_get_be32(tb[NFTA_HASH_SEED])); + + return nft_validate_register_load(priv->sreg, len) && + nft_validate_register_load(priv->dreg, sizeof(u32)); +} + +static int nft_hash_dump(struct sk_buff *skb, + const struct nft_expr *expr) +{ + const struct nft_hash *priv = nft_expr_priv(expr); + + if (nft_dump_register(skb, NFTA_HASH_SREG, priv->sreg)) + goto nla_put_failure; + if (nft_dump_register(skb, NFTA_HASH_DREG, priv->dreg)) + goto nla_put_failure; + if (nft_dump_register(skb, NFTA_HASH_LEN, priv->len)) + goto nla_put_failure; + if (nft_dump_register(skb, NFTA_HASH_MODULUS, priv->modulus)) + goto nla_put_failure; + if (nft_dump_register(skb, NFTA_HASH_SEED, priv->seed)) + goto nla_put_failure; + + return 0; + +nla_put_failure: + return -1; +} + +static struct nft_expr_type nft_hash_type; +static const struct nft_expr_ops nft_hash_ops = { + .type = &nft_hash_type, + .size = NFT_EXPR_SIZE(sizeof(struct nft_hash)), + .eval = nft_hash_eval, + .init = nft_hash_init, + .dump = nft_hash_dump, +}; + +static struct nft_expr_type nft_hash_type __read_mostly = { + .name = "hash", + .ops = &nft_hash_ops, + .policy = nft_hash_policy, + .maxattr = NFTA_HASH_MAX, + .owner = THIS_MODULE, +}; + +static int __init nft_hash_module_init(void) +{ + return nft_register_expr(&nft_hash_type); +} + +static void __exit nft_hash_module_exit(void) +{ + nft_unregister_expr(&nft_hash_type); +} + +module_init(nft_hash_module_init); +module_exit(nft_hash_module_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Laura Garcia "); +MODULE_ALIAS_NFT_EXPR("hash");