From: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>,
"Alexei Starovoitov" <ast@kernel.org>,
"Andrew Lunn" <andrew+netdev@lunn.ch>,
"Arkadiusz Kubalewski" <arkadiusz.kubalewski@intel.com>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Daniel Zahka" <daniel.zahka@gmail.com>,
"Donald Hunter" <donald.hunter@gmail.com>,
"Jacob Keller" <jacob.e.keller@intel.com>,
"Jesper Dangaard Brouer" <hawk@kernel.org>,
"Jiri Pirko" <jiri@resnulli.us>,
"Joe Damato" <jdamato@fastly.com>,
"John Fastabend" <john.fastabend@gmail.com>,
"Jonathan Corbet" <corbet@lwn.net>,
"Simon Horman" <horms@kernel.org>,
"Stanislav Fomichev" <sdf@fomichev.me>,
"Toke Høiland-Jørgensen" <toke@redhat.com>,
"Vadim Fedorenko" <vadim.fedorenko@linux.dev>,
"Willem de Bruijn" <willemb@google.com>,
bpf@vger.kernel.org, netdev@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next 1/6] tools: ynl-gen: bitshift the flag values in the generated code
Date: Mon, 13 Oct 2025 16:49:58 +0000 [thread overview]
Message-ID: <20251013165005.83659-2-ast@fiberby.net> (raw)
In-Reply-To: <20251013165005.83659-1-ast@fiberby.net>
Instead of pre-computing the flag values within the code generator,
then move the bitshift operation into the generated code.
This IMHO makes the generated code read more like handwritten code.
No functional changes.
Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
---
include/uapi/linux/dpll.h | 6 ++--
.../uapi/linux/ethtool_netlink_generated.h | 20 ++++++-------
include/uapi/linux/netdev.h | 28 +++++++++----------
tools/include/uapi/linux/netdev.h | 28 +++++++++----------
tools/net/ynl/pyynl/lib/nlspec.py | 7 +++--
tools/net/ynl/pyynl/ynl_gen_c.py | 2 +-
6 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/include/uapi/linux/dpll.h b/include/uapi/linux/dpll.h
index ab1725a954d74..28c9c8e5761b4 100644
--- a/include/uapi/linux/dpll.h
+++ b/include/uapi/linux/dpll.h
@@ -185,9 +185,9 @@ enum dpll_pin_state {
* @DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE: pin state can be changed
*/
enum dpll_pin_capabilities {
- DPLL_PIN_CAPABILITIES_DIRECTION_CAN_CHANGE = 1,
- DPLL_PIN_CAPABILITIES_PRIORITY_CAN_CHANGE = 2,
- DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE = 4,
+ DPLL_PIN_CAPABILITIES_DIRECTION_CAN_CHANGE = 1U << 0,
+ DPLL_PIN_CAPABILITIES_PRIORITY_CAN_CHANGE = 1U << 1,
+ DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE = 1U << 2,
};
#define DPLL_PHASE_OFFSET_DIVIDER 1000
diff --git a/include/uapi/linux/ethtool_netlink_generated.h b/include/uapi/linux/ethtool_netlink_generated.h
index 0e8ac0d974e20..14c9baacde0e8 100644
--- a/include/uapi/linux/ethtool_netlink_generated.h
+++ b/include/uapi/linux/ethtool_netlink_generated.h
@@ -26,9 +26,9 @@ enum {
* @ETHTOOL_FLAG_STATS: request statistics, if supported by the driver
*/
enum ethtool_header_flags {
- ETHTOOL_FLAG_COMPACT_BITSETS = 1,
- ETHTOOL_FLAG_OMIT_REPLY = 2,
- ETHTOOL_FLAG_STATS = 4,
+ ETHTOOL_FLAG_COMPACT_BITSETS = 1U << 0,
+ ETHTOOL_FLAG_OMIT_REPLY = 1U << 1,
+ ETHTOOL_FLAG_STATS = 1U << 2,
};
enum ethtool_tcp_data_split {
@@ -68,13 +68,13 @@ enum hwtstamp_source {
* power control from software
*/
enum ethtool_pse_event {
- ETHTOOL_PSE_EVENT_OVER_CURRENT = 1,
- ETHTOOL_PSE_EVENT_OVER_TEMP = 2,
- ETHTOOL_C33_PSE_EVENT_DETECTION = 4,
- ETHTOOL_C33_PSE_EVENT_CLASSIFICATION = 8,
- ETHTOOL_C33_PSE_EVENT_DISCONNECTION = 16,
- ETHTOOL_PSE_EVENT_OVER_BUDGET = 32,
- ETHTOOL_PSE_EVENT_SW_PW_CONTROL_ERROR = 64,
+ ETHTOOL_PSE_EVENT_OVER_CURRENT = 1U << 0,
+ ETHTOOL_PSE_EVENT_OVER_TEMP = 1U << 1,
+ ETHTOOL_C33_PSE_EVENT_DETECTION = 1U << 2,
+ ETHTOOL_C33_PSE_EVENT_CLASSIFICATION = 1U << 3,
+ ETHTOOL_C33_PSE_EVENT_DISCONNECTION = 1U << 4,
+ ETHTOOL_PSE_EVENT_OVER_BUDGET = 1U << 5,
+ ETHTOOL_PSE_EVENT_SW_PW_CONTROL_ERROR = 1U << 6,
};
enum {
diff --git a/include/uapi/linux/netdev.h b/include/uapi/linux/netdev.h
index 48eb49aa03d41..db0526cb6672d 100644
--- a/include/uapi/linux/netdev.h
+++ b/include/uapi/linux/netdev.h
@@ -26,13 +26,13 @@
* non-linear XDP buffer support in ndo_xdp_xmit callback.
*/
enum netdev_xdp_act {
- NETDEV_XDP_ACT_BASIC = 1,
- NETDEV_XDP_ACT_REDIRECT = 2,
- NETDEV_XDP_ACT_NDO_XMIT = 4,
- NETDEV_XDP_ACT_XSK_ZEROCOPY = 8,
- NETDEV_XDP_ACT_HW_OFFLOAD = 16,
- NETDEV_XDP_ACT_RX_SG = 32,
- NETDEV_XDP_ACT_NDO_XMIT_SG = 64,
+ NETDEV_XDP_ACT_BASIC = 1U << 0,
+ NETDEV_XDP_ACT_REDIRECT = 1U << 1,
+ NETDEV_XDP_ACT_NDO_XMIT = 1U << 2,
+ NETDEV_XDP_ACT_XSK_ZEROCOPY = 1U << 3,
+ NETDEV_XDP_ACT_HW_OFFLOAD = 1U << 4,
+ NETDEV_XDP_ACT_RX_SG = 1U << 5,
+ NETDEV_XDP_ACT_NDO_XMIT_SG = 1U << 6,
/* private: */
NETDEV_XDP_ACT_MASK = 127,
@@ -48,9 +48,9 @@ enum netdev_xdp_act {
* packet VLAN tag via bpf_xdp_metadata_rx_vlan_tag().
*/
enum netdev_xdp_rx_metadata {
- NETDEV_XDP_RX_METADATA_TIMESTAMP = 1,
- NETDEV_XDP_RX_METADATA_HASH = 2,
- NETDEV_XDP_RX_METADATA_VLAN_TAG = 4,
+ NETDEV_XDP_RX_METADATA_TIMESTAMP = 1U << 0,
+ NETDEV_XDP_RX_METADATA_HASH = 1U << 1,
+ NETDEV_XDP_RX_METADATA_VLAN_TAG = 1U << 2,
};
/**
@@ -63,9 +63,9 @@ enum netdev_xdp_rx_metadata {
* by the driver.
*/
enum netdev_xsk_flags {
- NETDEV_XSK_FLAGS_TX_TIMESTAMP = 1,
- NETDEV_XSK_FLAGS_TX_CHECKSUM = 2,
- NETDEV_XSK_FLAGS_TX_LAUNCH_TIME_FIFO = 4,
+ NETDEV_XSK_FLAGS_TX_TIMESTAMP = 1U << 0,
+ NETDEV_XSK_FLAGS_TX_CHECKSUM = 1U << 1,
+ NETDEV_XSK_FLAGS_TX_LAUNCH_TIME_FIFO = 1U << 2,
};
enum netdev_queue_type {
@@ -74,7 +74,7 @@ enum netdev_queue_type {
};
enum netdev_qstats_scope {
- NETDEV_QSTATS_SCOPE_QUEUE = 1,
+ NETDEV_QSTATS_SCOPE_QUEUE = 1U << 0,
};
enum netdev_napi_threaded {
diff --git a/tools/include/uapi/linux/netdev.h b/tools/include/uapi/linux/netdev.h
index 48eb49aa03d41..db0526cb6672d 100644
--- a/tools/include/uapi/linux/netdev.h
+++ b/tools/include/uapi/linux/netdev.h
@@ -26,13 +26,13 @@
* non-linear XDP buffer support in ndo_xdp_xmit callback.
*/
enum netdev_xdp_act {
- NETDEV_XDP_ACT_BASIC = 1,
- NETDEV_XDP_ACT_REDIRECT = 2,
- NETDEV_XDP_ACT_NDO_XMIT = 4,
- NETDEV_XDP_ACT_XSK_ZEROCOPY = 8,
- NETDEV_XDP_ACT_HW_OFFLOAD = 16,
- NETDEV_XDP_ACT_RX_SG = 32,
- NETDEV_XDP_ACT_NDO_XMIT_SG = 64,
+ NETDEV_XDP_ACT_BASIC = 1U << 0,
+ NETDEV_XDP_ACT_REDIRECT = 1U << 1,
+ NETDEV_XDP_ACT_NDO_XMIT = 1U << 2,
+ NETDEV_XDP_ACT_XSK_ZEROCOPY = 1U << 3,
+ NETDEV_XDP_ACT_HW_OFFLOAD = 1U << 4,
+ NETDEV_XDP_ACT_RX_SG = 1U << 5,
+ NETDEV_XDP_ACT_NDO_XMIT_SG = 1U << 6,
/* private: */
NETDEV_XDP_ACT_MASK = 127,
@@ -48,9 +48,9 @@ enum netdev_xdp_act {
* packet VLAN tag via bpf_xdp_metadata_rx_vlan_tag().
*/
enum netdev_xdp_rx_metadata {
- NETDEV_XDP_RX_METADATA_TIMESTAMP = 1,
- NETDEV_XDP_RX_METADATA_HASH = 2,
- NETDEV_XDP_RX_METADATA_VLAN_TAG = 4,
+ NETDEV_XDP_RX_METADATA_TIMESTAMP = 1U << 0,
+ NETDEV_XDP_RX_METADATA_HASH = 1U << 1,
+ NETDEV_XDP_RX_METADATA_VLAN_TAG = 1U << 2,
};
/**
@@ -63,9 +63,9 @@ enum netdev_xdp_rx_metadata {
* by the driver.
*/
enum netdev_xsk_flags {
- NETDEV_XSK_FLAGS_TX_TIMESTAMP = 1,
- NETDEV_XSK_FLAGS_TX_CHECKSUM = 2,
- NETDEV_XSK_FLAGS_TX_LAUNCH_TIME_FIFO = 4,
+ NETDEV_XSK_FLAGS_TX_TIMESTAMP = 1U << 0,
+ NETDEV_XSK_FLAGS_TX_CHECKSUM = 1U << 1,
+ NETDEV_XSK_FLAGS_TX_LAUNCH_TIME_FIFO = 1U << 2,
};
enum netdev_queue_type {
@@ -74,7 +74,7 @@ enum netdev_queue_type {
};
enum netdev_qstats_scope {
- NETDEV_QSTATS_SCOPE_QUEUE = 1,
+ NETDEV_QSTATS_SCOPE_QUEUE = 1U << 0,
};
enum netdev_napi_threaded {
diff --git a/tools/net/ynl/pyynl/lib/nlspec.py b/tools/net/ynl/pyynl/lib/nlspec.py
index 85c17fe01e35a..465d8fd909a04 100644
--- a/tools/net/ynl/pyynl/lib/nlspec.py
+++ b/tools/net/ynl/pyynl/lib/nlspec.py
@@ -90,9 +90,12 @@ class SpecEnumEntry(SpecElement):
def raw_value(self):
return self.value
- def user_value(self, as_flags=None):
+ def user_value(self, as_flags=None, as_c=None):
if self.enum_set['type'] == 'flags' or as_flags:
- return 1 << self.value
+ if as_c:
+ return f'1U << {self.value}'
+ else:
+ return 1 << self.value
else:
return self.value
diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen_c.py
index 58086b1010573..e6df0e2b63a8c 100755
--- a/tools/net/ynl/pyynl/ynl_gen_c.py
+++ b/tools/net/ynl/pyynl/ynl_gen_c.py
@@ -3209,7 +3209,7 @@ def render_uapi(family, cw):
for entry in enum.entries.values():
suffix = ','
if entry.value_change:
- suffix = f" = {entry.user_value()}" + suffix
+ suffix = f" = {entry.user_value(as_c=True)}" + suffix
cw.p(entry.c_name + suffix)
if const.get('render-max', False):
--
2.51.0
next prev parent reply other threads:[~2025-10-13 16:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-13 16:49 [PATCH net-next 0/6] tools: ynl-gen: generate flags better Asbjørn Sloth Tønnesen
2025-10-13 16:49 ` Asbjørn Sloth Tønnesen [this message]
2025-10-13 23:07 ` [PATCH net-next 1/6] tools: ynl-gen: bitshift the flag values in the generated code Jacob Keller
2025-10-14 16:27 ` Asbjørn Sloth Tønnesen
2025-10-14 0:53 ` Jakub Kicinski
2025-10-14 16:49 ` Asbjørn Sloth Tønnesen
2025-10-14 19:24 ` Jakub Kicinski
2025-10-13 16:49 ` [PATCH net-next 2/6] tools: ynl-gen: refactor render-max enum generation Asbjørn Sloth Tønnesen
2025-10-14 0:58 ` Jakub Kicinski
2025-10-14 17:04 ` Asbjørn Sloth Tønnesen
2025-10-14 19:26 ` Jakub Kicinski
2025-10-13 16:50 ` [PATCH net-next 3/6] tools: ynl-gen: use uapi mask definition in NLA_POLICY_MASK Asbjørn Sloth Tønnesen
2025-10-14 0:59 ` Jakub Kicinski
2025-10-14 17:29 ` Asbjørn Sloth Tønnesen
2025-10-14 19:32 ` Jakub Kicinski
2025-10-13 16:50 ` [PATCH net-next 4/6] tools: ynl-gen: add generic p_wrap() helper Asbjørn Sloth Tønnesen
2025-10-13 16:50 ` [PATCH net-next 5/6] tools: ynl-gen: construct bitflag masks in generated headers Asbjørn Sloth Tønnesen
2025-10-13 16:50 ` [PATCH net-next 6/6] tools: ynl-gen: allow custom naming of render-max definitions Asbjørn Sloth Tønnesen
2025-10-13 23:10 ` [PATCH net-next 0/6] tools: ynl-gen: generate flags better Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251013165005.83659-2-ast@fiberby.net \
--to=ast@fiberby.net \
--cc=andrew+netdev@lunn.ch \
--cc=arkadiusz.kubalewski@intel.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=corbet@lwn.net \
--cc=daniel.zahka@gmail.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=donald.hunter@gmail.com \
--cc=edumazet@google.com \
--cc=hawk@kernel.org \
--cc=horms@kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=jdamato@fastly.com \
--cc=jiri@resnulli.us \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
--cc=toke@redhat.com \
--cc=vadim.fedorenko@linux.dev \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®