From 0781895e0f8359843b9215ac6ad16925a46b2703 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 14 Apr 2020 07:00:48 +0200 Subject: pkg/compiler: refactor attribute handling Introduce common infrastructure for describing and parsing attribute instead of custom per-attribute code scattered across several locations. Change align attribute syntax from the weird align_N to align[N]. This also allows to use literal constants as N. Introduce notion of builtin constants. Currently we have only PTR_SIZE, which is needed to replace align_ptr with align[PTR_SIZE]. --- sys/linux/socket_netlink_generic_devlink.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/linux/socket_netlink_generic_devlink.txt') diff --git a/sys/linux/socket_netlink_generic_devlink.txt b/sys/linux/socket_netlink_generic_devlink.txt index 27afed7d0..20f053ca3 100644 --- a/sys/linux/socket_netlink_generic_devlink.txt +++ b/sys/linux/socket_netlink_generic_devlink.txt @@ -21,13 +21,13 @@ devlink_devname { devlink_nl_policy_nsim { DEVLINK_ATTR_BUS_NAME nlattr[DEVLINK_ATTR_BUS_NAME, string["netdevsim"]] DEVLINK_ATTR_DEV_NAME nlattr[DEVLINK_ATTR_DEV_NAME, devlink_devname] -} [packed, align_4] +} [packed, align[4]] devlink_nl_policy_pci { DEVLINK_ATTR_BUS_NAME nlattr[DEVLINK_ATTR_BUS_NAME, string["pci"]] # 0000:00:10.0 is a fixed pci address what is moved from initial network namespace by initialize_devlink() DEVLINK_ATTR_DEV_NAME nlattr[DEVLINK_ATTR_DEV_NAME, string["0000:00:10.0"]] -} [packed, align_4] +} [packed, align[4]] devlink_handle [ nsim devlink_nl_policy_nsim @@ -38,7 +38,7 @@ devlink_port_handle { port_handle devlink_handle # 0:3 is in sync with number of ports created by netdevsim_add() DEVLINK_ATTR_PORT_INDEX nlattr[DEVLINK_ATTR_PORT_INDEX, int32[0:3]] -} [packed, align_4] +} [packed, align[4]] type msghdr_nl_devlink[CMD] msghdr_netlink[netlink_msg_t[genl_devlink_family_id, genlmsghdr_t[CMD], devlink_handle]] sendmsg$DEVLINK_CMD_GET(fd sock_nl_generic, msg ptr[in, msghdr_nl_devlink[DEVLINK_CMD_GET]], f flags[send_flags]) @@ -55,14 +55,14 @@ devlink_nl_policy_reload [ devlink_reload { handle devlink_handle arg devlink_nl_policy_reload -} [packed, align_4] +} [packed, align[4]] type msghdr_nl_devlink_port_get msghdr_netlink[netlink_msg_t[genl_devlink_family_id, genlmsghdr_t[DEVLINK_CMD_PORT_GET], devlink_port_get]] sendmsg$DEVLINK_CMD_PORT_GET(fd sock_nl_generic, msg ptr[in, msghdr_nl_devlink_port_get], f flags[send_flags]) devlink_port_get { port_handle devlink_port_handle -} [packed, align_4] +} [packed, align[4]] type msghdr_nl_devlink_port_set msghdr_netlink[netlink_msg_t[genl_devlink_family_id, genlmsghdr_t[DEVLINK_CMD_PORT_SET], devlink_port_set]] sendmsg$DEVLINK_CMD_PORT_SET(fd sock_nl_generic, msg ptr[in, msghdr_nl_devlink_port_set], f flags[send_flags]) @@ -70,4 +70,4 @@ sendmsg$DEVLINK_CMD_PORT_SET(fd sock_nl_generic, msg ptr[in, msghdr_nl_devlink_p devlink_port_set { port_handle devlink_port_handle DEVLINK_ATTR_PORT_TYPE nlattr[DEVLINK_ATTR_PORT_TYPE, int16[DEVLINK_PORT_TYPE_NOTSET:DEVLINK_PORT_TYPE_IB]] -} [packed, align_4] +} [packed, align[4]] -- cgit mrf-deployment