Git log: commit 68409b09a969b49a07fbf3930409f155b953434b
Author: Salvatore Bonaccorso <carnil@debian.org>
Date: Mon Mar 6 17:04:19 2023 +0100
debian/changelog: Note new upstream release
commit e2342adf3ed616ab07a5a246cdc39c81d13d1775
Merge: b24474c 82642de
Author: Salvatore Bonaccorso <carnil@debian.org>
Date: Mon Mar 6 17:03:10 2023 +0100
Merge tag 'v6.2'
Release version 6.2.
commit 82642de0751cb0122c73757a906a63f2a272a2d1
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Tue Feb 21 15:25:14 2023 +0100
Release version 6.2.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
commit 97bbcba3ec8dbd206fdab615f8be504ecc5cca5f
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Wed Feb 1 17:55:58 2023 +0100
pretty: fix RSS attribute constants
Message descriptions for RSS messages refer to ETHTOOL_A_MODULE_* constants
which have the same as corresponding ETHTOOL_A_RSS_* ones but fix them
anyway to avoid confusion.
Fixes: ffab99c1f382 ("netlink: add netlink handler for get rss (-x)")
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
commit f546f15e68bd3af6a0983b6ef9e1b8eb11190deb
Merge: 2ce1970 ffab99c
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Wed Feb 1 16:34:32 2023 +0100
Merge branch 'review/get-rss-v6' into master
Sudheer Mogilappagari:
These patches add netlink based handler to fetch RSS information
using "ethtool -x <eth> [context %d]" command.
Output without --json option
$ethtool -x eno2
RX flow hash indirection table for eno2 with 8 RX ring(s):
0: 0 0 0 0 0 0 0 0
8: 1 1 1 1 1 1 1 1
...skip similar lines...
120: 7 7 7 7 7 7 7 7
RSS hash key:
be:c3:13:a6:59:9a:c3:c5:d8:60:75:2b:4c:b2:12:cc:5c:4e:34:
8a:f9:ab:16:c7:19:5d:ab:1d:b5:c1:c7:57:c7:a2:e1:2b:e3:ea:
02:60:88:8e:96:ef:2d:64:d2:de:2c:16:72:b6
RSS hash function:
toeplitz: on
xor: off
crc32: off
Sample output with json option:
$ethtool --json -x eno2
[ {
"ifname": "eno2",
"rss-indirection-table": [ 0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,
...skip similar lines...
7,7,7,7,7,7,7,7 ],
"rss-hash-key": [ 190,195,19,166,..],
"rss-hash-function": "toeplitz"
} ]
Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
---
v6:
- Added break after printing hash function in json output
- Coding style fixes
- Add v6 changelog in cover-letter and resend
v5:
- Fixed use of same socket for fetching rings info and RSS info
- Added checks to test if a field exists before accessing reply message
- Refactor print functions and avoid use of ethtool_rxfh structure
v4:
-Fixed hash function values in example output of commit message.
v3:
-Made hash key as an array of ints.
-Skip json field when not supported.
-Made hash function values as true/false instead of on/off
-Formatted key strings as per review comments.
v2:
-Added json support
commit 2ce19707f6690a520aaa826537de09b39381a715
Merge: af0b9d9 41be533
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Wed Feb 1 16:33:07 2023 +0100
Merge branch 'review/build-fixes-v2' into master
Florian Fainelli:
These 3 patches fix build issues encountered in the 6.1 release with
either older kernel headers (pre v4.11) or with musl-libc.
In case you want to add a prebuilt toolchain with your release procedure
you can use those binaries:
https://github.com/Broadcom/stbgcc-8.3/releases/tag/stbgcc-8.3-0.4
Changes in v2:
- reworked the first commit to bring in if.h, this is a more invasive
change but it allows us to drop the ALTIFNAMSIZ override and it might
be easier to maintain moving forward
- reworked the third commit to avoid using non standard integer types
commit ffab99c1f3820e21d65686e030dcf2c4fd0a8bd0
Author: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Date: Mon Jan 23 13:25:01 2023 -0800
netlink: add netlink handler for get rss (-x)
Add support for netlink based "ethtool -x <dev>" command using
ETHTOOL_MSG_RSS_GET netlink message. It implements same functionality
provided by traditional ETHTOOL_GRSSH subcommand. This displays RSS
table, hash key and hash function along with JSON support.
Sample output with json option:
$ethtool --json -x eno2
[ {
"ifname": "eno2",
"rss-indirection-table": [ 0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,
...skip similar lines...
7,7,7,7,7,7,7,7 ],
"rss-hash-key": [ 190,195,19,166,..],
"rss-hash-function": "toeplitz"
} ]
Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
commit d139d369c1506d72ddff2909b16a9f8fa7cae46c
Author: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Date: Mon Jan 23 13:25:00 2023 -0800
Move code that print rss info into common file
Move function that prints rss indirection table and hash key into
common file for use by both netlink and ioctl interface. Changed
function argument to be ring count instead of structure.
Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
commit 41be533331fc3c6b711dbe532405782d3b8be5d1
Author: Florian Fainelli <f.fainelli@gmail.com>
Date: Sat Jan 14 08:34:11 2023 -0800
marvell.c: Fix build with musl-libc
After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped
including net/if.h which resolved the proper defines to pull in
sys/types.h and provide a definition for u_int32_t. With musl-libc we
would need to define _GNU_SOURCE to ensure that sys/types.h does provide a
definition for u_int32_t.
Rather, just replace u_uint{16,32}_t with the more standard
uint{16,32}_t types from stdint.h
Fixes: 1fa60003a8b8 ("misc: header includes cleanup")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
commit 3ecec13406c62a36ffaac24b285c852eb016006b
Author: Florian Fainelli <f.fainelli@gmail.com>
Date: Sat Jan 14 08:34:10 2023 -0800
netlink: Fix maybe uninitialized 'meters' variable
GCC12 warns that 'meters' may be uninitialized, initialize it
accordingly.
Fixes: 9561db9b76f4 ("Add cable test TDR support")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
commit 0b09751eb84178d19e4f92543b7fb1e4f162c236
Author: Florian Fainelli <f.fainelli@gmail.com>
Date: Sat Jan 14 08:34:09 2023 -0800
uapi: Bring in if.h
Bring in if.h from commit eec517cdb481 ("net: Add IF_OPER_TESTING") as
well as uapi/linux/hdlc/ioctl.h. Ensure that we define all of the
necessary guards to provide updated definitions of ifmap, ifreq and
IFNAMSIZ. This resolves build issues with kernel headers < 4.11 which
lacked 2618be7dccf8739b89e1906b64bd8d551af351e6 ("uapi: fix linux/if.h
userspace compilation errors").
Fixes: 1fa60003a8b8 ("misc: header includes cleanup")
Reported-by: Markus Mayer <mmayer@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
commit af0b9d9783df8005672e7cd986b997b7e40a9ed1
Author: Maxim Georgiev <glipus@gmail.com>
Date: Tue Dec 27 10:52:21 2022 -0700
JSON output support for Netlink implementation of --show-ring option
Add --json support for Netlink implementation of --show-ring option
No changes for non-JSON output for this featire.
Example output without --json:
[ethtool-git]$ /ethtool -g enp9s0u2u1u2
Ring parameters for enp9s0u2u1u2:
Pre-set maximums:
RX: 4096
RX Mini: n/a
RX Jumbo: n/a
TX: n/a
Current hardware settings:
RX: 100
RX Mini: n/a
RX Jumbo: n/a
TX: n/a
RX Buf Len: n/a
CQE Size: n/a
TX Push: off
TCP data split: n/a
Same output with --json:
[ethtool-git]$ ./ethtool --json -g enp9s0u2u1u2
[ {
"ifname": "enp9s0u2u1u2",
"rx-max": 4096,
"rx": 100,
"tx-push": false
} ]
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Maxim Georgiev <glipus@gmail.com>
commit bd67f809c1f2fe5ee8c461b0af33ccb80d6502fd
Author: Maxim Georgiev <glipus@gmail.com>
Date: Tue Dec 27 10:36:20 2022 -0700
Fixing boolean value output for Netlink reported values in JSON format
Current implementation of show_bool_val() passes "val" parameter of pointer
type as a last parameter to print_bool():
https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/netlink/netlink.h#n131
...
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_bool() expects the last parameter to be bool:
https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/json_print.c#n153
...
void print_bool(enum output_type type,
const char *key,
const char *fmt,
bool value)
{
...
Current show_bool_val() implementation converts "val" pointer to bool while
calling show_bool_val(). As a result show_bool_val() always prints the value
as "true" as long as it gets a non-null pointer to the boolean value, even if
the referred boolean value is false.
Fixes: 7e5c1ddbe67d ("pause: add --json support")
Signed-off-by: Maxim Georgiev <glipus@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
commit 0da165ab4c1da658fee31597a71dd568515c92c3
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Tue Dec 20 17:59:38 2022 +0100
add 800Gb/s modes to link mode tables
Add recently added 800000base link modes to man page and ioctl and fallback
code paths.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
commit 8cee2091ae2af58a82abee9a656fcf7c04ebdefc
Author: Maxim Georgiev <glipus@gmail.com>
Date: Wed Dec 14 22:13:47 2022 -0700
JSON output support for Netlink implementation of --show-coalesce option
Add --json support for Netlink implementation of --show-coalesce option
No changes for non-JSON output for this feature.
Example output without --json:
[ethtool-git]$ sudo ./ethtool --show-coalesce enp9s0u2u1u2
Coalesce parameters for enp9s0u2u1u2:
Adaptive RX: n/a TX: n/a
stats-block-usecs: n/a
sample-interval: n/a
pkt-rate-low: n/a
pkt-rate-high: n/a
rx-usecs: 15000
rx-frames: n/a
rx-usecs-irq: n/a
rx-frames-irq: n/a
tx-usecs: 0
tx-frames: n/a
tx-usecs-irq: n/a
tx-frames-irq: n/a
rx-usecs-low: n/a
rx-frame-low: n/a
tx-usecs-low: n/a
tx-frame-low: n/a
rx-usecs-high: n/a
rx-frame-high: n/a
tx-usecs-high: n/a
tx-frame-high: n/a
CQE mode RX: n/a TX: n/a
Same output with --json:
[ethtool-git]$ sudo ./ethtool --json --show-coalesce enp9s0u2u1u2
[ {
"ifname": "enp9s0u2u1u2",
"rx-usecs": 15000,
"tx-usecs": 0
} ]
Note that since show_u32() signature was changed, all show_u32() call
sites had to be updated. So far only coalesce.c of all the updated files
supports JSON output. It's OK for now to mix show_u32() calls with
printf() calls in rings.c and channels.c since they can't print
JSON yet. Something to fix in future.
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Maxim Georgiev <glipus@gmail.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
commit 6177d9aece2fdd94f4ea69f0bea8e73994e9e8c5
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Mon Dec 19 23:54:14 2022 +0100
update UAPI header copies
Update to kernel commit 6feb57c2fd7c.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
commit aa1c279d49d83ce02c3d6d9af61c412898cfe52e
Merge: 8d8ab48 c179c6e
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Mon Dec 19 23:53:15 2022 +0100
Merge branch 'next' into master
Conflicts:
uapi/linux/if_link.h
commit c179c6e997ebb6dff26780ddb24d2d94122a440c
Author: Jakub Kicinski <kuba@kernel.org>
Date: Sun Dec 4 17:55:56 2022 +0100
linkstate: report the number of hard link flaps
Print the recently added link down event statistics when
present. We need to query the netlink policy to know if
the stats are supported.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
commit b814ed8f4525035a6bd7c8be35fd10b3d806d194
Author: Michal Kubecek <mkubecek@suse.cz>
Date: Sun Dec 4 17:52:43 2022 +0100
update UAPI header copies
Update to kernel commit 65e6af6cebef.
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
