From patchwork Mon Dec 31 14:32:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eran Ben Elisha X-Patchwork-Id: 1019584 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=mellanox.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43T0Cf03HZz9s55 for ; Tue, 1 Jan 2019 01:33:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727369AbeLaOdB (ORCPT ); Mon, 31 Dec 2018 09:33:01 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:52229 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726220AbeLaOcZ (ORCPT ); Mon, 31 Dec 2018 09:32:25 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from eranbe@mellanox.com) with ESMTPS (AES256-SHA encrypted); 31 Dec 2018 16:32:21 +0200 Received: from dev-l-vrt-198.mtl.labs.mlnx (dev-l-vrt-198.mtl.labs.mlnx [10.134.198.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wBVEWLYu017529; Mon, 31 Dec 2018 16:32:21 +0200 From: Eran Ben Elisha To: netdev@vger.kernel.org, "David S. Miller" , Jiri Pirko Cc: Moshe Shemesh , Aya Levin , Eran Ben Elisha , Tal Alon , Ariel Almog Subject: [PATCH RFC net-next 08/19] devlink: Add health objdump {get, clear} commands Date: Mon, 31 Dec 2018 16:32:02 +0200 Message-Id: <1546266733-9512-9-git-send-email-eranbe@mellanox.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1546266733-9512-1-git-send-email-eranbe@mellanox.com> References: <1546266733-9512-1-git-send-email-eranbe@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add devlink health objdump commands, in order to run an objdump operation over a specific reporter. The supported operations are objdump_get in order to get last saved objdump (if not exist, dump now) and objdump_clear to clear last saved objdump. It is expected from driver's callback for diagnose command to fill it via the buffer descriptors API. Devlink will parse it and convert isto netlink nla API in order to pass it to the user. Signed-off-by: Eran Ben Elisha --- include/uapi/linux/devlink.h | 2 + net/core/devlink.c | 73 ++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index 73faabe37488..0fecb7618d18 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -93,6 +93,8 @@ enum devlink_command { DEVLINK_CMD_HEALTH_REPORTER_SET, DEVLINK_CMD_HEALTH_REPORTER_RECOVER, DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE, + DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_GET, + DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_CLEAR, /* add new commands above here */ __DEVLINK_CMD_MAX, diff --git a/net/core/devlink.c b/net/core/devlink.c index 343ebbd38ba8..d45a284aa608 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -4528,6 +4528,65 @@ static int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb, return err; } +static void +devlink_health_objdump_clear(struct devlink_health_reporter *reporter) +{ + reporter->objdump_avail = false; + reporter->objdump_ts = 0; + devlink_health_buffers_reset(reporter->objdump_buffers_array, + DEVLINK_HEALTH_SIZE_TO_BUFFERS(reporter->ops->objdump_size)); +} + +static int devlink_nl_cmd_health_reporter_objdump_get_doit(struct sk_buff *skb, + struct genl_info *info) +{ + struct devlink *devlink = info->user_ptr[0]; + struct devlink_health_reporter *reporter; + u64 num_of_buffers; + int err; + + reporter = devlink_health_reporter_get_from_info(devlink, info); + if (!reporter) + return -EINVAL; + + if (!reporter->ops->objdump) + return -EOPNOTSUPP; + + num_of_buffers = + DEVLINK_HEALTH_SIZE_TO_BUFFERS(reporter->ops->objdump_size); + + mutex_lock(&reporter->objdump_lock); + err = devlink_health_do_objdump(reporter, NULL); + if (err) + goto out; + + err = devlink_health_buffer_snd(info, + DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_GET, + 0, reporter->objdump_buffers_array, + num_of_buffers); + +out: + mutex_unlock(&reporter->objdump_lock); + return err; +} + +static int +devlink_nl_cmd_health_reporter_objdump_clear_doit(struct sk_buff *skb, + struct genl_info *info) +{ + struct devlink *devlink = info->user_ptr[0]; + struct devlink_health_reporter *reporter; + + reporter = devlink_health_reporter_get_from_info(devlink, info); + if (!reporter) + return -EINVAL; + + mutex_lock(&reporter->objdump_lock); + devlink_health_objdump_clear(reporter); + mutex_unlock(&reporter->objdump_lock); + return 0; +} + static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = { [DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING }, [DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING }, @@ -4805,6 +4864,20 @@ static const struct genl_ops devlink_nl_ops[] = { .flags = GENL_ADMIN_PERM, .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK, }, + { + .cmd = DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_GET, + .doit = devlink_nl_cmd_health_reporter_objdump_get_doit, + .policy = devlink_nl_policy, + .flags = GENL_ADMIN_PERM, + .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK, + }, + { + .cmd = DEVLINK_CMD_HEALTH_REPORTER_OBJDUMP_CLEAR, + .doit = devlink_nl_cmd_health_reporter_objdump_clear_doit, + .policy = devlink_nl_policy, + .flags = GENL_ADMIN_PERM, + .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK, + }, }; static struct genl_family devlink_nl_family __ro_after_init = {