diff mbox series

[net-next,v1,3/7] tools/net/ynl: support decoding C arrays as enums

Message ID 20241203130655.45293-4-donald.hunter@gmail.com (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series netlink: specs: add a spec for nl80211 wiphy | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl fail Generated files up to date; build failed; build has 3 warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 3 this patch: 3
netdev/build_tools success Errors and warnings before: 0 (+23) this patch: 0 (+23)
netdev/cc_maintainers success CCed 6 of 6 maintainers
netdev/build_clang success Errors and warnings before: 3 this patch: 3
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 304 this patch: 304
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest fail net-next-2024-12-04--00-00 (tests: 759)

Commit Message

Donald Hunter Dec. 3, 2024, 1:06 p.m. UTC
The nl80211 family encodes the list of supported ciphers as a C array of
u32 values. Add support for translating arrays of scalars into enum
names.

Signed-off-by: Donald Hunter <donald.hunter@gmail.com>
---
 tools/net/ynl/lib/ynl.py | 2 ++
 1 file changed, 2 insertions(+)

Comments

Jakub Kicinski Dec. 4, 2024, 2:03 a.m. UTC | #1
On Tue,  3 Dec 2024 13:06:51 +0000 Donald Hunter wrote:
> Add support for translating arrays of scalars into enum names.

But not formatting hints.. ? ;) 

> Signed-off-by: Donald Hunter <donald.hunter@gmail.com>
> ---
>  tools/net/ynl/lib/ynl.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
> index 0d39a83574d5..f07a8404f71a 100644
> --- a/tools/net/ynl/lib/ynl.py
> +++ b/tools/net/ynl/lib/ynl.py
> @@ -627,6 +627,8 @@ class YnlFamily(SpecFamily):
>              decoded = self._decode_struct(attr.raw, attr_spec.struct_name)
>          elif attr_spec.sub_type:
>              decoded = attr.as_c_array(attr_spec.sub_type)
> +            if 'enum' in attr_spec:
> +                decoded = [ self._decode_enum(x, attr_spec) for x in decoded]

nit: missing space after 'decoded' or extra space before self, with
that fixed:

Acked-by: Jakub Kicinski <kuba@kernel.org>
Donald Hunter Dec. 4, 2024, 1:24 p.m. UTC | #2
On Wed, 4 Dec 2024 at 02:03, Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Tue,  3 Dec 2024 13:06:51 +0000 Donald Hunter wrote:
> > Add support for translating arrays of scalars into enum names.
>
> But not formatting hints.. ? ;)

Oooh, good catch. This does suggest that a refactor is needed for
scalar handling.

> > Signed-off-by: Donald Hunter <donald.hunter@gmail.com>
> > ---
> >  tools/net/ynl/lib/ynl.py | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
> > index 0d39a83574d5..f07a8404f71a 100644
> > --- a/tools/net/ynl/lib/ynl.py
> > +++ b/tools/net/ynl/lib/ynl.py
> > @@ -627,6 +627,8 @@ class YnlFamily(SpecFamily):
> >              decoded = self._decode_struct(attr.raw, attr_spec.struct_name)
> >          elif attr_spec.sub_type:
> >              decoded = attr.as_c_array(attr_spec.sub_type)
> > +            if 'enum' in attr_spec:
> > +                decoded = [ self._decode_enum(x, attr_spec) for x in decoded]
>
> nit: missing space after 'decoded' or extra space before self, with
> that fixed:

ack.

> Acked-by: Jakub Kicinski <kuba@kernel.org>
diff mbox series

Patch

diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
index 0d39a83574d5..f07a8404f71a 100644
--- a/tools/net/ynl/lib/ynl.py
+++ b/tools/net/ynl/lib/ynl.py
@@ -627,6 +627,8 @@  class YnlFamily(SpecFamily):
             decoded = self._decode_struct(attr.raw, attr_spec.struct_name)
         elif attr_spec.sub_type:
             decoded = attr.as_c_array(attr_spec.sub_type)
+            if 'enum' in attr_spec:
+                decoded = [ self._decode_enum(x, attr_spec) for x in decoded]
         else:
             decoded = attr.as_bin()
             if attr_spec.display_hint: