From nobody Sat Feb 7 14:45:12 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7865120458D for ; Mon, 16 Dec 2024 10:42:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345735; cv=none; b=jLQjJcYqGgvr5MMFYMWxDkVVBr81u2jmU2q9LXxa2TqyTJVYKtGF/yq3UhFfiQdZfR/K4deeAkkcaoJEZ6iKcGl59cozHcARaqno0Oa2nfyDATI6VfkJWfJ8KToIaDF+qICd+RcO4Y7UL0aVtmyoUdyE5EiXeW5OGIghQwys6BA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345735; c=relaxed/simple; bh=5FuMwi7o2xRwdUfs1aV90j5M8c0AOHVcS7+vgnVx8qk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=S+UY4lfmdoT6UhhT0bnHXgcwao1Un/QmrMgHLHgHeX9wbV9HMhZ0AHu7rAjVU0r6iCLw+6Hr26JtEk3afY7w6uoITH2jz8ohmacl7cYPrZg2cCuekIy4wRI5sdjoml4A6a4lxHXp7crOCb9dLv6zwueL3/Grl5uCqfuMs/SBB2w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Hcl6qYci; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Hcl6qYci" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734345731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hTqrHx/rHjwvoh4VZ+UElp504YgxK2FnTVLIGZu5YYE=; b=Hcl6qYciV3fvaIlxVCLhybWyJfK8nJj9OllrzEgrGcFlkLqm33d644ERQrCMJc+SERXxGk FoPLfZ1P0huDSHx97hKTMsP319Ty6V3h61zZFajG3wRIEnxJPKtuBhCHWJ/EvgXtScO+ql sd6OcfbstEpCUJcqxiZYKOzKQAomxSc= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-103-JUQ33SK6P46VH6h4dn5ZMA-1; Mon, 16 Dec 2024 05:42:05 -0500 X-MC-Unique: JUQ33SK6P46VH6h4dn5ZMA-1 X-Mimecast-MFC-AGG-ID: JUQ33SK6P46VH6h4dn5ZMA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 426601955F10; Mon, 16 Dec 2024 10:42:04 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.45.225.0]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6DE2430044C1; Mon, 16 Dec 2024 10:42:00 +0000 (UTC) From: Jan Stancek To: donald.hunter@gmail.com, stfomichev@gmail.com, kuba@kernel.org, jdamato@fastly.com Cc: pabeni@redhat.com, davem@davemloft.net, edumazet@google.com, horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jstancek@redhat.com Subject: [PATCH v3 1/4] tools: ynl: move python code to separate sub-directory Date: Mon, 16 Dec 2024 11:41:41 +0100 Message-ID: <64b1dda576e9502c5d704b3b31fda2337a189e19.1734345017.git.jstancek@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" Move python code to a separate directory so it can be packaged as a python module. Updates existing references in selftests and docs. Also rename ynl-gen-[c|rst] to ynl_gen_[c|rst], avoid dashes as these prevent easy imports for entrypoints. Signed-off-by: Jan Stancek Reviewed-by: Donald Hunter --- Documentation/Makefile | 2 +- Documentation/networking/multi-pf-netdev.rst | 4 ++-- Documentation/networking/napi.rst | 4 ++-- Documentation/networking/netlink_spec/readme.txt | 2 +- Documentation/userspace-api/netlink/intro-specs.rst | 8 ++++---- tools/net/ynl/Makefile | 2 ++ tools/net/ynl/generated/Makefile | 2 +- tools/net/ynl/lib/.gitignore | 1 - tools/net/ynl/lib/Makefile | 1 - tools/net/ynl/pyynl/.gitignore | 2 ++ tools/net/ynl/pyynl/__init__.py | 0 tools/net/ynl/{ =3D> pyynl}/cli.py | 0 tools/net/ynl/{ =3D> pyynl}/ethtool.py | 0 tools/net/ynl/{ =3D> pyynl}/lib/__init__.py | 0 tools/net/ynl/{ =3D> pyynl}/lib/nlspec.py | 0 tools/net/ynl/{ =3D> pyynl}/lib/ynl.py | 0 tools/net/ynl/{ynl-gen-c.py =3D> pyynl/ynl_gen_c.py} | 0 tools/net/ynl/{ynl-gen-rst.py =3D> pyynl/ynl_gen_rst.py} | 0 tools/net/ynl/ynl-regen.sh | 2 +- tools/testing/selftests/net/lib/py/ynl.py | 4 ++-- tools/testing/selftests/net/ynl.mk | 3 ++- 21 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 tools/net/ynl/pyynl/.gitignore create mode 100644 tools/net/ynl/pyynl/__init__.py rename tools/net/ynl/{ =3D> pyynl}/cli.py (100%) rename tools/net/ynl/{ =3D> pyynl}/ethtool.py (100%) rename tools/net/ynl/{ =3D> pyynl}/lib/__init__.py (100%) rename tools/net/ynl/{ =3D> pyynl}/lib/nlspec.py (100%) rename tools/net/ynl/{ =3D> pyynl}/lib/ynl.py (100%) rename tools/net/ynl/{ynl-gen-c.py =3D> pyynl/ynl_gen_c.py} (100%) rename tools/net/ynl/{ynl-gen-rst.py =3D> pyynl/ynl_gen_rst.py} (100%) diff --git a/Documentation/Makefile b/Documentation/Makefile index fa71602ec961..52c6c5a3efa9 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -104,7 +104,7 @@ quiet_cmd_sphinx =3D SPHINX $@ --> file://$(abspath $(= BUILDDIR)/$3/$4) YNL_INDEX:=3D$(srctree)/Documentation/networking/netlink_spec/index.rst YNL_RST_DIR:=3D$(srctree)/Documentation/networking/netlink_spec YNL_YAML_DIR:=3D$(srctree)/Documentation/netlink/specs -YNL_TOOL:=3D$(srctree)/tools/net/ynl/ynl-gen-rst.py +YNL_TOOL:=3D$(srctree)/tools/net/ynl/pyynl/ynl_gen_rst.py =20 YNL_RST_FILES_TMP :=3D $(patsubst %.yaml,%.rst,$(wildcard $(YNL_YAML_DIR)/= *.yaml)) YNL_RST_FILES :=3D $(patsubst $(YNL_YAML_DIR)%,$(YNL_RST_DIR)%, $(YNL_RST_= FILES_TMP)) diff --git a/Documentation/networking/multi-pf-netdev.rst b/Documentation/n= etworking/multi-pf-netdev.rst index 2cd25d81aaa7..2f5a5bb3ca9a 100644 --- a/Documentation/networking/multi-pf-netdev.rst +++ b/Documentation/networking/multi-pf-netdev.rst @@ -89,7 +89,7 @@ Observability =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D The relation between PF, irq, napi, and queue can be observed via netlink = spec:: =20 - $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml = --dump queue-get --json=3D'{"ifindex": 13}' + $ ./tools/net/ynl/pyynl/cli.py --spec Documentation/netlink/specs/netdev= .yaml --dump queue-get --json=3D'{"ifindex": 13}' [{'id': 0, 'ifindex': 13, 'napi-id': 539, 'type': 'rx'}, {'id': 1, 'ifindex': 13, 'napi-id': 540, 'type': 'rx'}, {'id': 2, 'ifindex': 13, 'napi-id': 541, 'type': 'rx'}, @@ -101,7 +101,7 @@ The relation between PF, irq, napi, and queue can be ob= served via netlink spec:: {'id': 3, 'ifindex': 13, 'napi-id': 542, 'type': 'tx'}, {'id': 4, 'ifindex': 13, 'napi-id': 543, 'type': 'tx'}] =20 - $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml = --dump napi-get --json=3D'{"ifindex": 13}' + $ ./tools/net/ynl/pyynl/cli.py --spec Documentation/netlink/specs/netdev= .yaml --dump napi-get --json=3D'{"ifindex": 13}' [{'id': 543, 'ifindex': 13, 'irq': 42}, {'id': 542, 'ifindex': 13, 'irq': 41}, {'id': 541, 'ifindex': 13, 'irq': 40}, diff --git a/Documentation/networking/napi.rst b/Documentation/networking/n= api.rst index 02720dd71a76..6083210ab2a4 100644 --- a/Documentation/networking/napi.rst +++ b/Documentation/networking/napi.rst @@ -199,13 +199,13 @@ parameters mentioned above use hyphens instead of und= erscores: =20 Per-NAPI configuration can be done programmatically in a user application or by using a script included in the kernel source tree: -``tools/net/ynl/cli.py``. +``tools/net/ynl/pyynl/cli.py``. =20 For example, using the script: =20 .. code-block:: bash =20 - $ kernel-source/tools/net/ynl/cli.py \ + $ kernel-source/tools/net/ynl/pyynl/cli.py \ --spec Documentation/netlink/specs/netdev.yaml \ --do napi-set \ --json=3D'{"id": 345, diff --git a/Documentation/networking/netlink_spec/readme.txt b/Documentati= on/networking/netlink_spec/readme.txt index 6763f99d216c..030b44aca4e6 100644 --- a/Documentation/networking/netlink_spec/readme.txt +++ b/Documentation/networking/netlink_spec/readme.txt @@ -1,4 +1,4 @@ SPDX-License-Identifier: GPL-2.0 =20 This file is populated during the build of the documentation (htmldocs) by= the -tools/net/ynl/ynl-gen-rst.py script. +tools/net/ynl/pyynl/ynl_gen_rst.py script. diff --git a/Documentation/userspace-api/netlink/intro-specs.rst b/Document= ation/userspace-api/netlink/intro-specs.rst index bada89699455..a4435ae4628d 100644 --- a/Documentation/userspace-api/netlink/intro-specs.rst +++ b/Documentation/userspace-api/netlink/intro-specs.rst @@ -15,7 +15,7 @@ developing Netlink related code. The tool is implemented = in Python and can use a YAML specification to issue Netlink requests to the kernel. Only Generic Netlink is supported. =20 -The tool is located at ``tools/net/ynl/cli.py``. It accepts +The tool is located at ``tools/net/ynl/pyynl/cli.py``. It accepts a handul of arguments, the most important ones are: =20 - ``--spec`` - point to the spec file @@ -27,7 +27,7 @@ YAML specs can be found under ``Documentation/netlink/spe= cs/``. =20 Example use:: =20 - $ ./tools/net/ynl/cli.py --spec Documentation/netlink/specs/ethtool.yaml= \ + $ ./tools/net/ynl/pyynl/cli.py --spec Documentation/netlink/specs/ethtoo= l.yaml \ --do rings-get \ --json '{"header":{"dev-index": 18}}' {'header': {'dev-index': 18, 'dev-name': 'eni1np1'}, @@ -75,7 +75,7 @@ the two marker lines like above to a file, add that file = to git, and run the regeneration tool. Grep the tree for ``YNL-GEN`` to see other examples. =20 -The code generation itself is performed by ``tools/net/ynl/ynl-gen-c.py`` +The code generation itself is performed by ``tools/net/ynl/pyynl/ynl_gen_c= .py`` but it takes a few arguments so calling it directly for each file quickly becomes tedious. =20 @@ -84,7 +84,7 @@ YNL lib =20 ``tools/net/ynl/lib/`` contains an implementation of a C library (based on libmnl) which integrates with code generated by -``tools/net/ynl/ynl-gen-c.py`` to create easy to use netlink wrappers. +``tools/net/ynl/pyynl/ynl_gen_c.py`` to create easy to use netlink wrapper= s. =20 YNL basics ---------- diff --git a/tools/net/ynl/Makefile b/tools/net/ynl/Makefile index d1cdf2a8f826..5268b91bf7ed 100644 --- a/tools/net/ynl/Makefile +++ b/tools/net/ynl/Makefile @@ -21,5 +21,7 @@ clean distclean: fi \ done rm -f libynl.a + rm -rf pyynl/__pycache__ + rm -rf pyynl/lib/__pycache__ =20 .PHONY: all clean distclean $(SUBDIRS) diff --git a/tools/net/ynl/generated/Makefile b/tools/net/ynl/generated/Mak= efile index 7db5240de58a..00af721b1571 100644 --- a/tools/net/ynl/generated/Makefile +++ b/tools/net/ynl/generated/Makefile @@ -12,7 +12,7 @@ include ../Makefile.deps YNL_GEN_ARG_ethtool:=3D--user-header linux/ethtool_netlink.h \ --exclude-op stats-get =20 -TOOL:=3D../ynl-gen-c.py +TOOL:=3D../pyynl/ynl_gen_c.py =20 GENS_PATHS=3D$(shell grep -nrI --files-without-match \ 'protocol: netlink' \ diff --git a/tools/net/ynl/lib/.gitignore b/tools/net/ynl/lib/.gitignore index 296c4035dbf2..a4383358ec72 100644 --- a/tools/net/ynl/lib/.gitignore +++ b/tools/net/ynl/lib/.gitignore @@ -1,2 +1 @@ -__pycache__/ *.d diff --git a/tools/net/ynl/lib/Makefile b/tools/net/ynl/lib/Makefile index 94c49cca3dca..4b2b98704ff9 100644 --- a/tools/net/ynl/lib/Makefile +++ b/tools/net/ynl/lib/Makefile @@ -19,7 +19,6 @@ ynl.a: $(OBJS) =20 clean: rm -f *.o *.d *~ - rm -rf __pycache__ =20 distclean: clean rm -f *.a diff --git a/tools/net/ynl/pyynl/.gitignore b/tools/net/ynl/pyynl/.gitignore new file mode 100644 index 000000000000..b801cd2d016e --- /dev/null +++ b/tools/net/ynl/pyynl/.gitignore @@ -0,0 +1,2 @@ +__pycache__/ +lib/__pycache__/ diff --git a/tools/net/ynl/pyynl/__init__.py b/tools/net/ynl/pyynl/__init__= .py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/tools/net/ynl/cli.py b/tools/net/ynl/pyynl/cli.py similarity index 100% rename from tools/net/ynl/cli.py rename to tools/net/ynl/pyynl/cli.py diff --git a/tools/net/ynl/ethtool.py b/tools/net/ynl/pyynl/ethtool.py similarity index 100% rename from tools/net/ynl/ethtool.py rename to tools/net/ynl/pyynl/ethtool.py diff --git a/tools/net/ynl/lib/__init__.py b/tools/net/ynl/pyynl/lib/__init= __.py similarity index 100% rename from tools/net/ynl/lib/__init__.py rename to tools/net/ynl/pyynl/lib/__init__.py diff --git a/tools/net/ynl/lib/nlspec.py b/tools/net/ynl/pyynl/lib/nlspec.py similarity index 100% rename from tools/net/ynl/lib/nlspec.py rename to tools/net/ynl/pyynl/lib/nlspec.py diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/pyynl/lib/ynl.py similarity index 100% rename from tools/net/ynl/lib/ynl.py rename to tools/net/ynl/pyynl/lib/ynl.py diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/pyynl/ynl_gen_c.py similarity index 100% rename from tools/net/ynl/ynl-gen-c.py rename to tools/net/ynl/pyynl/ynl_gen_c.py diff --git a/tools/net/ynl/ynl-gen-rst.py b/tools/net/ynl/pyynl/ynl_gen_rst= .py similarity index 100% rename from tools/net/ynl/ynl-gen-rst.py rename to tools/net/ynl/pyynl/ynl_gen_rst.py diff --git a/tools/net/ynl/ynl-regen.sh b/tools/net/ynl/ynl-regen.sh index a37304dcc88e..81b4ecd89100 100755 --- a/tools/net/ynl/ynl-regen.sh +++ b/tools/net/ynl/ynl-regen.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause =20 -TOOL=3D$(dirname $(realpath $0))/ynl-gen-c.py +TOOL=3D$(dirname $(realpath $0))/pyynl/ynl_gen_c.py =20 force=3D search=3D diff --git a/tools/testing/selftests/net/lib/py/ynl.py b/tools/testing/self= tests/net/lib/py/ynl.py index a0d689d58c57..9c0e5a89eb12 100644 --- a/tools/testing/selftests/net/lib/py/ynl.py +++ b/tools/testing/selftests/net/lib/py/ynl.py @@ -13,14 +13,14 @@ try: SPEC_PATH =3D KSFT_DIR / "net/lib/specs" =20 sys.path.append(tools_full_path.as_posix()) - from net.lib.ynl.lib import YnlFamily, NlError + from net.lib.ynl.pyynl.lib import YnlFamily, NlError else: # Running in tree tools_full_path =3D KSRC / "tools" SPEC_PATH =3D KSRC / "Documentation/netlink/specs" =20 sys.path.append(tools_full_path.as_posix()) - from net.ynl.lib import YnlFamily, NlError + from net.ynl.pyynl.lib import YnlFamily, NlError except ModuleNotFoundError as e: ksft_pr("Failed importing `ynl` library from kernel sources") ksft_pr(str(e)) diff --git a/tools/testing/selftests/net/ynl.mk b/tools/testing/selftests/n= et/ynl.mk index d43afe243779..12e7cae251be 100644 --- a/tools/testing/selftests/net/ynl.mk +++ b/tools/testing/selftests/net/ynl.mk @@ -31,7 +31,8 @@ $(OUTPUT)/libynl.a: $(YNL_SPECS) $(OUTPUT)/.libynl-$(YNL_= GENS_HASH).sig $(Q)cp $(top_srcdir)/tools/net/ynl/libynl.a $(OUTPUT)/libynl.a =20 EXTRA_CLEAN +=3D \ - $(top_srcdir)/tools/net/ynl/lib/__pycache__ \ + $(top_srcdir)/tools/net/ynl/pyynl/__pycache__ \ + $(top_srcdir)/tools/net/ynl/pyynl/lib/__pycache__ \ $(top_srcdir)/tools/net/ynl/lib/*.[ado] \ $(OUTPUT)/.libynl-*.sig \ $(OUTPUT)/libynl.a --=20 2.43.0 From nobody Sat Feb 7 14:45:12 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52C97203D70 for ; Mon, 16 Dec 2024 10:42:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345734; cv=none; b=GJCRlY7cQ9GtVRX3hdtoQqhudS/n6wSRhdyZeM030e5ZeMo3/shdnp9kljCe60RlAbiHMxikKquX/RyY0BiyKLa1I0IH5l73XFEnLo3VasutjqxetoBB/JW+tC1fHvpxkAlnfdCTyhJsYqozVD1kri5hVq9pazg7P7XVAHnyAGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345734; c=relaxed/simple; bh=6VdqSl8alXvH6pPsK78wHQAqoCIfIhg5UpI5s40sgg8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=lNqm1jq6BmXM2/UsGdyl75zrUvlJ1Se88meDyMEO8ulrzTcdldGzVubIOHv/N8qmDnAA4rAslsB6b+fxdCx7a3DqCto4L4IF21cLklHkzDgA6HqG5nILqxeTbcZavRjA7lw0QUujPmCR6xngIlBbWDnYfVtBLogeLu6MeQvCh2U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Ty75Rw3q; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ty75Rw3q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734345731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l7tcKVC1kh1dFVI8oN1xiQyOlNqxnj21TIJYyRp/op8=; b=Ty75Rw3qD0Ik3lUDHtmiL0CwjXc4EndxSRPySYpCJoab27pXw6LvdE5kUbg57PQooQ4QB+ fK6VQRnd6t4r5uWw4UM0IwXBy7UvHVALZAwz4MmXHs4vLCf6VnPGzgtaXjZuL8PJVa7Sun kHIOmXR7VNyB6x2TnGBWJR0MOrCQxb0= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-tUpMBIfLOWWK22VyY4z5Lw-1; Mon, 16 Dec 2024 05:42:10 -0500 X-MC-Unique: tUpMBIfLOWWK22VyY4z5Lw-1 X-Mimecast-MFC-AGG-ID: tUpMBIfLOWWK22VyY4z5Lw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7B6D8195609F; Mon, 16 Dec 2024 10:42:08 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.45.225.0]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BBEE8300F9B5; Mon, 16 Dec 2024 10:42:04 +0000 (UTC) From: Jan Stancek To: donald.hunter@gmail.com, stfomichev@gmail.com, kuba@kernel.org, jdamato@fastly.com Cc: pabeni@redhat.com, davem@davemloft.net, edumazet@google.com, horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jstancek@redhat.com Subject: [PATCH v3 2/4] tools: ynl: add initial pyproject.toml for packaging Date: Mon, 16 Dec 2024 11:41:42 +0100 Message-ID: <2a9b6d5a782acfa71ae5fb2f4d3cc538740013b6.1734345017.git.jstancek@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jan Stancek --- tools/net/ynl/pyproject.toml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 tools/net/ynl/pyproject.toml diff --git a/tools/net/ynl/pyproject.toml b/tools/net/ynl/pyproject.toml new file mode 100644 index 000000000000..677ea8f4c185 --- /dev/null +++ b/tools/net/ynl/pyproject.toml @@ -0,0 +1,26 @@ +[build-system] +requires =3D ["setuptools>=3D61.0"] +build-backend =3D "setuptools.build_meta" + +[project] +name =3D "pyynl" +authors =3D [ + {name =3D "Donald Hunter", email =3D "donald.hunter@gmail.com"}, + {name =3D "Jakub Kicinski", email =3D "kuba@kernel.org"}, +] +description =3D "yaml netlink (ynl)" +version =3D "0.0.1" +requires-python =3D ">=3D3.9" +dependencies =3D [ + "pyyaml=3D=3D6.*", + "jsonschema=3D=3D4.*" +] + +[tool.setuptools.packages.find] +include =3D ["pyynl", "pyynl.lib"] + +[project.scripts] +ynl =3D "pyynl.cli:main" +ynl-ethtool =3D "pyynl.ethtool:main" +ynl-gen-c =3D "pyynl.ynl_gen_c:main" +ynl-gen-rst =3D "pyynl.ynl_gen_rst:main" --=20 2.43.0 From nobody Sat Feb 7 14:45:12 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEB0D204C3F for ; Mon, 16 Dec 2024 10:42:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345741; cv=none; b=LsMVU6dW3YouDZPRE7R6jWSh1njOK+sd0EXAG1Xl0Z5iLAUqCccKJ5Sq9Wy/eZ7K4+R6La+B9rOac2D6ZJyt4YJHg2pEhDHn+Ce/7OG1/MXhtIicVof4ljs2PUYq1xsq9qrbPhLAuoUUrLGdjEVCuBpX6INcXPGCWEMNwpEl7Bk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345741; c=relaxed/simple; bh=N/wUQLAnBME2XdtaW/dnTdqAPs0z813+/Aguh8OsAro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=lc9xteL0VZfWDFhtT6UTEklv+G9dnNx+0BAgwBIyopOX1bX7+KCql1E5YAATmq9zpo06zOX2eTju6+I31S+2nOB83fc5gY8fQ+Dj3Muai9n4awJ4NvFqVpgUxeCZo2vXZvziullqvh5T45zrTbUjlRtqCI77bdPxh7/5W0ex8rw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TAiUpWUW; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TAiUpWUW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734345738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n40TTeyeXxDATT9p70QeA8QlaNAyq8YWOLnuryY7UcU=; b=TAiUpWUW5wZH8ILHd9Hb3dQsHk5rYCanLf8XV5VvVo8MZRYq91VPu1i/kNad5KOZv6+Etp Mn5LjOmu79umF5508IsLh/+YiQMNrHRjBLDquJU0AU9/P0sAKYBey5CtZoiT0MDCBW9YuJ n4AqA3YsfgX6mQ8LDO9duEwNv3U9k9A= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-350-Tn1MnRscPUaILODF89rHHg-1; Mon, 16 Dec 2024 05:42:14 -0500 X-MC-Unique: Tn1MnRscPUaILODF89rHHg-1 X-Mimecast-MFC-AGG-ID: Tn1MnRscPUaILODF89rHHg Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B5B80195609F; Mon, 16 Dec 2024 10:42:12 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.45.225.0]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 04F4E3000197; Mon, 16 Dec 2024 10:42:08 +0000 (UTC) From: Jan Stancek To: donald.hunter@gmail.com, stfomichev@gmail.com, kuba@kernel.org, jdamato@fastly.com Cc: pabeni@redhat.com, davem@davemloft.net, edumazet@google.com, horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jstancek@redhat.com Subject: [PATCH v3 3/4] tools: ynl: add install target for generated content Date: Mon, 16 Dec 2024 11:41:43 +0100 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" Generate docs using ynl_gen_rst and add install target for headers, specs and generates rst files. Signed-off-by: Jan Stancek --- tools/net/ynl/generated/.gitignore | 1 + tools/net/ynl/generated/Makefile | 40 +++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/tools/net/ynl/generated/.gitignore b/tools/net/ynl/generated/.= gitignore index ade488626d26..859a6fb446e1 100644 --- a/tools/net/ynl/generated/.gitignore +++ b/tools/net/ynl/generated/.gitignore @@ -1,2 +1,3 @@ *-user.c *-user.h +*.rst diff --git a/tools/net/ynl/generated/Makefile b/tools/net/ynl/generated/Mak= efile index 00af721b1571..208f7fead784 100644 --- a/tools/net/ynl/generated/Makefile +++ b/tools/net/ynl/generated/Makefile @@ -7,12 +7,19 @@ ifeq ("$(DEBUG)","1") CFLAGS +=3D -g -fsanitize=3Daddress -fsanitize=3Dleak -static-libasan endif =20 +INSTALL ?=3D install +prefix ?=3D /usr +datarootdir ?=3D $(prefix)/share +docdir ?=3D $(datarootdir)/doc +includedir ?=3D $(prefix)/include + include ../Makefile.deps =20 YNL_GEN_ARG_ethtool:=3D--user-header linux/ethtool_netlink.h \ --exclude-op stats-get =20 TOOL:=3D../pyynl/ynl_gen_c.py +TOOL_RST:=3D../pyynl/ynl_gen_rst.py =20 GENS_PATHS=3D$(shell grep -nrI --files-without-match \ 'protocol: netlink' \ @@ -22,7 +29,11 @@ SRCS=3D$(patsubst %,%-user.c,${GENS}) HDRS=3D$(patsubst %,%-user.h,${GENS}) OBJS=3D$(patsubst %,%-user.o,${GENS}) =20 -all: protos.a $(HDRS) $(SRCS) $(KHDRS) $(KSRCS) $(UAPI) +SPECS_PATHS=3D$(wildcard ../../../../Documentation/netlink/specs/*.yaml) +SPECS=3D$(patsubst ../../../../Documentation/netlink/specs/%.yaml,%,${SPEC= S_PATHS}) +RSTS=3D$(patsubst %,%.rst,${SPECS}) + +all: protos.a $(HDRS) $(SRCS) $(KHDRS) $(KSRCS) $(UAPI) $(RSTS) =20 protos.a: $(OBJS) @echo -e "\tAR $@" @@ -40,8 +51,12 @@ protos.a: $(OBJS) @echo -e "\tCC $@" @$(COMPILE.c) $(CFLAGS_$*) -o $@ $< =20 +%.rst: ../../../../Documentation/netlink/specs/%.yaml $(TOOL2) + @echo -e "\tGEN_RST $@" + @$(TOOL_RST) -o $@ -i $< + clean: - rm -f *.o + rm -f *.o *.rst =20 distclean: clean rm -f *.c *.h *.a @@ -49,5 +64,24 @@ distclean: clean regen: @../ynl-regen.sh =20 -.PHONY: all clean distclean regen +install-headers: $(HDRS) + @echo -e "\tINSTALL generated headers" + @$(INSTALL) -d $(DESTDIR)$(includedir)/ynl + @$(INSTALL) -m 0644 *.h $(DESTDIR)$(includedir)/ynl/ + +install-rsts: $(RSTS) + @echo -e "\tINSTALL generated docs" + @$(INSTALL) -d $(DESTDIR)$(docdir)/ynl + @$(INSTALL) -m 0644 $(RSTS) $(DESTDIR)$(docdir)/ynl/ + +install-specs: + @echo -e "\tINSTALL specs" + @$(INSTALL) -d $(DESTDIR)$(datarootdir)/ynl + @$(INSTALL) -m 0644 ../../../../Documentation/netlink/*.yaml $(DESTDIR)$(= datarootdir)/ynl/ + @$(INSTALL) -d $(DESTDIR)$(datarootdir)/ynl/specs + @$(INSTALL) -m 0644 ../../../../Documentation/netlink/specs/*.yaml $(DEST= DIR)$(datarootdir)/ynl/specs/ + +install: install-headers install-rsts install-specs + +.PHONY: all clean distclean regen install install-headers install-rsts ins= tall-specs .DEFAULT_GOAL: all --=20 2.43.0 From nobody Sat Feb 7 14:45:12 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 027A42040AE for ; Mon, 16 Dec 2024 10:42:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345744; cv=none; b=P7SZs8vrMrQIzSmV2TU6PF9FRgl+Joh2wTgPiinebQCTO3bUSoWBf0M2ibfse+4672B+thLMR8riXwkMk79d2uo3BNBhnrm6z+dge3q/PGnFPqtEftloYAi0itlMAJVXxd2tY9tlvPuEdL9Bq4DHRcLvHElfdCB+nAJxMZ+WWv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734345744; c=relaxed/simple; bh=NDQKlgYIRoYHDjrGjdF2F62jEDDDGK7dXm6HO9ykzCY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=l7x/PxQnpfTu1aPaVnViEaCSOZfxGG8Hd37eJ0wrFpmHSrIYbCXa3oOmUPWv2OQp7fo9VaX9zJfGSL6HshX6X2idD/mI7hlX3WjwCB7PyuUbidPZ2q54gG9f4ZbPyEwsvsHKgFjPXgJm7JYM1IiPeb2MtG/7ILMSFSGvV1oIRaA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Oi8nSx1A; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Oi8nSx1A" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734345742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FbJUyLJbUFxfvOdLaKu0MrumiGmKnShy5+kp4bmKqxk=; b=Oi8nSx1AWiatF2qOpyE8kVfJQWksTNl0BYxQ5AHuR+t6xWj4iZBh+tM24MnjMTHIjg4a+a hRXqlb+YbcubWLP1PzYJ8NUu6kySseWq2WZ3d3Jr5q8o6TPXmfNwkZHt0Sg9hXzdRYqB3Q dllGCBHLGnrgQEmbEhpFfndQYhBogLw= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-538-tuDewfukPO6zvDdSD4j6Hw-1; Mon, 16 Dec 2024 05:42:18 -0500 X-MC-Unique: tuDewfukPO6zvDdSD4j6Hw-1 X-Mimecast-MFC-AGG-ID: tuDewfukPO6zvDdSD4j6Hw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E274E195608B; Mon, 16 Dec 2024 10:42:16 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.45.225.0]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 41DBF3000197; Mon, 16 Dec 2024 10:42:12 +0000 (UTC) From: Jan Stancek To: donald.hunter@gmail.com, stfomichev@gmail.com, kuba@kernel.org, jdamato@fastly.com Cc: pabeni@redhat.com, davem@davemloft.net, edumazet@google.com, horms@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jstancek@redhat.com Subject: [PATCH v3 4/4] tools: ynl: add main install target Date: Mon, 16 Dec 2024 11:41:44 +0100 Message-ID: <6e41a47b9ea5ede099d9ae7768fbceb553c6614d.1734345017.git.jstancek@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Content-Type: text/plain; charset="utf-8" This will install C library, specs, rsts and pyynl. The initial structure is: $ mkdir /tmp/myroot $ make DESTDIR=3D/tmp/myroot install /usr /usr/lib64 /usr/lib64/libynl.a /usr/lib/python3.XX/site-packages/pyynl/* /usr/lib/python3.XX/site-packages/pyynl-0.0.1.dist-info/* /usr/bin /usr/bin/ynl /usr/bin/ynl-ethtool /usr/bin/ynl-gen-c /usr/bin/ynl-gen-rst /usr/include/ynl/*.h /usr/share /usr/share/doc /usr/share/doc/ynl /usr/share/doc/ynl/*.rst /usr/share/ynl /usr/share/ynl/genetlink-c.yaml /usr/share/ynl/genetlink-legacy.yaml /usr/share/ynl/genetlink.yaml /usr/share/ynl/netlink-raw.yaml /usr/share/ynl/specs /usr/share/ynl/specs/devlink.yaml /usr/share/ynl/specs/dpll.yaml /usr/share/ynl/specs/ethtool.yaml /usr/share/ynl/specs/fou.yaml /usr/share/ynl/specs/handshake.yaml /usr/share/ynl/specs/mptcp_pm.yaml /usr/share/ynl/specs/netdev.yaml /usr/share/ynl/specs/net_shaper.yaml /usr/share/ynl/specs/nfsd.yaml /usr/share/ynl/specs/nftables.yaml /usr/share/ynl/specs/nlctrl.yaml /usr/share/ynl/specs/ovs_datapath.yaml /usr/share/ynl/specs/ovs_flow.yaml /usr/share/ynl/specs/ovs_vport.yaml /usr/share/ynl/specs/rt_addr.yaml /usr/share/ynl/specs/rt_link.yaml /usr/share/ynl/specs/rt_neigh.yaml /usr/share/ynl/specs/rt_route.yaml /usr/share/ynl/specs/rt_rule.yaml /usr/share/ynl/specs/tcp_metrics.yaml /usr/share/ynl/specs/tc.yaml /usr/share/ynl/specs/team.yaml Signed-off-by: Jan Stancek Reviewed-by: Donald Hunter Reviewed-by: Joe Damato --- tools/net/ynl/Makefile | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/net/ynl/Makefile b/tools/net/ynl/Makefile index 5268b91bf7ed..211df5a93ad9 100644 --- a/tools/net/ynl/Makefile +++ b/tools/net/ynl/Makefile @@ -1,5 +1,17 @@ # SPDX-License-Identifier: GPL-2.0 =20 +include ../../scripts/Makefile.arch + +INSTALL ?=3D install +prefix ?=3D /usr +ifeq ($(LP64), 1) + libdir_relative =3D lib64 +else + libdir_relative =3D lib +endif +libdir ?=3D $(prefix)/$(libdir_relative) +includedir ?=3D $(prefix)/include + SUBDIRS =3D lib generated samples =20 all: $(SUBDIRS) libynl.a @@ -23,5 +35,18 @@ clean distclean: rm -f libynl.a rm -rf pyynl/__pycache__ rm -rf pyynl/lib/__pycache__ + rm -rf pyynl.egg-info + rm -rf build + +install: libynl.a lib/*.h + @echo -e "\tINSTALL libynl.a" + @$(INSTALL) -d $(DESTDIR)$(libdir) + @$(INSTALL) -m 0644 libynl.a $(DESTDIR)$(libdir)/libynl.a + @echo -e "\tINSTALL libynl headers" + @$(INSTALL) -d $(DESTDIR)$(includedir)/ynl + @$(INSTALL) -m 0644 lib/*.h $(DESTDIR)$(includedir)/ynl/ + @echo -e "\tINSTALL pyynl" + @pip install --prefix=3D$(DESTDIR)$(prefix) . + @make -C generated install =20 -.PHONY: all clean distclean $(SUBDIRS) +.PHONY: all clean distclean install $(SUBDIRS) --=20 2.43.0