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.

Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Acked-by: Pablo Neira Ayuso <pablo@gnumonks.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 4d1011b..6288e69 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -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)) {
        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;
        case TCP_V4_FLOW:
        case UDP_V4_FLOW: {
                const struct ethtool_tcpip4_spec *v4_spec, *v4_m_spec;