* [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout()
@ 2019-03-25 21:32 Yi-Hung Wei
2019-03-25 21:32 ` [PATCH net-next v3 2/2] openvswitch: Add timeout support to ct action Yi-Hung Wei
2019-03-26 17:56 ` [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout() Pravin Shelar
0 siblings, 2 replies; 3+ messages in thread
From: Yi-Hung Wei @ 2019-03-25 21:32 UTC (permalink / raw)
To: netdev; +Cc: Yi-Hung Wei, Pablo Neira Ayuso, Pravin Shelar
This patch exports nf_ct_set_timeout() and nf_ct_destroy_timeout().
The two functions are derived from xt_ct_destroy_timeout() and
xt_ct_set_timeout() in xt_CT.c, and moved to nf_conntrack_timeout.c
without any functional change.
It would be useful for other users (i.e. OVS) that utilizes the
finer-grain conntrack timeout feature.
CC: Pablo Neira Ayuso <pablo@netfilter.org>
CC: Pravin Shelar <pshelar@ovn.org>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
---
v1-> v2: Export nf_ct_set_timeout().
v2-> v3: Fix build issue when CONFIG_NF_CONNTRACK_TIMEOUT is not set.
---
include/net/netfilter/nf_conntrack_timeout.h | 15 +++++
net/netfilter/nf_conntrack_timeout.c | 97 ++++++++++++++++++++++++++++
net/netfilter/xt_CT.c | 93 ++------------------------
3 files changed, 118 insertions(+), 87 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
index 3394d75e1c80..00a8fbb2d735 100644
--- a/include/net/netfilter/nf_conntrack_timeout.h
+++ b/include/net/netfilter/nf_conntrack_timeout.h
@@ -88,6 +88,9 @@ static inline unsigned int *nf_ct_timeout_lookup(const struct nf_conn *ct)
int nf_conntrack_timeout_init(void);
void nf_conntrack_timeout_fini(void);
void nf_ct_untimeout(struct net *net, struct nf_ct_timeout *timeout);
+int nf_ct_set_timeout(struct net *net, struct nf_conn *ct, u8 l3num, u8 l4num,
+ const char *timeout_name);
+void nf_ct_destroy_timeout(struct nf_conn *ct);
#else
static inline int nf_conntrack_timeout_init(void)
{
@@ -98,6 +101,18 @@ static inline void nf_conntrack_timeout_fini(void)
{
return;
}
+
+static inline int nf_ct_set_timeout(struct net *net, struct nf_conn *ct,
+ u8 l3num, u8 l4num,
+ const char *timeout_name)
+{
+ return -EOPNOTSUPP;
+}
+
+static inline void nf_ct_destroy_timeout(struct nf_conn *ct)
+{
+ return;
+}
#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
diff --git a/net/netfilter/nf_conntrack_timeout.c b/net/netfilter/nf_conntrack_timeout.c
index 91fbd183da2d..c2dee577548e 100644
--- a/net/netfilter/nf_conntrack_timeout.c
+++ b/net/netfilter/nf_conntrack_timeout.c
@@ -48,6 +48,103 @@ void nf_ct_untimeout(struct net *net, struct nf_ct_timeout *timeout)
}
EXPORT_SYMBOL_GPL(nf_ct_untimeout);
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
+static void __nf_ct_timeout_put(struct nf_ct_timeout *timeout)
+{
+ typeof(nf_ct_timeout_put_hook) timeout_put;
+
+ timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
+ if (timeout_put)
+ timeout_put(timeout);
+}
+#endif
+
+int nf_ct_set_timeout(struct net *net, struct nf_conn *ct,
+ u8 l3num, u8 l4num, const char *timeout_name)
+{
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
+ typeof(nf_ct_timeout_find_get_hook) timeout_find_get;
+ struct nf_ct_timeout *timeout;
+ struct nf_conn_timeout *timeout_ext;
+ const char *errmsg = NULL;
+ int ret = 0;
+
+ rcu_read_lock();
+ timeout_find_get = rcu_dereference(nf_ct_timeout_find_get_hook);
+ if (!timeout_find_get) {
+ ret = -ENOENT;
+ errmsg = "Timeout policy base is empty";
+ goto out;
+ }
+
+ timeout = timeout_find_get(net, timeout_name);
+ if (!timeout) {
+ ret = -ENOENT;
+ pr_info_ratelimited("No such timeout policy \"%s\"\n",
+ timeout_name);
+ goto out;
+ }
+
+ if (timeout->l3num != l3num) {
+ ret = -EINVAL;
+ pr_info_ratelimited("Timeout policy `%s' can only be used by "
+ "L%d protocol number %d\n",
+ timeout_name, 3, timeout->l3num);
+ goto err_put_timeout;
+ }
+ /* Make sure the timeout policy matches any existing protocol tracker,
+ * otherwise default to generic.
+ */
+ if (timeout->l4proto->l4proto != l4num) {
+ ret = -EINVAL;
+ pr_info_ratelimited("Timeout policy `%s' can only be used by "
+ "L%d protocol number %d\n",
+ timeout_name, 4, timeout->l4proto->l4proto);
+ goto err_put_timeout;
+ }
+ timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
+ if (!timeout_ext) {
+ ret = -ENOMEM;
+ goto err_put_timeout;
+ }
+
+ rcu_read_unlock();
+ return ret;
+
+err_put_timeout:
+ __nf_ct_timeout_put(timeout);
+out:
+ rcu_read_unlock();
+ if (errmsg)
+ pr_info_ratelimited("%s\n", errmsg);
+ return ret;
+#else
+ return -EOPNOTSUPP;
+#endif
+}
+EXPORT_SYMBOL_GPL(nf_ct_set_timeout);
+
+void nf_ct_destroy_timeout(struct nf_conn *ct)
+{
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
+ struct nf_conn_timeout *timeout_ext;
+ typeof(nf_ct_timeout_put_hook) timeout_put;
+
+ rcu_read_lock();
+ timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
+
+ if (timeout_put) {
+ timeout_ext = nf_ct_timeout_find(ct);
+ if (timeout_ext) {
+ timeout_put(timeout_ext->timeout);
+ RCU_INIT_POINTER(timeout_ext->timeout, NULL);
+ }
+ }
+ rcu_read_unlock();
+#endif
+}
+EXPORT_SYMBOL_GPL(nf_ct_destroy_timeout);
+
static const struct nf_ct_ext_type timeout_extend = {
.len = sizeof(struct nf_conn_timeout),
.align = __alignof__(struct nf_conn_timeout),
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 0fa863f57575..d59cb4730fac 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -103,85 +103,24 @@ xt_ct_set_helper(struct nf_conn *ct, const char *helper_name,
return 0;
}
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-static void __xt_ct_tg_timeout_put(struct nf_ct_timeout *timeout)
-{
- typeof(nf_ct_timeout_put_hook) timeout_put;
-
- timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
- if (timeout_put)
- timeout_put(timeout);
-}
-#endif
-
static int
xt_ct_set_timeout(struct nf_conn *ct, const struct xt_tgchk_param *par,
const char *timeout_name)
{
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
- typeof(nf_ct_timeout_find_get_hook) timeout_find_get;
const struct nf_conntrack_l4proto *l4proto;
- struct nf_ct_timeout *timeout;
- struct nf_conn_timeout *timeout_ext;
- const char *errmsg = NULL;
- int ret = 0;
u8 proto;
- rcu_read_lock();
- timeout_find_get = rcu_dereference(nf_ct_timeout_find_get_hook);
- if (timeout_find_get == NULL) {
- ret = -ENOENT;
- errmsg = "Timeout policy base is empty";
- goto out;
- }
-
proto = xt_ct_find_proto(par);
if (!proto) {
- ret = -EINVAL;
- errmsg = "You must specify a L4 protocol and not use inversions on it";
- goto out;
- }
-
- timeout = timeout_find_get(par->net, timeout_name);
- if (timeout == NULL) {
- ret = -ENOENT;
- pr_info_ratelimited("No such timeout policy \"%s\"\n",
- timeout_name);
- goto out;
- }
-
- if (timeout->l3num != par->family) {
- ret = -EINVAL;
- pr_info_ratelimited("Timeout policy `%s' can only be used by L%d protocol number %d\n",
- timeout_name, 3, timeout->l3num);
- goto err_put_timeout;
+ pr_info_ratelimited("You must specify a L4 protocol and not "
+ "use inversions on it");
+ return -EINVAL;
}
- /* Make sure the timeout policy matches any existing protocol tracker,
- * otherwise default to generic.
- */
l4proto = nf_ct_l4proto_find(proto);
- if (timeout->l4proto->l4proto != l4proto->l4proto) {
- ret = -EINVAL;
- pr_info_ratelimited("Timeout policy `%s' can only be used by L%d protocol number %d\n",
- timeout_name, 4, timeout->l4proto->l4proto);
- goto err_put_timeout;
- }
- timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
- if (!timeout_ext) {
- ret = -ENOMEM;
- goto err_put_timeout;
- }
+ return nf_ct_set_timeout(par->net, ct, par->family, l4proto->l4proto,
+ timeout_name);
- rcu_read_unlock();
- return ret;
-
-err_put_timeout:
- __xt_ct_tg_timeout_put(timeout);
-out:
- rcu_read_unlock();
- if (errmsg)
- pr_info_ratelimited("%s\n", errmsg);
- return ret;
#else
return -EOPNOTSUPP;
#endif
@@ -328,26 +267,6 @@ static int xt_ct_tg_check_v2(const struct xt_tgchk_param *par)
return xt_ct_tg_check(par, par->targinfo);
}
-static void xt_ct_destroy_timeout(struct nf_conn *ct)
-{
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
- struct nf_conn_timeout *timeout_ext;
- typeof(nf_ct_timeout_put_hook) timeout_put;
-
- rcu_read_lock();
- timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
-
- if (timeout_put) {
- timeout_ext = nf_ct_timeout_find(ct);
- if (timeout_ext) {
- timeout_put(timeout_ext->timeout);
- RCU_INIT_POINTER(timeout_ext->timeout, NULL);
- }
- }
- rcu_read_unlock();
-#endif
-}
-
static void xt_ct_tg_destroy(const struct xt_tgdtor_param *par,
struct xt_ct_target_info_v1 *info)
{
@@ -361,7 +280,7 @@ static void xt_ct_tg_destroy(const struct xt_tgdtor_param *par,
nf_ct_netns_put(par->net, par->family);
- xt_ct_destroy_timeout(ct);
+ nf_ct_destroy_timeout(ct);
nf_ct_put(info->ct);
}
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH net-next v3 2/2] openvswitch: Add timeout support to ct action
2019-03-25 21:32 [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout() Yi-Hung Wei
@ 2019-03-25 21:32 ` Yi-Hung Wei
2019-03-26 17:56 ` [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout() Pravin Shelar
1 sibling, 0 replies; 3+ messages in thread
From: Yi-Hung Wei @ 2019-03-25 21:32 UTC (permalink / raw)
To: netdev; +Cc: Yi-Hung Wei, Pravin Shelar, Pablo Neira Ayuso
Add support for fine-grain timeout support to conntrack action.
The new OVS_CT_ATTR_TIMEOUT attribute of the conntrack action
specifies a timeout to be associated with this connection.
If no timeout is specified, it acts as is, that is the default
timeout for the connection will be automatically applied.
Example usage:
$ nfct timeout add timeout_1 inet tcp syn_sent 100 established 200
$ ovs-ofctl add-flow br0 in_port=1,ip,tcp,action=ct(commit,timeout=timeout_1)
CC: Pravin Shelar <pshelar@ovn.org>
CC: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
---
v1-> v2: Utilize nf_ct_set_timeout().
v2-> v3: No change in this patch, the build issue is resolved by patch 1.
---
include/uapi/linux/openvswitch.h | 3 +++
net/openvswitch/conntrack.c | 30 +++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
index dbe0cbe4f1b7..00ec98836cf3 100644
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
@@ -734,6 +734,7 @@ struct ovs_action_hash {
* be received on NFNLGRP_CONNTRACK_NEW and NFNLGRP_CONNTRACK_DESTROY groups,
* respectively. Remaining bits control the changes for which an event is
* delivered on the NFNLGRP_CONNTRACK_UPDATE group.
+ * @OVS_CT_ATTR_TIMEOUT: Variable length string defining conntrack timeout.
*/
enum ovs_ct_attr {
OVS_CT_ATTR_UNSPEC,
@@ -746,6 +747,8 @@ enum ovs_ct_attr {
OVS_CT_ATTR_NAT, /* Nested OVS_NAT_ATTR_* */
OVS_CT_ATTR_FORCE_COMMIT, /* No argument */
OVS_CT_ATTR_EVENTMASK, /* u32 mask of IPCT_* events. */
+ OVS_CT_ATTR_TIMEOUT, /* Associate timeout with this connection for
+ * fine-grain timeout tuning. */
__OVS_CT_ATTR_MAX
};
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 51080004677e..c4adbaeadda4 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -24,6 +24,7 @@
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_labels.h>
#include <net/netfilter/nf_conntrack_seqadj.h>
+#include <net/netfilter/nf_conntrack_timeout.h>
#include <net/netfilter/nf_conntrack_zones.h>
#include <net/netfilter/ipv6/nf_defrag_ipv6.h>
#include <net/ipv6_frag.h>
@@ -73,6 +74,7 @@ struct ovs_conntrack_info {
u32 eventmask; /* Mask of 1 << IPCT_*. */
struct md_mark mark;
struct md_labels labels;
+ char timeout[CTNL_TIMEOUT_NAME_MAX];
#ifdef CONFIG_NF_NAT_NEEDED
struct nf_nat_range2 range; /* Only present for SRC NAT and DST NAT. */
#endif
@@ -1465,6 +1467,8 @@ static const struct ovs_ct_len_tbl ovs_ct_attr_lens[OVS_CT_ATTR_MAX + 1] = {
#endif
[OVS_CT_ATTR_EVENTMASK] = { .minlen = sizeof(u32),
.maxlen = sizeof(u32) },
+ [OVS_CT_ATTR_TIMEOUT] = { .minlen = 1,
+ .maxlen = CTNL_TIMEOUT_NAME_MAX },
};
static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info,
@@ -1550,6 +1554,15 @@ static int parse_ct(const struct nlattr *attr, struct ovs_conntrack_info *info,
info->have_eventmask = true;
info->eventmask = nla_get_u32(a);
break;
+#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
+ case OVS_CT_ATTR_TIMEOUT:
+ memcpy(info->timeout, nla_data(a), nla_len(a));
+ if (!memchr(info->timeout, '\0', nla_len(a))) {
+ OVS_NLERR(log, "Invalid conntrack helper");
+ return -EINVAL;
+ }
+ break;
+#endif
default:
OVS_NLERR(log, "Unknown conntrack attr (%d)",
@@ -1631,6 +1644,14 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr,
OVS_NLERR(log, "Failed to allocate conntrack template");
return -ENOMEM;
}
+
+ if (ct_info.timeout[0]) {
+ if (nf_ct_set_timeout(net, ct_info.ct, family, key->ip.proto,
+ ct_info.timeout))
+ pr_info_ratelimited("Failed to associated timeout "
+ "policy `%s'\n", ct_info.timeout);
+ }
+
if (helper) {
err = ovs_ct_add_helper(&ct_info, helper, key, log);
if (err)
@@ -1751,6 +1772,10 @@ int ovs_ct_action_to_attr(const struct ovs_conntrack_info *ct_info,
if (ct_info->have_eventmask &&
nla_put_u32(skb, OVS_CT_ATTR_EVENTMASK, ct_info->eventmask))
return -EMSGSIZE;
+ if (ct_info->timeout[0]) {
+ if (nla_put_string(skb, OVS_CT_ATTR_TIMEOUT, ct_info->timeout))
+ return -EMSGSIZE;
+ }
#ifdef CONFIG_NF_NAT_NEEDED
if (ct_info->nat && !ovs_ct_nat_to_attr(ct_info, skb))
@@ -1772,8 +1797,11 @@ static void __ovs_ct_free_action(struct ovs_conntrack_info *ct_info)
{
if (ct_info->helper)
nf_conntrack_helper_put(ct_info->helper);
- if (ct_info->ct)
+ if (ct_info->ct) {
nf_ct_tmpl_free(ct_info->ct);
+ if (ct_info->timeout[0])
+ nf_ct_destroy_timeout(ct_info->ct);
+ }
}
#if IS_ENABLED(CONFIG_NETFILTER_CONNCOUNT)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout()
2019-03-25 21:32 [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout() Yi-Hung Wei
2019-03-25 21:32 ` [PATCH net-next v3 2/2] openvswitch: Add timeout support to ct action Yi-Hung Wei
@ 2019-03-26 17:56 ` Pravin Shelar
1 sibling, 0 replies; 3+ messages in thread
From: Pravin Shelar @ 2019-03-26 17:56 UTC (permalink / raw)
To: Yi-Hung Wei; +Cc: Linux Kernel Network Developers, Pablo Neira Ayuso
On Mon, Mar 25, 2019 at 2:40 PM Yi-Hung Wei <yihung.wei@gmail.com> wrote:
>
> This patch exports nf_ct_set_timeout() and nf_ct_destroy_timeout().
> The two functions are derived from xt_ct_destroy_timeout() and
> xt_ct_set_timeout() in xt_CT.c, and moved to nf_conntrack_timeout.c
> without any functional change.
> It would be useful for other users (i.e. OVS) that utilizes the
> finer-grain conntrack timeout feature.
>
> CC: Pablo Neira Ayuso <pablo@netfilter.org>
> CC: Pravin Shelar <pshelar@ovn.org>
> Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
> ---
> v1-> v2: Export nf_ct_set_timeout().
> v2-> v3: Fix build issue when CONFIG_NF_CONNTRACK_TIMEOUT is not set.
> ---
> include/net/netfilter/nf_conntrack_timeout.h | 15 +++++
> net/netfilter/nf_conntrack_timeout.c | 97 ++++++++++++++++++++++++++++
> net/netfilter/xt_CT.c | 93 ++------------------------
> 3 files changed, 118 insertions(+), 87 deletions(-)
>
> diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
> index 3394d75e1c80..00a8fbb2d735 100644
> --- a/include/net/netfilter/nf_conntrack_timeout.h
> +++ b/include/net/netfilter/nf_conntrack_timeout.h
> @@ -88,6 +88,9 @@ static inline unsigned int *nf_ct_timeout_lookup(const struct nf_conn *ct)
> int nf_conntrack_timeout_init(void);
> void nf_conntrack_timeout_fini(void);
> void nf_ct_untimeout(struct net *net, struct nf_ct_timeout *timeout);
> +int nf_ct_set_timeout(struct net *net, struct nf_conn *ct, u8 l3num, u8 l4num,
> + const char *timeout_name);
> +void nf_ct_destroy_timeout(struct nf_conn *ct);
> #else
> static inline int nf_conntrack_timeout_init(void)
> {
> @@ -98,6 +101,18 @@ static inline void nf_conntrack_timeout_fini(void)
> {
> return;
> }
> +
> +static inline int nf_ct_set_timeout(struct net *net, struct nf_conn *ct,
> + u8 l3num, u8 l4num,
> + const char *timeout_name)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> +static inline void nf_ct_destroy_timeout(struct nf_conn *ct)
> +{
> + return;
> +}
> #endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
>
> #ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> diff --git a/net/netfilter/nf_conntrack_timeout.c b/net/netfilter/nf_conntrack_timeout.c
> index 91fbd183da2d..c2dee577548e 100644
> --- a/net/netfilter/nf_conntrack_timeout.c
> +++ b/net/netfilter/nf_conntrack_timeout.c
> @@ -48,6 +48,103 @@ void nf_ct_untimeout(struct net *net, struct nf_ct_timeout *timeout)
> }
> EXPORT_SYMBOL_GPL(nf_ct_untimeout);
>
> +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> +static void __nf_ct_timeout_put(struct nf_ct_timeout *timeout)
> +{
> + typeof(nf_ct_timeout_put_hook) timeout_put;
> +
> + timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
> + if (timeout_put)
> + timeout_put(timeout);
> +}
> +#endif
This whole module is protected by CONFIG_NF_CONNTRACK_TIMEOUT, There
is no need for these #ifdefs.
> +
> +int nf_ct_set_timeout(struct net *net, struct nf_conn *ct,
> + u8 l3num, u8 l4num, const char *timeout_name)
> +{
> +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> + typeof(nf_ct_timeout_find_get_hook) timeout_find_get;
> + struct nf_ct_timeout *timeout;
> + struct nf_conn_timeout *timeout_ext;
> + const char *errmsg = NULL;
> + int ret = 0;
> +
> + rcu_read_lock();
> + timeout_find_get = rcu_dereference(nf_ct_timeout_find_get_hook);
> + if (!timeout_find_get) {
> + ret = -ENOENT;
> + errmsg = "Timeout policy base is empty";
> + goto out;
> + }
> +
> + timeout = timeout_find_get(net, timeout_name);
> + if (!timeout) {
> + ret = -ENOENT;
> + pr_info_ratelimited("No such timeout policy \"%s\"\n",
> + timeout_name);
> + goto out;
> + }
> +
> + if (timeout->l3num != l3num) {
> + ret = -EINVAL;
> + pr_info_ratelimited("Timeout policy `%s' can only be used by "
> + "L%d protocol number %d\n",
> + timeout_name, 3, timeout->l3num);
> + goto err_put_timeout;
> + }
> + /* Make sure the timeout policy matches any existing protocol tracker,
> + * otherwise default to generic.
> + */
> + if (timeout->l4proto->l4proto != l4num) {
> + ret = -EINVAL;
> + pr_info_ratelimited("Timeout policy `%s' can only be used by "
> + "L%d protocol number %d\n",
> + timeout_name, 4, timeout->l4proto->l4proto);
> + goto err_put_timeout;
> + }
> + timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
> + if (!timeout_ext) {
> + ret = -ENOMEM;
> + goto err_put_timeout;
> + }
> +
> + rcu_read_unlock();
> + return ret;
> +
> +err_put_timeout:
> + __nf_ct_timeout_put(timeout);
> +out:
> + rcu_read_unlock();
> + if (errmsg)
> + pr_info_ratelimited("%s\n", errmsg);
> + return ret;
> +#else
> + return -EOPNOTSUPP;
> +#endif
> +}
> +EXPORT_SYMBOL_GPL(nf_ct_set_timeout);
> +
> +void nf_ct_destroy_timeout(struct nf_conn *ct)
> +{
> +#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> + struct nf_conn_timeout *timeout_ext;
> + typeof(nf_ct_timeout_put_hook) timeout_put;
> +
> + rcu_read_lock();
> + timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
> +
> + if (timeout_put) {
> + timeout_ext = nf_ct_timeout_find(ct);
> + if (timeout_ext) {
> + timeout_put(timeout_ext->timeout);
> + RCU_INIT_POINTER(timeout_ext->timeout, NULL);
> + }
> + }
> + rcu_read_unlock();
> +#endif
> +}
> +EXPORT_SYMBOL_GPL(nf_ct_destroy_timeout);
> +
> static const struct nf_ct_ext_type timeout_extend = {
> .len = sizeof(struct nf_conn_timeout),
> .align = __alignof__(struct nf_conn_timeout),
> diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
> index 0fa863f57575..d59cb4730fac 100644
> --- a/net/netfilter/xt_CT.c
> +++ b/net/netfilter/xt_CT.c
> @@ -103,85 +103,24 @@ xt_ct_set_helper(struct nf_conn *ct, const char *helper_name,
> return 0;
> }
>
> -#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> -static void __xt_ct_tg_timeout_put(struct nf_ct_timeout *timeout)
> -{
> - typeof(nf_ct_timeout_put_hook) timeout_put;
> -
> - timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
> - if (timeout_put)
> - timeout_put(timeout);
> -}
> -#endif
> -
> static int
> xt_ct_set_timeout(struct nf_conn *ct, const struct xt_tgchk_param *par,
> const char *timeout_name)
> {
> #ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> - typeof(nf_ct_timeout_find_get_hook) timeout_find_get;
> const struct nf_conntrack_l4proto *l4proto;
> - struct nf_ct_timeout *timeout;
> - struct nf_conn_timeout *timeout_ext;
> - const char *errmsg = NULL;
> - int ret = 0;
> u8 proto;
>
> - rcu_read_lock();
> - timeout_find_get = rcu_dereference(nf_ct_timeout_find_get_hook);
> - if (timeout_find_get == NULL) {
> - ret = -ENOENT;
> - errmsg = "Timeout policy base is empty";
> - goto out;
> - }
> -
> proto = xt_ct_find_proto(par);
> if (!proto) {
> - ret = -EINVAL;
> - errmsg = "You must specify a L4 protocol and not use inversions on it";
> - goto out;
> - }
> -
> - timeout = timeout_find_get(par->net, timeout_name);
> - if (timeout == NULL) {
> - ret = -ENOENT;
> - pr_info_ratelimited("No such timeout policy \"%s\"\n",
> - timeout_name);
> - goto out;
> - }
> -
> - if (timeout->l3num != par->family) {
> - ret = -EINVAL;
> - pr_info_ratelimited("Timeout policy `%s' can only be used by L%d protocol number %d\n",
> - timeout_name, 3, timeout->l3num);
> - goto err_put_timeout;
> + pr_info_ratelimited("You must specify a L4 protocol and not "
> + "use inversions on it");
> + return -EINVAL;
> }
> - /* Make sure the timeout policy matches any existing protocol tracker,
> - * otherwise default to generic.
> - */
> l4proto = nf_ct_l4proto_find(proto);
> - if (timeout->l4proto->l4proto != l4proto->l4proto) {
> - ret = -EINVAL;
> - pr_info_ratelimited("Timeout policy `%s' can only be used by L%d protocol number %d\n",
> - timeout_name, 4, timeout->l4proto->l4proto);
> - goto err_put_timeout;
> - }
> - timeout_ext = nf_ct_timeout_ext_add(ct, timeout, GFP_ATOMIC);
> - if (!timeout_ext) {
> - ret = -ENOMEM;
> - goto err_put_timeout;
> - }
> + return nf_ct_set_timeout(par->net, ct, par->family, l4proto->l4proto,
> + timeout_name);
>
> - rcu_read_unlock();
> - return ret;
> -
> -err_put_timeout:
> - __xt_ct_tg_timeout_put(timeout);
> -out:
> - rcu_read_unlock();
> - if (errmsg)
> - pr_info_ratelimited("%s\n", errmsg);
> - return ret;
> #else
> return -EOPNOTSUPP;
> #endif
> @@ -328,26 +267,6 @@ static int xt_ct_tg_check_v2(const struct xt_tgchk_param *par)
> return xt_ct_tg_check(par, par->targinfo);
> }
>
> -static void xt_ct_destroy_timeout(struct nf_conn *ct)
> -{
> -#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
> - struct nf_conn_timeout *timeout_ext;
> - typeof(nf_ct_timeout_put_hook) timeout_put;
> -
> - rcu_read_lock();
> - timeout_put = rcu_dereference(nf_ct_timeout_put_hook);
> -
> - if (timeout_put) {
> - timeout_ext = nf_ct_timeout_find(ct);
> - if (timeout_ext) {
> - timeout_put(timeout_ext->timeout);
> - RCU_INIT_POINTER(timeout_ext->timeout, NULL);
> - }
> - }
> - rcu_read_unlock();
> -#endif
> -}
> -
> static void xt_ct_tg_destroy(const struct xt_tgdtor_param *par,
> struct xt_ct_target_info_v1 *info)
> {
> @@ -361,7 +280,7 @@ static void xt_ct_tg_destroy(const struct xt_tgdtor_param *par,
>
> nf_ct_netns_put(par->net, par->family);
>
> - xt_ct_destroy_timeout(ct);
> + nf_ct_destroy_timeout(ct);
> nf_ct_put(info->ct);
> }
> }
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-03-26 17:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-25 21:32 [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout() Yi-Hung Wei
2019-03-25 21:32 ` [PATCH net-next v3 2/2] openvswitch: Add timeout support to ct action Yi-Hung Wei
2019-03-26 17:56 ` [PATCH net-next v3 1/2] netfilter: Export nf_ct_{set,destroy}_timeout() Pravin Shelar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.