Merge pull request #38 from RemyDelion/add_offload_gro_functions

Offload: adding set_gso(), get_gro() and set_gro() functions

Author: frenzymadness

python-ethtool/ethtool-copy.h

@@ -290,6 +290,8 @@ struct ethtool_stats {
 #define ETHTOOL_SUFO        0x00000022  /* Set UFO enable (e.v.) */
 #define ETHTOOL_GGSO        0x00000023  /* Get GSO enable (e.v.) */
 #define ETHTOOL_SGSO        0x00000024  /* Set GSO enable (e.v.) */
+#define ETHTOOL_GGRO        0x0000002b  /* Get GRO enable (e.v.) */
+#define ETHTOOL_SGRO        0x0000002c  /* Set GRO enable (e.v.) */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET ETHTOOL_GSET

python-ethtool/ethtool.c

@@ -616,6 +616,34 @@ static PyObject *get_gso(PyObject *self __unused, PyObject *args)
     return Py_BuildValue("b", value);
 }
 
+static PyObject *set_gso(PyObject *self __unused, PyObject *args)
+{
+    if (dev_set_int_value(ETHTOOL_SGSO, args) < 0)
+        return NULL;
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+static PyObject *get_gro(PyObject *self __unused, PyObject *args)
+{
+    int value = 0;
+
+    if (get_dev_int_value(ETHTOOL_GGRO, args, &value) < 0)
+        return NULL;
+
+    return Py_BuildValue("b", value);
+}
+
+static PyObject *set_gro(PyObject *self __unused, PyObject *args)
+{
+    if (dev_set_int_value(ETHTOOL_SGRO, args) < 0)
+        return NULL;
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
 static PyObject *get_sg(PyObject *self __unused, PyObject *args)
 {
     int value = 0;
@@ -928,6 +956,21 @@ static struct PyMethodDef PyEthModuleMethods[] = {
         .ml_meth = (PyCFunction)get_gso,
         .ml_flags = METH_VARARGS,
     },
+    {
+        .ml_name = "set_gso",
+        .ml_meth = (PyCFunction)set_gso,
+        .ml_flags = METH_VARARGS,
+    },
+    {
+        .ml_name = "get_gro",
+        .ml_meth = (PyCFunction)get_gro,
+        .ml_flags = METH_VARARGS,
+    },
+    {
+        .ml_name = "set_gro",
+        .ml_meth = (PyCFunction)set_gro,
+        .ml_flags = METH_VARARGS,
+    },
     {
         .ml_name = "get_sg",
         .ml_meth = (PyCFunction)get_sg,

scripts/pethtool

@@ -211,10 +211,16 @@ def show_offload(interface, args=None):
     except IOError:
         gso = 'not supported'
 
+    try:
+        gro = ethtool.get_gro(interface) and 'on' or 'off'
+    except IOError:
+        gro = 'not supported'
+
     printtab('scatter-gather: %s' % sg)
     printtab('tcp segmentation offload: %s' % tso)
     printtab('udp fragmentation offload: %s' % ufo)
     printtab('generic segmentation offload: %s' % gso)
+    printtab('generic receive offload: %s' % gro)
 
 
 def set_offload(interface, args):
@@ -226,6 +232,18 @@ def set_offload(interface, args):
             ethtool.set_tso(interface, value)
         except:
             pass
+    elif cmd == 'gso':
+        value = value == 'on' and 1 or 0
+        try:
+            ethtool.set_gso(interface, value)
+        except:
+            pass
+    elif cmd == 'gro':
+        value = value == 'on' and 1 or 0
+        try:
+            ethtool.set_gro(interface, value)
+        except:
+            pass
 
 
 ethtool_ringparam_msgs = (

tests/test_ethtool.py

@@ -121,6 +121,7 @@ def _functions_accepting_devnames(self, devname):
         if not ifconfig.oldFormat:
             self.assertEqual(ethtool.get_flags(devname), scraped.flagsint)
         self.assertIsInt(ethtool.get_gso(devname))
+        self.assertIsInt(ethtool.get_gro(devname))
         self.assertIsString(ethtool.get_hwaddr(devname))
         self.assertEqualHwAddr(ethtool.get_hwaddr(devname),
                                scraped.hwaddr)
@@ -154,6 +155,10 @@ def _functions_accepting_devnames(self, devname):
 
         # TODO: self.assertIsString(ethtool.set_tso(devname))
 
+        # TODO: self.assertIsString(ethtool.set_gso(devname))
+
+        # TODO: self.assertIsString(ethtool.set_gro(devname))
+
     def _verify_etherinfo_object(self, ei):
         self.assertTrue(isinstance(ei, ethtool.etherinfo))
         self.assertIsString(ei.device)
@@ -196,14 +201,15 @@ def test_invalid_devices(self):
         # Verify sane handling of non-existant devices
 
         get_fns = ('get_broadcast', 'get_businfo', 'get_coalesce', 'get_flags',
-                   'get_gso', 'get_hwaddr', 'get_ipaddr', 'get_module',
-                   'get_netmask', 'get_ringparam', 'get_sg', 'get_tso',
-                   'get_ufo')
+                   'get_gso', 'get_gso', 'get_hwaddr', 'get_ipaddr',
+                   'get_module', 'get_netmask', 'get_ringparam', 'get_sg',
+                   'get_tso', 'get_ufo')
         for fnname in get_fns:
             self.assertRaisesNoSuchDevice(getattr(ethtool, fnname),
                                           INVALID_DEVICE_NAME)
 
-        set_fns = ('set_coalesce', 'set_ringparam', 'set_tso')
+        set_fns = ('set_coalesce', 'set_ringparam', 'set_tso', 'set_gso',
+                   'set_gro')
         for fnname in set_fns:
             # Currently this fails, with an IOError from
             #   ethtool.c:__struct_desc_from_dict

tests/test_scripts.py

@@ -77,6 +77,7 @@ def test_show_offload_lo(self):
 tcp segmentation offload: on
 udp fragmentation offload: on
 generic segmentation offload: on
+generic receive offload: on
 '''
                          )