From patchwork Thu Feb 28 12:12:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aya Levin X-Patchwork-Id: 1049412 X-Patchwork-Delegate: dsahern@gmail.com 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 449BKT0Ctbz9s47 for ; Thu, 28 Feb 2019 23:13:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731462AbfB1MNU (ORCPT ); Thu, 28 Feb 2019 07:13:20 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:45514 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730961AbfB1MNT (ORCPT ); Thu, 28 Feb 2019 07:13:19 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from ayal@mellanox.com) with ESMTPS (AES256-SHA encrypted); 28 Feb 2019 14:13:15 +0200 Received: from dev-l-vrt-210.mtl.labs.mlnx (dev-l-vrt-210.mtl.labs.mlnx [10.134.210.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x1SCDFd4013838; Thu, 28 Feb 2019 14:13:15 +0200 Received: from dev-l-vrt-210.mtl.labs.mlnx (localhost [127.0.0.1]) by dev-l-vrt-210.mtl.labs.mlnx (8.15.2/8.15.2/Debian-8ubuntu1) with ESMTP id x1SCDFDs015818; Thu, 28 Feb 2019 14:13:15 +0200 Received: (from ayal@localhost) by dev-l-vrt-210.mtl.labs.mlnx (8.15.2/8.15.2/Submit) id x1SCDFrN015817; Thu, 28 Feb 2019 14:13:15 +0200 From: Aya Levin To: David Ahern Cc: netdev@vger.kernel.org, Jiri Pirko , Moshe Shemesh , Eran Ben Elisha , Aya Levin Subject: [PATCH v4 iproute2-next 06/11] devlink: Add devlink health recover command Date: Thu, 28 Feb 2019 14:12:59 +0200 Message-Id: <1551355984-15752-7-git-send-email-ayal@mellanox.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1551355984-15752-1-git-send-email-ayal@mellanox.com> References: <1551355984-15752-1-git-send-email-ayal@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add devlink health recover command which enables the user to initiate a recovery on a reporter (if a recovery cb was supplied by the reporter). This operation will increment the recoveries counter displayed in the show command. Example: $ devlink health recover pci/0000:00:09.0 reporter tx Signed-off-by: Aya Levin Reviewed-by: Moshe Shemesh Acked-by: Jiri Pirko --- devlink/devlink.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/devlink/devlink.c b/devlink/devlink.c index 37eb2054ef06..c77f80c87adc 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -5815,6 +5815,23 @@ static int cmd_region(struct dl *dl) return -ENOENT; } +static int cmd_health_recover(struct dl *dl) +{ + struct nlmsghdr *nlh; + int err; + + nlh = mnlg_msg_prepare(dl->nlg, DEVLINK_CMD_HEALTH_REPORTER_RECOVER, + NLM_F_REQUEST | NLM_F_ACK); + + err = dl_argv_parse_put(nlh, dl, + DL_OPT_HANDLE | DL_OPT_HEALTH_REPORTER_NAME, 0); + if (err) + return err; + + dl_opts_put(nlh, dl); + return _mnlg_socket_sndrcv(dl->nlg, nlh, NULL, NULL); +} + enum devlink_health_reporter_state { DEVLINK_HEALTH_REPORTER_STATE_HEALTHY, DEVLINK_HEALTH_REPORTER_STATE_ERROR, @@ -5954,6 +5971,7 @@ static int cmd_health_show(struct dl *dl) static void cmd_health_help(void) { pr_err("Usage: devlink health show [ dev DEV reporter REPORTER_NAME ]\n"); + pr_err(" devlink health recover DEV reporter REPORTER_NAME\n"); } static int cmd_health(struct dl *dl) @@ -5965,6 +5983,9 @@ static int cmd_health(struct dl *dl) dl_argv_match(dl, "list") || dl_no_arg(dl)) { dl_arg_inc(dl); return cmd_health_show(dl); + } else if (dl_argv_match(dl, "recover")) { + dl_arg_inc(dl); + return cmd_health_recover(dl); } pr_err("Command \"%s\" not found\n", dl_argv(dl)); return -ENOENT;