[ovs-dev] [patch v1 4/9] ipf: Add command to enable fragmentation handling.

Darrell Ball dlu998 at gmail.com
Wed Jan 24 19:22:30 UTC 2018


A new command "ovs-appctl dpctl/ipf-set-enabled" is added to
enable/disable userspace datapath conntrack fragmentation support.

Signed-off-by: Darrell Ball <dlu998 at gmail.com>
---
 NEWS                |  2 ++
 lib/ct-dpif.c       |  8 ++++++++
 lib/ct-dpif.h       |  1 +
 lib/dpctl.c         | 31 +++++++++++++++++++++++++++++++
 lib/dpctl.man       |  4 ++++
 lib/dpif-netdev.c   |  8 ++++++++
 lib/dpif-netlink.c  |  1 +
 lib/dpif-provider.h |  4 ++++
 lib/ipf.c           |  7 +++++++
 lib/ipf.h           |  3 +++
 10 files changed, 69 insertions(+)

diff --git a/NEWS b/NEWS
index d5af504..cafd3bb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ Post-v2.9.0
 --------------------
    - Userspace datapath:
      * Add v4 fragmentation support for conntrack.
+     * New "ovs-appctl dpctl/ipf-set-enabled" command for userspace datapath
+       conntrack fragmentation support.
 
 v2.9.0 - xx xxx xxxx
 --------------------
diff --git a/lib/ct-dpif.c b/lib/ct-dpif.c
index 5fa3a97..f8fc632 100644
--- a/lib/ct-dpif.c
+++ b/lib/ct-dpif.c
@@ -164,6 +164,14 @@ ct_dpif_get_nconns(struct dpif *dpif, uint32_t *nconns)
             : EOPNOTSUPP);
 }
 
+int
+ct_dpif_ipf_change_enabled(struct dpif *dpif, bool enable)
+{
+    return (dpif->dpif_class->ipf_change_enabled
+            ? dpif->dpif_class->ipf_change_enabled(dpif, enable)
+            : EOPNOTSUPP);
+}
+
 void
 ct_dpif_entry_uninit(struct ct_dpif_entry *entry)
 {
diff --git a/lib/ct-dpif.h b/lib/ct-dpif.h
index 09e7698..0737ad7 100644
--- a/lib/ct-dpif.h
+++ b/lib/ct-dpif.h
@@ -200,6 +200,7 @@ int ct_dpif_flush(struct dpif *, const uint16_t *zone,
 int ct_dpif_set_maxconns(struct dpif *dpif, uint32_t maxconns);
 int ct_dpif_get_maxconns(struct dpif *dpif, uint32_t *maxconns);
 int ct_dpif_get_nconns(struct dpif *dpif, uint32_t *nconns);
+int ct_dpif_ipf_change_enabled(struct dpif *, bool);
 void ct_dpif_entry_uninit(struct ct_dpif_entry *);
 void ct_dpif_format_entry(const struct ct_dpif_entry *, struct ds *,
                           bool verbose, bool print_stats);
diff --git a/lib/dpctl.c b/lib/dpctl.c
index 87f0412..e0a2eee 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -1746,6 +1746,35 @@ dpctl_ct_get_nconns(int argc, const char *argv[],
     return error;
 }
 
+static int
+dpctl_ct_ipf_change_enabled(int argc, const char *argv[],
+                            struct dpctl_params *dpctl_p)
+{
+    struct dpif *dpif;
+    int error = dpctl_ct_open_dp(argc, argv, dpctl_p, &dpif, 3);
+    if (!error) {
+        uint32_t enabled;
+        if (ovs_scan(argv[argc - 1], "%"SCNu32, &enabled)) {
+            error = ct_dpif_ipf_change_enabled(dpif, enabled);
+
+            if (!error) {
+                dpctl_print(dpctl_p,
+                            "changing fragmentation enabled successful");
+            } else {
+                dpctl_error(dpctl_p, error,
+                            "changing fragmentation enabled failed");
+            }
+        } else {
+            error = EINVAL;
+            dpctl_error(dpctl_p, error,
+                        "parameter missing: 0 for disabled or 1 for enabled");
+        }
+        dpif_close(dpif);
+    }
+
+    return error;
+}
+
 /* Undocumented commands for unit testing. */
 
 static int
@@ -2045,6 +2074,8 @@ static const struct dpctl_command all_commands[] = {
     { "ct-set-maxconns", "[dp] maxconns", 1, 2, dpctl_ct_set_maxconns, DP_RW },
     { "ct-get-maxconns", "[dp]", 0, 1, dpctl_ct_get_maxconns, DP_RO },
     { "ct-get-nconns", "[dp]", 0, 1, dpctl_ct_get_nconns, DP_RO },
+    { "ipf-set-enabled", "[dp] enabled", 1, 2,
+       dpctl_ct_ipf_change_enabled, DP_RW },
     { "help", "", 0, INT_MAX, dpctl_help, DP_RO },
     { "list-commands", "", 0, INT_MAX, dpctl_list_commands, DP_RO },
 
diff --git a/lib/dpctl.man b/lib/dpctl.man
index 9e9d2dc..a427108 100644
--- a/lib/dpctl.man
+++ b/lib/dpctl.man
@@ -268,3 +268,7 @@ Only supported for userspace datapath.
 \*(DX\fBct\-get\-nconns\fR [\fIdp\fR]
 Read the current number of connection tracker connections.
 Only supported for userspace datapath.
+.TP
+\*(DX\fBipf\-set\-enabled\fR [\fIdp\fR] \fBparam\fR
+Enables or disables fragmentation handling for the userspace datapath
+connection tracker.  Disabled by default.
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index ba62128..68b5d52 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -47,6 +47,7 @@
 #include "flow.h"
 #include "hmapx.h"
 #include "id-pool.h"
+#include "ipf.h"
 #include "latch.h"
 #include "netdev.h"
 #include "netdev-vport.h"
@@ -5871,6 +5872,12 @@ dpif_netdev_ct_get_nconns(struct dpif *dpif, uint32_t *nconns)
     return conntrack_get_nconns(&dp->conntrack, nconns);
 }
 
+static int
+dpif_netdev_ipf_change_enabled(struct dpif *dpif OVS_UNUSED, bool enable)
+{
+    return ipf_change_enabled(enable);
+}
+
 const struct dpif_class dpif_netdev_class = {
     "netdev",
     dpif_netdev_init,
@@ -5919,6 +5926,7 @@ const struct dpif_class dpif_netdev_class = {
     dpif_netdev_ct_set_maxconns,
     dpif_netdev_ct_get_maxconns,
     dpif_netdev_ct_get_nconns,
+    dpif_netdev_ipf_change_enabled,
     dpif_netdev_meter_get_features,
     dpif_netdev_meter_set,
     dpif_netdev_meter_get,
diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
index f8d75eb..f089617 100644
--- a/lib/dpif-netlink.c
+++ b/lib/dpif-netlink.c
@@ -2992,6 +2992,7 @@ const struct dpif_class dpif_netlink_class = {
     NULL,                       /* ct_set_maxconns */
     NULL,                       /* ct_get_maxconns */
     NULL,                       /* ct_get_nconns */
+    NULL,                       /* ipf_change_enabled */
     dpif_netlink_meter_get_features,
     dpif_netlink_meter_set,
     dpif_netlink_meter_get,
diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h
index 62b3598..fcea867 100644
--- a/lib/dpif-provider.h
+++ b/lib/dpif-provider.h
@@ -41,6 +41,7 @@ struct dpif {
     uint8_t netflow_engine_id;
 };
 
+
 void dpif_init(struct dpif *, const struct dpif_class *, const char *name,
                uint8_t netflow_engine_type, uint8_t netflow_engine_id);
 void dpif_uninit(struct dpif *dpif, bool close);
@@ -444,6 +445,9 @@ struct dpif_class {
     /* Get number of connections tracked. */
     int (*ct_get_nconns)(struct dpif *, uint32_t *nconns);
 
+    /* IP Fragmentation. */
+    int (*ipf_change_enabled)(struct dpif *, bool);
+
     /* Meters */
 
     /* Queries 'dpif' for supported meter features.
diff --git a/lib/ipf.c b/lib/ipf.c
index 7f923ce..dea34bb 100644
--- a/lib/ipf.c
+++ b/lib/ipf.c
@@ -856,3 +856,10 @@ ipf_destroy(void)
     ipf_lock_unlock(&ipf_lock);
     ipf_lock_destroy(&ipf_lock);
 }
+
+int
+ipf_change_enabled(bool enable)
+{
+    atomic_store_relaxed(&ifp_enabled, enable);
+    return 0;
+}
diff --git a/lib/ipf.h b/lib/ipf.h
index 992fca0..63eb4a0 100644
--- a/lib/ipf.h
+++ b/lib/ipf.h
@@ -50,4 +50,7 @@ ipf_init(void);
 void
 ipf_destroy(void);
 
+int
+ipf_change_enabled(bool enable);
+
 #endif /* ipf.h */
-- 
1.9.1



More information about the dev mailing list