@@ -378,10 +378,25 @@ struct ethtool_usrip4_spec {
};
/**
+ * struct ethtool_ntuple_spec_ext - flow spec extension for ntuple in nfc
+ * @unused: space unused by extension
+ * @vlan_etype: EtherType for vlan tagged packet to match
+ * @vlan_tci: VLAN tag to match
+ * @data: Driver-dependent data to match
+ */
+struct ethtool_ntuple_spec_ext {
+ __be32 unused[15];
+ __be16 vlan_etype;
+ __be16 vlan_tci;
+ __be32 data[2];
+};
+
+/**
* struct ethtool_rx_flow_spec - specification for RX flow filter
* @flow_type: Type of match to perform, e.g. %TCP_V4_FLOW
* @h_u: Flow fields to match (dependent on @flow_type)
* @m_u: Masks for flow field bits to be ignored
+ * @flow_type_ext: Type of extended match to perform, e.g. %NTUPLE_FLOW_EXT
* @ring_cookie: RX ring/queue index to deliver to, or %RX_CLS_FLOW_DISC
* if packets should be discarded
* @location: Index of filter in hardware table
@@ -396,8 +411,10 @@ struct ethtool_rx_flow_spec {
struct ethtool_ah_espip4_spec esp_ip4_spec;
struct ethtool_usrip4_spec usr_ip4_spec;
struct ethhdr ether_spec;
+ struct ethtool_ntuple_spec_ext ntuple_spec;
__u8 hdata[72];
} h_u, m_u;
+ __u32 flow_type_ext;
__u64 ring_cookie;
__u32 location;
};
@@ -955,6 +972,9 @@ struct ethtool_ops {
#define IPV6_FLOW 0x11 /* hash only */
#define ETHER_FLOW 0x12 /* spec only (ether_spec) */
+/* Flow extension types for network flow classifier */
+#define NTUPLE_FLOW_EXT 0x01 /* indicates ntuple in nfc */
+
/* L3-L4 network traffic flow hash options */
#define RXH_L2DA (1 << 1)
#define RXH_VLAN (1 << 2)
This change is meant to add an ntuple define type to the rx network flow classification specifiers. The idea is to allow ntuple to be displayed and possibly configured via the network flow classification interface. To do this I added a ntuple_flow_spec_ext to the lsit of supported filters, and added a flow_type_ext value to the structure in an unused hole within the ethtool_rx_flow_spec structure. Due to the fact that the flow specifier structures are only 4 byte aligned instead of 8 I had to break the user data field into 2 sections. In addition I added the vlan ethertype field since this is what ixgbe was using the user-data for currently and it allows for the fields to stay 4 byte aligned while occupying space at the end of the flow_spec. In order to guarantee byte ordering I also thought it best to keep all fields in the flow_spec area a big endian value, as such I added vlan, vlan ethertype, and data as big endian values. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> --- include/linux/ethtool.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html