| Message ID | 20250122011445.4026973-1-mkedwards@meta.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ethtool: Fix JSON output for IRQ coalescing | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Tue, 21 Jan 2025 17:14:34 -0800 Michael Edwards wrote: > Currently, for a NIC that supports CQE mode settings, the output of > ethtool --json -c eth0 looks like this: > > [ { > "ifname": "eth0", > "rx": false, > "tx": false, > "rx-usecs": 33, > "rx-frames": 88, > "tx-usecs": 158, > "tx-frames": 128, > "rx": true, > "tx": false > } ] > > This diff will change the first rx/tx pair to adaptive-{rx|tx} and > the second pair to cqe-mode-{rx|tx} to match the keys used to set > the corresponding settings. Missing 3 details: - your Signed-off-by tag - To: Michal K who maintains ethtool - Fixes tag pointing to the commit where it got broken Renaming adaptive keys may be a bit controversial. We can decide whether it's okay to change the key based on how long we had json output for "rx" and "tx" before "modes" got added (IOW how long this has been broken for). If breakage is recent we need to leave adaptive be, someone may already be using 'rx' and 'tx' as the keys in their scripts.
diff --git a/netlink/coalesce.c b/netlink/coalesce.c index bb93f9b..bc8b57b 100644 --- a/netlink/coalesce.c +++ b/netlink/coalesce.c @@ -39,9 +39,9 @@ int coalesce_reply_cb(const struct nlmsghdr *nlhdr, void *data) show_cr(); print_string(PRINT_ANY, "ifname", "Coalesce parameters for %s:\n", nlctx->devname); - show_bool("rx", "Adaptive RX: %s ", + show_bool("adaptive-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_bool("adaptive-tx", "TX: %s\n", tb[ETHTOOL_A_COALESCE_USE_ADAPTIVE_TX]); show_u32("stats-block-usecs", "stats-block-usecs:\t", tb[ETHTOOL_A_COALESCE_STATS_BLOCK_USECS]); show_u32("sample-interval", "sample-interval:\t", @@ -85,9 +85,9 @@ int coalesce_reply_cb(const struct nlmsghdr *nlhdr, void *data) show_u32("tx-frame-high", "tx-frame-high:\t", tb[ETHTOOL_A_COALESCE_TX_MAX_FRAMES_HIGH]); show_cr(); - show_bool("rx", "CQE mode RX: %s ", + show_bool("cqe-mode-rx", "CQE mode RX: %s ", tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_RX]); - show_bool("tx", "TX: %s\n", tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_TX]); + show_bool("cqe-mode-tx", "TX: %s\n", tb[ETHTOOL_A_COALESCE_USE_CQE_MODE_TX]); show_cr(); show_u32("tx-aggr-max-bytes", "tx-aggr-max-bytes:\t", tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES]);
Currently, for a NIC that supports CQE mode settings, the output of ethtool --json -c eth0 looks like this: [ { "ifname": "eth0", "rx": false, "tx": false, "rx-usecs": 33, "rx-frames": 88, "tx-usecs": 158, "tx-frames": 128, "rx": true, "tx": false } ] This diff will change the first rx/tx pair to adaptive-{rx|tx} and the second pair to cqe-mode-{rx|tx} to match the keys used to set the corresponding settings. --- netlink/coalesce.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)