Commit f0d2ca15 authored Jun 12, 2019 by Maxime Chevallier Committed by David S. Miller Jun 12, 2019

net: ethtool: Allow matching on vlan DEI bit



Using ethtool, users can specify a classification action matching on the
full vlan tag, which includes the DEI bit (also previously called CFI).

However, when converting the ethool_flow_spec to a flow_rule, we use
dissector keys to represent the matching patterns.

Since the vlan dissector key doesn't include the DEI bit, this
information was silently discarded when translating the ethtool
flow spec in to a flow_rule.

This commit adds the DEI bit into the vlan dissector key, and allows
propagating the information to the driver when parsing the ethtool flow
spec.

Fixes: eca4205f ("ethtool: add ethtool_rx_flow_spec to flow_rule structure translator")
Reported-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bb2e05e0

include/net/flow_dissector.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ struct flow_dissector_key_tags {

		struct flow_dissector_key_vlan {
		u16 vlan_id:12,
		vlan_dei:1,
		vlan_priority:3;
		__be16 vlan_tpid;
		};

net/core/ethtool.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -3020,6 +3020,11 @@ ethtool_rx_flow_rule_create(const struct ethtool_rx_flow_spec_input *input)
		match->mask.vlan.vlan_id =
		ntohs(ext_m_spec->vlan_tci) & 0x0fff;

		match->key.vlan.vlan_dei =
		!!(ext_h_spec->vlan_tci & htons(0x1000));
		match->mask.vlan.vlan_dei =
		!!(ext_m_spec->vlan_tci & htons(0x1000));

		match->key.vlan.vlan_priority =
		(ntohs(ext_h_spec->vlan_tci) & 0xe000) >> 13;
		match->mask.vlan.vlan_priority =

Admin message