From patchwork Sat Mar 31 08:22:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harsha Sharma X-Patchwork-Id: 893726 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kbWaOeGY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Cs1Y4Tg3z9s1r for ; Sat, 31 Mar 2018 19:22:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751802AbeCaIW4 (ORCPT ); Sat, 31 Mar 2018 04:22:56 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35161 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751648AbeCaIWz (ORCPT ); Sat, 31 Mar 2018 04:22:55 -0400 Received: by mail-pg0-f67.google.com with SMTP id j3so6352807pgf.2 for ; Sat, 31 Mar 2018 01:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ez/Z6rJnyMH+jb0qxizUfUkFKIj9vrbzxjTecs/i7wk=; b=kbWaOeGY6B8akdCm8XV9Zk7tgXu5Ww+lxQk9I/ZbicN3J4jS7ukt0ENPCMHHO1R7zE 4Fgswo03Y0JPboqW/WIWieKi3ruWjmJD6NL1NSwwdVO244szf60f05GoYGQAR9xutCrq J1gEM+wmZUO3F/p/pENx4grddC29WL/QKHr9QAYnS+yXHG5PlmTP6LcKugvc2geDsCgO iWQMaw9kgBYMUf2WTafcYdWDQ6fYKUzQMQBoM85ccLgIYBqVhiWtA+tyQiI3m7Fs8WU5 RssznyhCS/hUJr6dW578ARwFhMKDZefG70R9JvFCJOLEFifnX10QWfENWST0My0FvtKM 3H0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ez/Z6rJnyMH+jb0qxizUfUkFKIj9vrbzxjTecs/i7wk=; b=q8M1YcE66kvNuzoHOTpqL4/cx668vpgMxy90CYELsnr525czwoEejTdxr9Y9dPjymK UFHBLxi9ek9cT5M4ICZdc/QtQqaZjWyEwsZf2abTvjPN8EhMbiRsp8eEHFpCD3abQ9Eb aGYTZxWpmuKfgpHNOS4hxVLbEGZCPhe3uh+F+htnPEvBfabQZ3SrQ35/tTyrOuxrbuwc GM0c7qJwVl0/+FYKKsuZ5EFi1rvFLeZMcZtTplIw51Ync4sS7l8ozpU69tAt3t0CnGzU 3MZNBEE+07TCVEcU7FRPxMX2cAirVY1/FPfpk4OtFOEt72I8vIVfSZpUDDxRVyLry/4C k/rw== X-Gm-Message-State: AElRT7FCDPJaCu7aeLns7yPlkggg4/c4scxfZJdU8zZPGpUvwkwWFRit j8Alf1roSBivO3+l7o62GhQ= X-Google-Smtp-Source: AIpwx49jXIonsLQO7AO85tbKAMVK6IhIwQE3c9XYWXCyuv6crmJMmswpeEMiHL4XlLlPOVwSMzC7ew== X-Received: by 2002:a17:902:2c83:: with SMTP id n3-v6mr2296217plb.140.1522484575125; Sat, 31 Mar 2018 01:22:55 -0700 (PDT) Received: from XDDDDD.iitr.ernet.in ([103.37.201.122]) by smtp.gmail.com with ESMTPSA id x3sm16490238pgv.86.2018.03.31.01.22.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 01:22:54 -0700 (PDT) From: Harsha Sharma To: pablo@netfilter.org, harshasharmaiitr@gmail.com Cc: netfilter-devel@vger.kernel.org Subject: [PATCH WIP nf-next] netfilter: nft_ct: add ct timeout support Date: Sat, 31 Mar 2018 13:52:32 +0530 Message-Id: <20180331082232.13889-1-harshasharmaiitr@gmail.com> X-Mailer: git-send-email 2.14.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch allows to add, list and delete connection tracking timeout policy via nft objref infrastructure. Signed-off-by: Harsha Sharma --- include/net/netfilter/nf_conntrack_timeout.h | 1 + include/uapi/linux/netfilter/nf_tables.h | 15 ++- net/netfilter/nft_ct.c | 167 ++++++++++++++++++++++++++- 3 files changed, 180 insertions(+), 3 deletions(-) diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h index 9468ab4ad12d..ae0f59cc1ffa 100644 --- a/include/net/netfilter/nf_conntrack_timeout.h +++ b/include/net/netfilter/nf_conntrack_timeout.h @@ -8,6 +8,7 @@ #include #include #include +#include #define CTNL_TIMEOUT_NAME_MAX 32 diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 66dceee0ae30..5762388e89dd 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -920,6 +920,7 @@ enum nft_rt_attributes { * @NFT_CT_AVGPKT: conntrack average bytes per packet * @NFT_CT_ZONE: conntrack zone * @NFT_CT_EVENTMASK: ctnetlink events to be generated for this conntrack + * @NFT_CT_TIMEOUT: connection tracking timeout policy assigned to conntrack */ enum nft_ct_keys { NFT_CT_STATE, @@ -941,6 +942,7 @@ enum nft_ct_keys { NFT_CT_AVGPKT, NFT_CT_ZONE, NFT_CT_EVENTMASK, + NFT_CT_TIMEOUT, }; /** @@ -1302,12 +1304,23 @@ enum nft_ct_helper_attributes { }; #define NFTA_CT_HELPER_MAX (__NFTA_CT_HELPER_MAX - 1) +enum nft_ct_timeout_timeout_attributes { + NFTA_CT_TIMEOUT_UNSPEC, + NFTA_CT_TIMEOUT_L3PROTO, + NFTA_CT_TIMEOUT_L4PROTO, + NFTA_CT_TIMEOUT_DATA, + NFTA_CT_TIMEOUT_USE, + __NFTA_CT_TIMEOUT_MAX, +}; +#define NFTA_CT_TIMEOUT_MAX (__NFTA_CT_TIMEOUT_MAX - 1) + #define NFT_OBJECT_UNSPEC 0 #define NFT_OBJECT_COUNTER 1 #define NFT_OBJECT_QUOTA 2 #define NFT_OBJECT_CT_HELPER 3 #define NFT_OBJECT_LIMIT 4 -#define __NFT_OBJECT_MAX 5 +#define NFT_OBJECT_CT_TIMEOUT 5 +#define __NFT_OBJECT_MAX 6 #define NFT_OBJECT_MAX (__NFT_OBJECT_MAX - 1) /** diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c index 6ab274b14484..e7af9781e4c1 100644 --- a/net/netfilter/nft_ct.c +++ b/net/netfilter/nft_ct.c @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include struct nft_ct { enum nft_ct_keys key:8; @@ -32,12 +35,16 @@ struct nft_ct { }; }; -struct nft_ct_helper_obj { +struct nft_ct_helper_obj { struct nf_conntrack_helper *helper4; struct nf_conntrack_helper *helper6; u8 l4proto; }; +struct nft_ct_timeout_obj { + struct ctnl_timeout *timeout; +}; + #ifdef CONFIG_NF_CONNTRACK_ZONES static DEFINE_PER_CPU(struct nf_conn *, nft_ct_pcpu_template); static unsigned int nft_ct_pcpu_template_refcnt __read_mostly; @@ -392,7 +399,6 @@ static int nft_ct_get_init(const struct nft_ctx *ctx, return -EINVAL; len = NF_CT_HELPER_NAME_LEN; break; - case NFT_CT_L3PROTOCOL: case NFT_CT_PROTOCOL: /* For compatibility, do not report error if NFTA_CT_DIRECTION @@ -727,6 +733,134 @@ static struct nft_expr_type nft_notrack_type __read_mostly = { .owner = THIS_MODULE, }; +static int +ctnl_timeout_parse_policy(void *timeouts, + const struct nf_conntrack_l4proto *l4proto, + struct net *net, const struct nlattr *attr) +{ + int ret = 0; + + if (likely(l4proto->ctnl_timeout.nlattr_to_obj)) { + struct nlattr *tb[l4proto->ctnl_timeout.nlattr_max + 1]; + + ret = nla_parse_nested(tb, l4proto->ctnl_timeout.nlattr_max, + attr, l4proto->ctnl_timeout.nla_policy, + NULL); + if (ret < 0) + return ret; + + ret = l4proto->ctnl_timeout.nlattr_to_obj(tb, net, timeouts); + } + return ret; +} + +static void nft_ct_timeout_obj_eval(struct nft_object *obj, + struct nft_regs *regs, + const struct nft_pktinfo *pkt) +{ +} + +static int nft_ct_timeout_obj_init(const struct nft_ctx *ctx, + const struct nlattr * const tb[], + struct nft_object *obj) +{ + __u16 l3num; + __u8 l4num; + struct nft_ct_timeout_obj *priv = nft_obj_data(obj); + const struct nf_conntrack_l4proto *l4proto; + struct ctnl_timeout *timeout, *matching = NULL; + int ret; + + if (!tb[NFTA_CT_TIMEOUT_L4PROTO] || + !tb[NFTA_CT_TIMEOUT_L3PROTO] || + !tb[NFTA_CT_TIMEOUT_DATA]) + return -EINVAL; + + l3num = ntohs(nla_get_be16(tb[NFTA_CT_TIMEOUT_L3PROTO])); + l4num = nla_get_u8(tb[NFTA_CT_TIMEOUT_L4PROTO]); + + INIT_LIST_HEAD(&ctx->net->nfct_timeout_list); + list_for_each_entry(timeout, &ctx->net->nfct_timeout_list, head) { + matching = timeout; + break; + } + + if (matching) { + if (matching->l3num != l3num || + matching->l4proto->l4proto != l4num) + return -EINVAL; + return ctnl_timeout_parse_policy(&matching->data, + matching->l4proto, ctx->net, + tb[NFTA_CT_TIMEOUT_DATA]); + } + + l4proto = nf_ct_l4proto_find_get(l3num, l4num); + + if (l4proto->l4proto != l4num) { + ret = -EOPNOTSUPP; + goto err_proto_put; + } + + timeout = kzalloc(sizeof(struct ctnl_timeout) + + l4proto->ctnl_timeout.obj_size, GFP_KERNEL); + if (timeout == NULL) { + ret = -ENOMEM; + goto err_proto_put; + } + + ret = ctnl_timeout_parse_policy(&timeout->data, l4proto, ctx->net, + tb[NFTA_CT_TIMEOUT_DATA]); + if (ret < 0) + goto err; + timeout->l3num = l3num; + timeout->l4proto = l4proto; + list_add_tail_rcu(&timeout->head, &ctx->net->nfct_timeout_list); + priv->timeout = timeout; + + return 0; +err: + kfree(timeout); +err_proto_put: + nf_ct_l4proto_put(l4proto); + return ret; +} + +static void nft_ct_timeout_obj_destroy(struct nft_object *obj) +{ + struct nft_ct_timeout_obj *priv = nft_obj_data(obj); + + if (refcount_dec_if_one(&priv->timeout->refcnt)) { + nf_ct_l4proto_put(priv->timeout->l4proto); + list_del_rcu(&priv->timeout->head); + } +} + +static int nft_ct_timeout_obj_dump(struct sk_buff *skb, + struct nft_object *obj, bool reset) +{ + const struct nft_ct_timeout_obj *priv = nft_obj_data(obj); + const struct ctnl_timeout *timeout = priv->timeout; + + if (nla_put_u8(skb, NFTA_CT_TIMEOUT_L4PROTO, timeout->l4proto->l4proto) || + nla_put_be16(skb, NFTA_CT_TIMEOUT_L3PROTO, htons(priv->timeout->l3num))) + return -1; + + if (likely(timeout->l4proto->ctnl_timeout.obj_to_nlattr)) { + struct nlattr *nest_params; + int ret; + + nest_params = nla_nest_start(skb, NFTA_CT_TIMEOUT_DATA | NLA_F_NESTED); + if (!nest_params) + return -1; + + ret = timeout->l4proto->ctnl_timeout.obj_to_nlattr(skb, &timeout->data); + if (ret < 0) + return -1; + nla_nest_end(skb, nest_params); + } + return 0; +} + static int nft_ct_helper_obj_init(const struct nft_ctx *ctx, const struct nlattr * const tb[], struct nft_object *obj) @@ -889,6 +1023,30 @@ static struct nft_object_type nft_ct_helper_obj_type __read_mostly = { .owner = THIS_MODULE, }; +static const struct nla_policy nft_ct_timeout_policy[NFTA_CT_TIMEOUT_MAX + 1] = { + [NFTA_CT_TIMEOUT_L3PROTO] = {.type = NLA_U16 }, + [NFTA_CT_TIMEOUT_L4PROTO] = {.type = NLA_U8 }, + [NFTA_CT_TIMEOUT_DATA] = {.type = NLA_NESTED }, +}; + +static struct nft_object_type nft_ct_timeout_obj_type; +static const struct nft_object_ops nft_ct_timeout_obj_ops = { + .type = &nft_ct_timeout_obj_type, + .size = sizeof(struct nft_ct_timeout_obj), + .eval = nft_ct_timeout_obj_eval, + .init = nft_ct_timeout_obj_init, + .destroy = nft_ct_timeout_obj_destroy, + .dump = nft_ct_timeout_obj_dump, +}; + +static struct nft_object_type nft_ct_timeout_obj_type __read_mostly = { + .type = NFT_OBJECT_CT_TIMEOUT, + .ops = &nft_ct_timeout_obj_ops, + .maxattr = NFTA_CT_TIMEOUT_MAX, + .policy = nft_ct_timeout_policy, + .owner = THIS_MODULE, +}; + static int __init nft_ct_module_init(void) { int err; @@ -904,6 +1062,9 @@ static int __init nft_ct_module_init(void) goto err1; err = nft_register_obj(&nft_ct_helper_obj_type); + if (err < 0) + goto err2; + err = nft_register_obj(&nft_ct_timeout_obj_type); if (err < 0) goto err2; @@ -919,6 +1080,7 @@ static int __init nft_ct_module_init(void) static void __exit nft_ct_module_exit(void) { nft_unregister_obj(&nft_ct_helper_obj_type); + nft_unregister_obj(&nft_ct_timeout_obj_type); nft_unregister_expr(&nft_notrack_type); nft_unregister_expr(&nft_ct_type); } @@ -931,3 +1093,4 @@ MODULE_AUTHOR("Patrick McHardy "); MODULE_ALIAS_NFT_EXPR("ct"); MODULE_ALIAS_NFT_EXPR("notrack"); MODULE_ALIAS_NFT_OBJ(NFT_OBJECT_CT_HELPER); +MODULE_ALIAS_NFT_OBJ(NFT_OBJECT_CT_TIMEOUT);