From nobody Fri Dec 19 18:47:32 2025 Received: from mail1.fiberby.net (mail1.fiberby.net [193.104.135.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 35052298CC4; Mon, 13 Oct 2025 16:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.104.135.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760374310; cv=none; b=lKB7aof4dmbPnWP8HqrfWwRPDGBdcMyBQ4kpyWE48vIm8jTHhJvlhmXENTiMWgLclgGKIeVRjHdnZUGDK9Niguh/PXQhUnentY38r7TDak59T2vRJlufRb8Nq9mpTYB9pzPsclcwhrq3m6ioijeGwcenWmBnIcl2Y6941fv/NTI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760374310; c=relaxed/simple; bh=3LWAW2XwKFRP8Oeuhh8xoOoHiwBJYBgYAYJw8UV+2mY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YjsmOZR3ZJcm3qdkLPZRkLiNeVYeS1Vn8ILLmpgQZAqGMoabzlV7IB+IMbPtSpBWS1/MWdh1g6kWkexDkllJnBJ1LZB7GK5rv2fwvv1Th3S3Vd9P3QplPuz9xV8engMuyNnLUpGMRRdZAlP7NkWZ+RZpbA6OFsqgTcj+IPjSRCY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net; spf=pass smtp.mailfrom=fiberby.net; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b=XdRfc3ch; arc=none smtp.client-ip=193.104.135.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=fiberby.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fiberby.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fiberby.net header.i=@fiberby.net header.b="XdRfc3ch" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fiberby.net; s=202008; t=1760374306; bh=3LWAW2XwKFRP8Oeuhh8xoOoHiwBJYBgYAYJw8UV+2mY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XdRfc3chi3xMDJ+gqELGqztdKoTXSd4IcD5LtHULkDk5ABFs16ftxSCnlCZVp/WTv nQu5MwFImVTQNes6aQAf+2F5cMcgxm+YC4jrF3rXn6T4LCcf3UQW9WVG6jhMqg/8AN Ua8LnPSH6032G76IaT/fcYIagXXI4gRc5rn8uOS7hpukihOVfENhdI4bjO5XO6na6e hbfrThy+lwGqNm83DtNYTTgpq3NIEfJeD72QTan6WKfb9kjOr0J/0qaJ2SjCGRoYJ3 tKMtEKR7YEibfpw81f8GDeHPLeZGr6/Ebdr7EdEC9e36jIXR2wu8J+D+m6+W88IHHH 0e7fU2GMH/MzA== Received: from x201s (193-104-135-243.ip4.fiberby.net [193.104.135.243]) by mail1.fiberby.net (Postfix) with ESMTPSA id 685DC60109; Mon, 13 Oct 2025 16:51:43 +0000 (UTC) Received: by x201s (Postfix, from userid 1000) id C155420199A; Mon, 13 Oct 2025 16:50:24 +0000 (UTC) From: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , Alexei Starovoitov , Andrew Lunn , Arkadiusz Kubalewski , Daniel Borkmann , Daniel Zahka , Donald Hunter , Jacob Keller , Jesper Dangaard Brouer , Jiri Pirko , Joe Damato , John Fastabend , Jonathan Corbet , Simon Horman , Stanislav Fomichev , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Vadim Fedorenko , Willem de Bruijn , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/6] tools: ynl-gen: refactor render-max enum generation Date: Mon, 13 Oct 2025 16:49:59 +0000 Message-ID: <20251013165005.83659-3-ast@fiberby.net> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013165005.83659-1-ast@fiberby.net> References: <20251013165005.83659-1-ast@fiberby.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch refactors the generation of the three render-max private enum members: (__$pfx-MAX and $pfx-MAX) or $pfx-MASK. The names, default or not, are now resolved in the EnumSet class. This makes enum.enum_max_name re-usable for NLA_POLICY_MASK() in the next patch in this series, so we don't have to re-define it. This doesn't change the generated output. Signed-off-by: Asbj=C3=B8rn Sloth T=C3=B8nnesen --- tools/net/ynl/pyynl/ynl_gen_c.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/net/ynl/pyynl/ynl_gen_c.py b/tools/net/ynl/pyynl/ynl_gen= _c.py index e6df0e2b63a8c..2666cc54d09c0 100755 --- a/tools/net/ynl/pyynl/ynl_gen_c.py +++ b/tools/net/ynl/pyynl/ynl_gen_c.py @@ -1060,7 +1060,9 @@ class EnumSet(SpecEnumSet): =20 self.value_pfx =3D yaml.get('name-prefix', f"{family.ident_name}-{= yaml['name']}-") self.header =3D yaml.get('header', None) - self.enum_cnt_name =3D yaml.get('enum-cnt-name', None) + self.enum_cnt_name =3D yaml.get('enum-cnt-name', f'--{self.value_p= fx}max') + suffix =3D yaml['type'] =3D=3D 'flags' and 'mask' or 'max' + self.enum_max_name =3D f'{self.value_pfx}{suffix}' =20 super().__init__(family, yaml) =20 @@ -3205,7 +3207,6 @@ def render_uapi(family, cw): cw.p(' */') =20 uapi_enum_start(family, cw, const, 'name') - name_pfx =3D const.get('name-prefix', f"{family.ident_name}-{c= onst['name']}-") for entry in enum.entries.values(): suffix =3D ',' if entry.value_change: @@ -3215,17 +3216,14 @@ def render_uapi(family, cw): if const.get('render-max', False): cw.nl() cw.p('/* private: */') + max_name =3D c_upper(enum.enum_max_name) if const['type'] =3D=3D 'flags': - max_name =3D c_upper(name_pfx + 'mask') - max_val =3D f' =3D {enum.get_mask()},' - cw.p(max_name + max_val) + max_val =3D f'{enum.get_mask()},' else: - cnt_name =3D enum.enum_cnt_name - max_name =3D c_upper(name_pfx + 'max') - if not cnt_name: - cnt_name =3D '__' + name_pfx + 'max' - cw.p(c_upper(cnt_name) + ',') - cw.p(max_name + ' =3D (' + c_upper(cnt_name) + ' - 1)') + cnt_name =3D c_upper(enum.enum_cnt_name) + cw.p(f'{cnt_name},') + max_val =3D f'({cnt_name} - 1)' + cw.p(f'{max_name} =3D {max_val}') cw.block_end(line=3D';') cw.nl() elif const['type'] =3D=3D 'const': --=20 2.51.0