[ovs-dev,v8,7/9] ipf: Add set minimum fragment size command.

Message ID 1531795191-58140-8-git-send-email-dlu998@gmail.com
State Changes Requested
Headers show
Series
  • Userspace datapath: Add fragmentation support.
Related show

Commit Message

Darrell Ball July 17, 2018, 2:39 a.m.
A new command "ovs-appctl dpctl/ipf-set-min-frag" is added
for userspace datapath conntrack fragmentation support.

Signed-off-by: Darrell Ball <dlu998@gmail.com>
---
 NEWS                |  2 ++
 lib/ct-dpif.c       |  8 ++++++++
 lib/ct-dpif.h       |  2 ++
 lib/dpctl.c         | 40 ++++++++++++++++++++++++++++++++++++++++
 lib/dpctl.man       |  9 +++++++++
 lib/dpif-netdev.c   |  8 ++++++++
 lib/dpif-netlink.c  |  1 +
 lib/dpif-provider.h |  3 +++
 lib/ipf.c           | 23 +++++++++++++++++++++++
 lib/ipf.h           |  2 ++
 10 files changed, 98 insertions(+)

Comments

Justin Pettit Aug. 1, 2018, 9:38 a.m. | #1
> On Jul 16, 2018, at 4:39 PM, Darrell Ball <dlu998@gmail.com> wrote:

> diff --git a/lib/ct-dpif.h b/lib/ct-dpif.h
> index bd6234d..6eb55b4 100644
> --- a/lib/ct-dpif.h
> +++ b/lib/ct-dpif.h
> @@ -17,6 +17,7 @@
> #ifndef CT_DPIF_H
> #define CT_DPIF_H
> 
> +#include "ipf.h"

I don't think it's necessary to add this header file.

> diff --git a/lib/dpctl.man b/lib/dpctl.man
> index a1eb026..a75fc77 100644
> --- a/lib/dpctl.man
> +++ b/lib/dpctl.man
> @@ -287,3 +287,12 @@ after conntrack.  Both v4 and v6 are enabled by default.
> Disables fragmentation handling for the userspace datapath connection
> tracker.  Either \fBv4\fR or \fBv6\fR must be specified.  Both v4 and v6 are
> enabled by default.
> +.
> +.TP
> +\*(DX\fBipf\-set\-min\-frag\fR [\fIdp\fR] \fBv4\fR|\fBv6\fR \fIminfrag\fR
> +Sets the minimum fragment size, which applies to non-last fragments,
> +supported by the userspace datapath connection tracker.  Either v4 or v6
> +must be specified.  The default v4 value is 1200 and the clamped minimum is
> +400.  The default v6 value is 1280, with a clamped minimum of 400, for
> +testing flexibility.  The maximum frag size is not clamped, however setting
> +this value too high might result in valid fragments being dropped.

Why would someone configure this value?  Is it just for debugging?  If it's for debugging, I wonder how generally useful it is. 

In any case, assuming we apply this patch, I'd like to apply the incremental at the bottom of this message.

--Justin


-=-=-=-=-=-=-=-=-

diff --git a/lib/ct-dpif.h b/lib/ct-dpif.h
index 6eb55b4b0197..f8a31921e16a 100644
--- a/lib/ct-dpif.h
+++ b/lib/ct-dpif.h
@@ -17,7 +17,6 @@
 #ifndef CT_DPIF_H
 #define CT_DPIF_H
 
-#include "ipf.h"
 #include "openvswitch/types.h"
 #include "packets.h"
 
diff --git a/lib/dpctl.c b/lib/dpctl.c
index 9fc205a2181a..5fe0ea1c3229 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -1756,7 +1756,7 @@ dpctl_ipf_set_min_frag(int argc, const char *argv[],
         } else {
             error = EINVAL;
             dpctl_error(dpctl_p, error,
-                        "parameter missing: v4 for ipv4 or v6 for ipv6");
+                        "parameter missing: 'v4' for IPv4 or 'v6' for IPv6");
         }
         dpif_close(dpif);
     }
diff --git a/lib/dpctl.man b/lib/dpctl.man
index 9cac158a69d8..82be828b987b 100644
--- a/lib/dpctl.man
+++ b/lib/dpctl.man
@@ -284,9 +284,10 @@ supported for userspace datapath.
 .
 .TP
 \*(DX\fBipf\-set\-min\-frag\fR [\fIdp\fR] \fBv4\fR|\fBv6\fR \fIminfrag\fR
-Sets the minimum fragment size, which applies to non-last fragments,
-supported by the userspace datapath connection tracker.  Either v4 or v6
-must be specified.  The default v4 value is 1200 and the clamped minimum is
-400.  The default v6 value is 1280, with a clamped minimum of 400, for
-testing flexibility.  The maximum frag size is not clamped, however setting
-this value too high might result in valid fragments being dropped.
+Sets the minimum fragment size for non-final fragments to
+\fI\fIminfrag\fR.  Either \fBv4\fR or \fBv6\fR must be specified.  The
+default IPv4 value is 1200 and the clamped minimum is 400.  The default
+IPv6 value is 1280, with a clamped minimum of 400, for testing
+flexibility.  The maximum fragment size is not clamped, however, setting
+this value too high might result in valid fragments being dropped.  Only
+supported for userspace datapath.

Patch

diff --git a/NEWS b/NEWS
index 104b16f..84bce38 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@  Post-v2.9.0
        conntrack fragmentation support.
      * New "ovs-appctl dpctl/ipf-set-disabled" command for userspace datapath
        conntrack fragmentation support.
+     * New "ovs-appctl dpctl/ipf-set-min-frag" command for userspace
+       datapath conntrack fragmentation support.
    - ovs-vsctl: New commands "add-bond-iface" and "del-bond-iface".
    - OpenFlow:
      * OFPT_ROLE_STATUS is now available in OpenFlow 1.3.
diff --git a/lib/ct-dpif.c b/lib/ct-dpif.c
index b1f29dc..d5596af 100644
--- a/lib/ct-dpif.c
+++ b/lib/ct-dpif.c
@@ -172,6 +172,14 @@  ct_dpif_ipf_set_enabled(struct dpif *dpif, bool v6, bool enable)
             : EOPNOTSUPP);
 }
 
+int
+ct_dpif_ipf_set_min_frag(struct dpif *dpif, bool v6, uint32_t min_frag)
+{
+    return (dpif->dpif_class->ipf_set_min_frag
+            ? dpif->dpif_class->ipf_set_min_frag(dpif, v6, min_frag)
+            : EOPNOTSUPP);
+}
+
 void
 ct_dpif_entry_uninit(struct ct_dpif_entry *entry)
 {
diff --git a/lib/ct-dpif.h b/lib/ct-dpif.h
index bd6234d..6eb55b4 100644
--- a/lib/ct-dpif.h
+++ b/lib/ct-dpif.h
@@ -17,6 +17,7 @@ 
 #ifndef CT_DPIF_H
 #define CT_DPIF_H
 
+#include "ipf.h"
 #include "openvswitch/types.h"
 #include "packets.h"
 
@@ -201,6 +202,7 @@  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_set_enabled(struct dpif *, bool v6, bool enable);
+int ct_dpif_ipf_set_min_frag(struct dpif *, bool, uint32_t);
 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 d6800fb..716862e 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -1726,6 +1726,44 @@  dpctl_ipf_set_disabled(int argc, const char *argv[],
     return ipf_set_enabled__(argc, argv, dpctl_p, false);
 }
 
+static int
+dpctl_ipf_set_min_frag(int argc, const char *argv[],
+                       struct dpctl_params *dpctl_p)
+{
+    struct dpif *dpif;
+    int error = opt_dpif_open(argc, argv, dpctl_p, 4, &dpif);
+    if (!error) {
+        char v4_or_v6[3] = {0};
+        if (ovs_scan(argv[argc - 2], "%2s", v4_or_v6) &&
+            (!strncmp(v4_or_v6, "v4", 2) || !strncmp(v4_or_v6, "v6", 2))) {
+            uint32_t min_fragment;
+            if (ovs_scan(argv[argc - 1], "%"SCNu32, &min_fragment)) {
+                error = ct_dpif_ipf_set_min_frag(
+                            dpif, !strncmp(v4_or_v6, "v6", 2), min_fragment);
+                if (!error) {
+                    dpctl_print(dpctl_p,
+                                "setting minimum fragment size successful");
+                } else {
+                    dpctl_error(dpctl_p, error,
+                                "requested minimum fragment size too small;"
+                                " see documentation");
+                }
+            } else {
+                error = EINVAL;
+                dpctl_error(dpctl_p, error,
+                            "parameter missing for minimum fragment size");
+            }
+        } else {
+            error = EINVAL;
+            dpctl_error(dpctl_p, error,
+                        "parameter missing: v4 for ipv4 or v6 for ipv6");
+        }
+        dpif_close(dpif);
+    }
+
+    return error;
+}
+
 /* Undocumented commands for unit testing. */
 
 static int
@@ -2029,6 +2067,8 @@  static const struct dpctl_command all_commands[] = {
        dpctl_ipf_set_enabled, DP_RW },
     { "ipf-set-disabled", "[dp] v4|v6", 1, 2,
        dpctl_ipf_set_disabled, DP_RW },
+    { "ipf-set-min-frag", "[dp] v4|v6 minfragment", 2, 3,
+       dpctl_ipf_set_min_frag, 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 a1eb026..a75fc77 100644
--- a/lib/dpctl.man
+++ b/lib/dpctl.man
@@ -287,3 +287,12 @@  after conntrack.  Both v4 and v6 are enabled by default.
 Disables fragmentation handling for the userspace datapath connection
 tracker.  Either \fBv4\fR or \fBv6\fR must be specified.  Both v4 and v6 are
 enabled by default.
+.
+.TP
+\*(DX\fBipf\-set\-min\-frag\fR [\fIdp\fR] \fBv4\fR|\fBv6\fR \fIminfrag\fR
+Sets the minimum fragment size, which applies to non-last fragments,
+supported by the userspace datapath connection tracker.  Either v4 or v6
+must be specified.  The default v4 value is 1200 and the clamped minimum is
+400.  The default v6 value is 1280, with a clamped minimum of 400, for
+testing flexibility.  The maximum frag size is not clamped, however setting
+this value too high might result in valid fragments being dropped.
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index ddab09e..653c313 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -6539,6 +6539,13 @@  dpif_netdev_ipf_set_enabled(struct dpif *dpif OVS_UNUSED, bool v6,
     return ipf_set_enabled(v6, enable);
 }
 
+static int
+dpif_netdev_ipf_set_min_frag(struct dpif *dpif OVS_UNUSED, bool v6,
+                             uint32_t min_frag)
+{
+    return ipf_set_min_frag(v6, min_frag);
+}
+
 const struct dpif_class dpif_netdev_class = {
     "netdev",
     dpif_netdev_init,
@@ -6588,6 +6595,7 @@  const struct dpif_class dpif_netdev_class = {
     dpif_netdev_ct_get_maxconns,
     dpif_netdev_ct_get_nconns,
     dpif_netdev_ipf_set_enabled,
+    dpif_netdev_ipf_set_min_frag,
     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 e1331e4..043398d 100644
--- a/lib/dpif-netlink.c
+++ b/lib/dpif-netlink.c
@@ -3007,6 +3007,7 @@  const struct dpif_class dpif_netlink_class = {
     NULL,                       /* ct_get_maxconns */
     NULL,                       /* ct_get_nconns */
     NULL,                       /* ipf_set_enabled */
+    NULL,                       /* ipf_set_min_frag */
     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 db65227..62a4574 100644
--- a/lib/dpif-provider.h
+++ b/lib/dpif-provider.h
@@ -24,6 +24,7 @@ 
 
 #include "openflow/openflow.h"
 #include "dpif.h"
+#include "ipf.h"
 #include "util.h"
 
 #ifdef  __cplusplus
@@ -446,6 +447,8 @@  struct dpif_class {
 
     /* IP Fragmentation. */
     int (*ipf_set_enabled)(struct dpif *, bool v6, bool enabled);
+    /* Set minimum fragment allowed. */
+    int (*ipf_set_min_frag)(struct dpif *, bool v6, uint32_t min_frag);
 
     /* Meters */
     /* Queries 'dpif' for supported meter features.
diff --git a/lib/ipf.c b/lib/ipf.c
index cc76c99..e3a84c0 100644
--- a/lib/ipf.c
+++ b/lib/ipf.c
@@ -1304,3 +1304,26 @@  ipf_set_enabled(bool v6, bool enable)
     atomic_store_relaxed(v6 ? &ifp_v6_enabled : &ifp_v4_enabled, enable);
     return 0;
 }
+
+int
+ipf_set_min_frag(bool v6, uint32_t value)
+{
+    /* If the user specifies an unreasonably large number, fragmentation
+     * will not work well but it will not blow up. */
+    if ((!v6 && value < IPF_V4_FRAG_SIZE_LBOUND) ||
+        (v6 && value < IPF_V6_FRAG_SIZE_LBOUND)) {
+        return 1;
+    }
+
+    ipf_lock_lock(&ipf_lock);
+    if (v6) {
+        atomic_store_relaxed(&min_v6_frag_size, value);
+    } else {
+        atomic_store_relaxed(&min_v4_frag_size, value);
+        max_v4_frag_list_size = DIV_ROUND_UP(
+            IPV4_PACKET_MAX_SIZE - IPV4_PACKET_MAX_HDR_SIZE,
+            min_v4_frag_size - IPV4_PACKET_MAX_HDR_SIZE);
+    }
+    ipf_lock_unlock(&ipf_lock);
+    return 0;
+}
diff --git a/lib/ipf.h b/lib/ipf.h
index da47dcb..fa6da5d 100644
--- a/lib/ipf.h
+++ b/lib/ipf.h
@@ -59,4 +59,6 @@  void ipf_destroy(void);
 
 int ipf_set_enabled(bool v6, bool enable);
 
+int ipf_set_min_frag(bool v6, uint32_t value);
+
 #endif /* ipf.h */