ethtool: Correctly pull n-tuple string length for get_rx_ntuple
Subsystems (2)
PATCH v4 1/1 ethtool: Correctly pull n-tuple string length for get_rx_ntuple
From: Peter Waskiewicz <[email protected]>
This patch fixes inconsistencies with the kernel header files, while correctly gets the variable length string counts for the get_rx_ntuple return value. It does this by using the new GSSET_INFO ioctl.
Signed-off-by Peter P Waskiewicz Jr <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
ethtool-copy.h | 14 ++++++++++++-- ethtool.c | 19 ++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-)
ethtool-copy.h +12 -2
@@ -253,6 +253,17 @@ struct ethtool_gstrings {__u8 data[0 ]; }; +struct ethtool_sset_info { +__u32 cmd;/* ETHTOOL_GSSET_INFO */ +__u32 reserved; +__u64 sset_mask;/* input: each bit selects an sset to query */ +/* output: each bit a returned sset */ +__u32 data[0 ];/* ETH_SS_xxx count, in order, based on bits +in sset_mask. One bit implies one +__u32, two bits implies two +__u32's, etc. */ +}; +enum ethtool_test_flags {ETH_TEST_FL_OFFLINE = (1 <<0 ),/* online / offline */ ETH_TEST_FL_FAILED = (1 <<1 ),/* test passed / failed */
@@ -389,8 +400,6 @@ struct ethtool_rx_ntuple_flow_spec {#define ETHTOOL_RXNTUPLE_ACTION_DROP -1 }; -#define ETHTOOL_MAX_NTUPLE_LIST_ENTRY 1024 -#define ETHTOOL_MAX_NTUPLE_STRING_PER_ENTRY 14struct ethtool_rx_ntuple {__u32 cmd;struct ethtool_rx_ntuple_flow_spec fs;
@@ -466,6 +475,7 @@ struct ethtool_flash {#define ETHTOOL_SRXNTUPLE 0x00000035/* Add an n-tuple filter to device */ #define ETHTOOL_GRXNTUPLE 0x00000036/* Get n-tuple filters from device */ +#define ETHTOOL_GSSET_INFO 0x00000037/* Get string set info */ /* compatibility with older code */ #define SPARC_ETH_GSET ETHTOOL_GSET
ethtool.c +16 -3
@@ -2657,11 +2657,24 @@ static int do_srxntuple(int fd, struct ifreq *ifr)static int do_grxntuple (int fd,struct ifreq *ifr) { +struct ethtool_sset_info *sset_info;struct ethtool_gstrings *strings;int sz_str, n_strings, err, i; - n_strings =ETHTOOL_MAX_NTUPLE_LIST_ENTRY * -ETHTOOL_MAX_NTUPLE_STRING_PER_ENTRY ; + sset_info =malloc (sizeof (struct ethtool_sset_info ) +sizeof (u32)); + sset_info->cmd =ETHTOOL_GSSET_INFO ; + sset_info->sset_mask = (1ULL <<ETH_SS_NTUPLE_FILTERS ); + ifr->ifr_data = (caddr_t )sset_info; + err =send_ioctl (fd, ifr); + +if ((err <0 ) || + (!(sset_info->sset_mask & (1ULL <<ETH_SS_NTUPLE_FILTERS )))) { +perror ("Cannot get driver strings info" ); +return 100 ; + } + + n_strings = sset_info->data[0 ]; +free (sset_info); sz_str = n_strings *ETH_GSTRING_LEN ; strings =calloc (1 , sz_str +sizeof (struct ethtool_gstrings ));
@@ -2678,7 +2691,7 @@ static int do_grxntuple(int fd, struct ifreq *ifr)if (err <0 ) {perror ("Cannot get Rx n-tuple information" );free (strings); -return 100 ; +return 101 ; } n_strings = strings->len;
Jeff Garzik
AppliedQuoted 6 lines · Jeff Kirsher
From: Peter Waskiewicz<[email protected]>
This patch fixes inconsistencies with the kernel header files, while correctly gets the variable length string counts for the
get_rx_ntuplereturn value. It does this by using the newGSSET_INFOioctl.
Quoted 7 lines
Signed-off-by Peter P Waskiewicz Jr<[email protected]>Signed-off-by Jeff Kirsher<[email protected]>---
ethtool-copy.h | 14 ++++++++++++-- ethtool.c | 19 ++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-)
applied