| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 7 Jul 2022 18:20:22 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Vikas Gupta <vikas.gupta@...adcom.com>
Cc: jiri@...dia.com, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, davem@...emloft.net,
dsahern@...nel.org, stephen@...workplumber.org,
edumazet@...gle.com, pabeni@...hat.com, ast@...nel.org,
leon@...nel.org, linux-doc@...r.kernel.org, corbet@....net,
michael.chan@...adcom.com, andrew.gospodarek@...adcom.com
Subject: Re: [PATCH net-next v2 1/3] devlink: introduce framework for
selftests
On Thu, 7 Jul 2022 23:59:48 +0530 Vikas Gupta wrote:
> + * - Name
> + - Description
> + * - ``DEVLINK_SELFTEST_FLASH``
> + - Runs a flash test on the device.
A little more info on what "flash test" does would be useful.
> + DEVLINK_CMD_SELFTESTS_SHOW,
nit: _LIST?
> /**
> * enum devlink_trap_action - Packet trap action.
> * @DEVLINK_TRAP_ACTION_DROP: Packet is dropped by the device and a copy is not
> @@ -576,6 +598,10 @@ enum devlink_attr {
> DEVLINK_ATTR_LINECARD_TYPE, /* string */
> DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES, /* nested */
>
> + DEVLINK_ATTR_SELFTESTS_MASK, /* u32 */
Can we make the uAPI field 64b just in case we need more bits?
Internally we can keep using u32 doesn't matter.
> + DEVLINK_ATTR_TEST_RESULT, /* nested */
> + DEVLINK_ATTR_TEST_NAME, /* string */
> + DEVLINK_ATTR_TEST_RESULT_VAL, /* u8 */
> /* add new attributes above here, update the policy in devlink.c */
>
> __DEVLINK_ATTR_MAX,
> diff --git a/net/core/devlink.c b/net/core/devlink.c
> index db61f3a341cb..0b7341ab6379 100644
> --- a/net/core/devlink.c
> +++ b/net/core/devlink.c
> @@ -4794,6 +4794,136 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb,
> return ret;
> }
>
> +static int devlink_selftest_name_put(struct sk_buff *skb, int test)
> +{
> + const char *name = devlink_selftest_name(test);
empty line
> + if (nla_put_string(skb, DEVLINK_ATTR_TEST_NAME, name))
> + return -EMSGSIZE;
> +
> + return 0;
> +}
This wrapper feels slightly unnecessary, it's only used once AFAICT.
Of you want to keep it you should compress it to one stmt:
static int devlink_selftest_name_put(struct sk_buff *skb, int test)
{
return nla_put_string(skb, DEVLINK_ATTR_TEST_NAME,
devlink_selftest_name(test)));
}
> +static int devlink_selftest_result_put(struct sk_buff *skb, int test,
> + u8 result)
> +{
> + const char *name = devlink_selftest_name(test);
> + struct nlattr *result_attr;
> +
> + result_attr = nla_nest_start_noflag(skb, DEVLINK_ATTR_TEST_RESULT);
I think we can use the normal (non-_noflag) nests in new devlink code.
> + if (!result_attr)
> + return -EMSGSIZE;
> +
> + if (nla_put_string(skb, DEVLINK_ATTR_TEST_NAME, name) ||
> + nla_put_u8(skb, DEVLINK_ATTR_TEST_RESULT_VAL, result))
> + goto nla_put_failure;
> +
> + nla_nest_end(skb, result_attr);
> +
> + return 0;
> +
> +nla_put_failure:
> + nla_nest_cancel(skb, result_attr);
> + return -EMSGSIZE;
> +}
> +
> +static int devlink_nl_cmd_selftests_run(struct sk_buff *skb,
> + struct genl_info *info)
> +{
> + u8 test_results[DEVLINK_SELFTEST_MAX_BIT + 1] = {};
> + struct devlink *devlink = info->user_ptr[0];
> + unsigned long tests;
> + struct sk_buff *msg;
> + u32 tests_mask;
> + void *hdr;
> + int err = 0;
reverse xmas tree, but you probably don't want this init
> + int test;
> +
> + if (!devlink->ops->selftests_run)
> + return -EOPNOTSUPP;
> +
> + if (!info->attrs[DEVLINK_ATTR_SELFTESTS_MASK])
> + return -EINVAL;
> +
> + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
> + if (!msg)
> + return -ENOMEM;
> +
> + hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq,
> + &devlink_nl_family, 0, DEVLINK_CMD_SELFTESTS_RUN);
> + if (!hdr)
> + goto free_msg;
err is not set here
> + if (devlink_nl_put_handle(msg, devlink))
> + goto genlmsg_cancel;
or here
> + tests_mask = nla_get_u32(info->attrs[DEVLINK_ATTR_SELFTESTS_MASK]);
> +
> + devlink->ops->selftests_run(devlink, tests_mask, test_results,
> + info->extack);
> + tests = tests_mask;
> +
> + for_each_set_bit(test, &tests, __DEVLINK_SELFTEST_MAX_BIT) {
> + err = devlink_selftest_result_put(msg, test,
> + test_results[test]);
> + if (err)
> + goto genlmsg_cancel;
> + }
> +
> + genlmsg_end(msg, hdr);
> +
> + return genlmsg_reply(msg, info);
> +
> +genlmsg_cancel:
> + genlmsg_cancel(msg, hdr);
> +free_msg:
> + nlmsg_free(msg);
> + return err;
> +}
> +
> static const struct devlink_param devlink_param_generic[] = {
> {
> .id = DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET,
> @@ -9000,6 +9130,8 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
> [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING },
> [DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32 },
> [DEVLINK_ATTR_LINECARD_TYPE] = { .type = NLA_NUL_STRING },
> + [DEVLINK_ATTR_SELFTESTS_MASK] = NLA_POLICY_MASK(NLA_U32,
> + DEVLINK_SELFTESTS_MASK),
> };
>
> static const struct genl_small_ops devlink_nl_ops[] = {
> @@ -9361,6 +9493,18 @@ static const struct genl_small_ops devlink_nl_ops[] = {
> .doit = devlink_nl_cmd_trap_policer_set_doit,
> .flags = GENL_ADMIN_PERM,
> },
> + {
> + .cmd = DEVLINK_CMD_SELFTESTS_SHOW,
> + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
I think we can validate strict for new commands, so no validation flags
needed.
> + .doit = devlink_nl_cmd_selftests_show,
What about dump? Listing all tests on all devices?
> + .flags = GENL_ADMIN_PERM,
> + },
> + {
> + .cmd = DEVLINK_CMD_SELFTESTS_RUN,
> + .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
> + .doit = devlink_nl_cmd_selftests_run,
> + .flags = GENL_ADMIN_PERM,
> + },
> };
>
> static struct genl_family devlink_nl_family __ro_after_init = {
Powered by blists - more mailing lists