Ben Hutchings says: ==================== Pull request: Fixes for new ethtool RSS commands This addresses several problems I previously identified with the new ETHTOOL_{G,S}RSSH commands: 1. Missing validation of reserved parameters 2. Vague documentation 3. Use of unnamed magic number 4. No consolidation with existing driver operations I don't currently have access to suitable network hardware, but have tested these changes with a dummy driver that can support various combinations of operations and sizes, together with (a) Debian's ethtool 3.13 (b) ethtool 3.14 with the submitted patch to use ETHTOOL_{G,S}RSSH and minor adjustment for fixes 1 and 3. v2: Update RSS operations in vmxnet3 too ====================
Showing the changes to include/uapi/linux (1 of 14 files). Show all
Unified · Split
| @@ -850,21 +850,23 @@ struct ethtool_rxfh_indir { · 849 unmodified lines | |||
| 850 | * struct ethtool_rxfh - command to get/set RX flow hash indir or/and hash key. | 850 | * struct ethtool_rxfh - command to get/set RX flow hash indir or/and hash key. |
| 851 | * @cmd: Specific command number - %ETHTOOL_GRSSH or %ETHTOOL_SRSSH | 851 | * @cmd: Specific command number - %ETHTOOL_GRSSH or %ETHTOOL_SRSSH |
| 852 | * @rss_context: RSS context identifier. | 852 | * @rss_context: RSS context identifier. |
| 853 | * @indir_size: On entry, the array size of the user buffer, which may be zero. | 853 | * @indir_size: On entry, the array size of the user buffer for the |
| 854 | * On return from %ETHTOOL_GRSSH, the array size of the hardware | 854 | * indirection table, which may be zero, or (for %ETHTOOL_SRSSH), |
| 855 | * indirection table. | 855 | * %ETH_RXFH_INDIR_NO_CHANGE. On return from %ETHTOOL_GRSSH, |
| 856 | * @key_size: On entry, the array size of the user buffer in bytes, | 856 | * the array size of the hardware indirection table. |
| 857 | * which may be zero. | 857 | * @key_size: On entry, the array size of the user buffer for the hash key, |
| 858 | * On return from %ETHTOOL_GRSSH, the size of the RSS hash key. | 858 | * which may be zero. On return from %ETHTOOL_GRSSH, the size of the |
| 859 | * hardware hash key. | ||
| 859 | * @rsvd: Reserved for future extensions. | 860 | * @rsvd: Reserved for future extensions. |
| 860 | * @rss_config: RX ring/queue index for each hash value i.e., indirection table | 861 | * @rss_config: RX ring/queue index for each hash value i.e., indirection table |
| 861 | * of size @indir_size followed by hash key of size @key_size. | 862 | * of @indir_size __u32 elements, followed by hash key of @key_size |
| 863 | * bytes. | ||
| 862 | * | 864 | * |
| 863 | * For %ETHTOOL_GRSSH, a @indir_size and key_size of zero means that only the | 865 | * For %ETHTOOL_GRSSH, a @indir_size and key_size of zero means that only the |
| 864 | * size should be returned. For %ETHTOOL_SRSSH, a @indir_size of 0xDEADBEEF | 866 | * size should be returned. For %ETHTOOL_SRSSH, an @indir_size of |
| 865 | * means that indir table setting is not requested and a @indir_size of zero | 867 | * %ETH_RXFH_INDIR_NO_CHANGE means that indir table setting is not requested |
| 866 | * means the indir table should be reset to default values. This last feature | 868 | * and a @indir_size of zero means the indir table should be reset to default |
| 867 | * is not supported by the original implementations. | 869 | * values. |
| 868 | */ | 870 | */ |
| 869 | struct ethtool_rxfh { | 871 | struct ethtool_rxfh { |
| 870 | __u32 cmd; | 872 | __u32 cmd; |
| @@ -874,6 +876,7 @@ struct ethtool_rxfh { · 3 unmodified lines | |||
| 874 | __u32 rsvd[2]; | 876 | __u32 rsvd[2]; |
| 875 | __u32 rss_config[0]; | 877 | __u32 rss_config[0]; |
| 876 | }; | 878 | }; |
| 879 | #define ETH_RXFH_INDIR_NO_CHANGE 0xffffffff | ||
| 877 | 880 | ||
| 878 | /** | 881 | /** |
| 879 | * struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter | 882 | * struct ethtool_rx_ntuple_flow_spec - specification for RX flow filter |