From 7bb75228e6849f3371cd434cf36d29f406db1ccc Mon Sep 17 00:00:00 2001

From: Jakub Kicinski <kuba@kernel.org>

Date: Sun, 18 Oct 2020 14:31:46 -0700

Subject: [PATCH 29/37] pause: add --json support

No change in normal text output:

 # ./ethtool  -a eth0

Pause parameters for eth0:

Autonegotiate:	on

RX:		on

TX:		on

RX negotiated: on

TX negotiated: on

JSON:

 # ./ethtool --json -a eth0

[ {

        "ifname": "eth0",

        "autonegotiate": true,

        "rx": true,

        "tx": true,

        "negotiated": {

            "rx": true,

            "tx": true

        }

    } ]

v2:

 - restructure show_bool() so we can use its logic for show_bool_val()

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>

(cherry picked from commit 7e5c1ddbe67d0eefe9004e9a69f2ea5378e3bc5e)

---

 netlink/coalesce.c |  6 +++---

 netlink/netlink.h  | 21 ++++++++++++++++-----

 netlink/pause.c    | 44 ++++++++++++++++++++++++++++++++------------

 3 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/netlink/coalesce.c b/netlink/coalesce.c

index 0223f8e3484e..75922a91c2e7 100644

--- a/netlink/coalesce.c

+++ b/netlink/coalesce.c

@@ -36,9 +36,9 @@ int coalesce_reply_cb(const struct nlmsghdr *nlhdr, void *data)

 	if (silent)

 		putchar('\n');

 	printf("Coalesce parameters for %s:\n", nlctx->devname);

-	printf("Adaptive RX: %s  TX: %s\n",

-	       u8_to_bool(tb[ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX]),

-	       u8_to_bool(tb[ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX]));

+	show_bool("rx", "Adaptive RX: %s  ",

+		  tb[ETHTOOL_A_COALESCE_USE_ADAPTIVE_RX]);

+	show_bool("tx", "TX: %s\n", tb[ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX]);

 	show_u32(tb[ETHTOOL_A_COALESCE_STATS_BLOCK_USECS],

 		 "stats-block-usecs: ");

 	show_u32(tb[ETHTOOL_A_COALESCE_RATE_SAMPLE_INTERVAL],

diff --git a/netlink/netlink.h b/netlink/netlink.h

index 61a072db8ed9..e79143016bd5 100644

--- a/netlink/netlink.h

+++ b/netlink/netlink.h

@@ -102,17 +102,28 @@ static inline void show_u32(const struct nlattr *attr, const char *label)

 		printf("%sn/a\n", label);

 }

-static inline const char *u8_to_bool(const struct nlattr *attr)

+static inline const char *u8_to_bool(const uint8_t *val)

 {

-	if (attr)

-		return mnl_attr_get_u8(attr) ? "on" : "off";

+	if (val)

+		return *val ? "on" : "off";

 	else

 		return "n/a";

 }

-static inline void show_bool(const struct nlattr *attr, const char *label)

+static inline void show_bool_val(const char *key, const char *fmt, uint8_t *val)

+{

+	if (is_json_context()) {

+		if (val)

+			print_bool(PRINT_JSON, key, NULL, val);

+	} else {

+		print_string(PRINT_FP, NULL, fmt, u8_to_bool(val));

+	}

+}

+

+static inline void show_bool(const char *key, const char *fmt,

+			     const struct nlattr *attr)

 {

-	printf("%s%s\n", label, u8_to_bool(attr));

+	show_bool_val(key, fmt, attr ? mnl_attr_get_payload(attr) : NULL);

 }

 /* misc */

diff --git a/netlink/pause.c b/netlink/pause.c

index 048320b123d2..c54488d71fce 100644

--- a/netlink/pause.c

+++ b/netlink/pause.c

@@ -40,8 +40,8 @@ static int pause_autoneg_cb(const struct nlmsghdr *nlhdr, void *data)

 	struct pause_autoneg_status ours = {};

 	struct pause_autoneg_status peer = {};

 	struct nl_context *nlctx = data;

-	bool rx_status = false;

-	bool tx_status = false;

+	uint8_t rx_status = false;

+	uint8_t tx_status = false;

 	bool silent;

 	int err_ret;

 	int ret;

@@ -72,8 +72,11 @@ static int pause_autoneg_cb(const struct nlmsghdr *nlhdr, void *data)

 		else if (peer.pause)

 			tx_status = true;

 	}

-	printf("RX negotiated: %s\nTX negotiated: %s\n",

-	       rx_status ? "on" : "off", tx_status ? "on" : "off");

+

+	open_json_object("negotiated");

+	show_bool_val("rx", "RX negotiated: %s\n", &rx_status);

+	show_bool_val("tx", "TX negotiated: %s\n", &tx_status);

+	close_json_object();

 	return MNL_CB_OK;

 }

@@ -121,21 +124,34 @@ int pause_reply_cb(const struct nlmsghdr *nlhdr, void *data)

 		return err_ret;

 	if (silent)

-		putchar('\n');

-	printf("Pause parameters for %s:\n", nlctx->devname);

-	show_bool(tb[ETHTOOL_A_PAUSE_AUTONEG], "Autonegotiate:\t");

-	show_bool(tb[ETHTOOL_A_PAUSE_RX], "RX:\t\t");

-	show_bool(tb[ETHTOOL_A_PAUSE_TX], "TX:\t\t");

+		print_nl();

+

+	open_json_object(NULL);

+

+	print_string(PRINT_ANY, "ifname", "Pause parameters for %s:\n",

+		     nlctx->devname);

+

+	show_bool("autonegotiate", "Autonegotiate:\t%s\n",

+		  tb[ETHTOOL_A_PAUSE_AUTONEG]);

+	show_bool("rx", "RX:\t\t%s\n", tb[ETHTOOL_A_PAUSE_RX]);

+	show_bool("tx", "TX:\t\t%s\n", tb[ETHTOOL_A_PAUSE_TX]);

+

 	if (!nlctx->is_monitor && tb[ETHTOOL_A_PAUSE_AUTONEG] &&

 	    mnl_attr_get_u8(tb[ETHTOOL_A_PAUSE_AUTONEG])) {

 		ret = show_pause_autoneg_status(nlctx);

 		if (ret < 0)

-			return err_ret;

+			goto err_close_dev;

 	}

 	if (!silent)

-		putchar('\n');

+		print_nl();

+

+	close_json_object();

 	return MNL_CB_OK;

+

+err_close_dev:

+	close_json_object();

+	return err_ret;

 }

 int nl_gpause(struct cmd_context *ctx)

@@ -156,7 +172,11 @@ int nl_gpause(struct cmd_context *ctx)

 				      ETHTOOL_A_PAUSE_HEADER, 0);

 	if (ret < 0)

 		return ret;

-	return nlsock_send_get_request(nlsk, pause_reply_cb);

+

+	new_json_obj(ctx->json);

+	ret = nlsock_send_get_request(nlsk, pause_reply_cb);

+	delete_json_obj();

+	return ret;

 }

 /* PAUSE_SET */

-- 

2.26.2