diff mbox series

[ovs-dev,v5,3/4] netdev-linux: Generalize ethtool stringset query.

Message ID 20260318110442.102318-4-matteo.perin@canonical.com
State New
Delegated to: Ilya Maximets
Headers show
Series netdev-linux: Add peer_ifindex in interface status for veth. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed

Commit Message

Matteo Perin March 18, 2026, 11:04 a.m. UTC 
Refactor netdev_linux_read_stringset_info() and
netdev_linux_read_definitions() to accept a string set type
parameter, instead of hardcoding ETH_SS_FEATURES.

This allows these functions to query any ethtool string set type,
such as ETH_SS_STATS (i.e. device statistics).

Signed-off-by: Matteo Perin <matteo.perin@canonical.com>
---
 lib/netdev-linux.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index c44aa4093..40d10f66e 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -2562,7 +2562,9 @@  netdev_internal_get_stats(const struct netdev *netdev_,
 }
 
 static int
-netdev_linux_read_stringset_info(struct netdev_linux *netdev, uint32_t *len)
+netdev_linux_read_stringset_info(struct netdev_linux *netdev,
+                                 enum ethtool_stringset string_set,
+                                 uint32_t *len)
 {
     union {
         struct ethtool_cmd ecmd;
@@ -2576,7 +2578,7 @@  netdev_linux_read_stringset_info(struct netdev_linux *netdev, uint32_t *len)
 
     sset_info.hdr.cmd = ETHTOOL_GSSET_INFO;
     sset_info.hdr.reserved = 0;
-    sset_info.hdr.sset_mask = 1ULL << ETH_SS_FEATURES;
+    sset_info.hdr.sset_mask = 1ULL << string_set;
 
     error = netdev_linux_do_ethtool(netdev_get_name(&netdev->up),
                                     (struct ethtool_cmd *) &sset_info,
@@ -2584,11 +2586,11 @@  netdev_linux_read_stringset_info(struct netdev_linux *netdev, uint32_t *len)
     if (error) {
         return error;
     }
-    if (sset_info.hdr.sset_mask & (1ULL << ETH_SS_FEATURES)) {
+    if (sset_info.hdr.sset_mask & (1ULL << string_set)) {
         *len = sset_info.sset_len[0];
         return 0;
     } else {
-        /* ETH_SS_FEATURES is not supported. */
+        /* String set is not supported. */
         return -EOPNOTSUPP;
     }
 }
@@ -2596,13 +2598,14 @@  netdev_linux_read_stringset_info(struct netdev_linux *netdev, uint32_t *len)
 
 static int
 netdev_linux_read_definitions(struct netdev_linux *netdev,
+                              enum ethtool_stringset string_set,
                               struct ethtool_gstrings **pstrings)
 {
     struct ethtool_gstrings *strings = NULL;
     uint32_t len = 0;
     int error = 0;
 
-    error = netdev_linux_read_stringset_info(netdev, &len);
+    error = netdev_linux_read_stringset_info(netdev, string_set, &len);
     if (error) {
         return error;
     } else if (!len) {
@@ -2612,7 +2615,7 @@  netdev_linux_read_definitions(struct netdev_linux *netdev,
     strings = xzalloc(sizeof *strings + len * ETH_GSTRING_LEN);
 
     strings->cmd = ETHTOOL_GSTRINGS;
-    strings->string_set = ETH_SS_FEATURES;
+    strings->string_set = string_set;
     strings->len = len;
     error = netdev_linux_do_ethtool(netdev_get_name(&netdev->up),
                                     (struct ethtool_cmd *) strings,
@@ -2644,7 +2647,7 @@  netdev_linux_set_ol(struct netdev *netdev_)
 
     COVERAGE_INC(netdev_get_ethtool);
 
-    error = netdev_linux_read_definitions(netdev, &names);
+    error = netdev_linux_read_definitions(netdev, ETH_SS_FEATURES, &names);
     if (error) {
         return;
     }