From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Pirko Subject: [patch iproute2 v2 1/2] devlink: Change netlink attribute validation Date: Wed, 3 May 2017 13:25:22 +0200 Message-ID: <1493810723-2536-2-git-send-email-jiri@resnulli.us> References: <1493810723-2536-1-git-send-email-jiri@resnulli.us> Cc: arkadis@mellanox.com, stephen@networkplumber.org, davem@davemloft.net, mlxsw@mellanox.com, dsa@cumulusnetworks.com To: netdev@vger.kernel.org Return-path: Received: from mail-wr0-f195.google.com ([209.85.128.195]:34823 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751687AbdECLZ1 (ORCPT ); Wed, 3 May 2017 07:25:27 -0400 Received: by mail-wr0-f195.google.com with SMTP id g12so22287823wrg.2 for ; Wed, 03 May 2017 04:25:27 -0700 (PDT) In-Reply-To: <1493810723-2536-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org List-ID: From: Arkadi Sharshevsky Currently the netlink attribute resolving is done by a sequence of if's. Change the attribute resolving to table lookup. Signed-off-by: Arkadi Sharshevsky Signed-off-by: Jiri Pirko --- devlink/devlink.c | 103 ++++++++++++++++-------------------------------------- 1 file changed, 30 insertions(+), 73 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index e90226e..35220d8 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -232,88 +232,45 @@ static bool dl_no_arg(struct dl *dl) return dl_argc(dl) == 0; } +static const enum mnl_attr_data_type devlink_policy[DEVLINK_ATTR_MAX + 1] = { + [DEVLINK_ATTR_BUS_NAME] = MNL_TYPE_NUL_STRING, + [DEVLINK_ATTR_DEV_NAME] = MNL_TYPE_NUL_STRING, + [DEVLINK_ATTR_PORT_INDEX] = MNL_TYPE_U32, + [DEVLINK_ATTR_PORT_TYPE] = MNL_TYPE_U16, + [DEVLINK_ATTR_PORT_DESIRED_TYPE] = MNL_TYPE_U16, + [DEVLINK_ATTR_PORT_NETDEV_IFINDEX] = MNL_TYPE_U32, + [DEVLINK_ATTR_PORT_NETDEV_NAME] = MNL_TYPE_NUL_STRING, + [DEVLINK_ATTR_PORT_IBDEV_NAME] = MNL_TYPE_NUL_STRING, + [DEVLINK_ATTR_SB_INDEX] = MNL_TYPE_U32, + [DEVLINK_ATTR_SB_SIZE] = MNL_TYPE_U32, + [DEVLINK_ATTR_SB_INGRESS_POOL_COUNT] = MNL_TYPE_U16, + [DEVLINK_ATTR_SB_EGRESS_POOL_COUNT] = MNL_TYPE_U16, + [DEVLINK_ATTR_SB_INGRESS_TC_COUNT] = MNL_TYPE_U16, + [DEVLINK_ATTR_SB_EGRESS_TC_COUNT] = MNL_TYPE_U16, + [DEVLINK_ATTR_SB_POOL_INDEX] = MNL_TYPE_U16, + [DEVLINK_ATTR_SB_POOL_TYPE] = MNL_TYPE_U8, + [DEVLINK_ATTR_SB_POOL_SIZE] = MNL_TYPE_U32, + [DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE] = MNL_TYPE_U8, + [DEVLINK_ATTR_SB_THRESHOLD] = MNL_TYPE_U32, + [DEVLINK_ATTR_SB_TC_INDEX] = MNL_TYPE_U16, + [DEVLINK_ATTR_SB_OCC_CUR] = MNL_TYPE_U32, + [DEVLINK_ATTR_SB_OCC_MAX] = MNL_TYPE_U32, + [DEVLINK_ATTR_ESWITCH_MODE] = MNL_TYPE_U16, + [DEVLINK_ATTR_ESWITCH_INLINE_MODE] = MNL_TYPE_U8, +}; + static int attr_cb(const struct nlattr *attr, void *data) { const struct nlattr **tb = data; int type; - type = mnl_attr_get_type(attr); - if (mnl_attr_type_valid(attr, DEVLINK_ATTR_MAX) < 0) return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_BUS_NAME && - mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_DEV_NAME && - mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_PORT_INDEX && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_PORT_TYPE && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_PORT_DESIRED_TYPE && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_PORT_NETDEV_IFINDEX && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_PORT_NETDEV_NAME && - mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_PORT_IBDEV_NAME && - mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_INDEX && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_SIZE && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_INGRESS_POOL_COUNT && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_EGRESS_POOL_COUNT && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_INGRESS_TC_COUNT && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_EGRESS_TC_COUNT && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_POOL_INDEX && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_POOL_TYPE && - mnl_attr_validate(attr, MNL_TYPE_U8) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_POOL_SIZE && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_POOL_THRESHOLD_TYPE && - mnl_attr_validate(attr, MNL_TYPE_U8) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_THRESHOLD && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_TC_INDEX && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_OCC_CUR && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_SB_OCC_MAX && - mnl_attr_validate(attr, MNL_TYPE_U32) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_ESWITCH_MODE && - mnl_attr_validate(attr, MNL_TYPE_U16) < 0) - return MNL_CB_ERROR; - if (type == DEVLINK_ATTR_ESWITCH_INLINE_MODE && - mnl_attr_validate(attr, MNL_TYPE_U8) < 0) + type = mnl_attr_get_type(attr); + if (mnl_attr_validate(attr, devlink_policy[type]) < 0) return MNL_CB_ERROR; + tb[type] = attr; return MNL_CB_OK; } -- 2.7.4