| Message ID | 1372453518-4749-1-git-send-email-eric@regit.org |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi Eric, On Fri, Jun 28, 2013 at 11:05:18PM +0200, Eric Leblond wrote: > This patch adds a new rule attribute NFTA_RULE_POSITION which is > used to store the position of a rule relatively to the others. > By providing a create command and specifying a position, the rule is > inserted after the rule with the handle equal to the provided > position. > Regarding notification, the position attribute is added to specify > the handle of the previous rule in append mode and the handle of > the next rule in the other case. > > Signed-off-by: Eric Leblond <eric@regit.org> > --- > include/uapi/linux/netfilter/nf_tables.h | 1 + > net/netfilter/nf_tables_api.c | 32 +++++++++++++++++++++++++++++--- > 2 files changed, 30 insertions(+), 3 deletions(-) > > diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h > index d40a7f9..d9bf8ea 100644 > --- a/include/uapi/linux/netfilter/nf_tables.h > +++ b/include/uapi/linux/netfilter/nf_tables.h > @@ -143,6 +143,7 @@ enum nft_rule_attributes { > NFTA_RULE_EXPRESSIONS, > NFTA_RULE_FLAGS, > NFTA_RULE_COMPAT, > + NFTA_RULE_POSITION, > __NFTA_RULE_MAX > }; > #define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1) > diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c > index b00aca8..a03aa9f 100644 > --- a/net/netfilter/nf_tables_api.c > +++ b/net/netfilter/nf_tables_api.c > @@ -1267,6 +1267,7 @@ static const struct nla_policy nft_rule_policy[NFTA_RULE_MAX + 1] = { > [NFTA_RULE_EXPRESSIONS] = { .type = NLA_NESTED }, > [NFTA_RULE_FLAGS] = { .type = NLA_U32 }, > [NFTA_RULE_COMPAT] = { .type = NLA_NESTED }, > + [NFTA_RULE_POSITION] = { .type = NLA_U64 }, > }; > > static int nf_tables_fill_rule_info(struct sk_buff *skb, u32 portid, u32 seq, > @@ -1298,6 +1299,17 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, u32 portid, u32 seq, > if (nla_put_be64(skb, NFTA_RULE_HANDLE, cpu_to_be64(rule->handle))) > goto nla_put_failure; > > + if (event & NLM_F_APPEND && rule->list.prev) { .prev is always != NULL. It points to the list head in the first element case. It is set to LIST_POISON2 in case that rule has been deleted. > + if (nla_put_be64(skb, NFTA_RULE_POSITION, > + cpu_to_be64(((struct nft_rule *)rule->list.prev)->handle))) > + goto nla_put_failure; > + } else if (rule->list.next) { > + if (nla_put_be64(skb, NFTA_RULE_POSITION, > + cpu_to_be64(((struct nft_rule *)rule->list.next)->handle))) > + goto nla_put_failure; > + } else > + goto nla_put_failure; > + > list = nla_nest_start(skb, NFTA_RULE_EXPRESSIONS); > if (list == NULL) > goto nla_put_failure; > @@ -1537,7 +1549,7 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, > int err, rem; > bool create; > u32 flags = 0; > - u64 handle; > + u64 handle, pos_handle; > > create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false; > > @@ -1571,6 +1583,16 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, > handle = nf_tables_alloc_handle(table); > } > > + if (nla[NFTA_RULE_POSITION]) { > + pos_handle = be64_to_cpu(nla_get_be64(nla[NFTA_RULE_POSITION])); > + old_rule = __nf_tables_rule_lookup(chain, pos_handle); > + if (IS_ERR(old_rule)) > + return PTR_ERR(old_rule); > + > + if (! (nlh->nlmsg_flags & NLM_F_CREATE)) > + return -EOPNOTSUPP; > + } > + > nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla); > > n = 0; > @@ -1626,8 +1648,12 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, > } > } else if (nlh->nlmsg_flags & NLM_F_APPEND) > list_add_tail_rcu(&rule->list, &chain->rules); > - else > - list_add_rcu(&rule->list, &chain->rules); > + else { > + if (old_rule) > + list_add_rcu(&rule->list, &old_rule->list); > + else > + list_add_rcu(&rule->list, &chain->rules); > + } > > if (flags & NFT_RULE_F_COMMIT) > list_add(&rule->dirty_list, &chain->dirty_rules); > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Eric, There is 2 long lines it seems, > + if (nla_put_be64(skb, NFTA_RULE_POSITION, > + cpu_to_be64(((struct nft_rule *)rule->list.prev)->handle))) Here, > + goto nla_put_failure; > + } else if (rule->list.next) { > + if (nla_put_be64(skb, NFTA_RULE_POSITION, > + cpu_to_be64(((struct nft_rule *)rule->list.next)->handle))) and there. Tomasz -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello, Here's a rework of previous patch. Kernel patch, libnftables and nftables patches are to follow. libnftables patchset statistics: examples/Makefile.am | 4 + examples/nft-rule-insert.c | 204 ++++++++++++++++++++++++++++++++++++ include/libnftables/rule.h | 3 +- include/linux/netfilter/nf_tables.h | 1 + src/rule.c | 29 ++++- 5 files changed, 237 insertions(+), 4 deletions(-) nftables patchset statistics: include/rule.h | 2 ++ src/netlink.c | 2 ++ src/netlink_delinearize.c | 2 ++ src/parser.y | 22 ++++++++++++++++++++-- src/rule.c | 2 ++ src/scanner.l | 3 +++ 6 files changed, 31 insertions(+), 2 deletions(-) BR, -- Eric -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index d40a7f9..d9bf8ea 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -143,6 +143,7 @@ enum nft_rule_attributes { NFTA_RULE_EXPRESSIONS, NFTA_RULE_FLAGS, NFTA_RULE_COMPAT, + NFTA_RULE_POSITION, __NFTA_RULE_MAX }; #define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index b00aca8..a03aa9f 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1267,6 +1267,7 @@ static const struct nla_policy nft_rule_policy[NFTA_RULE_MAX + 1] = { [NFTA_RULE_EXPRESSIONS] = { .type = NLA_NESTED }, [NFTA_RULE_FLAGS] = { .type = NLA_U32 }, [NFTA_RULE_COMPAT] = { .type = NLA_NESTED }, + [NFTA_RULE_POSITION] = { .type = NLA_U64 }, }; static int nf_tables_fill_rule_info(struct sk_buff *skb, u32 portid, u32 seq, @@ -1298,6 +1299,17 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, u32 portid, u32 seq, if (nla_put_be64(skb, NFTA_RULE_HANDLE, cpu_to_be64(rule->handle))) goto nla_put_failure; + if (event & NLM_F_APPEND && rule->list.prev) { + if (nla_put_be64(skb, NFTA_RULE_POSITION, + cpu_to_be64(((struct nft_rule *)rule->list.prev)->handle))) + goto nla_put_failure; + } else if (rule->list.next) { + if (nla_put_be64(skb, NFTA_RULE_POSITION, + cpu_to_be64(((struct nft_rule *)rule->list.next)->handle))) + goto nla_put_failure; + } else + goto nla_put_failure; + list = nla_nest_start(skb, NFTA_RULE_EXPRESSIONS); if (list == NULL) goto nla_put_failure; @@ -1537,7 +1549,7 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, int err, rem; bool create; u32 flags = 0; - u64 handle; + u64 handle, pos_handle; create = nlh->nlmsg_flags & NLM_F_CREATE ? true : false; @@ -1571,6 +1583,16 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, handle = nf_tables_alloc_handle(table); } + if (nla[NFTA_RULE_POSITION]) { + pos_handle = be64_to_cpu(nla_get_be64(nla[NFTA_RULE_POSITION])); + old_rule = __nf_tables_rule_lookup(chain, pos_handle); + if (IS_ERR(old_rule)) + return PTR_ERR(old_rule); + + if (! (nlh->nlmsg_flags & NLM_F_CREATE)) + return -EOPNOTSUPP; + } + nft_ctx_init(&ctx, skb, nlh, afi, table, chain, nla); n = 0; @@ -1626,8 +1648,12 @@ static int nf_tables_newrule(struct sock *nlsk, struct sk_buff *skb, } } else if (nlh->nlmsg_flags & NLM_F_APPEND) list_add_tail_rcu(&rule->list, &chain->rules); - else - list_add_rcu(&rule->list, &chain->rules); + else { + if (old_rule) + list_add_rcu(&rule->list, &old_rule->list); + else + list_add_rcu(&rule->list, &chain->rules); + } if (flags & NFT_RULE_F_COMMIT) list_add(&rule->dirty_list, &chain->dirty_rules);
This patch adds a new rule attribute NFTA_RULE_POSITION which is used to store the position of a rule relatively to the others. By providing a create command and specifying a position, the rule is inserted after the rule with the handle equal to the provided position. Regarding notification, the position attribute is added to specify the handle of the previous rule in append mode and the handle of the next rule in the other case. Signed-off-by: Eric Leblond <eric@regit.org> --- include/uapi/linux/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 32 +++++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-)