Commit 6479c975 authored Oct 27, 2023 by Davide Caratti Committed by Jakub Kicinski Oct 27, 2023

doc/netlink: Update schema to support cmd-cnt-name and cmd-max-name



allow specifying cmd-cnt-name and cmd-max-name in netlink specs, in
accordance with Documentation/userspace-api/netlink/c-code-gen.rst.

Use cmd-cnt-name and attr-cnt-name in the mptcp yaml spec and in the
corresponding uAPI headers, to preserve the #defines we had in the past
and avoid adding new ones.

v2:
 - squash modification in mptcp.yaml and MPTCP uAPI headers

Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Link: https://lore.kernel.org/r/12d4ed0116d8883cf4b533b856f3125a34e56749.1698415310.git.dcaratti@redhat.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent d96e48a3

Documentation/netlink/genetlink-c.yaml

+6 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,12 @@ properties:
		max-by-define:
		description: Makes the number of attributes and commands be specified by a define, not an enum value.
		type: boolean
		cmd-max-name:
		description: Name of the define for the last operation in the list.
		type: string
		cmd-cnt-name:
		description: The explicit name for constant holding the count of operations (last operation + 1).
		type: string
		# End genetlink-c

		definitions:

Documentation/netlink/genetlink-legacy.yaml

+6 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,12 @@ properties:
		max-by-define:
		description: Makes the number of attributes and commands be specified by a define, not an enum value.
		type: boolean
		cmd-max-name:
		description: Name of the define for the last operation in the list.
		type: string
		cmd-cnt-name:
		description: The explicit name for constant holding the count of operations (last operation + 1).
		type: string
		# End genetlink-c
		# Start genetlink-legacy
		kernel-policy:

Documentation/netlink/netlink-raw.yaml

+6 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,12 @@ properties:
		max-by-define:
		description: Makes the number of attributes and commands be specified by a define, not an enum value.
		type: boolean
		cmd-max-name:
		description: Name of the define for the last operation in the list.
		type: string
		cmd-cnt-name:
		description: The explicit name for constant holding the count of operations (last operation + 1).
		type: string
		# End genetlink-c
		# Start genetlink-legacy
		kernel-policy:

Documentation/netlink/specs/mptcp.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ c-family-name: mptcp-pm-name
		c-version-name: mptcp-pm-ver
		max-by-define: true
		kernel-policy: per-op
		cmd-cnt-name: --mptcp-pm-cmd-after-last

		definitions:
		-
		@@ -167,6 +168,7 @@ attribute-sets:
		-
		name: attr
		name-prefix: mptcp-pm-attr-
		attr-cnt-name: --mptcp-attr-after-last
		attributes:
		-
		name: unspec

include/uapi/linux/mptcp.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -28,10 +28,6 @@

		#include <linux/mptcp_pm.h>

		/* for backward compatibility */
		#define __MPTCP_PM_CMD_AFTER_LAST __MPTCP_PM_CMD_MAX
		#define __MPTCP_ATTR_AFTER_LAST __MPTCP_ATTR_MAX

		#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0)
		#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1)