Merge branch 'current' of https://github.com/vyos/vyos-1x into current

3 files changed, 107 insertions, 4 deletions

diff --git a/python/vyos/configsession.py b/python/vyos/configsession.py
index 82b9355a3..670e6c7fc 100644
--- a/python/vyos/configsession.py
+++ b/python/vyos/configsession.py
@@ -129,9 +129,9 @@ class ConfigSession(object):
 
     def __run_command(self, cmd_list):
         p = subprocess.Popen(cmd_list, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=self.__session_env)
+        (stdout_data, stderr_data) = p.communicate()
+        output = stdout_data.decode()
         result = p.wait()
-        output = p.stdout.read().decode()
-        p.communicate()
         if result != 0:
             raise ConfigSessionError(output)
         return output
diff --git a/python/vyos/ethtool.py b/python/vyos/ethtool.py
new file mode 100644
index 000000000..cef7d476f
--- /dev/null
+++ b/python/vyos/ethtool.py
@@ -0,0 +1,101 @@
+# Copyright 2021 VyOS maintainers and contributors <maintainers@vyos.io>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+from vyos.util import cmd
+
+class Ethtool:
+    """
+    Class is used to retrive and cache information about an ethernet adapter
+    """
+
+    # dictionary containing driver featurs, it will be populated on demand and
+    # the content will look like:
+    # {
+    #   'tls-hw-tx-offload': {'fixed': True, 'on': False},
+    #   'tx-checksum-fcoe-crc': {'fixed': True, 'on': False},
+    #   'tx-checksum-ip-generic': {'fixed': False, 'on': True},
+    #   'tx-checksum-ipv4': {'fixed': True, 'on': False},
+    #   'tx-checksum-ipv6': {'fixed': True, 'on': False},
+    #   'tx-checksum-sctp': {'fixed': True, 'on': False},
+    #   'tx-checksumming': {'fixed': False, 'on': True},
+    #   'tx-esp-segmentation': {'fixed': True, 'on': False},
+    # }
+    features = { }
+    ring_buffers = { }
+
+    def __init__(self, ifname):
+        # Now populate features dictionaty
+        tmp = cmd(f'ethtool -k {ifname}')
+        # skip the first line, it only says: "Features for eth0":
+        for line in tmp.splitlines()[1:]:
+            if ":" in line:
+                key, value = [s.strip() for s in line.strip().split(":", 1)]
+                fixed = "fixed" in value
+                if fixed:
+                    value = value.split()[0].strip()
+                self.features[key.strip()] = {
+                    "on": value == "on",
+                    "fixed": fixed
+                }
+
+        tmp = cmd(f'ethtool -g {ifname}')
+        # We are only interested in line 2-5 which contains the device maximum
+        # ringbuffers
+        for line in tmp.splitlines()[2:6]:
+            if ':' in line:
+                key, value = [s.strip() for s in line.strip().split(":", 1)]
+                key = key.lower().replace(' ', '_')
+                self.ring_buffers[key] = int(value)
+
+
+    def is_fixed_lro(self):
+        # in case of a missing configuration, rather return "fixed". In Ethtool
+        # terminology "fixed" means the setting can not be changed by the user.
+        return self.features.get('large-receive-offload', True).get('fixed', True)
+
+    def is_fixed_gro(self):
+        # in case of a missing configuration, rather return "fixed". In Ethtool
+        # terminology "fixed" means the setting can not be changed by the user.
+        return self.features.get('generic-receive-offload', True).get('fixed', True)
+
+    def is_fixed_gso(self):
+        # in case of a missing configuration, rather return "fixed". In Ethtool
+        # terminology "fixed" means the setting can not be changed by the user.
+        return self.features.get('generic-segmentation-offload', True).get('fixed', True)
+
+    def is_fixed_sg(self):
+        # in case of a missing configuration, rather return "fixed". In Ethtool
+        # terminology "fixed" means the setting can not be changed by the user.
+        return self.features.get('scatter-gather', True).get('fixed', True)
+
+    def is_fixed_tso(self):
+        # in case of a missing configuration, rather return "fixed". In Ethtool
+        # terminology "fixed" means the setting can not be changed by the user.
+        return self.features.get('tcp-segmentation-offload', True).get('fixed', True)
+
+    def is_fixed_ufo(self):
+        # in case of a missing configuration, rather return "fixed". In Ethtool
+        # terminology "fixed" means the setting can not be changed by the user.
+        return self.features.get('udp-fragmentation-offload', True).get('fixed', True)
+
+    def get_rx_buffer(self):
+        # in case of a missing configuration rather return a "small"
+        # buffer of only 512 bytes.
+        return self.ring_buffers.get('rx', '512')
+
+    def get_tx_buffer(self):
+        # in case of a missing configuration rather return a "small"
+        # buffer of only 512 bytes.
+        return self.ring_buffers.get('tx', '512')
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index 8528c4a81..d9507d816 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -1015,9 +1015,11 @@ class Interface(Control):
             source_if = next(iter(self._config['is_mirror_intf']))
             config = self._config['is_mirror_intf'][source_if].get('mirror', None)
 
+        # Please do not clear the 'set $? = 0 '. It's meant to force a return of 0
         # Remove existing mirroring rules
-        delete_tc_cmd  = f'tc qdisc del dev {source_if} handle ffff: ingress; '
-        delete_tc_cmd += f'tc qdisc del dev {source_if} handle 1: root prio'
+        delete_tc_cmd  = f'tc qdisc del dev {source_if} handle ffff: ingress 2> /dev/null;'
+        delete_tc_cmd += f'tc qdisc del dev {source_if} handle 1: root prio 2> /dev/null;'
+        delete_tc_cmd += 'set $?=0'
         self._popen(delete_tc_cmd)
 
         # Bail out early if nothing needs to be configured