summaryrefslogtreecommitdiffstats
path: root/tools/net
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2023-01-30 18:33:45 -0800
committerJakub Kicinski <kuba@kernel.org>2023-01-31 20:36:03 -0800
commit19b64b48a33e986dd21430e759629af2562373b2 (patch)
tree8fd925a8fa57fb20f2dc1ea9f5c1fa11855603a6 /tools/net
parent30a5c6c8104f34ed02c50041b82f3ef80924de6d (diff)
downloadlinux-stable-19b64b48a33e986dd21430e759629af2562373b2.tar.gz
linux-stable-19b64b48a33e986dd21430e759629af2562373b2.tar.bz2
linux-stable-19b64b48a33e986dd21430e759629af2562373b2.zip
tools: ynl: add support for types needed by ethtool
Ethtool needs support for handful of extra types. It doesn't have the definitions section yet. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/net')
-rw-r--r--tools/net/ynl/lib/ynl.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
index 0ceb627ba686..a656b655d302 100644
--- a/tools/net/ynl/lib/ynl.py
+++ b/tools/net/ynl/lib/ynl.py
@@ -75,6 +75,9 @@ class NlAttr:
self.full_len = (self.payload_len + 3) & ~3
self.raw = raw[offset + 4:offset + self.payload_len]
+ def as_u8(self):
+ return struct.unpack("B", self.raw)[0]
+
def as_u16(self):
return struct.unpack("H", self.raw)[0]
@@ -302,7 +305,7 @@ class YnlFamily(SpecFamily):
self._types = dict()
- for elem in self.yaml['definitions']:
+ for elem in self.yaml.get('definitions', []):
self._types[elem['name']] = elem
self.async_msg_ids = set()
@@ -334,6 +337,8 @@ class YnlFamily(SpecFamily):
attr_payload = b''
for subname, subvalue in value.items():
attr_payload += self._add_attr(attr['nested-attributes'], subname, subvalue)
+ elif attr["type"] == 'flag':
+ attr_payload = b''
elif attr["type"] == 'u32':
attr_payload = struct.pack("I", int(value))
elif attr["type"] == 'string':
@@ -369,6 +374,8 @@ class YnlFamily(SpecFamily):
if attr_spec["type"] == 'nest':
subdict = self._decode(NlAttrs(attr.raw), attr_spec['nested-attributes'])
rsp[attr_spec['name']] = subdict
+ elif attr_spec['type'] == 'u8':
+ rsp[attr_spec['name']] = attr.as_u8()
elif attr_spec['type'] == 'u32':
rsp[attr_spec['name']] = attr.as_u32()
elif attr_spec['type'] == 'u64':
@@ -377,6 +384,8 @@ class YnlFamily(SpecFamily):
rsp[attr_spec['name']] = attr.as_strz()
elif attr_spec["type"] == 'binary':
rsp[attr_spec['name']] = attr.as_bin()
+ elif attr_spec["type"] == 'flag':
+ rsp[attr_spec['name']] = True
else:
raise Exception(f'Unknown {attr.type} {attr_spec["name"]} {attr_spec["type"]}')