net: ethtool: Allow parsing ETHER_FLOW types when using flow_rule
Subsystems (2)
PATCH v2 1/1 net: ethtool: Allow parsing ETHER_FLOW types when using flow_rule
When parsing an ethtool_rx_flow_spec, users can specify an ethernet flow which could contain matches based on the ethernet header, such as the MAC address, the VLAN tag or the ethertype.
ETHER_FLOW uses the src and dst ethernet addresses, along with the ethertype as keys. Matches based on the vlan tag are also possible, but they are specified using the special FLOW_EXT flag.
---
V2 : Add src and dst mac address parsing, as suggested by Pablo.
net/core/ethtool.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
net/core/ethtool.c +24 -0
@@ -2883,6 +2883,30 @@ ethtool_rx_flow_rule_create(const struct ethtool_rx_flow_spec_input *input) match->mask.basic.n_proto =htons (0xffff );switch (fs->flow_type & ~(FLOW_EXT |FLOW_MAC_EXT |FLOW_RSS )) { +case ETHER_FLOW : { +const struct ethhdr *ether_spec, *ether_m_spec; + + ether_spec = &fs->h_u.ether_spec; + ether_m_spec = &fs->m_u.ether_spec; + +if (!is_zero_ether_addr (ether_m_spec->h_source)) { +ether_addr_copy (match->key.eth_addrs.src, + ether_spec->h_source); +ether_addr_copy (match->mask.eth_addrs.src, + ether_m_spec->h_source); + } +if (!is_zero_ether_addr (ether_m_spec->h_dest)) { +ether_addr_copy (match->key.eth_addrs.dst, + ether_spec->h_dest); +ether_addr_copy (match->mask.eth_addrs.dst, + ether_m_spec->h_dest); + } +if (ether_m_spec->h_proto) { + match->key.basic.n_proto = ether_spec->h_proto; + match->mask.basic.n_proto = ether_m_spec->h_proto; + } + } +break ;case TCP_V4_FLOW :case UDP_V4_FLOW : {const struct ethtool_tcpip4_spec *v4_spec, *v4_m_spec;
Signature · 1 line
2.20.1
Quoted 9 lines · Maxime Chevallier
When parsing an
ethtool_rx_flow_spec, users can specify an ethernet flow which could contain matches based on the ethernet header, such as the MAC address, the VLAN tag or the ethertype.
ETHER_FLOWuses the src and dst ethernet addresses, along with the ethertype as keys. Matches based on the vlan tag are also possible, but they are specified using the specialFLOW_EXTflag.Signed-off-by Maxime Chevallier <[email protected]>
Thanks Maxime.
From: Maxime Chevallier <[email protected]>
Date: Thu, 27 Jun 2019 10:52:26 +0200
Quoted 11 lines
When parsing an
ethtool_rx_flow_spec, users can specify an ethernet flow which could contain matches based on the ethernet header, such as the MAC address, the VLAN tag or the ethertype.
ETHER_FLOWuses the src and dst ethernet addresses, along with the ethertype as keys. Matches based on the vlan tag are also possible, but they are specified using the specialFLOW_EXTflag.Signed-off-by Maxime Chevallier <[email protected]>---
V2 : Add src and dst mac address parsing, as suggested by Pablo.
Applied, thanks.