From patchwork Thu Oct 17 09:47:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= X-Patchwork-Id: 13839735 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 601E11D9598 for ; Thu, 17 Oct 2024 09:47:38 +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=1729158461; cv=none; b=l47qP6WvNJEQr9+tJWS0COkAjCI2uzWCFo1X6+f59k4W7Be0WWcEg61J0rOg1T3WvRmGfx4GuglSMn0DIkHO0yMIA1VFKa1/fEESoXcbjj5Vr4aqniGKuiDljv7ponM8TWcIcfsMPw2dhqKZmzaJMLRGGSXQwZj0iSLTud56tvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729158461; c=relaxed/simple; bh=rlctYl5U8K1DKzy7dCypquZqcKDhUvVVu5KxJ9C02oU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=G/7NixJJtMtrujY0zFQjY0cLeU7b9QoYJv/AAsdGm2HqGRjRQuczVOSiQ/BhbzY+pANxo7TUKIA5rnw7jXA+9ISb0akC559H8ynO+ynmD7Fdk8c/cD7KxE0bOa630et1asPuYxvWf04rz2KlCGHQWymvhbgDjd2hYBH5CGYqa8o= 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=N23q9ZA6; 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="N23q9ZA6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fiberby.net; s=202008; t=1729158456; bh=rlctYl5U8K1DKzy7dCypquZqcKDhUvVVu5KxJ9C02oU=; h=From:To:Cc:Subject:Date:From; b=N23q9ZA6sy1EIr9zwziOQpOWGgVq4gSDunvu2KNPq1DvM4JLlga80RaIaK2DPcWLa z8W7K8POX+fMP1iW/5DP3vIY5bXfY06hJZHByxQRmCISoixHSyQST/C4Qt8j+k5akx 57ghcd4hofmJiw0loyLmuP9qATpwglBV1tljXYfcpQPPbHzuLn3uRm1hBGu0Jk0SkB qw10i8YPymETDrghCmMCL/5DReXGhJKOdqqK159JOFdyIrz/E6B9SuZXVhBVBvPlsR ellZI5htKVyRoKt6kLFPxgj9xb6fDrw0i9MbWe+KKb7wLNMVvPqPrwOePYZLs9ivp1 sI924R2d6HEAw== Received: from x201s (193-104-135-243.ip4.fiberby.net [193.104.135.243]) by mail1.fiberby.net (Postfix) with ESMTPSA id F41A7600C4; Thu, 17 Oct 2024 09:47:11 +0000 (UTC) Received: by x201s (Postfix, from userid 1000) id 1CB8A2039AA; Thu, 17 Oct 2024 09:47:08 +0000 (UTC) From: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?= , David Ahern , Matthieu Baerts , Mat Martineau , Geliang Tang , Donald Hunter , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2] tools: ynl-gen: use big-endian netlink attribute types Date: Thu, 17 Oct 2024 09:47:02 +0000 Message-ID: <20241017094704.3222173-1-ast@fiberby.net> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Change ynl-gen-c.py to use NLA_BE16 and NLA_BE32 types to represent big-endian u16 and u32 ynl types. Doing this enables those attributes to have range checks applied, as the validator will then convert to host endianness prior to validation. The autogenerated kernel/uapi code have been regenerated by running: ./tools/net/ynl/ynl-regen.sh -f This changes the policy types of the following attributes: FOU_ATTR_PORT (NLA_U16 -> NLA_BE16) FOU_ATTR_PEER_PORT (NLA_U16 -> NLA_BE16) These two are used with nla_get_be16/nla_put_be16(). MPTCP_PM_ADDR_ATTR_ADDR4 (NLA_U32 -> NLA_BE32) This one is used with nla_get_in_addr/nla_put_in_addr(), which uses nla_get_be32/nla_put_be32(). IOWs the generated changes are AFAICT aligned with their implementations. The generated userspace code remains identical, and have been verified by comparing the output generated by the following command: make -C tools/net/ynl/generated Signed-off-by: Asbjørn Sloth Tønnesen Reviewed-by: Simon Horman --- Changelog: v2: - Re-implement to avoid adding a new Type attribute (Requested by Jakub). v1: https://lore.kernel.org/netdev/20240913085555.134788-1-ast@fiberby.net/ --- net/ipv4/fou_nl.c | 4 ++-- net/mptcp/mptcp_pm_gen.c | 2 +- tools/net/ynl/ynl-gen-c.py | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/ipv4/fou_nl.c b/net/ipv4/fou_nl.c index 98b90107b5ab..3d9614609b2d 100644 --- a/net/ipv4/fou_nl.c +++ b/net/ipv4/fou_nl.c @@ -12,7 +12,7 @@ /* Global operation policy for fou */ const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1] = { - [FOU_ATTR_PORT] = { .type = NLA_U16, }, + [FOU_ATTR_PORT] = { .type = NLA_BE16, }, [FOU_ATTR_AF] = { .type = NLA_U8, }, [FOU_ATTR_IPPROTO] = { .type = NLA_U8, }, [FOU_ATTR_TYPE] = { .type = NLA_U8, }, @@ -21,7 +21,7 @@ const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1] = { [FOU_ATTR_LOCAL_V6] = { .len = 16, }, [FOU_ATTR_PEER_V4] = { .type = NLA_U32, }, [FOU_ATTR_PEER_V6] = { .len = 16, }, - [FOU_ATTR_PEER_PORT] = { .type = NLA_U16, }, + [FOU_ATTR_PEER_PORT] = { .type = NLA_BE16, }, [FOU_ATTR_IFINDEX] = { .type = NLA_S32, }, }; diff --git a/net/mptcp/mptcp_pm_gen.c b/net/mptcp/mptcp_pm_gen.c index c30a2a90a192..5a6b2b4510d3 100644 --- a/net/mptcp/mptcp_pm_gen.c +++ b/net/mptcp/mptcp_pm_gen.c @@ -14,7 +14,7 @@ const struct nla_policy mptcp_pm_address_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX + 1] = { [MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, }, [MPTCP_PM_ADDR_ATTR_ID] = { .type = NLA_U8, }, - [MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_U32, }, + [MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_BE32, }, [MPTCP_PM_ADDR_ATTR_ADDR6] = NLA_POLICY_EXACT_LEN(16), [MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16, }, [MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32, }, diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index d64cb2b49c44..1a825b4081b2 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -167,7 +167,10 @@ class Type(SpecAttr): return '{ .type = ' + policy + ', }' def attr_policy(self, cw): - policy = c_upper('nla-' + self.attr['type']) + policy = f'NLA_{c_upper(self.type)}' + if self.attr.get('byte-order') == 'big-endian': + if self.type in {'u16', 'u32'}: + policy = f'NLA_BE{self.type[1:]}' spec = self._attr_policy(policy) cw.p(f"\t[{self.enum_name}] = {spec},")